Make Datetime local (No date if today) working (#31274) (#31275)

(cherry picked from commit 0253685304)

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>

.drone.star

@@ -1,8 +1,9 @@
 load('scripts/pr.star', 'pr_pipelines')
 load('scripts/master.star', 'master_pipelines')
 load('scripts/release.star', 'release_pipelines', 'test_release_pipelines')
+load('scripts/version.star', 'version_branch_pipelines')
 
 def main(ctx):
     edition = 'oss'
     return pr_pipelines(edition=edition) + master_pipelines(edition=edition) + release_pipelines() + \
-        test_release_pipelines()
+        test_release_pipelines() + version_branch_pipelines()

.eslintignore

@@ -5,3 +5,4 @@ vendor
 devenv
 data
 dist
+e2e/tmp

.eslintrc

@@ -1,9 +1,20 @@
 {
   "extends": ["@grafana/eslint-config"],
   "root": true,
+  "plugins": [
+    "no-only-tests"
+  ],
+  "rules": {
+    "no-only-tests/no-only-tests": "error",
+    "react/prop-types": "off"
+  },
   "overrides": [
     {
-      "files": ["packages/grafana-ui/**/*/!(*.story).{ts,tsx}", "public/app/**/*.{ts,tsx}"],
+      "files": [
+        "packages/grafana-ui/**/*/!(*.story).{ts,tsx}",
+        "packages/jaeger-ui-components/**/*.{ts,tsx,js}",
+        "public/app/**/*.{ts,tsx}"
+      ],
       "rules": {
         "react-hooks/rules-of-hooks": "off",
         "react-hooks/exhaustive-deps": "off"

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

.github/CODEOWNERS

@@ -12,15 +12,19 @@
 # This should make it easy to add new rules without breaking existing ones.
 
 # Documentation owner: Diana Payton
-/docs/ @oddlittlebird @achatterjee-grafana
-/contribute/ @oddlittlebird  @marcusolsson @achatterjee-grafana
+/docs/ @grafana/docs-squad
+/contribute/ @marcusolsson @grafana/docs-squad
 /docs/sources/developers/plugins/ @marcusolsson
+/docs/sources/enterprise/ @osg-grafana
 
 # Backend code
 *.go @grafana/backend-platform
 go.mod @grafana/backend-platform
 go.sum @grafana/backend-platform
 
+# Backend code docs
+/contribute/style-guides/backend.md @grafana/backend-platform
+
 /e2e @grafana/grafana-frontend-platform
 /packages @grafana/grafana-frontend-platform
 /plugins-bundled @grafana/grafana-frontend-platform
@@ -58,3 +62,6 @@ lerna.json @grafana/grafana-frontend-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
+
+# Cloud middleware
+/grafana-mixin/ @grafana/cloud-middleware

.github/actions/gha-publish-to-git/Dockerfile

@@ -1,7 +0,0 @@
-FROM alpine
-RUN apk update
-RUN apk add rsync git bash
-
-COPY entrypoint.sh /entrypoint.sh
-
-ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]

.github/actions/gha-publish-to-git/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2019 Sean Middleditch
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

.github/actions/gha-publish-to-git/README.md

@@ -1,60 +0,0 @@
-publish-to-git
-==============
-
-[GitHub Action](https://github.com/features/actions) for publishing a directory
-and its contents to another git repository.
-
-This can be especially useful for publishing static website, such as with
-[GitHub Pages](https://pages.github.com/), from built files in other job
-steps, such as [Doxygen](http://www.doxygen.nl/) generated HTML files.
-
-> **Note:** GitHub currently requires the use of a Personal Access Token for
-pushing to other repositories. Pushing to the current repository should work
-with the always-available GitHub Token (available via
-`{{ secrets.GITHUB_TOKEN }}`. If pushing to another repository, a Personal
-Access Token will need to be [created](https://help.github.com/en/articles/creating-a-personal-access-token-for-the-command-line) and assigned to the
-workflow [secrets](https://help.github.com/en/articles/virtual-environments-for-github-actions#creating-and-using-secrets-encrypted-variables).
-
-Inputs
-------
-
-- `repository`: Destination repository (default: current repository).
-- `branch`: Destination branch (required).
-- `host`: Destination git host (default: `github.com`).
-- `github_token`: GitHub Token (required; use `secrets.GITHUB_TOKEN`).
-- `github_pat`: Personal Access Token or other https credentials.
-- `source_folder`: Source folder in workspace to copy (default: workspace root).
-- `target_folder`: Target folder in destination branch to copy to (default: repository root).
-- `commit_author`: Override commit author (default: `{github.actor}@users.noreply.github.com`).
-- `commit_message`: Set commit message (default: `[workflow] Publish from [repository]:[branch]/[folder]`).
-- `dry_run`: Does not push if non-empty (default: empty).
-- `working_directory`: Location to checkout repository (default: random location in `${HOME}`)
-
-Outputs
--------
-
-- `commit_hash`: SHA hash of the new commit.
-- `working_directory`: Working directory of git clone of repository.
-
-License
--------
-
-MIT License. See [LICENSE](LICENSE) for details.
-
-Usage Example
--------------
-
-```yaml
-jobs:
-  publish:
-    - uses: actions/checkout@master
-    - run: |
-        sh scripts/build-doxygen-html.sh --out static/html
-    - uses: seanmiddleditch/gha-publish-to-git@master
-      with:
-        branch: gh-pages
-        github_token: '${{ secrets.GITHUB_TOKEN  }}'
-        github_pat: '${{ secrets.GH_PAT }}'
-        source_folder: static/html
-      if: success() && github.event == 'push'
-```

.github/actions/gha-publish-to-git/action.yml

@@ -1,60 +0,0 @@
----
-name: publish-to-git
-description: 'Publish files to a git repository'
-branding:
-  icon: 'git-commit'
-  color: 'blue'
-inputs:
-  repository:
-    description: 'Destination repository (default: current repository)'
-    default: ''
-  branch:
-    description: 'Destination branch'
-    required: true
-  host:
-    description: 'Destination git host'
-    default: 'github.com'
-  github_token:
-    description: 'GitHub Token (use `secrets.GITHUB_TOKEN`)'
-    required: true
-  github_pat:
-    description: 'Personal Access Token or other https credentials'
-    default: ''
-  source_folder:
-    description: 'Source folder in workspace to copy (default: workspace root)'
-    defaault: ''
-  target_folder:
-    description: 'Target folder in destination branch to copy to (default: repository root)'
-    default: ''
-  commit_author:
-    description: 'User Name <email@address> (default: [github.actor]@users.noreply.github.com)'
-    default: ''
-  commit_message:
-    description: 'Commit message (default: [workflow] Publish from [repository]:[branch]/[folder])'
-    default: ''
-  dry_run:
-    description: 'Do not push to repository (set to non-empty string to make dry-run)'
-    default: ''
-  working_directory:
-    description: 'Working directory for clone (default: random location in `${HOME}`)'
-    default: ''
-outputs:
-  commit_hash:
-    description: 'Hash of the new commit'
-  working_directory:
-    description: 'Working directory of temporary repository'
-runs:
-  using: 'docker'
-  image: 'Dockerfile'
-  args:
-    - ${{ inputs.repository }}
-    - ${{ inputs.branch }}
-    - ${{ inputs.host }}
-    - ${{ inputs.github_token }}
-    - ${{ inputs.github_pat }}
-    - ${{ inputs.source_folder }}
-    - ${{ inputs.target_folder }}
-    - ${{ inputs.commit_author }}
-    - ${{ inputs.commit_message }}
-    - ${{ inputs.dry_run }}
-    - ${{ inputs.working_directory }}

.github/actions/gha-publish-to-git/entrypoint.sh

@@ -1,99 +0,0 @@
-#/bin/bash
-
-# Name the Docker inputs.
-#
-INPUT_REPOSITORY="$1"
-INPUT_BRANCH="$2"
-INPUT_HOST="$3"
-INPUT_GITHUB_TOKEN="$4"
-INPUT_GITHUB_PAT="$5"
-INPUT_SOURCE_FOLDER="$6"
-INPUT_TARGET_FOLDER="$7"
-INPUT_COMMIT_AUTHOR="$8"
-INPUT_COMMIT_MESSAGE="$9"
-INPUT_DRYRUN="${10}"
-INPUT_WORKDIR="${11}"
-
-# Check for required inputs.
-#
-[ -z "$INPUT_BRANCH" ] && echo >&2 "::error::'branch' is required" && exit 1
-[ -z "$INPUT_GITHUB_TOKEN" -a -z "$INPUT_GITHUB_PAT" ] && echo >&2 "::error::'github_token' or 'github_pat' is required" && exit 1
-
-# Set state from inputs or defaults.
-#
-REPOSITORY="${INPUT_REPOSITORY:-${GITHUB_REPOSITORY}}"
-BRANCH="${INPUT_BRANCH}"
-HOST="${INPUT_GIT_HOST:-github.com}"
-TOKEN="${INPUT_GITHUB_PAT:-${INPUT_GITHUB_TOKEN}}"
-REMOTE="${INPUT_REMOTE:-https://${TOKEN}@${HOST}/${REPOSITORY}.git}"
-
-SOURCE_FOLDER="${INPUT_SOURCE_FOLDER:-.}"
-TARGET_FOLDER="${INPUT_TARGET_FOLDER}"
-
-REF="${GITHUB_BASE_REF:-${GITHUB_REF}}"
-REF_BRANCH=$(echo "${REF}" | rev | cut -d/ -f1 | rev)
-[ -z "$REF_BRANCH" ] && echo 2>&1 "No ref branch" && exit 1
-
-COMMIT_AUTHOR="${INPUT_AUTHOR:-${GITHUB_ACTOR} <${GITHUB_ACTOR}@users.noreply.github.com>}"
-COMMIT_MESSAGE="${INPUT_COMMIT_MESSAGE:-[${GITHUB_WORKFLOW}] Publish from ${GITHUB_REPOSITORY}:${REF_BRANCH}/${SOURCE_FOLDER}}"
-
-# Calculate the real source path.
-#
-SOURCE_PATH="$(realpath "${SOURCE_FOLDER}")"
-[ -z "${SOURCE_PATH}" ] && exit 1
-echo "::debug::SOURCE_PATH=${SOURCE_PATH}"
-
-# Let's start doing stuff.
-echo "Publishing ${SOURCE_FOLDER} to ${REMOTE}:${BRANCH}/${TARGET_FOLDER}"
-
-# Create a working directory; the workspace may be filled with other important
-# files.
-#
-WORK_DIR="${INPUT_WORKDIR:-$(mktemp -d "${HOME}/gitrepo.XXXXXX")}"
-[ -z "${WORK_DIR}" ] && echo >&2 "::error::Failed to create temporary working directory" && exit 1
-cd "${WORK_DIR}"
-
-# Initialize git repo and configure for remote access.
-#
-echo "Initializing repository with remote ${REMOTE}"
-git init || exit 1
-git config --local user.email "${GITHUB_ACTOR}@users.noreply.github.com" || exit 1
-git config --local user.name  "${GITHUB_ACTOR}" || exit 1
-git remote add origin "${REMOTE}" || exit 1
-git remote -v
-
-# Fetch initial (current contents).
-#
-echo "Fetching ${REMOTE}:${BRANCH}"
-git fetch --depth 1 origin "${BRANCH}" || exit 1
-git checkout -b "${BRANCH}" || exit 1
-git pull origin "${BRANCH}" || exit 1
-
-# Create the target directory (if necessary) and copy files from source.
-#
-TARGET_PATH="${WORK_DIR}/${TARGET_FOLDER}"
-echo "Populating ${TARGET_PATH}"
-mkdir -p "${TARGET_PATH}" || exit 1
-rsync -a --quiet --delete "${SOURCE_PATH}/" "${TARGET_PATH}" || exit 1
-
-# Create commit with changes.
-#
-echo "Creating commit"
-git add "${TARGET_PATH}" || exit 1
-git commit -m "${COMMIT_MESSAGE}" --author "${COMMIT_AUTHOR}" || exit 1
-COMMIT_HASH="$(git rev-parse HEAD)"
-echo "Created commit ${COMMIT_HASH}"
-
-# Publish output variables.
-#
-echo "::set-output name=commit_hash::${COMMIT_HASH}"
-echo "::set-output name=working_directory::${WORK_DIR}"
-
-# Push if not a dry-run.
-#
-if [ -z "${INPUT_DRYRUN}" ] ; then
-    echo "Pushing to ${REMOTE}:${BRANCH}"
-    git push origin "${BRANCH}" || exit 1
-else
-    echo "[DRY-RUN] Not pushing to ${REMOTE}:${BRANCH}"
-fi

.github/bot.md

@@ -0,0 +1,30 @@
+# GitHub & grafanabot automation
+
+The bot is configured via [commands.json](https://github.com/grafana/grafana/blob/master/.github/commands.json) and some other GitHub workflows [workflows](https://github.com/grafana/grafana/tree/master/.github/workflows).
+
+Comment commands:
+
+* Write the word `/duplicate #<number>`  anywhere in a comment and the bot  will add the correct label and standard message.
+* Write the word `/needsMoreInfo`  anywhere in a comment and the bot will add the correct label and standard message.
+
+Label commands:
+
+* Add label `bot/question` the the bot will close with standard question message and add label `type/question`
+* Add label `bot/duplicate` the the bot will close with standard duplicate message and add label `type/duplicate`
+* Add label `bot/needs more info` for bot to request more info (or use comment command mentioned above)
+* Add label `bot/close feature request` for bot to close a feature request with standard message and adds label `not implemented`
+* Add label `bot/no new info` for bot to close an issue where we asked for more info but has not received any updates in at least 14 days.
+
+## Metrics
+
+Metrics are configured in [metrics-collector.json](https://github.com/grafana/grafana/blob/master/.github/metrics-collector.json) and are also defined in the 
+[metrics-collector](https://github.com/grafana/grafana-github-actions/blob/main/metrics-collector/index.ts) GitHub action.
+
+## Backport PR
+
+To automatically backport a PR to a release branch like v7.3.x add a label named `backport v7.3.x`. The label name should follow the pattern `backport <branch-name>`. Once merged grafanabot will automatically 
+try to cherry-pick the PR merge commit into that branch and open a PR. It will sync the milestone with the source PR so make sure the source PR also is assigned the milestone for the patch release. If the PR is already merged you can still add this label and trigger the backport automation. 
+
+If there are merge conflicts the bot will write a comment on the source PR saying the cherry-pick failed. In this case you have to do the cherry pick and backport PR manually. 
+
+The backport logic is written [here](https://github.com/grafana/grafana-github-actions/blob/main/backport/backport.ts)

.github/commands.json

@@ -1,7 +1,9 @@
 [
   {
     "type": "label",
-    "name": "type/question",
+    "name": "bot/question",
+    "addLabel": "type/question",
+    "removeLabel": "bot/question",
     "action": "close",
     "comment": "Please ask your question on [community.grafana.com/](https://community.grafana.com/). To avoid having your issue closed in the future, please read our [CONTRIBUTING](https://github.com/grafana/grafana/blob/master/CONTRIBUTING.md) guidelines.\n\nHappy graphing!"
   },
@@ -14,14 +16,38 @@
   },
   {
     "type": "label",
-    "name": "type/duplicate",
+    "name": "bot/duplicate",
+    "addLabel": "type/duplicate",
+    "removeLabel": "bot/duplicate",
     "action": "close",
     "comment": "Thanks for creating this issue! It looks like this has already been reported by another user. We’ve closed this in favor of the existing one. Please consider adding any details you think is missing to that issue.\n\nTo avoid having your issue closed in the future, please read our [CONTRIBUTING](https://github.com/grafana/grafana/blob/master/CONTRIBUTING.md) guidelines.\n\nHappy graphing!"
   },
+  {
+    "type": "comment",
+    "name": "needsMoreInfo",
+    "allowUsers": [],
+    "action": "updateLabels",
+    "addLabel": "bot/needs more info"
+  },
   {
     "type": "label",
-    "name": "no new info",
+    "name": "bot/needs more info",
+    "action": "updateLabels",
+    "addLabel": "needs more info",
+    "removeLabel": "bot/needs more info",
+    "comment": "Thanks for creating this issue! We think it's missing some basic information. \r\n\r\nFollow the issue template and add additional information that will help us replicate the problem. \r\nFor data visualization issues: \r\n- Query results from the inspect drawer (data tab & query inspector)\r\n- Panel settings can be extracted in the panel inspect drawer JSON tab\r\n\r\nFor dashboard related issues: \r\n- Dashboard JSON can be found in the dashboard settings JSON model view\r\n\r\nFor authentication and alerting issues, Grafana server logs are useful. \r\n\r\nHappy graphing!"
+  },
+  {
+    "type": "label",
+    "name": "bot/no new info",
     "action": "close",
     "comment": "We've closed this issue since it needs more information and hasn't had any activity recently. We can re-open it after you you add more information. To avoid having your issue closed in the future, please read our [CONTRIBUTING](https://github.com/grafana/grafana/blob/master/CONTRIBUTING.md) guidelines.\n\nHappy graphing!"
+  },
+  {
+    "type": "label",
+    "name": "bot/close feature request",
+    "action": "close",
+    "addLabel": "not implemented",
+    "comment": "This feature request has been open for a long time with few received upvotes or comments, so we are closing it. We're trying to limit open GitHub issues in order to better track planned work and features.  \r\n\r\nThis doesn't mean that we'll never ever implement it or that we will never accept a PR for it. A closed issue can still attract upvotes and act as a ticket to track feature demand\/interest. \r\n\r\nThank You to you for taking the time to create this issue!"
   }
 ]

.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/metrics-collector.json

@@ -0,0 +1,32 @@
+{
+  "queries": [
+    {
+      "name": "type_bug",
+      "query": "label:\"type/bug\" is:open"
+    },
+    {
+      "name": "type_docs",
+      "query": "label:\"type/docs\" is:open"
+    },
+    {
+      "name": "needs_investigation",
+      "query": "label:\"needs investigation\" is:open"
+    },
+    {
+      "name": "needs_more_info",
+      "query": "label:\"needs more info\" is:open"
+    },
+    {
+      "name": "unlabeled",
+      "query": "is:open is:issue no:label"
+    },
+    {
+      "name": "open_prs",
+      "query": "is:open is:pr"
+    },
+    {
+      "name": "milestone_7_4_open",
+      "query": "is:open is:issue milestone:7.4"
+    }
+  ]
+}

.github/workflows/backport.yml

@@ -0,0 +1,26 @@
+name: Backport PR Creator
+on:
+  pull_request_target:
+    types:
+      - closed
+      - labeled
+
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Actions
+        uses: actions/checkout@v2
+        with:
+          repository: "grafana/grafana-github-actions"
+          path: ./actions
+          ref: main
+      - name: Install Actions
+        run: npm install --production --prefix ./actions
+      - name: Run backport
+        uses: ./actions/backport
+        with:
+          metricsWriteAPIKey: ${{secrets.GRAFANA_MISC_STATS_API_KEY}}
+          token: ${{secrets.GH_BOT_ACCESS_TOKEN}}
+          labelsToAdd: "backport"
+          title: "[{{base}}] {{originalTitle}}"

.github/workflows/bump-version.yml

@@ -0,0 +1,27 @@
+name: Bump version
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        required: true
+        default: '7.x.x'
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Actions
+        uses: actions/checkout@v2
+        with:
+          repository: "grafana/grafana-github-actions"
+          path: ./actions
+          ref: main
+      - uses: actions/setup-node@v2.1.4
+        with:
+          node-version: '14'
+      - name: Install Actions
+        run: npm install --production --prefix ./actions
+      - name: Run bump version
+        uses: ./actions/bump-version
+        with:
+          token: ${{secrets.GH_BOT_ACCESS_TOKEN}}
+          metricsWriteAPIKey: ${{secrets.GRAFANA_MISC_STATS_API_KEY}}

.github/workflows/commands.yml

@@ -22,4 +22,4 @@ jobs:
         with:
           metricsWriteAPIKey: ${{secrets.GRAFANA_MISC_STATS_API_KEY}}
           token: ${{secrets.GH_BOT_ACCESS_TOKEN}}
-          config-path: commands
+          configPath: commands

.github/workflows/github-release.yml

@@ -0,0 +1,24 @@
+name: Create or update GitHub release
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        required: true        
+        description: Needs to match, exactly, the name of a milestone (NO v prefix)
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Actions
+        uses: actions/checkout@v2
+        with:
+          repository: "grafana/grafana-github-actions"
+          path: ./actions
+          ref: main    
+      - name: Install Actions
+        run: npm install --production --prefix ./actions
+      - name: Run github release action
+        uses: ./actions/github-release
+        with:
+          token: ${{secrets.GH_BOT_ACCESS_TOKEN}}
+          metricsWriteAPIKey: ${{secrets.GRAFANA_MISC_STATS_API_KEY}}

.github/workflows/metrics-collector.yml

@@ -8,7 +8,7 @@
 #
 # https://github.com/grafana/grafana-github-actions/blob/main/metrics-collector/index.ts
 #
-name: Github issue metrics collection 
+name: Github issue metrics collection
 on:
   schedule:
     - cron: "*/10 * * * *"
@@ -32,3 +32,4 @@ jobs:
         with:
           metricsWriteAPIKey: ${{secrets.GRAFANA_MISC_STATS_API_KEY}}
           token: ${{secrets.GH_BOT_ACCESS_TOKEN}}
+          configPath: "metrics-collector"

.github/workflows/publish.yml

@@ -15,15 +15,20 @@ jobs:
 
     steps:
     - uses: actions/checkout@v1
+    - run: git clone --single-branch --no-tags --depth 1 -b master https://grafanabot:${{ secrets.GH_BOT_ACCESS_TOKEN }}@github.com/grafana/website-sync ./.github/actions/website-sync
+    - uses: actions/cache@v2
+      with:
+        path: '**/node_modules'
+        key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
     - name: generate-packages-docs
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v2.1.4
       id: generate-docs
       with:
-        node-version: '12'
+        node-version: '14'
     - run: yarn install --pure-lockfile --no-progress
     - run: ./scripts/ci-reference-docs-build.sh
     - name: publish-to-git
-      uses: ./.github/actions/gha-publish-to-git
+      uses: ./.github/actions/website-sync
       id: publish
       with:
         repository: grafana/website
@@ -32,7 +37,8 @@ jobs:
         github_pat: '${{ secrets.GH_BOT_ACCESS_TOKEN }}'
         source_folder: docs/sources
         target_folder: content/docs/grafana/latest
+        allow_no_changes: 'true'
     - shell: bash
       run: |
         test -n "${{ steps.publish.outputs.commit_hash }}"
-        test -n "${{ steps.publish.outputs.working_directory }}"
+        test -n "${{ steps.publish.outputs.working_directory }}"

.github/workflows/update-changelog.yml

@@ -0,0 +1,24 @@
+name: Update changelog
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        required: true        
+        description: Needs to match, exactly, the name of a milestone
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Actions
+        uses: actions/checkout@v2
+        with:
+          repository: "grafana/grafana-github-actions"
+          path: ./actions
+          ref: main      
+      - name: Install Actions
+        run: npm install --production --prefix ./actions
+      - name: Run update changelog
+        uses: ./actions/update-changelog
+        with:
+          token: ${{secrets.GH_BOT_ACCESS_TOKEN}}
+          metricsWriteAPIKey: ${{secrets.GRAFANA_MISC_STATS_API_KEY}}

.gitignore

@@ -20,6 +20,9 @@ vendor/
 /emails/templates/enterprise_*
 /public/emails/enterprise_*
 
+# Enterprise reporting fonts
+/public/fonts/dejavu
+
 # Enterprise devenv
 /devenv/docker/blocks/grafana-enterprise
 
@@ -118,3 +121,6 @@ compilation-stats.json
 
 # report dumping the whole system env
 /report.*.json
+
+# auto generated frontend docs
+/docs/sources/packages_api

CONTRIBUTING.md

@@ -19,9 +19,20 @@ For more ways to contribute, check out the [Open Source Guides](https://opensour
 
 ### Report bugs
 
+Before submitting a new issue, try to make sure someone hasn't already reported the problem. Look through the [existing issues](https://github.com/grafana/grafana/issues) for similar issues.
+
 Report a bug by submitting a [bug report](https://github.com/grafana/grafana/issues/new?labels=type%3A+bug&template=1-bug_report.md). Make sure that you provide as much information as possible on how to reproduce the bug.
 
-Before submitting a new issue, try to make sure someone hasn't already reported the problem. Look through the [existing issues](https://github.com/grafana/grafana/issues) for similar issues.
+Follow the issue template and add additional information that will help us replicate the problem.
+
+For data visualization issues:
+- Query results from the inspect drawer (data tab & query inspector)
+- Panel settings can be extracted in the panel inspect drawer JSON tab
+
+For a dashboard related issues:
+- Dashboard JSON can be found in the dashboard settings JSON model view
+
+For authentication and alerting Grafana server logs are useful.
 
 #### Security issues
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:12.19.0-alpine3.12 as js-builder
+FROM node:14.15.1-alpine3.12 as js-builder
 
 WORKDIR /usr/src/app/
 
@@ -7,14 +7,14 @@ COPY packages packages
 
 RUN yarn install --pure-lockfile --no-progress
 
-COPY Gruntfile.js tsconfig.json .eslintrc .editorconfig .browserslistrc .prettierrc.js ./
+COPY 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
+RUN yarn build
 
 FROM golang:1.15.1-alpine3.12 as go-builder
 
@@ -37,7 +37,7 @@ FROM alpine:3.12
 LABEL maintainer="Grafana team <hello@grafana.com>"
 
 ARG GF_UID="472"
-ARG GF_GID="472"
+ARG GF_GID="0"
 
 ENV PATH="/usr/share/grafana/bin:$PATH" \
     GF_PATHS_CONFIG="/etc/grafana/grafana.ini" \
@@ -54,18 +54,23 @@ RUN apk add --no-cache ca-certificates bash tzdata && \
 
 COPY conf ./conf
 
-RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
-    addgroup -S -g $GF_GID grafana && \
-    adduser -S -u $GF_UID -G grafana grafana && \
+RUN if [ ! $(getent group "$GF_GID") ]; then \
+      addgroup -S -g $GF_GID grafana; \
+    fi
+
+RUN export GF_GID_NAME=$(getent group $GF_GID | cut -d':' -f1) && \
+    mkdir -p "$GF_PATHS_HOME/.aws" && \
+    adduser -S -u $GF_UID -G "$GF_GID_NAME" grafana && \
     mkdir -p "$GF_PATHS_PROVISIONING/datasources" \
              "$GF_PATHS_PROVISIONING/dashboards" \
              "$GF_PATHS_PROVISIONING/notifiers" \
+             "$GF_PATHS_PROVISIONING/plugins" \
              "$GF_PATHS_LOGS" \
              "$GF_PATHS_PLUGINS" \
              "$GF_PATHS_DATA" && \
     cp "$GF_PATHS_HOME/conf/sample.ini" "$GF_PATHS_CONFIG" && \
     cp "$GF_PATHS_HOME/conf/ldap.toml" /etc/grafana/ldap.toml && \
-    chown -R grafana:grafana "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
+    chown -R "grafana:$GF_GID_NAME" "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
     chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING"
 
 COPY --from=go-builder /go/src/github.com/grafana/grafana/bin/linux-amd64/grafana-server /go/src/github.com/grafana/grafana/bin/linux-amd64/grafana-cli ./bin/

Dockerfile.ubuntu

@@ -1,4 +1,4 @@
-FROM node:12.19.0-slim AS js-builder
+FROM node:14.15.1-slim AS js-builder
 
 WORKDIR /usr/src/app/
 
@@ -7,14 +7,14 @@ COPY packages packages
 
 RUN yarn install --pure-lockfile
 
-COPY Gruntfile.js tsconfig.json .eslintrc .editorconfig .browserslistrc .prettierrc.js ./
+COPY 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
+RUN yarn build
 
 FROM golang:1.15.1 AS go-builder
 
@@ -58,6 +58,7 @@ RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
   mkdir -p "$GF_PATHS_PROVISIONING/datasources" \
              "$GF_PATHS_PROVISIONING/dashboards" \
              "$GF_PATHS_PROVISIONING/notifiers" \
+             "$GF_PATHS_PROVISIONING/plugins" \
              "$GF_PATHS_LOGS" \
              "$GF_PATHS_PLUGINS" \
              "$GF_PATHS_DATA" && \

Gruntfile.js

@@ -1,66 +0,0 @@
-'use strict';
-module.exports = function(grunt) {
-  var os = require('os');
-  var config = {
-    pkg: grunt.file.readJSON('package.json'),
-    baseDir: '.',
-    srcDir: 'public',
-    genDir: 'public_gen',
-    destDir: 'dist',
-    tempDir: 'tmp',
-    platform: process.platform.replace('win32', 'windows'),
-    enterprise: false,
-    libc: null,
-  };
-
-  if (grunt.option('platform')) {
-    config.platform = grunt.option('platform');
-  }
-
-  if (grunt.option('enterprise')) {
-    config.enterprise = true;
-  }
-
-  if (grunt.option('arch')) {
-    config.arch = grunt.option('arch');
-  } else {
-    config.arch = os.arch();
-
-    if (process.platform.match(/^win/)) {
-      config.arch = process.env.hasOwnProperty('ProgramFiles(x86)') ? 'x64' : 'x86';
-    }
-  }
-
-  if (grunt.option('libc')) {
-    config.libc = grunt.option('libc');
-  }
-
-  config.pkg.version = grunt.option('pkgVer') || config.pkg.version;
-
-  console.log('Version', config.pkg.version);
-
-  // load plugins
-  require('load-grunt-tasks')(grunt);
-
-  // load task definitions
-  grunt.loadTasks('./scripts/grunt');
-
-  // Utility function to load plugin settings into config
-  function loadConfig(config, path) {
-    require('glob')
-      .sync('*', { cwd: path })
-      .forEach(function(option) {
-        var key = option.replace(/\.js$/, '');
-        // If key already exists, extend it. It is your responsibility to avoid naming collisions
-        config[key] = config[key] || {};
-        grunt.util._.extend(config[key], require(path + option)(config, grunt));
-      });
-    // technically not required
-    return config;
-  }
-
-  // Merge that object with what with whatever we have here
-  loadConfig(config, './scripts/grunt/options/');
-  // pass the config to grunt
-  grunt.initConfig(config);
-};

ISSUE_TRIAGE.md

@@ -304,7 +304,9 @@ Even if you don't have the time or knowledge to investigate an issue we highly r
 We have some automation that triggers on comments or labels being added to issues. Many of these automated behaviors are defined in [commands.json](https://github.com/grafana/grafana/blob/master/.github/commands.json). Or in other [GitHub Actions](https://github.com/grafana/grafana/tree/master/.github/workflows)
 
 * Add /duplicate `#<issue number>`  to have Grafana label & close issue with an appropriate message. 
-* Add `type/question` and the bot will close it with an appropriate message. 
+* Add `bot/question` and the bot will close it with an appropriate message. 
+
+[Read more on bot actions](https://github.com/grafana/grafana/blob/master/.github/bot.md)
 
 ## External PRs
 

NOTICE.md

@@ -1,5 +1,5 @@
 
-Copyright 2014-2018 Grafana Labs
+Copyright 2014-2021 Grafana Labs
 
 This software is based on Kibana: 
 Copyright 2012-2013 Elasticsearch BV

README.md

@@ -8,7 +8,7 @@ The open-source platform for monitoring and observability.
 
 Grafana allows you to query, visualize, alert on and understand your metrics no matter where they are stored. Create, explore, and share dashboards with your team and foster a data driven culture:
 
-- **Visualize:** Fast and flexible client side graphs with a multitude of options. Panel plugins for many different way to visualize metrics and logs.
+- **Visualize:** Fast and flexible client side graphs with a multitude of options. Panel plugins offer many different ways to visualize metrics and logs.
 - **Dynamic Dashboards:** Create dynamic & reusable dashboards with template variables that appear as dropdowns at the top of the dashboard.
 - **Explore Metrics:** Explore your data through ad-hoc queries and dynamic drilldown. Split view and compare different time ranges, queries and data sources side by side.
 - **Explore Logs:** Experience the magic of switching from metrics to logs with preserved label filters. Quickly search through all your logs or streaming them live.
@@ -36,8 +36,8 @@ If you're interested in contributing to the Grafana project:
 
 ## Get involved
 
-- Follow [@grafana on Twitter](https://twitter.com/grafana/)
-- Read and subscribe to the [Grafana blog](https://grafana.com/blog/)
+- Follow [@grafana on Twitter](https://twitter.com/grafana/).
+- Read and subscribe to the [Grafana blog](https://grafana.com/blog/).
 - If you have a specific question, check out our [discussion forums](https://community.grafana.com/).
 - For general discussions, join us on the [official Slack](http://slack.raintank.io/) team.
 

WORKFLOW.md

@@ -38,6 +38,12 @@ PRs MUST be [reviewed](https://help.github.com/en/github/collaborating-with-issu
 
 Once a PR is approved as per above, any team member MAY merge the PR.
 
+## Backporting a PR
+
+PRs intended for inclusion in the next PATCH release they must be backported to the release branch. The bot can do this automatically. [Read more on backport PRs](https://github.com/grafana/grafana/blob/master/.github/bot.md). Both the source PR and the backport PR should be assigned to the patch release milestone, unless you are backporting to many releases then it can differ. 
+
+Backport PRs are also needed during the beta period to get fixes into the stable release. 
+
 # Release workflow
 
 ## Branch structure
@@ -61,8 +67,6 @@ Release branches MUST be split from the following branches.
 
 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

build.go

@@ -30,13 +30,14 @@ const (
 
 var (
 	//versionRe = regexp.MustCompile(`-[0-9]{1,3}-g[0-9a-f]{5,10}`)
-	goarch  string
-	goos    string
-	gocc    string
-	cgo     bool
-	libc    string
-	pkgArch string
-	version string = "v1"
+	goarch    string
+	goos      string
+	gocc      string
+	cgo       bool
+	libc      string
+	pkgArch   string
+	version   string = "v1"
+	buildTags []string
 	// deb & rpm does not support semver so have to handle their version a little differently
 	linuxPackageVersion   string = "v1"
 	linuxPackageIteration string = ""
@@ -59,11 +60,13 @@ func main() {
 	log.SetFlags(0)
 
 	var buildIdRaw string
+	var buildTagsRaw string
 
 	flag.StringVar(&goarch, "goarch", runtime.GOARCH, "GOARCH")
 	flag.StringVar(&goos, "goos", runtime.GOOS, "GOOS")
 	flag.StringVar(&gocc, "cc", "", "CC")
 	flag.StringVar(&libc, "libc", "", "LIBC")
+	flag.StringVar(&buildTagsRaw, "build-tags", "", "Sets custom build tags")
 	flag.BoolVar(&cgo, "cgo-enabled", cgo, "Enable cgo")
 	flag.StringVar(&pkgArch, "pkg-arch", "", "PKG ARCH")
 	flag.BoolVar(&race, "race", race, "Use race detector")
@@ -89,6 +92,10 @@ func main() {
 		return
 	}
 
+	if len(buildTagsRaw) > 0 {
+		buildTags = strings.Split(buildTagsRaw, ",")
+	}
+
 	log.Printf("Version: %s, Linux Version: %s, Package Iteration: %s\n", version, linuxPackageVersion, linuxPackageIteration)
 
 	if flag.NArg() == 0 {
@@ -105,47 +112,20 @@ func main() {
 
 		case "build-srv", "build-server":
 			clean()
-			doBuild("grafana-server", "./pkg/cmd/grafana-server", []string{})
+			doBuild("grafana-server", "./pkg/cmd/grafana-server", buildTags)
 
 		case "build-cli":
 			clean()
-			doBuild("grafana-cli", "./pkg/cmd/grafana-cli", []string{})
+			doBuild("grafana-cli", "./pkg/cmd/grafana-cli", buildTags)
 
 		case "build":
 			//clean()
 			for _, binary := range binaries {
-				doBuild(binary, "./pkg/cmd/"+binary, []string{})
+				doBuild(binary, "./pkg/cmd/"+binary, buildTags)
 			}
 
 		case "build-frontend":
-			grunt(gruntBuildArg("build")...)
-
-		case "test":
-			test("./pkg/...")
-			grunt("test")
-
-		case "package":
-			grunt(gruntBuildArg("build")...)
-			grunt(gruntBuildArg("package")...)
-			if goos == linux {
-				createLinuxPackages()
-			}
-
-		case "package-only":
-			grunt(gruntBuildArg("package")...)
-			if goos == linux {
-				createLinuxPackages()
-			}
-		case "pkg-archive":
-			grunt(gruntBuildArg("package")...)
-
-		case "pkg-rpm":
-			grunt(gruntBuildArg("release")...)
-			createRpmPackages()
-
-		case "pkg-deb":
-			grunt(gruntBuildArg("release")...)
-			createDebPackages()
+			yarn("build")
 
 		case "sha-dist":
 			shaFilesInDist()
@@ -226,202 +206,8 @@ func readVersionFromPackageJson() {
 	}
 }
 
-type linuxPackageOptions struct {
-	packageType            string
-	packageArch            string
-	homeDir                string
-	homeBinDir             string
-	binPath                string
-	serverBinPath          string
-	cliBinPath             string
-	configDir              string
-	ldapFilePath           string
-	etcDefaultPath         string
-	etcDefaultFilePath     string
-	initdScriptFilePath    string
-	systemdServiceFilePath string
-
-	postinstSrc         string
-	initdScriptSrc      string
-	defaultFileSrc      string
-	systemdFileSrc      string
-	cliBinaryWrapperSrc string
-
-	depends []string
-}
-
-func createDebPackages() {
-	debPkgArch := pkgArch
-	if pkgArch == "armv7" || pkgArch == "armv6" {
-		debPkgArch = "armhf"
-	}
-
-	createPackage(linuxPackageOptions{
-		packageType:            "deb",
-		packageArch:            debPkgArch,
-		homeDir:                "/usr/share/grafana",
-		homeBinDir:             "/usr/share/grafana/bin",
-		binPath:                "/usr/sbin",
-		configDir:              "/etc/grafana",
-		etcDefaultPath:         "/etc/default",
-		etcDefaultFilePath:     "/etc/default/grafana-server",
-		initdScriptFilePath:    "/etc/init.d/grafana-server",
-		systemdServiceFilePath: "/usr/lib/systemd/system/grafana-server.service",
-
-		postinstSrc:         "packaging/deb/control/postinst",
-		initdScriptSrc:      "packaging/deb/init.d/grafana-server",
-		defaultFileSrc:      "packaging/deb/default/grafana-server",
-		systemdFileSrc:      "packaging/deb/systemd/grafana-server.service",
-		cliBinaryWrapperSrc: "packaging/wrappers/grafana-cli",
-
-		depends: []string{"adduser", "libfontconfig1"},
-	})
-}
-
-func createRpmPackages() {
-	rpmPkgArch := pkgArch
-	switch {
-	case pkgArch == "armv7":
-		rpmPkgArch = "armhfp"
-	case pkgArch == "arm64":
-		rpmPkgArch = "aarch64"
-	}
-	createPackage(linuxPackageOptions{
-		packageType:            "rpm",
-		packageArch:            rpmPkgArch,
-		homeDir:                "/usr/share/grafana",
-		homeBinDir:             "/usr/share/grafana/bin",
-		binPath:                "/usr/sbin",
-		configDir:              "/etc/grafana",
-		etcDefaultPath:         "/etc/sysconfig",
-		etcDefaultFilePath:     "/etc/sysconfig/grafana-server",
-		initdScriptFilePath:    "/etc/init.d/grafana-server",
-		systemdServiceFilePath: "/usr/lib/systemd/system/grafana-server.service",
-
-		postinstSrc:         "packaging/rpm/control/postinst",
-		initdScriptSrc:      "packaging/rpm/init.d/grafana-server",
-		defaultFileSrc:      "packaging/rpm/sysconfig/grafana-server",
-		systemdFileSrc:      "packaging/rpm/systemd/grafana-server.service",
-		cliBinaryWrapperSrc: "packaging/wrappers/grafana-cli",
-
-		depends: []string{"/sbin/service", "fontconfig", "freetype", "urw-fonts"},
-	})
-}
-
-func createLinuxPackages() {
-	if !skipDebGen {
-		createDebPackages()
-	}
-
-	if !skipRpmGen {
-		createRpmPackages()
-	}
-}
-
-func createPackage(options linuxPackageOptions) {
-	packageRoot, _ := ioutil.TempDir("", "grafana-linux-pack")
-
-	// create directories
-	runPrint("mkdir", "-p", filepath.Join(packageRoot, options.homeDir))
-	runPrint("mkdir", "-p", filepath.Join(packageRoot, options.configDir))
-	runPrint("mkdir", "-p", filepath.Join(packageRoot, "/etc/init.d"))
-	runPrint("mkdir", "-p", filepath.Join(packageRoot, options.etcDefaultPath))
-	runPrint("mkdir", "-p", filepath.Join(packageRoot, "/usr/lib/systemd/system"))
-	runPrint("mkdir", "-p", filepath.Join(packageRoot, "/usr/sbin"))
-
-	// copy grafana-cli wrapper
-	runPrint("cp", "-p", options.cliBinaryWrapperSrc, filepath.Join(packageRoot, "/usr/sbin/"+cliBinary))
-
-	// copy grafana-server binary
-	runPrint("cp", "-p", filepath.Join(workingDir, "tmp/bin/"+serverBinary), filepath.Join(packageRoot, "/usr/sbin/"+serverBinary))
-
-	// copy init.d script
-	runPrint("cp", "-p", options.initdScriptSrc, filepath.Join(packageRoot, options.initdScriptFilePath))
-	// copy environment var file
-	runPrint("cp", "-p", options.defaultFileSrc, filepath.Join(packageRoot, options.etcDefaultFilePath))
-	// copy systemd file
-	runPrint("cp", "-p", options.systemdFileSrc, filepath.Join(packageRoot, options.systemdServiceFilePath))
-	// copy release files
-	runPrint("cp", "-a", filepath.Join(workingDir, "tmp")+"/.", filepath.Join(packageRoot, options.homeDir))
-	// remove bin path
-	runPrint("rm", "-rf", filepath.Join(packageRoot, options.homeDir, "bin"))
-
-	// create /bin within home
-	runPrint("mkdir", "-p", filepath.Join(packageRoot, options.homeBinDir))
-	// The grafana-cli binary is exposed through a wrapper to ensure a proper
-	// configuration is in place. To enable that, we need to store the original
-	// binary in a separate location to avoid conflicts.
-	runPrint("cp", "-p", filepath.Join(workingDir, "tmp/bin/"+cliBinary), filepath.Join(packageRoot, options.homeBinDir, cliBinary))
-
-	args := []string{
-		"-s", "dir",
-		"--description", "Grafana",
-		"-C", packageRoot,
-		"--url", "https://grafana.com",
-		"--maintainer", "contact@grafana.com",
-		"--config-files", options.initdScriptFilePath,
-		"--config-files", options.etcDefaultFilePath,
-		"--config-files", options.systemdServiceFilePath,
-		"--after-install", options.postinstSrc,
-
-		"--version", linuxPackageVersion,
-		"-p", "./dist",
-	}
-
-	name := "grafana"
-	if enterprise {
-		name += "-enterprise"
-		args = append(args, "--replaces", "grafana")
-	}
-	fmt.Printf("pkgArch is set to '%s', generated arch is '%s'\n", pkgArch, options.packageArch)
-	if pkgArch == "armv6" {
-		name += "-rpi"
-		args = append(args, "--replaces", "grafana")
-	}
-	args = append(args, "--name", name)
-
-	description := "Grafana"
-	if enterprise {
-		description += " Enterprise"
-	}
-
-	if !enterprise {
-		args = append(args, "--license", "\"Apache 2.0\"")
-	}
-
-	if options.packageType == "rpm" {
-		args = append(args, "--rpm-posttrans", "packaging/rpm/control/posttrans")
-	}
-
-	if options.packageType == "deb" {
-		args = append(args, "--deb-no-default-config-files")
-	}
-
-	if options.packageArch != "" {
-		args = append(args, "-a", options.packageArch)
-	}
-
-	if linuxPackageIteration != "" {
-		args = append(args, "--iteration", linuxPackageIteration)
-	}
-
-	// add dependencies
-	for _, dep := range options.depends {
-		args = append(args, "--depends", dep)
-	}
-
-	args = append(args, ".")
-
-	fmt.Println("Creating package: ", options.packageType)
-	runPrint("fpm", append([]string{"-t", options.packageType}, args...)...)
-}
-
-func grunt(params ...string) {
-	if runtime.GOOS == windows {
-		runPrint(`.\node_modules\.bin\grunt`, params...)
-	} else {
-		runPrint("./node_modules/.bin/grunt", params...)
-	}
+func yarn(params ...string) {
+	runPrint(`yarn run`, params...)
 }
 
 func genPackageVersion() string {
@@ -432,26 +218,13 @@ func genPackageVersion() string {
 	}
 }
 
-func gruntBuildArg(task string) []string {
-	args := []string{task}
-	args = append(args, fmt.Sprintf("--pkgVer=%v", genPackageVersion()))
-	if pkgArch != "" {
-		args = append(args, fmt.Sprintf("--arch=%v", pkgArch))
-	}
-	if libc != "" {
-		args = append(args, fmt.Sprintf("--libc=%s", libc))
-	}
-	if enterprise {
-		args = append(args, "--enterprise")
-	}
-
-	args = append(args, fmt.Sprintf("--platform=%v", goos))
-
-	return args
-}
-
 func setup() {
-	runPrint("go", "install", "-v", "./pkg/cmd/grafana-server")
+	args := []string{"install", "-v"}
+	if goos == windows {
+		args = append(args, "-buildmode=exe")
+	}
+	args = append(args, "./pkg/cmd/grafana-server")
+	runPrint("go", args...)
 }
 
 func printGeneratedVersion() {
@@ -460,7 +233,12 @@ func printGeneratedVersion() {
 
 func test(pkg string) {
 	setBuildEnv()
-	runPrint("go", "test", "-short", "-timeout", "60s", pkg)
+	args := []string{"test", "-short", "-timeout", "60s"}
+	if goos == windows {
+		args = append(args, "-buildmode=exe")
+	}
+	args = append(args, pkg)
+	runPrint("go", args...)
 }
 
 func doBuild(binaryName, pkg string, tags []string) {
@@ -482,6 +260,10 @@ func doBuild(binaryName, pkg string, tags []string) {
 		rmr(binary, binary+".md5")
 	}
 	args := []string{"build", "-ldflags", ldflags()}
+	if goos == windows {
+		// Work around a linking error on Windows: "export ordinal too large"
+		args = append(args, "-buildmode=exe")
+	}
 	if len(tags) > 0 {
 		args = append(args, "-tags", strings.Join(tags, ","))
 	}

conf/defaults.ini

@@ -66,6 +66,9 @@ cert_key =
 # Unix socket path
 socket = /tmp/grafana.sock
 
+# CDN Url
+cdn_url =
+
 #################################### Database ############################
 [database]
 # You can configure the database connection by specifying type, host, name, user and password
@@ -159,6 +162,9 @@ send_user_header = false
 # Change this option to false to disable reporting.
 reporting_enabled = true
 
+# The name of the distributor of the Grafana instance. Ex hosted-grafana, grafana-labs
+reporting_distributor = grafana-labs
+
 # Set to false to disable all checks to https://grafana.com
 # for new versions (grafana itself and plugins), check is used
 # in some UI views to notify that grafana or plugin update exists
@@ -227,6 +233,13 @@ x_content_type_options = true
 # when they detect reflected cross-site scripting (XSS) attacks.
 x_xss_protection = true
 
+# Enable adding the Content-Security-Policy header to your requests.
+# CSP allows to control resources the user agent is allowed to load and helps prevent XSS attacks.
+content_security_policy = false
+
+# Set Content Security Policy template used when adding the Content-Security-Policy header to your requests.
+# $NONCE in the template includes a random nonce.
+content_security_policy_template = """script-src 'unsafe-eval' 'strict-dynamic' $NONCE;object-src 'none';font-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data:;base-uri 'self';connect-src 'self' grafana.com;manifest-src 'self';media-src 'none';form-action 'self';"""
 
 #################################### Snapshots ###########################
 [snapshots]
@@ -255,6 +268,11 @@ 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 =
 
+################################### Data sources #########################
+[datasources]
+# Upper limit of data sources that Grafana will return. This limit is a temporary configuration and it will be deprecated when pagination will be introduced on the list data sources API.
+datasource_limit = 5000
+
 #################################### Users ###############################
 [users]
 # disable user signup / registration
@@ -296,6 +314,9 @@ editors_can_admin = false
 # The duration in time a user invitation remains valid before expiring. This setting should be expressed as a duration. Examples: 6h (hours), 2d (days), 1w (week). Default is 24h (24 hours). The minimum supported duration is 15m (15 minutes).
 user_invite_max_lifetime_duration = 24h
 
+# Enter a comma-separated list of usernames to hide them in the Grafana UI. These users are shown to Grafana admins and to themselves.
+hidden_users =
+
 [auth]
 # Login cookie name
 login_cookie_name = grafana_session
@@ -442,6 +463,7 @@ scopes = user:email
 email_attribute_name = email:primary
 email_attribute_path =
 login_attribute_path =
+name_attribute_path =
 role_attribute_path =
 id_token_attribute_name =
 auth_url =
@@ -478,7 +500,7 @@ enabled = false
 config_file = /etc/grafana/ldap.toml
 allow_sign_up = true
 
-# LDAP backround sync (Enterprise only)
+# LDAP background sync (Enterprise only)
 # At 1 am every day
 sync_cron = "0 0 1 * * *"
 active_sync_enabled = true
@@ -559,6 +581,25 @@ facility =
 # Syslog tag. By default, the process' argv[0] is used.
 tag =
 
+[log.frontend]
+# Should Sentry javascript agent be initialized
+enabled = false
+
+# Sentry DSN if you want to send events to Sentry.
+sentry_dsn =
+
+# Custom HTTP endpoint to send events captured by the Sentry agent to. Default will log the events to stdout.
+custom_endpoint = /log
+
+# Rate of events to be reported between 0 (none) and 1 (all), float
+sample_rate = 1.0
+
+# Requests per second limit enforced per an extended period, for Grafana backend log ingestion endpoint (/log).
+log_endpoint_requests_per_second_limit = 3
+
+# Max requests accepted per short interval of time for Grafana backend log ingestion endpoint (/log)
+log_endpoint_burst_limit = 15
+
 #################################### Usage Quotas ########################
 [quota]
 enabled = false
@@ -670,6 +711,12 @@ disable_total_stats = false
 basic_auth_username =
 basic_auth_password =
 
+# Metrics environment info adds dimensions to the `grafana_environment_info` metric, which
+# can expose more information about the Grafana instance.
+[metrics.environment_info]
+#exampleLabel1 = exampleValue1
+#exampleLabel2 = exampleValue2
+
 # Send internal Grafana metrics to graphite
 [metrics.graphite]
 # Enable by setting the address setting (ex localhost:2003)
@@ -699,6 +746,8 @@ sampler_type = const
 # and indicates the initial sampling rate before the actual one
 # is received from the mothership
 sampler_param = 1
+# sampling_server_url is the URL of a sampling manager providing a sampling strategy.
+sampling_server_url =
 # Whether or not to use Zipkin span propagation (x-b3- HTTP headers).
 zipkin_propagation = false
 # Setting this to true disables shared RPC spans.
@@ -762,6 +811,7 @@ 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 =
+marketplace_url = https://grafana.com/grafana/plugins/
 
 #################################### Grafana Image Renderer Plugin ##########################
 [plugin.grafana-image-renderer]
@@ -849,3 +899,7 @@ use_browser_locale = false
 
 # Default timezone for user preferences. Options are 'browser' for the browser local timezone or a timezone name from IANA Time Zone database, e.g. 'UTC' or 'Europe/Amsterdam' etc.
 default_timezone = browser
+
+[expressions]
+# Enable or disable the expressions functionality.
+enabled = true

conf/ldap.toml

@@ -7,9 +7,9 @@
 host = "127.0.0.1"
 # Default port is 389 or 636 if use_ssl = true
 port = 389
-# Set to true if ldap server supports TLS
+# Set to true if LDAP server should use an encrypted TLS connection (either with STARTTLS or LDAPS)
 use_ssl = false
-# Set to true if connect ldap server with STARTTLS pattern (create connection in insecure, then upgrade to secure connection with TLS)
+# If set to true, use LDAP with STARTTLS instead of LDAPS
 start_tls = false
 # set to true if you want to skip ssl cert validation
 ssl_skip_verify = false

conf/sample.ini

@@ -67,6 +67,9 @@
 # Unix socket path
 ;socket =
 
+# CDN Url
+;cdn_url =
+
 #################################### Database ####################################
 [database]
 # You can configure the database connection by specifying type, host, name, user and password
@@ -110,6 +113,11 @@
 # For "sqlite3" only. cache mode setting used for connecting to the database. (private, shared)
 ;cache_mode = private
 
+################################### Data sources #########################
+[datasources]
+# Upper limit of data sources that Grafana will return. This limit is a temporary configuration and it will be deprecated when pagination will be introduced on the list data sources API.
+;datasource_limit = 5000
+
 #################################### Cache server #############################
 [remote_cache]
 # Either "redis", "memcached" or "database" default is "database"
@@ -160,6 +168,9 @@
 # Change this option to false to disable reporting.
 ;reporting_enabled = true
 
+# The name of the distributor of the Grafana instance. Ex hosted-grafana, grafana-labs
+;reporting_distributor = grafana-labs
+
 # Set to false to disable all checks to https://grafana.net
 # for new versions (grafana itself and plugins), check is used
 # in some UI views to notify that grafana or plugin update exists
@@ -228,6 +239,14 @@
 # when they detect reflected cross-site scripting (XSS) attacks.
 ;x_xss_protection = true
 
+# Enable adding the Content-Security-Policy header to your requests.
+# CSP allows to control resources the user agent is allowed to load and helps prevent XSS attacks.
+;content_security_policy = false
+
+# Set Content Security Policy template used when adding the Content-Security-Policy header to your requests.
+# $NONCE in the template includes a random nonce.
+;content_security_policy_template = """script-src 'unsafe-eval' 'strict-dynamic' $NONCE;object-src 'none';font-src 'self';style-src 'self' 'unsafe-inline';img-src 'self' data:;base-uri 'self';connect-src 'self' grafana.com;manifest-src 'self';media-src 'none';form-action 'self';"""
+
 #################################### Snapshots ###########################
 [snapshots]
 # snapshot sharing options
@@ -295,6 +314,9 @@
 # The duration in time a user invitation remains valid before expiring. This setting should be expressed as a duration. Examples: 6h (hours), 2d (days), 1w (week). Default is 24h (24 hours). The minimum supported duration is 15m (15 minutes).
 ;user_invite_max_lifetime_duration = 24h
 
+# Enter a comma-separated list of users login to hide them in the Grafana UI. These users are shown to Grafana admins and themselves.
+; hidden_users =
+
 [auth]
 # Login cookie name
 ;login_cookie_name = grafana_session
@@ -432,6 +454,7 @@
 ;email_attribute_name = email:primary
 ;email_attribute_path =
 ;login_attribute_path =
+;name_attribute_path =
 ;id_token_attribute_name =
 ;auth_url = https://foo.bar/login/oauth/authorize
 ;token_url = https://foo.bar/login/oauth/access_token
@@ -467,7 +490,7 @@
 ;config_file = /etc/grafana/ldap.toml
 ;allow_sign_up = true
 
-# LDAP backround sync (Enterprise only)
+# LDAP background sync (Enterprise only)
 # At 1 am every day
 ;sync_cron = "0 0 1 * * *"
 ;active_sync_enabled = true
@@ -550,6 +573,25 @@
 # Syslog tag. By default, the process' argv[0] is used.
 ;tag =
 
+[log.frontend]
+# Should Sentry javascript agent be initialized
+;enabled = false
+
+# Sentry DSN if you want to send events to Sentry.
+;sentry_dsn =
+
+# Custom HTTP endpoint to send events captured by the Sentry agent to. Default will log the events to stdout.
+;custom_endpoint = /log
+
+# Rate of events to be reported between 0 (none) and 1 (all), float
+;sample_rate = 1.0
+
+# Requests per second limit enforced an extended period, for Grafana backend log ingestion endpoint (/log).
+;log_endpoint_requests_per_second_limit = 3
+
+# Max requests accepted per short interval of time for Grafana backend log ingestion endpoint (/log).
+;log_endpoint_burst_limit = 15
+
 #################################### Usage Quotas ########################
 [quota]
 ; enabled = false
@@ -664,6 +706,12 @@
 ; basic_auth_username =
 ; basic_auth_password =
 
+# Metrics environment info adds dimensions to the `grafana_environment_info` metric, which
+# can expose more information about the Grafana instance.
+[metrics.environment_info]
+#exampleLabel1 = exampleValue1
+#exampleLabel2 = exampleValue2
+
 # Send internal metrics to Graphite
 [metrics.graphite]
 # Enable by setting the address setting (ex localhost:2003)
@@ -691,6 +739,8 @@
 # and indicates the initial sampling rate before the actual one
 # is received from the mothership
 ;sampler_param = 1
+# sampling_server_url is the URL of a sampling manager providing a sampling strategy.
+;sampling_server_url =
 # Whether or not to use Zipkin propagation (x-b3- HTTP headers).
 ;zipkin_propagation = false
 # Setting this to true disables shared RPC spans.
@@ -750,6 +800,7 @@
 ;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 =
+;marketplace_url = https://grafana.com/grafana/plugins/
 
 #################################### Grafana Image Renderer Plugin ##########################
 [plugin.grafana-image-renderer]
@@ -838,3 +889,7 @@
 
 # Default timezone for user preferences. Options are 'browser' for the browser local timezone or a timezone name from IANA Time Zone database, e.g. 'UTC' or 'Europe/Amsterdam' etc.
 ;default_timezone = browser
+
+[expressions]
+# Enable or disable the expressions functionality.
+;enabled = true

contribute/architecture/README.md

@@ -8,3 +8,6 @@ Learn more about the backend architecture:
 - Part 2: [Communication](communication.md)
 - Part 3: [Database](database.md)
 
+Learn more about the frontend architecture:
+- Part 1: [Data requests](frontend-data-requests.md)
+

contribute/architecture/database.md

@@ -8,13 +8,13 @@ Grafana supports the [following databases](https://grafana.com/docs/installation
 - [PostgreSQL](https://www.postgresql.org/)
 - [SQLite3](https://www.sqlite.org/)
 
-Grafana uses the [XORM](https://xorm.io) framework for persisting objects to the database. For more information on how to use XORM, refer to the [documentation](http://gobook.io/read/github.com/go-xorm/manual-en-US/).
+Grafana uses the [XORM](https://xorm.io) framework for persisting objects to the database. For more information on how to use XORM, refer to the [documentation](https://gobook.io/read/gitea.com/xorm/manual-en-US/).
 
-[Services](services.md) don't use XORM directly. Instead, services use the _SQL store_, a special type of service that provides an abstraction for the database layer. There are two ways of using the `sqlstore`: using `sqlstore` handlers, and using the `SqlStore` instance.
+[Services](services.md) don't use XORM directly. Instead, services use the _SQL store_, a special type of service that provides an abstraction for the database layer. There are two ways of using the `sqlstore`: using `sqlstore` handlers, and using the `SQLStore` instance.
 
 ## `sqlstore` handlers
 
-> **Deprecated:** We are deprecating `sqlstore` handlers in favor of using the `SqlStore` object directly in each service. Since most services still use the `sqlstore` handlers, we still want to explain how they work.
+> **Deprecated:** We are deprecating `sqlstore` handlers in favor of using the `SQLStore` object directly in each service. Since most services still use the `sqlstore` handlers, we still want to explain how they work.
 
 The `sqlstore` package allows you to register [command handlers](communication.md#handle-commands) that either store, or retrieve objects from the database. `sqlstore` handlers are similar to services:
 
@@ -46,15 +46,15 @@ func DeleteDashboard(cmd *models.DeleteDashboardCommand) error {
 
 Here, `inTransaction` is a helper function in the `sqlstore` package that provides a session, that lets you execute SQL statements.
 
-## `SqlStore`
+## `SQLStore`
 
-As opposed to a `sqlstore` handler, the `SqlStore` is a service itself. The `SqlStore` has the same responsibility however: to store and retrieve objects, to and from the database.
+As opposed to a `sqlstore` handler, the `SQLStore` is a service itself. The `SQLStore` has the same responsibility however: to store and retrieve objects, to and from the database.
 
-To use the `SqlStore`, inject the `SQLStore` in your service struct:
+To use the `SQLStore`, inject it in your service struct:
 
 ```go
 type MyService struct {
-    SQLStore *sqlstore.SqlStore `inject:""`
+    SQLStore *sqlstore.SQLStore `inject:""`
 }
 ```
 

contribute/architecture/frontend-data-requests.md

@@ -0,0 +1,41 @@
+# Data requests
+
+[BackendSrv](https://grafana.com/docs/grafana/latest/packages_api/runtime/backendsrv) handles all outgoing HTTP requests from Grafana. This document explains the high-level concepts used by `BackendSrv`.
+
+## Canceling requests
+This section describes how canceling requests work in Grafana. While data sources can implement their own cancellation concept, we recommend that you use the method we describe here.
+
+A data request can take a long time to finish. During the time between when a request starts and finishes, the user can change context. For example, the user may navigate away or issue the same request again.
+
+If we wait for canceled requests to complete, it might create unnecessary load on data sources.
+
+Grafana uses a concept called _request cancelation_ to cancel any ongoing request that Grafana doesn't need.
+
+#### Before Grafana 7.2
+Before Grafana can cancel any data request, it has to identify that request. Grafana identifies a request using the property `requestId` [passed as options](https://github.com/grafana/grafana/blob/master/docs/sources/packages_api/runtime/backendsrvrequest.md) when you use [BackendSrv](https://grafana.com/docs/grafana/latest/packages_api/runtime/backendsrv).
+
+The cancellation logic is as follows:
+- When an ongoing request discovers that an additional request with the same `requestId` has started, then Grafana will cancel the ongoing request.
+- When an ongoing request discovers that the special "cancel all requests" `requestId` was sent, then Grafana will cancel the ongoing request.
+
+#### After Grafana 7.2
+Grafana 7.2 introduced an additional way of canceling requests using [RxJs](https://github.com/ReactiveX/rxjs). To support the new cancellation functionality, the data source needs to use the new `fetch` function in [BackendSrv](https://grafana.com/docs/grafana/latest/packages_api/runtime/backendsrv).
+
+Migrating the core data sources to the new `fetch` function [is an ongoing process that you can read about in this issue.](https://github.com/grafana/grafana/issues/27222)
+
+## Request queue
+Depending on how the web browser implements the protocol for HTTP 1.1, it will limit the number of parallel requests, lets call this limit _max_parallel_browser_request_. 
+
+Unless you have configured Grafana to use HTTP2, the browser limits parallel data requests according to the browser's implementation. For more information on how to enable HTTP2, refer to [Configuration](https://grafana.com/docs/grafana/latest/administration/configuration/#protocol).
+
+Because there is a _max_parallel_browser_request_ limit, if some of the requests take a long time, they will block later requests and make interacting with Grafana very slow.
+
+#### Before Grafana 7.2
+Not supported. 
+
+#### After Grafana 7.2
+Grafana uses a _request queue_ to process all incoming data requests in order while reserving a free "spot" for any requests to the Grafana API. 
+
+Since the first implementation of the request queue doesn't take into account what browser the user uses, the _request queue_ limit for parallel data source requests is hard-coded to 5.
+
+> **Note:** Grafana instances [configured with HTTP2 ](https://grafana.com/docs/grafana/latest/administration/configuration/#protocol) will have a hard coded limit of 1000.

contribute/developer-guide.md

@@ -20,7 +20,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@14
 
 npm install -g yarn
 ```
@@ -76,7 +76,10 @@ When you log in for the first time, Grafana asks you to change your password.
 
 #### Building on Windows
 
-The Grafana backend includes Sqlite3 which requires GCC to compile. So in order to compile Grafana on Windows you need to install GCC. We recommend [TDM-GCC](http://tdm-gcc.tdragon.net/download).
+The Grafana backend includes SQLite which requires GCC to compile. So in order to compile Grafana on Windows you need to install GCC. We recommend [TDM-GCC](http://tdm-gcc.tdragon.net/download). Eventually, if you use [Scoop](https://scoop.sh), you can install GCC through that.
+
+You can simply build the back-end as follows: `go run build.go build`. The Grafana binaries will be in bin\\windows-amd64.
+Alternately, if you wish to use the `make` command, install [Make for Windows](http://gnuwin32.sourceforge.net/packages/make.htm) and use it in a Unix shell (f.ex. Git Bash). 
 
 ## Test Grafana
 
@@ -87,7 +90,7 @@ The test suite consists of three types of tests: _Frontend tests_, _backend test
 We use [jest](https://jestjs.io/) for our frontend tests. Run them using Yarn:
 
 ```
-yarn jest
+yarn test
 ```
 
 ### Run backend tests
@@ -98,6 +101,13 @@ If you're developing for the backend, run the tests with the standard Go tool:
 go test -v ./pkg/...
 ```
 
+#### On Windows
+Running the backend tests on Windows currently needs some tweaking, so use the build.go script:
+
+```
+go run build.go test
+```
+
 ### Run end-to-end tests
 
 The end to end tests in Grafana use [Cypress](https://www.cypress.io/) to run automated scripts in a headless Chromium browser. Read more about our [e2e framework](/contribute/style-guides/e2e.md).

contribute/style-guides/backend.md

@@ -39,3 +39,62 @@ 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.
+
+### Assertions
+
+Use respectively [`assert.*`](https://github.com/stretchr/testify#assert-package) functions to make assertions that 
+should _not_ halt the test ("soft checks") and [`require.*`](https://github.com/stretchr/testify#require-package) 
+functions to make assertions that _should_ halt the test ("hard checks"). Typically you want to use the latter type of
+check to assert that errors have or have not happened, since continuing the test after such an assertion fails is
+chaotic (the system under test will be in an undefined state) and you'll often have segfaults in practice.
+
+### Sub-tests
+
+Use [`t.Run`](https://golang.org/pkg/testing/#T.Run) to group sub-test cases, since it allows common setup and teardown
+code, plus lets you run each test case in isolation when debugging. Don't use `t.Run` to e.g. group assertions.
+
+### Cleanup
+
+Use [`t.Cleanup`](https://golang.org/pkg/testing/#T.Cleanup) to clean up resources in tests. It's a less fragile choice than `defer`, since it's independent of which
+function you call it in. It will always execute after the test is over in reverse call order (last `t.Cleanup` first, same as `defer`).
+
+## Globals
+
+As a general rule of thumb, avoid using global variables, since they make the code difficult to maintain and reason
+about, and to write tests for. The Grafana codebase currently does use a lot of global variables, especially when
+it comes to configuration, but that is a problem we're trying to solve.
+
+## Pointers
+
+In general, use value types and only reach for pointers when there's a real need. The reason being that pointers
+increase the risk of bugs, since a pointer can be nil and dereferencing a nil pointer leads to a panic (AKA segfault).
+Valid reasons to use a pointer include (but not necessarily limited to):
+
+* You might need to pass a modifiable argument to a function
+* Copying an object might incur a performance hit (benchmark to check your assumptions, copying is often faster than
+  allocating heap memory)
+* You might *need* `nil` to tell if a variable isn't set, although usually it's better to use the type's zero
+  value to tell instead
+
+## Database
+
+In database related code, we follow certain patterns.
+
+### Foreign keys
+
+While they can be useful, we don't generally use foreign key constraints in Grafana, for historical and
+technical reasons. See this [comment](https://github.com/grafana/grafana/issues/3269#issuecomment-383328548) by Torkel 
+for context.
+
+### Unique columns
+
+If a column, or column combination, should be unique, add a corresponding uniqueness constraint through a migration.
+
+## JSON
+
+The simplejson package is used a lot throughout the backend codebase, but it's legacy, so if at all possible
+avoid using it in new code. Use [json-iterator](https://github.com/json-iterator/go) instead, which is a more performant 
+drop-in alternative to the standard [encoding/json](https://golang.org/pkg/encoding/json/) package. While encoding/json
+is a fine choice, profiling shows that json-iterator may be 3-4 times more efficient for encoding. We haven't profiled
+its parsing performance yet, but according to json-iterator's own benchmarks, it appears even more superior in this
+department.

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

@@ -116,12 +116,32 @@ Build a list of points - an unordered or unnumbered list - by using "\-" (hyphen
 
 ## Images
 
+_Do not_ use image shortcodes at this time.
+
 Include images in a document using the following syntax:
 
-**Example** \!\[Grafana Logo](/link/to/grafanalogo/logo.png)
+```
+![Alt text](link to image, starting with /img/docs/ if it is to an internal image "Title of image in sentence case")
+```
+
+> **Note:** Alt text does not appear when the user hovers the mouse over the image, but title text does.
+
+**Examples:** 
+
+- \!\[Grafana logo](/link/to/grafanalogo/logo.png)
+- \!\[Example](/img/docs/folder_name/alert_test_rule.png)
 
 This follows the format of "!", alt text wrapped in "[]" and the link URL wrapped in "()".
 
+You can also use HTML such as the following:
+```
+<img src="example.png"
+     alt="Example image"
+     style="float: left; margin-right: 5px;" />
+```
+
+In most cases, use the markdown syntax rather than the HTML syntax. Only use the HTML if you need to change the image in ways unsupported by Markdown.
+
 ## Comments
 
 You can include comments that will not appear in published markdown using the following syntax:

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

@@ -51,12 +51,15 @@ The following sections provide general guidelines on topics specific to Grafana
 ### General
 
 - Use active voice. Avoid passive voice.
-  - Passive: The heatmap visualization is displayed.
-  - Active: Grafana displays the heatmap visualization.
+  - Use active: Grafana displays the heatmap visualization.
+  - Avoid passive: The heatmap visualization is displayed.
+- Write directly to the reader.
+  - Use: "After you create a dashboard, you can add a panel to it."
+  - Avoid: "After you create a dashboard, it is possible to add a panel to it."
 - Write in the imperative second person. Examples: You can write a query. Click the panel. Close the window.
 - Write in present tense.
-  - Not: The panel will open.
   - Use: The panel opens. Grafana opens the panel.
+  - Not: The panel will open.
 - 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.
@@ -69,19 +72,36 @@ The following sections provide general guidelines on topics specific to Grafana
 - Files that are displayed in the help system should have names that are all lowercase, no spaces. Use hyphens instead of spaces. Example: glossary.md
 - Documentation file names should match the title. **Note:** This only applies to new files at this time. Do not change the names of older files unless directed to do so.
 - Internal reference file names should be all uppercase except the file extension. Example: CONTRIBUTING.md
+- Image file names should be descriptive and unique. Also, add the software version number that the image applies to or the screenshot was taken in. Example: share-dashboard-link-7-3.png
 
 ### Headings
 
 - Write headings in sentence case, not title case.
   - This is sentence case
-  - This Is Title Case
+  - This is Title Case
 - Task topic headings start with a verb.
-  - Write a query. Create a dashboard.
+  - Write a query
+  - Create a dashboard
 - Concept and reference topic headings should be nouns or gerunds. Examples: Contributing to docs, Visualizations, Style guide
-- Avoid following one heading with another heading.
+
+#### Heading don'ts
+
+- Avoid stacked headings, which is following one heading with another heading.
 - Avoid skipping heading levels. For example, an h1 should be followed by an h2 rather than an h3.
-- Avoid having just one lower-level heading. For example, h1, h2, h2, h3, h3, h2 is a good order. Do not go h1, h2, h3, h2, h3, h2.
-- Don't include parenthetical words like (Important!) in headings.
+- Avoid having just one lower-level heading. For example, h1, h2, h2, h3, h3, h2, h2 is a good order. Do not go h1, h2, h3, h2, h3, h2.
+- Avoid using hyphens in headings.
+- Do not include parenthetical words like (Important!) in headings.
+
+#### Step-by-step headings
+
+In most cases, headings should not be numbered steps.
+
+However, sometimes we need to use headings as numbered steps. This is mostly in cases where each step is complex or a series of other procedures. For example, in [Getting started with Grafana and Prometheus](https://grafana.com/docs/grafana/latest/getting-started/getting-started-prometheus/).
+
+If that is the case, then use the following format for headings:
+
+##### Step 1. Install the software
+##### Step 2. Run the software
 
 ### Images
 
@@ -91,12 +111,14 @@ The following sections provide general guidelines on topics specific to Grafana
 - Assume all graphics will be exclusively viewed on the web.
 - Maximum image size is 3840px X 2160px.
 - Screenshots should be readable, but not too large.
+- _Do not_ use image shortcodes. Follow the guidance in the [Grafana markdown guide](https://github.com/grafana/grafana/blob/master/contribute/style-guides/documentation-markdown-guide.md#images).
+- Markdown image links are preferred. Only use the HTML image links if you need to style the image in ways unsupported in Markdown.
+- When you name a file, follow the [file naming conventions](#file-naming-conventions). Example: image-name-7-3.png
 
 ### Capitalization
 
 - Grafana, Loki, and Prometheus are always capitalized unless part of a code block.
 - API names are always Title Case, followed by "API"—for example, "Dashboard Permissions API"
-- Git is always capitalized, unless part of a code block.
 - Abbreviations are always capitalized (such as API, HTTP, ID, JSON, SQL, or URL) unless they are part of a code block.
 - Menu and submenu titles always use sentence case: capitalize the first word, and lowercase the rest.
   - "Dashboards" when referring to the submenu title.
@@ -106,6 +128,22 @@ The following sections provide general guidelines on topics specific to Grafana
   - Lowercase "dashboards" when referring to multiple dashboards.
 - **Exceptions:** If a term is lowercased in the Grafana UI, then match the UI.
 
+#### Git, GitHub
+
+Git is always capitalized, unless part of a code block. GitHub is the correct spelling and capitalization.
+
+#### Integrations
+
+In general, "integration" is not capitalized. Only capitalize it if it is capitalized in the UI or part of a proper noun, like the name of a specific integration.
+
+The first letter of the name of an integration is always capitalized, even if the original named source is lowercase.
+
+**Examples:**
+- MySQL Integration
+- CockroachDB Integration
+- Etcd Integration
+- I installed an integration on my local Grafana.
+
 ### Links and references
 
 When referencing another document, use "Refer to" rather than alternatives such as "See" or "Check out."
@@ -152,9 +190,8 @@ Warnings tell the user not to do something. For example:
 - Do not assume everyone is using Linux. Make sure instructions include enough information for Windows and Mac users to successfully complete procedures.
 
 - Do not add `$` before commands. Make it easy for users to copy and paste commands.
-
-  - **Wrong:** `$ sudo yum install grafana`
   - **Right:** `sudo yum install grafana`
+  - **Wrong:** `$ sudo yum install grafana`
 
 - Include `sudo` before commands that require `sudo` to work.
 
@@ -174,6 +211,18 @@ Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
 
 Grafana products has some words, abbreviations, and terms particular to the Grafana discourse community.
 
+#### changelog
+
+One word, not two.
+
+**Example**
+
+- Read the full changelog.
+
+**Exception:**
+
+- When referring to the file containing the official changelog, use the filename: `CHANGELOG.md`.
+
 #### checkout, check out
 
 Two words if used as a verb, one word if used as a noun.
@@ -185,7 +234,7 @@ Two words if used as a verb, one word if used as a noun.
 
 #### data source
 
-Two words, not one
+Two words, not one.
 
 **Exceptions:**
 - "datasource" used as an identifier
@@ -213,6 +262,10 @@ Do not use. This is developer jargon that refers to a UI panel. Refer to the pan
 
 One word, not two.
 
+#### mixin
+
+One word, not two. Also, not hyphenated.
+
 #### 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._
@@ -227,3 +280,15 @@ Two words if used as a verb, one word if used as a noun.
 
 - Set up the workspace.
 - Initial setup might take five minutes.
+
+### node_exporter, windows_exporter
+
+When referencing the Prometheus data source exporters, always use "node_exporter" and "windows_exporter" when referring to those tools.
+
+**Correct:** node_exporter, windows_exporter
+**Incorrect:** Node Exporter, node exporter, Windows Exporter, Windows exporter, windows exporter.
+
+### MS SQL Server
+Always use "MS SQL" when referring to MS SQL Server application.
+
+Incorrect UI spellings will be corrected in a later version of Grafana.

contribute/style-guides/redux.md

@@ -46,3 +46,37 @@ const dispatchedActions = await thunkTester(initialState)
 
 expect(dispatchedActions).toEqual([someAction('reducer tests')]);
 ```
+
+## Typing of connected props
+
+It is possible to infer connected props automatically from `mapStateToProps` and `mapDispatchToProps` using a helper type `ConnectedProps` from Redux. For this to work the `connect` call has to be split into two parts.
+
+```typescript
+import { connect, ConnectedProps } from 'react-redux'
+
+const mapStateToProps = (state: StoreState) => {
+  return {
+    location: state.location,
+    initDone: state.panelEditor.initDone,
+    uiState: state.panelEditor.ui,
+  };
+};
+
+const mapDispatchToProps = {
+  updateLocation,
+  initPanelEditor,
+  panelEditorCleanUp,
+  setDiscardChanges,
+  updatePanelEditorUIState,
+  updateTimeZoneForSession,
+};
+
+const connector = connect(mapStateToProps, mapDispatchToProps);
+
+type Props = OwnProps & ConnectedProps<typeof connector>;
+
+class PanelEditorUnconnected extends PureComponent<Props> {};
+
+export const PanelEditor = connector(PanelEditorUnconnected);
+```
+For more examples, refer to the [Redux docs](https://react-redux.js.org/using-react-redux/static-typing#inferring-the-connected-props-automatically).

contribute/style-guides/storybook.md

@@ -64,13 +64,13 @@ 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 { TabsBar } from './TabsBar';
 
 // Import the MDX file
-import mdx from "./TabsBar.mdx";
+import mdx from './TabsBar.mdx';
 
 export default {
-  title: "General/Tabs/TabsBar",
+  title: 'General/Tabs/TabsBar',
   component: TabsBar,
   parameters: {
     docs: {
@@ -93,8 +93,8 @@ There are some things that the MDX file should contain:
 ```jsx
 // In MyComponent.mdx
 
-import { Props } from "@storybook/addon-docs/blocks";
-import { MyComponent } from "./MyComponent";
+import { Props } from '@storybook/addon-docs/blocks';
+import { MyComponent } from './MyComponent';
 
 <Props of={MyComponent} />;
 ```
@@ -141,39 +141,66 @@ interface MyProps {
 }
 ```
 
-### Knobs
+### Controls
 
-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.
+The [controls addon](https://storybook.js.org/docs/react/essentials/controls) provides a way to interact with a component's properties dynamically and requires much less code than knobs. We're deprecating knobs in favor of using controls.
 
-```jsx
-// In MyComponent.story.tsx
+#### Migrating a story from Knobs to Controls
 
-import { number, text } from "@storybook/addon-knobs";
+As a test, we migrated the [button story](https://github.com/grafana/grafana/blob/master/packages/grafana-ui/src/components/Button/Button.story.tsx). Here's the guide on how to migrate a story to controls.
 
-export const basicStory = () => (
-  <MyComponent
-    max={number("Max value", 10)}
-    min={number("Min value", -10)}
-    title={text("Title", "Look at the value!")}
-  />
-);
-```
+1.  Remove the `@storybook/addon-knobs` dependency.
+2.  Import the Story type from `@storybook/react`
 
-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:
+    `import { Story } from @storybook/react`
 
-| 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                                                                                           |
+3.  Import the props interface from the component you're working on (these must be exported in the component).
+
+    `import { Props } from './Component'`
+
+4.  Add the Story type to all stories in the file, then replace the props sent to the component
+    and remove any knobs.
+
+    Before
+
+    ```tsx
+    export const Simple = () => {
+      const prop1 = text('Prop1', 'Example text');
+      const prop2 = select('Prop2', ['option1', 'option2'], 'option1');
+
+      return <Component prop1={prop1} prop2={prop2} />;
+    };
+    ```
+
+    After
+
+    ```tsx
+    export const Simple: Story<Props> = ({ prop1, prop2 }) => {
+      return <Component prop1={prop1} prop2={prop2} />;
+    };
+    ```
+
+5.  Add default props (or args in Storybook language).
+
+    ```tsx
+    Simple.args = {
+      prop1: 'Example text',
+      prop2: 'option 1',
+    };
+    ```
+
+6.  If the component has advanced props type (ie. other than string, number, boolean), you need to
+    specify these in an `argTypes`. This is done in the default export of the story.
+
+    ```tsx
+    export default {
+      title: 'Component/Component',
+      component: Component,
+      argTypes: {
+        prop2: { control: { type: 'select', options: ['option1', 'option2'] } },
+      },
+    };
+    ```
 
 ## Best practices
 

dashboard-schemas/Dashboard.cue

@@ -0,0 +1,68 @@
+package main
+
+#Dashboard: {
+	// Unique numeric identifier for the dashboard. (generated by the db)
+	id: int
+	// Unique dashboard identifier that can be generated by anyone. string (8-40)
+	uid: string
+	// Title of dashboard.
+	title?: string
+	// Description of dashboard.
+	description?: string
+	// Tags associated with dashboard.
+	tags?: [...string]
+	// Theme of dashboard.
+	style: *"light" | "dark"
+	// Timezone of dashboard,
+	timezone?: *"browser" | "utc"
+	// Whether a dashboard is editable or not.
+	editable: bool | *true
+	// 0 for no shared crosshair or tooltip (default).
+	// 1 for shared crosshair.
+	// 2 for shared crosshair AND shared tooltip.
+	graphTooltip: int >= 0 <= 2 | *0
+	// Time range for dashboard, e.g. last 6 hours, last 7 days, etc
+	time?: {
+		from: string | *"now-6h"
+		to:   string | *"now"
+	}
+	// Timepicker metadata.
+	timepicker?: {
+		// Whether timepicker is collapsed or not.
+		collapse: bool | *false
+		// Whether timepicker is enabled or not.
+		enable: bool | *true
+		// Whether timepicker is visible or not.
+		hidden: bool | *false
+		// Selectable intervals for auto-refresh.
+		refresh_intervals: [...string] | *["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
+	}
+	// Templating.
+	templating?: list: [...{}]
+	// Annotations.
+	annotations?: list: [...{
+		builtIn: int | *0
+		// Datasource to use for annotation.
+		datasource: string
+		// Whether annotation is enabled.
+		enable?: bool | *true
+		// Whether to hide annotation.
+		hide?: bool | *false
+		// Annotation icon color.
+		iconColor?: string
+		// Name of annotation.
+		name?: string
+		// Query for annotation data.
+		rawQuery: string
+		showIn:   int | *0
+	}] | *[]
+	// Auto-refresh interval.
+	refresh: string
+	// Version of the JSON schema, incremented each time a Grafana update brings
+	// changes to said schema.
+	schemaVersion: int | *25
+	// Version of the dashboard, incremented each time the dashboard is updated.
+	version: string
+	// Dashboard panels.
+	panels?: [...{}]
+}

dashboard-schemas/README.md

@@ -0,0 +1,86 @@
+# Dashboard Schemas
+
+Schema description documents for [Grafana Dashboard
+JSON](https://grafana.com/docs/grafana/latest/reference/dashboard/) and core
+panels.
+
+> **Note:** This directory is experimental. The schemas are not currently
+> implemented or enforced in Grafana.
+
+Schemas are defined in [Cue](https://cuelang.org/). Cue was chosen because it
+strongly facilitates our primary use cases - [schema
+definition](https://cuelang.org/docs/usecases/datadef/), [data
+validation](https://cuelang.org/docs/usecases/validation/), and [code
+generation/extraction](https://cuelang.org/docs/usecases/generate/).
+
+## Schema Organization
+
+Each schema describes part of a dashboard. `Dashboard.cue` is the main dashboard
+schema object. All other schemas describe nested objects within a dashboard.
+They are grouped in the following directories:
+
+* `panels` - schemas for
+  [panels](https://grafana.com/docs/grafana/latest/panels/panels-overview/).
+* `targets` - targets represent
+  [queries](https://grafana.com/docs/grafana/latest/panels/queries/). Each [data
+  source](https://grafana.com/docs/grafana/latest/datasources/) type has a
+  unique target schema.
+* `variables` - schemas for
+  [variables](https://grafana.com/docs/grafana/latest/variables/variable-types/).
+* `transformations` - schemas for
+  [transformations](https://grafana.com/docs/grafana/latest/panels/transformations/types-options/).
+
+The following somewhat conveys how they fit together when constructing a
+dashboard:
+
+```
++-----------+      +-----------+
+| Dashboard +------> Variables |
++---------+-+      +-----------+
+          |    +--------+    +---------+
+          +----> Panels +----> Targets |
+               +------+-+    +---------+
+                      |      +-----------------+
+                      +------> Transformations |
+                             +-----------------+
+```
+
+## Definitions
+
+All schemas are [Cue
+definitions](https://cuelang.org/docs/references/spec/#definitions-and-hidden-fields).
+Schemas intended to be exported must begin with a capital letter. For example,
+[Gauge](./panels/Gauge.cue). Definitions beginning with a lowercase letter will
+not be exported. These are reusable components for constructing the exported
+definitions. For example, [`#panel`](./panels/panel.cue) is intended to
+be a base schema for panels. `#Gauge` extends `#panel` with the following:
+
+```
+#Gauge: panel & {
+	...
+}
+```
+
+## Exporting OpenAPI
+
+[OpenAPI](https://www.openapis.org/) schemas can be exported from these CUE
+sources.
+
+### Command Line
+
+While you can use `cue export` to output OpenAPI documents, it does not expand
+references which makes the output unusable.
+
+```
+cue export --out openapi -o - ./...
+```
+
+### Using Go
+
+You need to use Go to generate useable OpenAPI schemas. This directory contains
+a Go program that will output just the OpenAPI schemas for one or many Cue
+packages.
+
+```
+go run . <entrypoint> ...
+```

dashboard-schemas/cue.mod/module.cue

@@ -0,0 +1 @@
+module: "github.com/grafana/grafana/dashboard-schemas"

dashboard-schemas/go.mod

@@ -0,0 +1,5 @@
+module github.com/grafana/grafana/dashboard-schemas
+
+go 1.15
+
+require cuelang.org/go v0.2.2

dashboard-schemas/go.sum

@@ -0,0 +1,185 @@
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cuelang.org/go v0.2.2 h1:i/wFo48WDibGHKQTRZ08nB8PqmGpVpQ2sRflZPj73nQ=
+cuelang.org/go v0.2.2/go.mod h1:Dyjk8Y/B3CfFT1jQKJU0g5PpCeMiDe0yMOhk57oXwqo=
+dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
+github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
+github.com/cockroachdb/apd/v2 v2.0.1 h1:y1Rh3tEU89D+7Tgbw+lp52T6p/GJLpDmNvr10UWqLTE=
+github.com/cockroachdb/apd/v2 v2.0.1/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOGr0B9pvN3Gw=
+github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
+github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
+github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
+github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
+github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
+github.com/emicklei/proto v1.6.15 h1:XbpwxmuOPrdES97FrSfpyy67SSCV/wBIKXqgJzh6hNw=
+github.com/emicklei/proto v1.6.15/go.mod h1:rn1FgRS/FANiZdD2djyH7TMA9jdRDcYQ9IEN9yvjX0A=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
+github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
+github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
+github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
+github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
+github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A=
+github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de h1:D5x39vF5KCwKQaw+OC9ZPiLVHXz3UFw2+psEX+gYcto=
+github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de/go.mod h1:kJun4WP5gFuHZgRjZUWWuH1DTxCtxbHDOIJsudS8jzY=
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
+github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
+github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
+github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
+github.com/rogpeppe/go-internal v1.6.0/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
+github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
+github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
+github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
+github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=
+github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
+github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
+github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
+github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
+github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
+go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
+go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
+go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20200513190911-00229845015e/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b h1:0mm1VjtFUOIlE1SbDlwjYaDxZVDP2S5ou6y0gSgXHu8=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200612220849-54c614fe050c h1:g6oFfz6Cmw68izP3xsdud3Oxu145IPkeFzyRg58AKHM=
+golang.org/x/tools v0.0.0-20200612220849-54c614fe050c/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
+gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71 h1:Xe2gvTZUJpsvOWUnvmL/tmhVBZUmHSvLbMjRj6NUUKo=
+gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

dashboard-schemas/main.go

@@ -0,0 +1,58 @@
+package main
+
+import (
+	"fmt"
+	"log"
+	"os"
+
+	"cuelang.org/go/cue"
+	"cuelang.org/go/cue/load"
+	"cuelang.org/go/encoding/openapi"
+)
+
+func main() {
+	b, err := openAPISchemas(os.Args[1:])
+	if err != nil {
+		log.Fatal(err)
+	}
+	fmt.Println(string(b))
+}
+
+// openAPISchemas returns OpenAPI schema JSON of the Cue entrypoints passed to
+// it. It is not a valid OpenAPI document - just the schemas.
+func openAPISchemas(entrypoints []string) ([]byte, error) {
+
+	var r cue.Runtime
+	cfg := openapi.Config{
+		ExpandReferences: true,
+	}
+	bis := load.Instances(entrypoints, nil)
+
+	// collect all schemas
+	var pairs []openapi.KeyValue
+	for _, bi := range bis {
+		if bi.Err != nil {
+			return nil, bi.Err
+		}
+		inst, err := r.Build(bi)
+		if err != nil {
+			return nil, err
+		}
+		om, err := cfg.Schemas(inst)
+		if err != nil {
+			return nil, err
+		}
+		pairs = append(pairs, om.Pairs()...)
+	}
+
+	// add all schemas to new ordered map
+	om := openapi.OrderedMap{}
+	om.SetAll(pairs)
+
+	j, err := om.MarshalJSON()
+	if err != nil {
+		return nil, err
+	}
+
+	return j, nil
+}

dashboard-schemas/main_test.go

@@ -0,0 +1,47 @@
+package main
+
+import (
+	"encoding/json"
+	"testing"
+)
+
+func TestOpenAPISchemas(t *testing.T) {
+
+	tests := map[string]struct {
+		entrypoints []string
+	}{
+		"All packages": {
+			entrypoints: []string{"./..."},
+		},
+		"One package": {
+			entrypoints: []string{"./panels"},
+		},
+		"Many packags": {
+			entrypoints: []string{
+				"./panels",
+				"./targets",
+				"./transformations",
+				"./variables",
+			},
+		},
+	}
+
+	for testName, test := range tests {
+
+		t.Logf("Running test case %s...", testName)
+
+		j, err := openAPISchemas(test.entrypoints)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		// We don't want to validate the JSON content since it's expected to change
+		// often. Only that it is valid JSON by unmarshalling it.
+
+		var iface interface{}
+		err = json.Unmarshal(j, &iface)
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+}

dashboard-schemas/panels/Gauge.cue

@@ -0,0 +1,74 @@
+package panels
+
+// Gauge is a single value panel that can repeat a gauge for every series,
+// column or row.
+#Gauge: _panel & {
+	// Field config.
+	fieldConfig: {
+		// Defaults.
+		defaults: {
+			// Custom.
+			custom: {}
+			// Unit.
+			unit: string
+			// Min.
+			min: int
+			// Max.
+			max: int
+			// Decimals.
+			decimals: int
+			// Change the field or series name.
+			displayName: string
+			// What to show when there is no value.
+			noValue: string
+			// Threshold config.
+			thresholds: _thresholds
+			// Mappings.
+			mappings: [..._mapping]
+			// Data Links.
+			links: [..._dataLink]
+		}
+		// Overrides.
+		overrides: [..._override]
+	}
+	// Options.
+	options: {
+		// Reduce options.
+		reduceOptions: {
+			// * `true` - Show a calculated value based on all rows.
+			// * `false` - Show a separate stat for every row.
+			values: bool | *false
+			// If values is false, sets max number of rows to
+			// display.
+			limit: int
+			// Reducer function/calculation.
+			calcs: [
+				"allIsZero",
+				"allIsNull",
+				"changeCount",
+				"count",
+				"delta",
+				"diff",
+				"distinctCount",
+				"first",
+				"firstNotNull",
+				"lastNotNull",
+				"last",
+				"logmin",
+				"max",
+				"min",
+				"range",
+				"step",
+				"sum",
+			] | *["mean"]
+			// Fields that should be included in the panel.
+			fields: string | *""
+		}
+		// Render the threshold values around the gauge bar.
+		showThresholdLabels: bool | *false
+		// Render the thresholds as an outer bar.
+		showThresholdMarkers: bool | *true
+	}
+	// Panel type.
+	type: string | *"gauge"
+}

dashboard-schemas/panels/Graph.cue

@@ -0,0 +1,192 @@
+package panels
+
+#Graph: _panel & {
+	// Display values as a bar chart.
+	bars: bool | *false
+	// Dashed line length.
+	dashLength: int | *10
+	// Show line with dashes.
+	dashes: bool | *false
+	// Dashed line spacing when `dashes` is true.
+	spaceLength: int | *10
+	// Controls how many decimals are displayed for legend values and graph hover
+	// tooltips.
+	decimals: int
+	// Field config.
+	fieldConfig: {
+		// Defaults.
+		defaults: custom: {}
+		// Overrides.
+		overrides: [..._override]
+	}
+	// Amount of color fill for a series. Expects a value between 0 and 1.
+	fill: number >= 0 <= 1 | *1
+	// Degree of gradient on the area fill. 0 is no gradient, 10 is a steep
+	// gradient.
+	fillGradient: int >= 0 <= 10 | *0
+	// Hide the series.
+	hiddenSeries: bool | *false
+	// Lengend options.
+	legend: {
+		// Whether to display legend in table.
+		alignAsTable: bool | *false
+		// Average of all values returned from the metric query.
+		avg: bool | *false
+		// Last value returned from the metric query.
+		current: bool | *false
+		// Maximum of all values returned from the metric query.
+		max: bool | *false
+		// Minimum of all values returned from the metric query.
+		min: bool | *false
+		// Display legend to the right.
+		rightSide: bool | *false
+		// Show or hide the legend.
+		show: bool | *true
+		// Available when `rightSide` is true. The minimum width for the legend in
+		// pixels.
+		sideWidth?: int
+		// Sum of all values returned from the metric query.
+		total: bool | *false
+		// Values.
+		values: bool | *true
+	}
+	// Display values as a line graph.
+	lines: bool | *true
+	// The width of the line for a series.
+	linewidth: int | *1
+	// How null values are displayed.
+	// * 'null' - If there is a gap in the series, meaning a null value, then the
+	// line in the graph will be broken and show the gap.
+	// * 'null as zero' - If there is a gap in the series, meaning a null value,
+	// then it will be displayed as a zero value in the graph panel.
+	// * 'connected' - If there is a gap in the series, meaning a null value or
+	// values, then the line will skip the gap and connect to the next non-null
+	// value.
+	nullPointMode: string | *"null"
+	// Options.
+	options: {
+		// Data links.
+		dataLinks: [..._dataLink]
+	}
+	// Available when `stack` is true. Each series is drawn as a percentage of the
+	// total of all series.
+	percentage: bool | *false
+	// Controls how large the points are.
+	pointradius: int
+	// Display points for values.
+	points: bool | *true
+	// Renderer.
+	renderer: string | *"flot"
+	// Series overrides allow a series in a graph panel to be rendered
+	// differently from the others. You can customize display options on a
+	// per-series bases or by using regex rules. For example, one series can have
+	// a thicker line width to make it stand out or be moved to the right Y-axis.
+	seriesOverrides: [...{
+		// Alias or regex matching the series you'd like to target.
+		alias?:         string
+		bars?:          bool
+		lines?:         bool
+		fill?:          int
+		fillGradient?:  int
+		linewidth?:     int
+		nullPointMode?: string
+		fillBelowTo?:   string
+		steppedLine?:   bool
+		dashes?:        bool
+		hiddenSeries?:  bool
+		dashLength?:    int
+		spaceLength?:   int
+		points?:        bool
+		pointradius?:   int
+		stack?:         int
+		color?:         string
+		yaxis?:         int
+		zindex?:        int
+		transform?:     string
+		legend?:        bool
+		hideTooltip?:   bool
+	}]
+	// Each series is stacked on top of another.
+	stack: bool | *false
+	// Draws adjacent points as staircase.
+	steppedLine: bool | *false
+	// Threshold config.
+	thresholds: _thresholds
+	// Time from.
+	timeFrom: string
+	// Time regions.
+	timeRegions: [...string]
+	// Time shift
+	timeShift: string
+	// Tooltip settings.
+	tooltip: {
+		// * true - The hover tooltip shows all series in the graph.  Grafana
+		// highlights the series that you are hovering over in bold in the series
+		// list in the tooltip.
+		// * false - The hover tooltip shows only a single series, the one that you
+		// are hovering over on the graph.
+		shared: bool | *true
+		// * 0 (none) - The order of the series in the tooltip is determined by the
+		// sort order in your query. For example, they could be alphabetically
+		// sorted by series name.
+		// * 1 (increasing) - The series in the hover tooltip are sorted by value
+		// and in increasing order, with the lowest value at the top of the list.
+		// * 2 (decreasing) - The series in the hover tooltip are sorted by value
+		// and in decreasing order, with the highest value at the top of the list.
+		sort: int >= 0 <= 2 | *2
+		// Value type.
+		value_type: string | *"individual"
+	}
+	// Panel type.
+	type: string | *"graph"
+	xaxis: {
+		// Buckets.
+		buckets: string
+		// The display mode completely changes the visualization of the graph
+		// panel. It’s like three panels in one. The main mode is the time series
+		// mode with time on the X-axis. The other two modes are a basic bar chart
+		// mode with series on the X-axis instead of time and a histogram mode.
+		// * 'time' - The X-axis represents time and that the data is grouped by
+		// time (for example, by hour, or by minute).
+		// * 'series' - The data is grouped by series and not by time. The Y-axis
+		// still represents the value.
+		// * 'histogram' - Converts the graph into a histogram. A histogram is a
+		// kind of bar chart that groups numbers into ranges, often called buckets
+		// or bins. Taller bars show that more data falls in that range.
+		mode: string | *"time"
+		// Name.
+		name: string
+		// Show or hide the axis.
+		show: bool | *true
+		// Values
+		values: [...number]
+	}
+	yaxes: [...{
+		// Defines how many decimals are displayed for Y value.
+		decimals: int
+		// The display unit for the Y value.
+		format: string | *"short"
+		// The Y axis label.
+		label: string
+		// The scale to use for the Y value - linear, or logarithmic.
+		// * 1 - linear
+		// * 2 - log (base 2)
+		// * 10 - log (base 10)
+		// * 32 - log (base 32)
+		// * 1024 - log (base 1024)
+		logBase: int | *1
+		// The maximum Y value.
+		max?: int
+		// The minimum Y value.
+		min?: int
+		// Show or hide the axis.
+		show: bool | *true
+	}]
+	yaxis: {
+		// Align left and right Y-axes by value.
+		align: bool | *false
+		// Available when align is true. Value to use for alignment of left and
+		// right Y-axes, starting from Y=0.
+		alignLevel: int | *0
+	}
+}

dashboard-schemas/panels/Row.cue

@@ -0,0 +1,24 @@
+package panels
+
+// A row is a logical divider within a dashboard. It is used
+// to group panels together.
+#Row: {
+	// Whether the row is collapsed or not.
+	collapsed: bool | *true
+	// Name of default data source.
+	datasource?: string
+	// Grid position.
+	gridPos?: _gridPos
+	// Dashboard panels.
+	panels?: [...{}]
+	// Name of template variable to repeat for.
+	repeat?: string
+	// Whether to display the title.
+	showTitle: bool | *true
+	// Title.
+	title?: string
+	// Size of title.
+	titleSize: string | *"h6"
+	// Panel type.
+	type: string | *"row"
+}

dashboard-schemas/panels/gridPos.cue

@@ -0,0 +1,12 @@
+package panels
+
+_gridPos: {
+	// Panel height.
+	h?: int > 0 | *9
+	// Panel width.
+	w?: int > 0 <= 24 | *12
+	// Panel x position.
+	x?: int >= 0 < 24 | *0
+	// Panel y position.
+	y?: int >= 0 | *0
+}

dashboard-schemas/panels/link.cue

@@ -0,0 +1,14 @@
+package panels
+
+_link: {
+	// Link title.
+	title?: string
+	// Whether to open link in new browser tab.
+	targetBlank: bool | *true
+	// URL of link.
+	url: string
+}
+
+_panelLink: _link
+
+_dataLink: _link

dashboard-schemas/panels/mapping.cue

@@ -0,0 +1,11 @@
+package panels
+
+_mapping: {
+	id:       int
+	from:     string
+	operator: string
+	to:       string
+	text:     string
+	type:     int
+	value:    string
+}

dashboard-schemas/panels/override.cue

@@ -0,0 +1,12 @@
+package panels
+
+_override: {
+	matcher: {
+		id:      string
+		options: string
+	}
+	properties: [...{
+		id:    string
+		value: int
+	}]
+}

dashboard-schemas/panels/panel.cue

@@ -0,0 +1,24 @@
+package panels
+
+_panel: {
+	// Panel title.
+	title?: string
+	// Description.
+	description?: string
+	// Whether to display the panel without a background.
+	transparent: bool | *false
+	// Name of default datasource.
+	datasource?: string
+	// Grid position.
+	gridPos?: _gridPos
+	// Panel links.
+	links?: [..._panelLink]
+	// Name of template variable to repeat for.
+	repeat?: string
+	// Direction to repeat in if 'repeat' is set.
+	// "h" for horizontal, "v" for vertical.
+	repeatDirection: *"h" | "v"
+	// Panel targets - datasource and query configurations to use as
+	// a basis for vizualization.
+	targets?: [...{}]
+}

dashboard-schemas/panels/thresholds.cue

@@ -0,0 +1,11 @@
+package panels
+
+_thresholds: {
+	// Threshold mode.
+	mode: string | *"absolute"
+	// Threshold steps.
+	steps: [...{
+		color: string
+		value: number
+	}]
+}

dashboard-schemas/targets/Prometheus.cue

@@ -0,0 +1,19 @@
+package targets
+
+#Prometheus: {
+	// Query expression.
+	expr: string
+	// Controls the name of the time series, using name or pattern.
+	legendFormat?: string
+	// Interval.
+	interval?: int | *1
+	// Target reference ID.
+	refId: string
+	// Perform an “instant” query, to return only the latest value that
+	// Prometheus has scraped for the requested time series.
+	instant: bool | *false
+	// Resolution.
+	intervalFactor?: int
+	// Format.
+	format: *"time_series" | "table" | "heat_map"
+}

dashboard-schemas/transformations/CalculateField.cue

@@ -0,0 +1,39 @@
+package transformations
+
+// Add field from calculation.
+#CalculateField: {
+	// Transformation ID.
+	id: string | *"calculateField"
+	// Configuration options.
+	options: {
+		// The name of your new field. If you leave this blank, then the field will
+		// be named to match the calculation.
+		alias: string
+		// Binary options.
+		binary: {
+			// Field or number for left side of equation.
+			left: string
+			// Field or number for right side of equation.
+			right: string
+			// Operator.
+			operator: string | *"+"
+			// Calculation to use.
+			reducer: string | *"sum"
+		}
+		// 'reduceRow' - apply selected calculation on each row of selected fields
+		// independently.
+		// 'binary' - apply basic math operation(sum, multiply, etc) on values in a
+		// single row from two selected fields.
+		mode: *"reduceRow" | "binary"
+		// Reduce options.
+		reduce: {
+			// Calculation to use.
+			reducer: string
+			// Fields to include in calculation.
+			include: [...string]
+		}
+		// Hide all other fields and display only your calculated field in the
+		// visualization.
+		replaceFields: bool | *false
+	}
+}

dashboard-schemas/transformations/Organize.cue

@@ -0,0 +1,16 @@
+package transformations
+
+// Reorder, hide, or rename fields/columns.
+#Organize: {
+	// Transformation ID.
+	id: string | *"organize"
+	// Configuration options.
+	options: {
+		// Exclude fields by name.
+		excludeByName: {}
+		// Set field order by name.
+		indexByName: {}
+		// Rename a field by name.
+		renameByName: {}
+	}
+}

dashboard-schemas/variables/Custom.cue

@@ -0,0 +1,9 @@
+package variables
+
+// Custom variables are for values that do not change.
+#Custom: _variable & {
+	// Options as comma separated values.
+	query: string
+	// Variable type.
+	type: string | *"custom"
+}

dashboard-schemas/variables/Datasource.cue

@@ -0,0 +1,18 @@
+package variables
+
+// Data source variables allow you to quickly change the data source for an
+// entire dashboard.
+#Datasource: _variable & {
+	// Data source type.
+	query: string
+	// Query value.
+	queryValue: string | *""
+	// Refresh.
+	refresh: int | *1
+	// Regex filter for which data source instances to choose
+	// from in the variable value dropdown. Leave empty for
+	// all.
+	regex: string
+	// Variable type.
+	type: string | *"datasource"
+}

dashboard-schemas/variables/Query.cue

@@ -0,0 +1,30 @@
+package variables
+
+// Query variables allow you to write a data source query that can return a
+// list of metric names, tag values, or keys.
+#Query: _variable & {
+	// Data source to use.
+	datasource: string
+	// Definition.
+	definition?: string
+	// Query.
+	query: string
+	// Refresh.
+	refresh: int | *1
+	// Regex.
+	regex?: string
+	// * 0 - Disabled.
+	// * 1 - Alphabetical (asc).
+	// * 2 - Alphabetical (desc).
+	// * 3 - Numerical (asc).
+	// * 4 - Numerical (desc).
+	// * 5 - Alphabetical (case-insensitive, asc).
+	// * 6 - Alphabetical (case-insensitive, desc).
+	sort:            int >= 0 <= 6 | *0
+	tagValuesQuery?: string
+	tags:            [...string] | *[]
+	tagsQuery?:      string
+	// Variable type.
+	type:    "query"
+	useTags: bool | *false
+}

dashboard-schemas/variables/variable.cue

@@ -0,0 +1,33 @@
+package variables
+
+_variable: {
+	// Currently selected value.
+	current: {
+		selected: bool | *false
+		text:     string | [...string]
+		value:    string | [...string]
+	}
+	// Whether to hide the label and variable.
+	// * 0 - Show all.
+	// * 1 - Hide label.
+	// * 2 - Hide label and variable.
+	hide: int >= 0 <= 2 | *0
+	// Enable include all option.
+	includeAll: bool | *false
+	// When includeAll is enabled, this sets its value.
+	allValue?: string
+	// Optional display name.
+	label?: string
+	// Allows mutltiple values to be selected at the same time.
+	multi: bool | *false
+	// Variable name.
+	name: string
+	// Options for variable.
+	options: [...{
+		selected: bool
+		text:     string
+		value:    string
+	}]
+	// Skip URL sync.
+	skipUrlSync: bool | *false
+}

devenv/README.md

@@ -47,3 +47,16 @@ 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.
+
+## Troubleshooting
+
+### Containers fail to start (Mac OS)
+
+```
+ERROR: for <service_name> Cannot start service <service_name>: OCI runtime create failed: container_linux.go:349: starting container process caused "process_linux.go:449: container init caused \"rootfs_linux.go:58: mounting ... merged/var/log/grafana: operation not permitted\\\"\"": unknown
+ERROR: Encountered errors while bringing up the project.
+```
+
+If running Mac OSX the above error might be encountered when starting certain Docker containers that mount `/var/log/`. When first run this causes Docker to try to create the folder `/var/log/grafana` however by default Docker for Mac does not have permission to create folders at this location as it runs as the current user. 
+
+To solve this issue manually create the folder `/var/log/grafana` and give your user write permissions then try starting the containers again.

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

@@ -436,6 +436,10 @@
             {
               "text": "Micro Bitcoin (μBTC)",
               "value": "currencyμBTC"
+            },
+            {
+              "text": "Vietnamese Dong (VND)",
+              "value": "currencyVND"
             }
           ],
           "text": "currency"
@@ -1535,6 +1539,10 @@
             {
               "text": "Bitcoin (฿)",
               "value": "currencyBTC"
+            },
+            {
+              "text": "Vietnamese Dong (VND)",
+              "value": "currencyVND"
             }
           ],
           "text": "currency"
@@ -2614,6 +2622,10 @@
             {
               "text": "Bitcoin (฿)",
               "value": "currencyBTC"
+            },
+            {
+              "text": "Vietnamese Dong (VND)",
+              "value": "currencyVND"
             }
           ],
           "text": "currency"

devenv/dev-dashboards/feature-templating/global-variables-and-interpolation.json

@@ -27,14 +27,14 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 16,
+        "h": 18,
         "w": 24,
         "x": 0,
         "y": 0
       },
       "id": 11,
       "options": {
-        "content": "## Global variables\n\n* `__dashboard` = `${__dashboard}`\n* `__dashboard.name` = `${__dashboard.name}`\n* `__dashboard.uid` = `${__dashboard.uid}`\n* `__org.name` = `${__org.name}`\n* `__org.id` = `${__org.id}`\n* `__user.id` = `${__user.id}`\n* `__user.login` = `${__user.login}`\n         \n## Formats\n\n* `Server:raw` = `${Server:raw}`\n* `Server:regex` = `${Server:regex}`\n* `Server:lucene` = `${Server:lucene}`\n* `Server:glob` = `${Server:glob}`\n* `Server:pipe` = `${Server:pipe}`\n* `Server:distributed` = `${Server:distributed}`\n* `Server:csv` = `${Server:csv}`\n* `Server:html` = `${Server:html}`\n* `Server:json` = `${Server:json}`\n* `Server:percentencode` = `${Server:percentencode}`\n* `Server:singlequote` = `${Server:singlequote}`\n* `Server:doublequote` = `${Server:doublequote}`\n* `Server:sqlstring` = `${Server:sqlstring}`\n* `Server:date` = `${Server:date}`\n* `Server:text` = `${Server:text}`\n\n",
+        "content": "## Global variables\n\n* `__dashboard` = `${__dashboard}`\n* `__dashboard.name` = `${__dashboard.name}`\n* `__dashboard.uid` = `${__dashboard.uid}`\n* `__org.name` = `${__org.name}`\n* `__org.id` = `${__org.id}`\n* `__user.id` = `${__user.id}`\n* `__user.login` = `${__user.login}`\n* `__user.email` = `${__user.email}`\n         \n## Formats\n\n* `Server:raw` = `${Server:raw}`\n* `Server:regex` = `${Server:regex}`\n* `Server:lucene` = `${Server:lucene}`\n* `Server:glob` = `${Server:glob}`\n* `Server:pipe` = `${Server:pipe}`\n* `Server:distributed` = `${Server:distributed}`\n* `Server:csv` = `${Server:csv}`\n* `Server:html` = `${Server:html}`\n* `Server:json` = `${Server:json}`\n* `Server:percentencode` = `${Server:percentencode}`\n* `Server:singlequote` = `${Server:singlequote}`\n* `Server:doublequote` = `${Server:doublequote}`\n* `Server:sqlstring` = `${Server:sqlstring}`\n* `Server:date` = `${Server:date}`\n* `Server:text` = `${Server:text}`\n* `Server:queryparam` = `${Server:queryparam}`\n\n",
         "mode": "markdown"
       },
       "pluginVersion": "7.1.0",

devenv/dev-dashboards/feature-templating/templating-textbox-e2e-scenarios.json

@@ -0,0 +1,116 @@
+{
+  "__inputs": [
+    {
+      "name": "DS_GDEV-TESTDATA",
+      "label": "gdev-testdata",
+      "description": "",
+      "type": "datasource",
+      "pluginId": "testdata",
+      "pluginName": "TestData DB"
+    }
+  ],
+  "__requires": [
+    {
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "7.4.0-pre"
+    },
+    {
+      "type": "datasource",
+      "id": "testdata",
+      "name": "TestData DB",
+      "version": "1.0.0"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
+    }
+  ],
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": "-- Grafana --",
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
+  "id": null,
+  "iteration": 1606804991052,
+  "links": [],
+  "panels": [
+    {
+      "datasource": "${DS_GDEV-TESTDATA}",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 12,
+        "x": 0,
+        "y": 0
+      },
+      "id": 2,
+      "options": {
+        "content": "# variable: ${text}\n         ",
+        "mode": "markdown"
+      },
+      "pluginVersion": "7.4.0-pre",
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Panel Title",
+      "type": "text"
+    }
+  ],
+  "schemaVersion": 27,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": [
+      {
+        "current": {
+          "selected": false,
+          "text": "default value",
+          "value": "default value"
+        },
+        "description": null,
+        "error": null,
+        "hide": 0,
+        "label": null,
+        "name": "text",
+        "options": [
+          {
+            "selected": true,
+            "text": "default value",
+            "value": "default value"
+          }
+        ],
+        "query": "default value",
+        "skipUrlSync": false,
+        "type": "textbox"
+      }
+    ]
+  },
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "Templating - Textbox e2e scenarios",
+  "uid": "AejrN1AMz",
+  "version": 1
+}

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

@@ -0,0 +1,338 @@
+{
+  "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": "gdev-testdata",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "continuous-BlYlRd"
+          },
+          "custom": {
+            "align": "center",
+            "displayMode": "color-background",
+            "filterable": false
+          },
+          "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": "Field"
+            },
+            "properties": [
+              {
+                "id": "custom.displayMode"
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 16,
+        "w": 19,
+        "x": 0,
+        "y": 0
+      },
+      "id": 4,
+      "options": {
+        "showHeader": true,
+        "sortBy": [
+          {
+            "desc": true,
+            "displayName": "Last"
+          }
+        ]
+      },
+      "pluginVersion": "7.4.0-pre",
+      "targets": [
+        {
+          "alias": "",
+          "csvWave": {
+            "timeStep": 60,
+            "valuesCSV": "0,0,2,2,1,1"
+          },
+          "lines": 10,
+          "points": [],
+          "pulseWave": {
+            "offCount": 3,
+            "offValue": 1,
+            "onCount": 3,
+            "onValue": 2,
+            "timeStep": 60
+          },
+          "refId": "A",
+          "scenarioId": "random_walk",
+          "seriesCount": 15,
+          "stream": {
+            "bands": 1,
+            "noise": 2.2,
+            "speed": 250,
+            "spread": 3.5,
+            "type": "signal"
+          },
+          "stringInput": ""
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Gradient color schemes",
+      "transformations": [
+        {
+          "id": "reduce",
+          "options": {
+            "reducers": ["max", "mean", "last", "min"]
+          }
+        },
+        {
+          "id": "organize",
+          "options": {
+            "excludeByName": {
+              "Field": false
+            },
+            "indexByName": {},
+            "renameByName": {}
+          }
+        }
+      ],
+      "type": "table"
+    },
+    {
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "continuous-blues"
+          },
+          "custom": {},
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 20
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 26,
+        "w": 5,
+        "x": 19,
+        "y": 0
+      },
+      "id": 2,
+      "options": {
+        "colorMode": "background",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": ["mean"],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "value"
+      },
+      "pluginVersion": "7.4.0-pre",
+      "targets": [
+        {
+          "alias": "",
+          "csvWave": {
+            "timeStep": 60,
+            "valuesCSV": "0,0,2,2,1,1"
+          },
+          "labels": "",
+          "lines": 10,
+          "points": [],
+          "pulseWave": {
+            "offCount": 3,
+            "offValue": 1,
+            "onCount": 3,
+            "onValue": 2,
+            "timeStep": 60
+          },
+          "refId": "A",
+          "scenarioId": "random_walk",
+          "seriesCount": 30,
+          "stream": {
+            "bands": 1,
+            "noise": 2.2,
+            "speed": 250,
+            "spread": 3.5,
+            "type": "signal"
+          },
+          "stringInput": ""
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Stats",
+      "type": "stat"
+    },
+    {
+      "datasource": "gdev-testdata",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "continuous-GrYlRd"
+          },
+          "custom": {
+            "align": "center",
+            "displayMode": "color-background",
+            "filterable": false
+          },
+          "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": "Field"
+            },
+            "properties": [
+              {
+                "id": "custom.displayMode"
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 10,
+        "w": 19,
+        "x": 0,
+        "y": 16
+      },
+      "id": 5,
+      "options": {
+        "displayMode": "lcd",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": ["mean"],
+          "fields": "",
+          "values": false
+        },
+        "showUnfilled": true
+      },
+      "pluginVersion": "7.4.0-pre",
+      "targets": [
+        {
+          "alias": "",
+          "csvWave": {
+            "timeStep": 60,
+            "valuesCSV": "0,0,2,2,1,1"
+          },
+          "lines": 10,
+          "points": [],
+          "pulseWave": {
+            "offCount": 3,
+            "offValue": 1,
+            "onCount": 3,
+            "onValue": 2,
+            "timeStep": 60
+          },
+          "refId": "A",
+          "scenarioId": "random_walk",
+          "seriesCount": 15,
+          "stream": {
+            "bands": 1,
+            "noise": 2.2,
+            "speed": 250,
+            "spread": 3.5,
+            "type": "signal"
+          },
+          "stringInput": ""
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Bar Gauge LCD",
+      "transformations": [],
+      "type": "bargauge"
+    }
+  ],
+  "schemaVersion": 26,
+  "style": "dark",
+  "tags": ["gdev", "demo"],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "Gradient Color modes",
+  "uid": "inxsweKGz",
+  "version": 17
+}

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

@@ -0,0 +1,577 @@
+{
+  "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": [
+    {
+      "icon": "external link",
+      "tags": ["gdev", "graph-ng"],
+      "type": "dashboards"
+    }
+  ],
+  "panels": [
+    {
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "drawStyle": "line",
+            "gradientMode": "opacity",
+            "fillOpacity": 40,
+            "lineInterpolation": "linear",
+            "lineWidth": 2,
+            "pointSize": 6,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": true
+          },
+          "mappings": [],
+          "nullValueMode": "null",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "A-series"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "rgb(48, 139, 237)",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 10,
+        "x": 0,
+        "y": 0
+      },
+      "id": 2,
+      "interval": "1m",
+      "links": [],
+      "options": {
+        "graph": {},
+        "legend": {
+          "displayMode": "hidden",
+          "placement": "bottom"
+        },
+        "tooltipOptions": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "7.4.0-pre",
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Req/s",
+      "type": "timeseries"
+    },
+    {
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "drawStyle": "bars",
+            "gradientNode": "opacity",
+            "fillOpacity": 53,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 6,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": true
+          },
+          "mappings": [],
+          "nullValueMode": "null",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "A-series"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "blue",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 7,
+        "x": 10,
+        "y": 0
+      },
+      "id": 11,
+      "interval": "1m",
+      "links": [],
+      "maxDataPoints": 10,
+      "options": {
+        "graph": {},
+        "legend": {
+          "displayMode": "hidden",
+          "placement": "bottom"
+        },
+        "tooltipOptions": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "7.4.0-pre",
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Req/s",
+      "type": "timeseries"
+    },
+    {
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "drawStyle": "bars",
+            "gradientMode": "opacity",
+            "fillOpacity": 100,
+            "lineInterpolation": "linear",
+            "lineWidth": 0,
+            "pointSize": 6,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": true
+          },
+          "mappings": [],
+          "nullValueMode": "null",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "A-series"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "red",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 7,
+        "x": 17,
+        "y": 0
+      },
+      "id": 12,
+      "interval": "1m",
+      "links": [],
+      "maxDataPoints": 20,
+      "options": {
+        "graph": {},
+        "legend": {
+          "displayMode": "hidden",
+          "placement": "bottom"
+        },
+        "tooltipOptions": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "7.4.0-pre",
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Req/s",
+      "type": "timeseries"
+    },
+    {
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "drawStyle": "line",
+            "gradientMode": "opacity",
+            "fillOpacity": 20,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 6,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": true
+          },
+          "mappings": [],
+          "nullValueMode": "null",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "decgbytes"
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "A-series"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "red",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 10,
+        "x": 0,
+        "y": 8
+      },
+      "id": 7,
+      "interval": "1m",
+      "links": [],
+      "options": {
+        "graph": {},
+        "legend": {
+          "displayMode": "hidden",
+          "placement": "bottom"
+        },
+        "tooltipOptions": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "7.4.0-pre",
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Memory",
+      "type": "timeseries"
+    },
+    {
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "drawStyle": "line",
+            "gradientMode": "hue",
+            "fillOpacity": 62,
+            "lineInterpolation": "smooth",
+            "lineWidth": 2,
+            "pointSize": 6,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": true
+          },
+          "mappings": [],
+          "nullValueMode": "null",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "A-series"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "semi-dark-blue",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 14,
+        "x": 10,
+        "y": 8
+      },
+      "id": 13,
+      "interval": "1m",
+      "links": [],
+      "maxDataPoints": 80,
+      "options": {
+        "graph": {},
+        "legend": {
+          "displayMode": "hidden",
+          "placement": "bottom"
+        },
+        "tooltipOptions": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "7.4.0-pre",
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Hue gradient mode",
+      "type": "timeseries"
+    },
+    {
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "drawStyle": "bars",
+            "gradientMode": "hue",
+            "fillOpacity": 100,
+            "lineInterpolation": "smooth",
+            "lineWidth": 0,
+            "pointSize": 6,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": true
+          },
+          "mappings": [],
+          "nullValueMode": "null",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "A-series"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "red",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 11,
+        "w": 24,
+        "x": 0,
+        "y": 16
+      },
+      "id": 16,
+      "interval": "1m",
+      "links": [],
+      "maxDataPoints": 50,
+      "options": {
+        "graph": {},
+        "legend": {
+          "displayMode": "hidden",
+          "placement": "bottom"
+        },
+        "tooltipOptions": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "7.4.0-pre",
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Hue gradient mode",
+      "type": "timeseries"
+    }
+  ],
+  "schemaVersion": 27,
+  "style": "dark",
+  "tags": ["gdev", "panel-tests", "graph-ng"],
+  "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": "Panel Tests - Graph NG - Gradient Area Fills",
+  "uid": "_gWgX2JGk",
+  "version": 1
+}

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

@@ -0,0 +1,892 @@
+{
+  "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": 391,
+  "links": [],
+  "panels": [
+    {
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "drawStyle": "bars",
+            "fillOpacity": 100,
+            "gradientMode": "hue",
+            "hideFrom": {
+              "graph": false,
+              "legend": false,
+              "tooltip": false
+            },
+            "lineInterpolation": "smooth",
+            "lineWidth": 0,
+            "pointSize": 6,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": true
+          },
+          "mappings": [],
+          "nullValueMode": "null",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "A-series"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "red",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 8,
+        "x": 0,
+        "y": 0
+      },
+      "id": 2,
+      "interval": "1m",
+      "links": [],
+      "maxDataPoints": 9,
+      "options": {
+        "graph": {},
+        "legend": {
+          "calcs": [],
+          "displayMode": "hidden",
+          "placement": "bottom"
+        },
+        "tooltipOptions": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "7.4.0-pre",
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Hue gradient mode",
+      "type": "timeseries"
+    },
+    {
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "drawStyle": "bars",
+            "fillOpacity": 72,
+            "gradientMode": "hue",
+            "hideFrom": {
+              "graph": false,
+              "legend": false,
+              "tooltip": false
+            },
+            "lineInterpolation": "smooth",
+            "lineWidth": 1,
+            "pointSize": 6,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": true
+          },
+          "mappings": [],
+          "nullValueMode": "null",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "A-series"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "green",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 8,
+        "x": 8,
+        "y": 0
+      },
+      "id": 3,
+      "interval": "1m",
+      "links": [],
+      "maxDataPoints": 9,
+      "options": {
+        "graph": {},
+        "legend": {
+          "calcs": [],
+          "displayMode": "hidden",
+          "placement": "bottom"
+        },
+        "tooltipOptions": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "7.4.0-pre",
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Hue gradient mode (line + opacity)",
+      "type": "timeseries"
+    },
+    {
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "drawStyle": "bars",
+            "fillOpacity": 78,
+            "gradientMode": "hue",
+            "hideFrom": {
+              "graph": false,
+              "legend": false,
+              "tooltip": false
+            },
+            "lineInterpolation": "smooth",
+            "lineWidth": 2,
+            "pointSize": 6,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": true
+          },
+          "mappings": [],
+          "nullValueMode": "null",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "A-series"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "orange",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 8,
+        "x": 16,
+        "y": 0
+      },
+      "id": 5,
+      "interval": "1m",
+      "links": [],
+      "maxDataPoints": 9,
+      "options": {
+        "graph": {},
+        "legend": {
+          "calcs": [],
+          "displayMode": "hidden",
+          "placement": "bottom"
+        },
+        "tooltipOptions": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "7.4.0-pre",
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Hue gradient mode (line + opacity)",
+      "type": "timeseries"
+    },
+    {
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "drawStyle": "bars",
+            "fillOpacity": 100,
+            "gradientMode": "hue",
+            "hideFrom": {
+              "graph": false,
+              "legend": false,
+              "tooltip": false
+            },
+            "lineInterpolation": "smooth",
+            "lineWidth": 0,
+            "pointSize": 6,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": true
+          },
+          "mappings": [],
+          "nullValueMode": "null",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "A-series"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "purple",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 8,
+        "x": 0,
+        "y": 9
+      },
+      "id": 4,
+      "interval": "1m",
+      "links": [],
+      "maxDataPoints": 9,
+      "options": {
+        "graph": {},
+        "legend": {
+          "calcs": [],
+          "displayMode": "hidden",
+          "placement": "bottom"
+        },
+        "tooltipOptions": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "7.4.0-pre",
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Hue gradient mode",
+      "type": "timeseries"
+    },
+    {
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "drawStyle": "bars",
+            "fillOpacity": 100,
+            "gradientMode": "hue",
+            "hideFrom": {
+              "graph": false,
+              "legend": false,
+              "tooltip": false
+            },
+            "lineInterpolation": "smooth",
+            "lineWidth": 0,
+            "pointSize": 6,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": true
+          },
+          "mappings": [],
+          "nullValueMode": "null",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "A-series"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "yellow",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 8,
+        "x": 8,
+        "y": 9
+      },
+      "id": 6,
+      "interval": "1m",
+      "links": [],
+      "maxDataPoints": 9,
+      "options": {
+        "graph": {},
+        "legend": {
+          "calcs": [],
+          "displayMode": "hidden",
+          "placement": "bottom"
+        },
+        "tooltipOptions": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "7.4.0-pre",
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Hue gradient mode",
+      "type": "timeseries"
+    },
+    {
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "drawStyle": "bars",
+            "fillOpacity": 100,
+            "gradientMode": "hue",
+            "hideFrom": {
+              "graph": false,
+              "legend": false,
+              "tooltip": false
+            },
+            "lineInterpolation": "smooth",
+            "lineWidth": 0,
+            "pointSize": 6,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": true
+          },
+          "mappings": [],
+          "nullValueMode": "null",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "A-series"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "rgb(12, 187, 242)",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 8,
+        "x": 16,
+        "y": 9
+      },
+      "id": 7,
+      "interval": "1m",
+      "links": [],
+      "maxDataPoints": 9,
+      "options": {
+        "graph": {},
+        "legend": {
+          "calcs": [],
+          "displayMode": "hidden",
+          "placement": "bottom"
+        },
+        "tooltipOptions": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "7.4.0-pre",
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Hue gradient mode",
+      "type": "timeseries"
+    },
+    {
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "drawStyle": "line",
+            "fillOpacity": 78,
+            "gradientMode": "hue",
+            "hideFrom": {
+              "graph": false,
+              "legend": false,
+              "tooltip": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 2,
+            "pointSize": 6,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": true
+          },
+          "mappings": [],
+          "nullValueMode": "null",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "A-series"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "orange",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 8,
+        "x": 0,
+        "y": 18
+      },
+      "id": 8,
+      "interval": "1m",
+      "links": [],
+      "maxDataPoints": 100,
+      "options": {
+        "graph": {},
+        "legend": {
+          "calcs": [],
+          "displayMode": "hidden",
+          "placement": "bottom"
+        },
+        "tooltipOptions": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "7.4.0-pre",
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Hue gradient mode (line + opacity)",
+      "type": "timeseries"
+    },
+    {
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "drawStyle": "line",
+            "fillOpacity": 78,
+            "gradientMode": "hue",
+            "hideFrom": {
+              "graph": false,
+              "legend": false,
+              "tooltip": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 2,
+            "pointSize": 6,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": true
+          },
+          "mappings": [],
+          "nullValueMode": "null",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "A-series"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "blue",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 8,
+        "x": 8,
+        "y": 18
+      },
+      "id": 9,
+      "interval": "1m",
+      "links": [],
+      "maxDataPoints": 100,
+      "options": {
+        "graph": {},
+        "legend": {
+          "calcs": [],
+          "displayMode": "hidden",
+          "placement": "bottom"
+        },
+        "tooltipOptions": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "7.4.0-pre",
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Hue gradient mode (line + opacity)",
+      "type": "timeseries"
+    },
+    {
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "drawStyle": "line",
+            "fillOpacity": 78,
+            "gradientMode": "hue",
+            "hideFrom": {
+              "graph": false,
+              "legend": false,
+              "tooltip": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 2,
+            "pointSize": 6,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": true
+          },
+          "mappings": [],
+          "nullValueMode": "null",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "A-series"
+            },
+            "properties": [
+              {
+                "id": "color",
+                "value": {
+                  "fixedColor": "green",
+                  "mode": "fixed"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 8,
+        "x": 16,
+        "y": 18
+      },
+      "id": 10,
+      "interval": "1m",
+      "links": [],
+      "maxDataPoints": 100,
+      "options": {
+        "graph": {},
+        "legend": {
+          "calcs": [],
+          "displayMode": "hidden",
+          "placement": "bottom"
+        },
+        "tooltipOptions": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "7.4.0-pre",
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Hue gradient mode (line + opacity)",
+      "type": "timeseries"
+    }
+  ],
+  "schemaVersion": 27,
+  "style": "dark",
+  "tags": ["gdev", "panel-tests", "graph-ng"],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "Panel Tests - GraphNG - Hue Gradients",
+  "uid": "k3XQFOBMk",
+  "version": 3
+}

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

@@ -0,0 +1,758 @@
+{
+  "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": [
+    {
+      "icon": "external link",
+      "tags": ["gdev", "graph-ng"],
+      "type": "dashboards"
+    }
+  ],
+  "panels": [
+    {
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axis": {
+              "grid": true,
+              "label": "",
+              "side": 3,
+              "width": 60
+            },
+            "bars": {
+              "show": false
+            },
+            "fill": {
+              "alpha": 0
+            },
+            "line": {
+              "show": true,
+              "width": 1
+            },
+            "nullValues": "null",
+            "points": {
+              "radius": 4,
+              "show": false
+            }
+          },
+          "links": [],
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 8,
+        "x": 0,
+        "y": 0
+      },
+      "id": 7,
+      "options": {
+        "legend": {
+          "asTable": false,
+          "isVisible": true,
+          "placement": "bottom"
+        },
+        "tooltipOptions": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "7.4.0-pre",
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "csv_metric_values",
+          "stringInput": "0,500,1000,3000,2500,4000,4500,5000,7000,7500,8000,8500,9000,9500,10000"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Data from 0 - 10K (unit short)",
+      "type": "timeseries"
+    },
+    {
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axis": {
+              "grid": true,
+              "label": "",
+              "side": 3,
+              "width": 60
+            },
+            "bars": {
+              "show": false
+            },
+            "fill": {
+              "alpha": 0
+            },
+            "line": {
+              "show": true,
+              "width": 1
+            },
+            "nullValues": "null",
+            "points": {
+              "radius": 4,
+              "show": false
+            }
+          },
+          "links": [],
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "bytes"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 8,
+        "x": 8,
+        "y": 0
+      },
+      "id": 5,
+      "options": {
+        "legend": {
+          "asTable": false,
+          "isVisible": true,
+          "placement": "bottom"
+        },
+        "tooltipOptions": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "7.4.0-pre",
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "csv_metric_values",
+          "stringInput": "0,500,1000,3000,2500,4000,4500,5000,7000,7500,8000,8500,9000,9500,10000"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Data from 0 - 10K (unit bytes metric)",
+      "type": "timeseries"
+    },
+    {
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axis": {
+              "grid": true,
+              "label": "",
+              "side": 3,
+              "width": 60
+            },
+            "bars": {
+              "show": false
+            },
+            "fill": {
+              "alpha": 0
+            },
+            "line": {
+              "show": true,
+              "width": 1
+            },
+            "nullValues": "null",
+            "points": {
+              "radius": 4,
+              "show": false
+            }
+          },
+          "links": [],
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "bytes"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 8,
+        "x": 16,
+        "y": 0
+      },
+      "id": 4,
+      "options": {
+        "legend": {
+          "asTable": false,
+          "isVisible": true,
+          "placement": "bottom"
+        },
+        "tooltipOptions": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "7.4.0-pre",
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "csv_metric_values",
+          "stringInput": "0,500,1000,3000,2500,4000,4500,5000,7000,7500,8000,8500,9000,9500,10000"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Data from 0 - 10K (unit bytes IEC)",
+      "type": "timeseries"
+    },
+    {
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axis": {
+              "grid": true,
+              "label": "",
+              "side": 3,
+              "width": 60
+            },
+            "bars": {
+              "show": false
+            },
+            "fill": {
+              "alpha": 0
+            },
+            "line": {
+              "show": true,
+              "width": 1
+            },
+            "nullValues": "null",
+            "points": {
+              "radius": 4,
+              "show": false
+            }
+          },
+          "links": [],
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 8,
+        "x": 0,
+        "y": 7
+      },
+      "id": 2,
+      "options": {
+        "legend": {
+          "asTable": false,
+          "isVisible": true,
+          "placement": "bottom"
+        },
+        "tooltipOptions": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "7.4.0-pre",
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "csv_metric_values",
+          "stringInput": "0,500,1000,3000,2500,4000,4500,5000,7000,7500,8000,8500,9000,9500,10000"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Data from 0 - 10K (unit short)",
+      "type": "timeseries"
+    },
+    {
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axis": {
+              "grid": true,
+              "label": "",
+              "side": 3,
+              "width": 60
+            },
+            "bars": {
+              "show": false
+            },
+            "fill": {
+              "alpha": 0
+            },
+            "line": {
+              "show": true,
+              "width": 1
+            },
+            "nullValues": "null",
+            "points": {
+              "radius": 4,
+              "show": false
+            }
+          },
+          "links": [],
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 8,
+        "x": 8,
+        "y": 7
+      },
+      "id": 3,
+      "options": {
+        "legend": {
+          "asTable": false,
+          "isVisible": true,
+          "placement": "bottom"
+        },
+        "tooltipOptions": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "7.4.0-pre",
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "csv_metric_values",
+          "stringInput": "0.001,0.0002,0.0003"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Data from 0.0002 - 0.001 (unit short)",
+      "type": "timeseries"
+    },
+    {
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axis": {
+              "grid": true,
+              "label": "",
+              "side": 3,
+              "width": 60
+            },
+            "bars": {
+              "show": false
+            },
+            "fill": {
+              "alpha": 0
+            },
+            "line": {
+              "show": true,
+              "width": 1
+            },
+            "nullValues": "null",
+            "points": {
+              "radius": 4,
+              "show": false
+            }
+          },
+          "links": [],
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "ms"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 8,
+        "x": 16,
+        "y": 7
+      },
+      "id": 6,
+      "options": {
+        "legend": {
+          "asTable": false,
+          "isVisible": true,
+          "placement": "bottom"
+        },
+        "tooltipOptions": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "7.4.0-pre",
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "csv_metric_values",
+          "stringInput": "12000,15000,20000"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Data from 12000 - 30000 (unit ms)",
+      "type": "timeseries"
+    },
+    {
+      "datasource": null,
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axis": {
+              "grid": true,
+              "label": "",
+              "side": 3,
+              "width": 60
+            },
+            "bars": {
+              "show": false
+            },
+            "fill": {
+              "alpha": 0
+            },
+            "line": {
+              "show": true,
+              "width": 1
+            },
+            "nullValues": "null",
+            "points": {
+              "radius": 4,
+              "show": false
+            }
+          },
+          "links": [],
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 8,
+        "x": 0,
+        "y": 16
+      },
+      "id": 9,
+      "options": {
+        "legend": {
+          "asTable": false,
+          "isVisible": true,
+          "placement": "bottom"
+        },
+        "tooltipOptions": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "7.4.0-pre",
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "csv_metric_values",
+          "stringInput": "0,10000000000"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Data from 0 - 1B (unit short)",
+      "type": "timeseries"
+    },
+    {
+      "datasource": null,
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axis": {
+              "grid": true,
+              "label": "",
+              "side": 3,
+              "width": 60
+            },
+            "bars": {
+              "show": false
+            },
+            "fill": {
+              "alpha": 0
+            },
+            "line": {
+              "show": true,
+              "width": 1
+            },
+            "nullValues": "null",
+            "points": {
+              "radius": 4,
+              "show": false
+            }
+          },
+          "links": [],
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "decbytes"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 8,
+        "x": 8,
+        "y": 16
+      },
+      "id": 10,
+      "options": {
+        "legend": {
+          "asTable": false,
+          "isVisible": true,
+          "placement": "bottom"
+        },
+        "tooltipOptions": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "7.4.0-pre",
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "csv_metric_values",
+          "stringInput": "0,10000000000"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Data from 0 - 1B (unit bytes)",
+      "type": "timeseries"
+    },
+    {
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axis": {
+              "grid": true,
+              "label": "",
+              "side": 3,
+              "width": 60
+            },
+            "bars": {
+              "show": false
+            },
+            "fill": {
+              "alpha": 0
+            },
+            "line": {
+              "show": true,
+              "width": 1
+            },
+            "nullValues": "null",
+            "points": {
+              "radius": 4,
+              "show": false
+            }
+          },
+          "links": [],
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "ms"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 8,
+        "x": 16,
+        "y": 16
+      },
+      "id": 8,
+      "options": {
+        "legend": {
+          "asTable": false,
+          "isVisible": true,
+          "placement": "bottom"
+        },
+        "tooltipOptions": {
+          "mode": "single"
+        }
+      },
+      "pluginVersion": "7.4.0-pre",
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "csv_metric_values",
+          "stringInput": "12000,15000,20000"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Data from 12000 - 30000 (unit ms)",
+      "type": "timeseries"
+    }
+  ],
+  "refresh": false,
+  "schemaVersion": 26,
+  "style": "dark",
+  "tags": ["gdev", "panel-tests", "graph-ng"],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timepicker": {
+    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
+  },
+  "timezone": "",
+  "title": "Panel Tests - Graph NG - Y axis ticks",
+  "uid": "29Yjn62Gk",
+  "version": 2
+}

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

@@ -0,0 +1,178 @@
+{
+  "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": 66,
+  "links": [],
+  "panels": [
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 6,
+        "w": 6,
+        "x": 0,
+        "y": 0
+      },
+      "hiddenSeries": false,
+      "id": 5,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "alertThreshold": true
+      },
+      "percentage": false,
+      "pluginVersion": "7.4.0-pre",
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "alias": "",
+          "csvWave": {
+            "timeStep": 60,
+            "valuesCSV": "0,0,2,2,1,1"
+          },
+          "lines": 10,
+          "points": [],
+          "pulseWave": {
+            "offCount": 3,
+            "offValue": 1,
+            "onCount": 3,
+            "onValue": 2,
+            "timeStep": 60
+          },
+          "refId": "A",
+          "scenarioId": "csv_metric_values",
+          "stream": {
+            "bands": 1,
+            "noise": 2.2,
+            "speed": 250,
+            "spread": 3.5,
+            "type": "signal"
+          },
+          "stringInput": "1,20,90,30,5,0"
+        }
+      ],
+      "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
+      }
+    },
+    {
+      "gridPos": {
+        "h": 6,
+        "w": 6,
+        "x": 6,
+        "y": 0
+      },
+      "id": 3,
+      "libraryPanel": {
+        "uid": "MAnX2ifMk",
+        "name": "React Table"
+      }
+    },
+    {
+      "gridPos": {
+        "h": 16,
+        "w": 12,
+        "x": 0,
+        "y": 6
+      },
+      "id": 2,
+      "libraryPanel": {
+        "uid": "g1sNpCaMz",
+        "name": "React Gauge"
+      }
+    }
+  ],
+  "schemaVersion": 27,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-5m",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "Panel - Panel Library",
+  "uid": "imQX6j-Gz",
+  "version": 1
+}

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

@@ -436,6 +436,10 @@
             {
               "text": "Micro Bitcoin (μBTC)",
               "value": "currencyμBTC"
+            },
+            {
+              "text": "Vietnamese Dong (VND)",
+              "value": "currencyVND"
             }
           ],
           "text": "currency"
@@ -1535,6 +1539,10 @@
             {
               "text": "Bitcoin (฿)",
               "value": "currencyBTC"
+            },
+            {
+              "text": "Vietnamese Dong (VND)",
+              "value": "currencyVND"
             }
           ],
           "text": "currency"
@@ -2614,6 +2622,10 @@
             {
               "text": "Bitcoin (฿)",
               "value": "currencyBTC"
+            },
+            {
+              "text": "Vietnamese Dong (VND)",
+              "value": "currencyVND"
             }
           ],
           "text": "currency"

devenv/docker/blocks/alert_webhook_listener/main.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
+	"log"
 	"net/http"
 )
 
@@ -15,10 +16,12 @@ func hello(w http.ResponseWriter, r *http.Request) {
 
 	line := fmt.Sprintf("webbhook: -> %s", string(body))
 	fmt.Println(line)
-	io.WriteString(w, line)
+	if _, err := io.WriteString(w, line); err != nil {
+		log.Printf("Failed to write: %v", err)
+	}
 }
 
 func main() {
 	http.HandleFunc("/", hello)
-	http.ListenAndServe(":3010", nil)
+	log.Fatal(http.ListenAndServe(":3010", nil))
 }

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

@@ -5,6 +5,10 @@
       - '2004:2004'
       - '8083:8083'
       - '8086:8086'
+    environment:
+      INFLUXDB_ADMIN_USER: grafana
+      INFLUXDB_ADMIN_PASSWORD: grafana
+      INFLUXDB_DB: site
     volumes:
       - ./docker/blocks/influxdb/influxdb.conf:/etc/influxdb/influxdb.conf
 

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

@@ -0,0 +1,40 @@
+  influxdb:
+    image: quay.io/influxdb/influxdb:v2.0.3
+    container_name: influxdb2
+    ports:
+      - '8086:8086'
+    environment:
+      INFLUXDB_REPORTING_DISABLED: 'true'
+    volumes:
+      - ./docker/blocks/influxdb2/influxdb.conf:/etc/influxdb/influxdb.conf
+
+  # Use the influx cli to set up an influxdb instance.
+  influxdb_cli:
+    links:
+      - influxdb
+    image: quay.io/influxdb/influxdb:v2.0.3
+    # Use these same configurations parameters in your telegraf configuration, mytelegraf.conf.
+    entrypoint: influx setup --bucket mybucket -t mytoken -o myorg --username=grafana --password=grafana12345 --host=http://influxdb:8086 -f
+      # Wait for the influxd service in the influxdb container has fully bootstrapped before trying to setup an influxdb instance with the influxdb_cli service.
+    restart: on-failure:10
+    depends_on:
+      - influxdb
+
+  fake-influxdb-data:
+    image: grafana/fake-data-gen
+    links:
+      - influxdb
+    environment:
+      FD_DATASOURCE: influxdb
+      FD_PORT: 8086
+
+  telegraf:
+    image: telegraf
+    links:
+      - influxdb
+    depends_on:
+      - influxdb_cli
+    volumes:
+      - ./docker/blocks/influxdb2/telegraf.conf:/etc/telegraf/telegraf.conf:ro
+      - /var/log:/var/log
+      - ../data/log:/var/log/grafana

devenv/docker/blocks/influxdb2/influxdb.conf

@@ -0,0 +1,93 @@
+reporting-disabled = false
+
+[meta]
+  # Where the metadata/raft database is stored
+  dir = "/var/lib/influxdb/meta"
+
+  retention-autocreate = true
+
+  # If log messages are printed for the meta service
+  logging-enabled = true
+  pprof-enabled = false
+
+  # The default duration for leases.
+  lease-duration = "1m0s"
+
+[data]
+  # Controls if this node holds time series data shards in the cluster
+  enabled = true
+
+  dir = "/var/lib/influxdb/data"
+
+  # These are the WAL settings for the storage engine >= 0.9.3
+  wal-dir = "/var/lib/influxdb/wal"
+  wal-logging-enabled = true
+
+
+[coordinator]
+  write-timeout = "10s"
+  max-concurrent-queries = 0
+  query-timeout = "0"
+  log-queries-after = "0"
+  max-select-point = 0
+  max-select-series = 0
+  max-select-buckets = 0
+
+[retention]
+  enabled = true
+  check-interval = "30m"
+
+[shard-precreation]
+  enabled = true
+  check-interval = "10m"
+  advance-period = "30m"
+
+[monitor]
+  store-enabled = true # Whether to record statistics internally.
+  store-database = "_internal" # The destination database for recorded statistics
+  store-interval = "10s" # The interval at which to record statistics
+
+[admin]
+  enabled = true
+  bind-address = ":8083"
+  https-enabled = false
+  https-certificate = "/etc/ssl/influxdb.pem"
+
+[http]
+  enabled = true
+  bind-address = ":8086"
+  auth-enabled = true
+  log-enabled = true
+  write-tracing = false
+  pprof-enabled = false
+  https-enabled = false
+  https-certificate = "/etc/ssl/influxdb.pem"
+  ### Use a separate private key location.
+  # https-private-key = ""
+  max-row-limit = 10000
+  realm = "InfluxDB"
+
+  unix-socket-enabled = false # enable http service over unix domain socket
+  # bind-socket = "/var/run/influxdb.sock"
+  flux-enabled = true
+
+[subscriber]
+  enabled = true
+
+[[graphite]]
+  enabled = false
+
+[[collectd]]
+  enabled = false
+
+[[opentsdb]]
+  enabled = false
+
+[[udp]]
+  enabled = false
+
+[continuous_queries]
+  log-enabled = true
+  enabled = true
+  # run-interval = "1s" # interval for how often continuous queries will be checked if they need to run
+

devenv/docker/blocks/mssql/build/Dockerfile

@@ -1,5 +1,12 @@
-FROM mcr.microsoft.com/mssql/server:2017-CU4-ubuntu
+FROM mcr.microsoft.com/mssql/server:2019-CU8-ubuntu-18.04
 WORKDIR /usr/setup
-COPY . /usr/setup
-RUN chmod +x /usr/setup/setup.sh
-CMD /bin/bash ./entrypoint.sh
+COPY setup.sh setup.sql.template entrypoint.sh ./
+
+USER root
+
+RUN chmod +x setup.sh
+RUN chown -R mssql ./
+
+USER mssql
+
+CMD /bin/bash ./entrypoint.sh

devenv/docker/blocks/mssql/build/setup.sh

@@ -1,4 +1,5 @@
 #/bin/bash
+set -eo pipefail
 
 #wait for the SQL Server to come up
 sleep 15s
@@ -9,4 +10,4 @@ cat /usr/setup/setup.sql.template | awk '{
   gsub(/%%PWD%%/,"'$MSSQL_PASSWORD'")
 }1' > /usr/setup/setup.sql
 
-/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P $MSSQL_SA_PASSWORD -d master -i /usr/setup/setup.sql
+/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P $MSSQL_SA_PASSWORD -d master -i /usr/setup/setup.sql

devenv/docker/blocks/mysql_tests/.env

@@ -0,0 +1 @@
+mysql_version=5.6

devenv/docker/blocks/mysql_tests/Dockerfile

@@ -1,3 +1,4 @@
-FROM mysql:5.6
+ARG mysql_version=5.6
+FROM mysql:${mysql_version}
 ADD setup.sql /docker-entrypoint-initdb.d
 CMD ["mysqld"]

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

@@ -1,6 +1,8 @@
   mysqltests:
     build:
       context: docker/blocks/mysql_tests
+      args:
+        - mysql_version=${mysql_version}
     environment:
       MYSQL_ROOT_PASSWORD: rootpass
       MYSQL_DATABASE: grafana_tests

devenv/docker/blocks/nginx_proxy/Dockerfile

@@ -1,4 +1,4 @@
-FROM nginx:alpine
+FROM nginx:1.19.3-alpine
 
 COPY nginx.conf /etc/nginx/nginx.conf
 COPY htpasswd /etc/nginx/htpasswd

devenv/docker/blocks/nginx_proxy_mac/Dockerfile

@@ -1,4 +1,4 @@
-FROM nginx:alpine
+FROM nginx:1.19.3-alpine
 
 COPY nginx.conf /etc/nginx/nginx.conf
 COPY htpasswd /etc/nginx/htpasswd

devenv/docker/blocks/postgres_tests/.env

@@ -0,0 +1 @@
+postgres_version=9.3

devenv/docker/blocks/postgres_tests/Dockerfile

@@ -1,3 +1,4 @@
-FROM postgres:9.3
+ARG postgres_version=9.3
+FROM postgres:${postgres_version}
 ADD setup.sql /docker-entrypoint-initdb.d
 CMD ["postgres"]

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

@@ -1,6 +1,8 @@
   postgrestest:
     build:
       context: docker/blocks/postgres_tests
+      args:
+        - postgres_version=${postgres_version}
     environment:
       POSTGRES_USER: grafanatest
       POSTGRES_PASSWORD: grafanatest