Search: removed old not working search shortcuts (#17226)

(cherry picked from commit e421723992)

.babelrc

@@ -3,11 +3,8 @@
     [
       "@babel/preset-env",
       {
-        "targets": {
-          "browsers": "last 3 versions"
-        },
-        "useBuiltIns": "entry",
-        "modules": "false",
+		  "targets": { "browsers": "last 3 versions" },
+		  "useBuiltIns": "entry"
       }
     ]
   ]

.bra.toml

@@ -1,7 +1,6 @@
 [run]
 init_cmds = [
-  ["go", "run", "-mod=vendor", "build.go", "-dev", "build-cli"],
-	["go", "run", "-mod=vendor", "build.go", "-dev", "build-server"],
+  ["go", "run", "build.go", "-dev", "build-server"],
 	["./bin/grafana-server", "-packaging=dev", "cfg:app_mode=development"]
 ]
 watch_all = true
@@ -14,6 +13,6 @@ watch_dirs = [
 watch_exts = [".go", ".ini", ".toml", ".template.html"]
 build_delay = 1500
 cmds = [
-  ["go", "run", "-mod=vendor", "build.go", "-dev", "build-server"],
+  ["go", "run", "build.go", "-dev", "build-server"],
 	["./bin/grafana-server", "-packaging=dev", "cfg:app_mode=development"]
 ]

.circleci/config.yml

@@ -19,7 +19,7 @@ version: 2
 jobs:
   mysql-integration-test:
     docker:
-      - image: circleci/golang:1.13.1
+      - image: circleci/golang:1.12.4
       - image: circleci/mysql:5.6-ram
         environment:
           MYSQL_ROOT_PASSWORD: rootpass
@@ -30,7 +30,7 @@ jobs:
     steps:
         - checkout
         - run: sudo apt update
-        - run: sudo apt install -y default-mysql-client
+        - run: sudo apt install -y mysql-client
         - run: dockerize -wait tcp://127.0.0.1:3306 -timeout 120s
         - run: cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h 127.0.0.1 -P 3306 -u root -prootpass
         - run:
@@ -39,7 +39,7 @@ jobs:
 
   postgres-integration-test:
     docker:
-      - image: circleci/golang:1.13.1
+      - image: circleci/golang:1.12.4
       - image: circleci/postgres:9.3-ram
         environment:
           POSTGRES_USER: grafanatest
@@ -58,7 +58,7 @@ jobs:
 
   cache-server-test:
     docker:
-      - image: circleci/golang:1.13.1
+      - image: circleci/golang:1.12.4
       - image: circleci/redis:4-alpine
       - image: memcached
     working_directory: /go/src/github.com/grafana/grafana
@@ -70,62 +70,6 @@ jobs:
             name: cache server tests
             command: './scripts/circle-test-cache-servers.sh'
 
-  end-to-end-test:
-      docker:
-        - image: circleci/node:10-browsers
-        - image: grafana/grafana-dev:master-$CIRCLE_SHA1
-      steps:
-          - run: dockerize -wait tcp://127.0.0.1:3000 -timeout 120s
-          - checkout
-          - restore_cache:
-              key: dependency-cache-{{ checksum "yarn.lock" }}
-          - run:
-              name: yarn install
-              command: 'yarn install --pure-lockfile --no-progress'
-              no_output_timeout: 5m
-          - save_cache:
-              key: dependency-cache-{{ checksum "yarn.lock" }}
-              paths:
-                - node_modules
-          - run:
-              name: run end-to-end tests
-              command: 'env BASE_URL=http://127.0.0.1:3000 yarn e2e-tests'
-              no_output_timeout: 5m
-          - store_artifacts:
-                path: public/e2e-test/screenShots/theTruth
-                destination: expected-screenshots
-          - store_artifacts:
-                path: public/e2e-test/screenShots/theOutput
-                destination: output-screenshots
-
-  end-to-end-test-release:
-      docker:
-        - image: circleci/node:10-browsers
-        - image: grafana/grafana-dev:$CIRCLE_TAG
-      steps:
-          - run: dockerize -wait tcp://127.0.0.1:3000 -timeout 120s
-          - checkout
-          - restore_cache:
-              key: dependency-cache-{{ checksum "yarn.lock" }}
-          - run:
-              name: yarn install
-              command: 'yarn install --pure-lockfile --no-progress'
-              no_output_timeout: 5m
-          - save_cache:
-              key: dependency-cache-{{ checksum "yarn.lock" }}
-              paths:
-                - node_modules
-          - run:
-              name: run end-to-end tests
-              command: 'env BASE_URL=http://127.0.0.1:3000 yarn e2e-tests'
-              no_output_timeout: 5m
-          - store_artifacts:
-                path: public/e2e-test/screenShots/theTruth
-                destination: expected-screenshots
-          - store_artifacts:
-                path: public/e2e-test/screenShots/theOutput
-                destination: output-screenshots
-
   codespell:
     docker:
       - image: circleci/python
@@ -142,9 +86,9 @@ jobs:
           name: check documentation spelling errors
           command: 'codespell -I ./words_to_ignore.txt docs/'
 
-  lint-go:
+  backend-lint:
     docker:
-      - image: circleci/golang:1.13.1
+      - image: circleci/golang:1.12.4
         environment:
           # we need CGO because of go-sqlite3
           CGO_ENABLED: 1
@@ -152,28 +96,19 @@ jobs:
     steps:
       - checkout
       - run:
-          name: Lint Go
-          command: 'make lint-go'
-
-  shellcheck:
-    machine: true
-    working_directory: ~/go/src/github.com/grafana/grafana
-    steps:
-      - checkout
-      - run:
-          name: ShellCheck
-          command: 'make shellcheck'
+          name: backend lint
+          command: './scripts/backend-lint.sh'
 
   test-frontend:
     docker:
-      - image: circleci/node:10
+      - image: circleci/node:8
     steps:
       - checkout
       - restore_cache:
           key: dependency-cache-{{ checksum "yarn.lock" }}
       - run:
           name: yarn install
-          command: 'yarn install --frozen-lockfile --no-progress'
+          command: 'yarn install --pure-lockfile --no-progress'
           no_output_timeout: 15m
       - save_cache:
           key: dependency-cache-{{ checksum "yarn.lock" }}
@@ -185,7 +120,7 @@ jobs:
 
   test-backend:
     docker:
-      - image: circleci/golang:1.13.1
+      - image: circleci/golang:1.12.4
     working_directory: /go/src/github.com/grafana/grafana
     steps:
       - checkout
@@ -195,7 +130,7 @@ jobs:
 
   build-all:
     docker:
-      - image: grafana/build-container:1.2.11
+     - image: grafana/build-container:1.2.6
     working_directory: /go/src/github.com/grafana/grafana
     steps:
       - checkout
@@ -214,15 +149,15 @@ jobs:
       - run:
           name: build and package grafana
           command: './scripts/build/build-all.sh'
-      - run:
-          name: Prepare GPG private key
-          command: './scripts/build/prepare_signing_key.sh'
       - run:
           name: sign packages
-          command: './scripts/build/sign_packages.sh dist/*.rpm'
+          command: './scripts/build/sign_packages.sh'
       - run:
           name: verify signed packages
-          command: './scripts/build/verify_signed_packages.sh dist/*.rpm'
+          command: |
+            mkdir -p ~/.rpmdb/pubkeys
+            curl -s https://grafanarel.s3.amazonaws.com/RPM-GPG-KEY-grafana > ~/.rpmdb/pubkeys/grafana.key
+            ./scripts/build/verify_signed_packages.sh dist/*.rpm
       - run:
           name: sha-sum packages
           command: 'go run build.go sha-dist'
@@ -239,7 +174,7 @@ jobs:
 
   build:
     docker:
-      - image: grafana/build-container:1.2.11
+     - image: grafana/build-container:1.2.6
     working_directory: /go/src/github.com/grafana/grafana
     steps:
       - checkout
@@ -249,12 +184,9 @@ jobs:
       - run:
           name: build and package grafana
           command: './scripts/build/build.sh'
-      - run:
-          name: Prepare GPG private key
-          command: './scripts/build/prepare_signing_key.sh'
       - run:
           name: sign packages
-          command: './scripts/build/sign_packages.sh dist/*.rpm'
+          command: './scripts/build/sign_packages.sh'
       - run:
           name: sha-sum packages
           command: 'go run build.go sha-dist'
@@ -268,7 +200,7 @@ jobs:
 
   build-fast-backend:
     docker:
-      - image: grafana/build-container:1.2.11
+     - image: grafana/build-container:1.2.6
     working_directory: /go/src/github.com/grafana/grafana
     steps:
       - checkout
@@ -285,7 +217,7 @@ jobs:
 
   build-fast-frontend:
     docker:
-      - image: grafana/build-container:1.2.11
+     - image: grafana/build-container:1.2.6
     working_directory: /go/src/github.com/grafana/grafana
     steps:
       - checkout
@@ -309,7 +241,7 @@ jobs:
 
   build-fast-package:
     docker:
-      - image: grafana/build-container:1.2.11
+     - image: grafana/build-container:1.2.6
     working_directory: /go/src/github.com/grafana/grafana
     steps:
       - checkout
@@ -336,7 +268,7 @@ jobs:
 
   build-fast-save:
     docker:
-      - image: grafana/build-container:1.2.11
+     - image: grafana/build-container:1.2.6
     working_directory: /go/src/github.com/grafana/grafana
     steps:
       - checkout
@@ -363,12 +295,9 @@ jobs:
       - run:
           name: package grafana
           command: './scripts/build/build.sh --fast --package-only'
-      - run:
-          name: Prepare GPG private key
-          command: './scripts/build/prepare_signing_key.sh'
       - run:
           name: sign packages
-          command: './scripts/build/sign_packages.sh dist/*.rpm'
+          command: './scripts/build/sign_packages.sh'
       - run:
           name: sha-sum packages
           command: 'go run build.go sha-dist'
@@ -392,23 +321,9 @@ jobs:
       - run: cp dist/grafana-latest.linux-*.tar.gz packaging/docker
       - run: cd packaging/docker && ./build-deploy.sh "master-${CIRCLE_SHA1}"
       - run: rm packaging/docker/grafana-latest.linux-*.tar.gz
-      - run: cp enterprise-dist/grafana-enterprise-*.linux-amd64-musl.tar.gz packaging/docker/grafana-latest.linux-x64-musl.tar.gz
+      - run: cp enterprise-dist/grafana-enterprise-*.linux-amd64.tar.gz packaging/docker/grafana-latest.linux-x64.tar.gz
       - run: cd packaging/docker && ./build-enterprise.sh "master"
 
-  grafana-docker-ubuntu-master:
-    machine:
-      image: circleci/classic:201808-01
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run: docker info
-      - run: docker run --privileged linuxkit/binfmt:v0.6
-      - run: cp dist/grafana-latest.linux-*.tar.gz packaging/docker
-      - run: cd packaging/docker && ./build-deploy.sh --ubuntu "master-${CIRCLE_SHA1}"
-      - run: rm packaging/docker/grafana-latest.linux-*.tar.gz
-      - run: cp enterprise-dist/grafana-enterprise-*.linux-amd64.tar.gz packaging/docker/grafana-latest.linux-x64.tar.gz
-      - run: cd packaging/docker && ./build-enterprise.sh --ubuntu "master"
 
   grafana-docker-pr:
     machine:
@@ -422,18 +337,6 @@ jobs:
       - run: cp dist/grafana-latest.linux-*.tar.gz packaging/docker
       - run: cd packaging/docker && ./build.sh --fast "${CIRCLE_SHA1}"
 
-  grafana-docker-ubuntu-pr:
-    machine:
-      image: circleci/classic:201808-01
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run: docker info
-      - run: docker run --privileged linuxkit/binfmt:v0.6
-      - run: cp dist/grafana-latest.linux-*.tar.gz packaging/docker
-      - run: cd packaging/docker && ./build.sh --fast --ubuntu "${CIRCLE_SHA1}"
-
   grafana-docker-release:
     machine:
       image: circleci/classic:201808-01
@@ -446,27 +349,12 @@ jobs:
       - run: cp dist/grafana-latest.linux-*.tar.gz packaging/docker
       - run: cd packaging/docker && ./build-deploy.sh "${CIRCLE_TAG}"
       - run: rm packaging/docker/grafana-latest.linux-*.tar.gz
-      - run: cp enterprise-dist/grafana-enterprise-*.linux-amd64-musl.tar.gz packaging/docker/grafana-latest.linux-x64-musl.tar.gz
-      - run: cd packaging/docker && ./build-enterprise.sh "${CIRCLE_TAG}"
-
-  grafana-docker-ubuntu-release:
-    machine:
-      image: circleci/classic:201808-01
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run: docker info
-      - run: docker run --privileged linuxkit/binfmt:v0.6
-      - run: cp dist/grafana-latest.linux-*.tar.gz packaging/docker
-      - run: cd packaging/docker && ./build-deploy.sh --ubuntu "${CIRCLE_TAG}"
-      - run: rm packaging/docker/grafana-latest.linux-*.tar.gz
       - run: cp enterprise-dist/grafana-enterprise-*.linux-amd64.tar.gz packaging/docker/grafana-latest.linux-x64.tar.gz
-      - run: cd packaging/docker && ./build-enterprise.sh --ubuntu "${CIRCLE_TAG}"
+      - run: cd packaging/docker && ./build-enterprise.sh "${CIRCLE_TAG}"
 
   build-enterprise:
     docker:
-      - image: grafana/build-container:1.2.11
+     - image: grafana/build-container:1.2.6
     working_directory: /go/src/github.com/grafana/grafana
     steps:
       - checkout
@@ -482,12 +370,9 @@ jobs:
       - run:
           name: build and package enterprise
           command: './scripts/build/build.sh -enterprise'
-      - run:
-          name: Prepare GPG private key
-          command: './scripts/build/prepare_signing_key.sh'
       - run:
           name: sign packages
-          command: './scripts/build/sign_packages.sh dist/*.rpm'
+          command: './scripts/build/sign_packages.sh'
       - run:
           name: sha-sum packages
           command: 'go run build.go sha-dist'
@@ -501,7 +386,7 @@ jobs:
 
   build-all-enterprise:
     docker:
-    - image: grafana/build-container:1.2.11
+    - image: grafana/build-container:1.2.6
     working_directory: /go/src/github.com/grafana/grafana
     steps:
     - checkout
@@ -526,15 +411,15 @@ jobs:
     - run:
         name: build and package grafana
         command: './scripts/build/build-all.sh -enterprise'
-    - run:
-        name: Prepare GPG private key
-        command: './scripts/build/prepare_signing_key.sh'
     - run:
         name: sign packages
-        command: './scripts/build/sign_packages.sh dist/*.rpm'
+        command: './scripts/build/sign_packages.sh'
     - run:
         name: verify signed packages
-        command: './scripts/build/verify_signed_packages.sh dist/*.rpm'
+        command: |
+          mkdir -p ~/.rpmdb/pubkeys
+          curl -s https://grafanarel.s3.amazonaws.com/RPM-GPG-KEY-grafana > ~/.rpmdb/pubkeys/grafana.key
+          ./scripts/build/verify_signed_packages.sh dist/*.rpm
     - run:
         name: sha-sum packages
         command: 'go run build.go sha-dist'
@@ -558,6 +443,9 @@ jobs:
       - run:
           name: sign in to gcp
           command: '/opt/google-cloud-sdk/bin/gcloud auth activate-service-account --key-file=/tmp/gcpkey.json'
+      - run:
+          name: deploy to s3
+          command: 'aws s3 sync ./enterprise-dist s3://$ENTERPRISE_BUCKET_NAME/master'
       - run:
           name: deploy to gcp
           command: '/opt/google-cloud-sdk/bin/gsutil cp ./enterprise-dist/* gs://$GCP_BUCKET_NAME/enterprise/master'
@@ -574,37 +462,31 @@ jobs:
     steps:
       - checkout
       - attach_workspace:
-          at: .
+         at: .
       - run:
           name: gcp credentials
           command: 'echo ${GCP_GRAFANA_UPLOAD_KEY} > /tmp/gcpkey.json'
       - run:
           name: sign in to gcp
           command: '/opt/google-cloud-sdk/bin/gcloud auth activate-service-account --key-file=/tmp/gcpkey.json'
+      - run:
+          name: deploy to s3
+          command: 'aws s3 sync ./enterprise-dist s3://$ENTERPRISE_BUCKET_NAME/release'
       - run:
           name: deploy to gcp
           command: '/opt/google-cloud-sdk/bin/gsutil cp ./enterprise-dist/* gs://$GCP_BUCKET_NAME/enterprise/release'
       - run:
           name: Deploy to Grafana.com
           command: './scripts/build/publish.sh --enterprise'
-      - run:
-          name: Prepare GPG private key
-          command: './scripts/build/prepare_signing_key.sh'
       - run:
           name: Load GPG private key
-          command: './scripts/build/update_repo/load-signing-key.sh'
+          command: './scripts/build/load-signing-key.sh'
       - run:
           name: Update Debian repository
           command: './scripts/build/update_repo/update-deb.sh "enterprise" "$GPG_KEY_PASSWORD" "$CIRCLE_TAG" "enterprise-dist"'
-      - run:
-          name: Publish Debian repository
-          command: './scripts/build/update_repo/publish-deb.sh "enterprise"'
       - run:
           name: Update RPM repository
           command: './scripts/build/update_repo/update-rpm.sh "enterprise" "$GPG_KEY_PASSWORD" "$CIRCLE_TAG" "enterprise-dist"'
-      - run:
-          name: Publish RPM repository
-          command: './scripts/build/update_repo/publish-rpm.sh "enterprise" "$CIRCLE_TAG"'
 
 
   deploy-master:
@@ -613,6 +495,12 @@ jobs:
     steps:
       - attach_workspace:
           at: .
+      - run:
+          name: deploy to s3
+          command: |
+            # Also
+            cp dist/grafana-latest.linux-x64.tar.gz dist/grafana-master-$(echo "${CIRCLE_SHA1}" | cut -b1-7).linux-x64.tar.gz
+            aws s3 sync ./dist s3://$BUCKET_NAME/master
       - run:
           name: Trigger Windows build
           command: './scripts/trigger_windows_build.sh ${APPVEYOR_TOKEN} ${CIRCLE_SHA1} master'
@@ -628,7 +516,8 @@ jobs:
       - run:
           name: Publish to Grafana.com
           command: |
-            rm dist/*latest* || true
+            rm dist/grafana-master-$(echo "${CIRCLE_SHA1}" | cut -b1-7).linux-x64.tar.gz
+            rm dist/*latest*
             cd dist && ../scripts/build/release_publisher/release_publisher -apikey ${GRAFANA_COM_API_KEY} -version "v$(cat grafana.version)" --nightly
 
   deploy-release:
@@ -638,6 +527,9 @@ jobs:
       - checkout
       - attach_workspace:
           at: .
+      - run:
+          name: deploy to s3
+          command: 'aws s3 sync ./dist s3://$BUCKET_NAME/release'
       - run:
           name: gcp credentials
           command: 'echo ${GCP_GRAFANA_UPLOAD_KEY} > /tmp/gcpkey.json'
@@ -650,24 +542,15 @@ jobs:
       - run:
           name: Deploy to Grafana.com
           command: './scripts/build/publish.sh'
-      - run:
-          name: Prepare GPG private key
-          command: './scripts/build/prepare_signing_key.sh'
       - run:
           name: Load GPG private key
-          command: './scripts/build/update_repo/load-signing-key.sh'
+          command: './scripts/build/load-signing-key.sh'
       - run:
           name: Update Debian repository
           command: './scripts/build/update_repo/update-deb.sh "oss" "$GPG_KEY_PASSWORD" "$CIRCLE_TAG" "dist"'
-      - run:
-          name: Publish Debian repository
-          command: './scripts/build/update_repo/publish-deb.sh "oss"'
       - run:
           name: Update RPM repository
           command: './scripts/build/update_repo/update-rpm.sh "oss" "$GPG_KEY_PASSWORD" "$CIRCLE_TAG" "dist"'
-      - run:
-          name: Publish RPM repository
-          command: './scripts/build/update_repo/publish-rpm.sh "oss" "$CIRCLE_TAG"'
 
   build-oss-msi:
     docker:
@@ -687,101 +570,13 @@ jobs:
 
   store-build-artifacts:
     docker:
-      - image: circleci/node:10
+      - image: circleci/node:8
     steps:
       - attach_workspace:
           at: .
       - store_artifacts:
           path: ./dist
 
-  trigger-docs-update:
-    docker:
-      - image: circleci/python:3.6.8
-    steps:
-      - checkout
-      - run:
-          name: Trigger Docs update
-          command: |
-            if git diff --name-only HEAD^ | grep -q "^docs"; then
-              echo "Build URL:"
-              curl -s -u "$DOCS_CIRCLE_TOKEN:" \
-                -d build_parameters[CIRCLE_JOB]=pull-submodule-changes \
-                https://circleci.com/api/v1.1/project/github/grafana/docs.grafana.com/tree/master \
-              | jq .build_url
-            else
-              echo "-- no changes to docs files --"
-            fi
-
-  build-grafana-packages:
-    docker:
-      - image: circleci/node:10
-    steps:
-      - checkout
-      - run:
-          name: Boostrap lerna
-          command: 'npx lerna bootstrap'
-      - run:
-          name: Build packages
-          command: yarn packages:build
-
-
-  release-next-packages:
-    docker:
-      - image: circleci/node:10
-    steps:
-      - checkout
-      - run:
-          name: Boostrap lerna
-          command: 'npx lerna bootstrap'
-      - run:
-          name: npm - Prepare auth token
-          command: 'echo //registry.npmjs.org/:_authToken=$NPM_TOKEN >> ~/.npmrc'
-      - run:
-          name: Release next packages
-          command: './scripts/circle-release-next-packages.sh'
-
-  release-packages:
-    docker:
-      - image: circleci/node:10
-    steps:
-      - checkout
-      - run:
-          name: Boostrap lerna
-          command: 'npx lerna bootstrap'
-      - run:
-          name: npm - Prepare auth token
-          command: 'echo //registry.npmjs.org/:_authToken=$NPM_TOKEN >> ~/.npmrc'
-      - run:
-          name: Release packages
-          command: ./scripts/build/release-packages.sh "${CIRCLE_TAG}"
-
-  scan-docker-master:
-    docker:
-      - image: circleci/buildpack-deps:stretch
-    steps:
-      - setup_remote_docker
-      - restore_cache:
-          key: vulnerability-db
-      - run:
-          name: Install trivy
-          command: |
-            VERSION=$(
-                curl --silent "https://api.github.com/repos/aquasecurity/trivy/releases/latest" | \
-                grep '"tag_name":' | \
-                sed -E 's/.*"v([^"]+)".*/\1/'
-            )
-
-            wget https://github.com/aquasecurity/trivy/releases/download/v${VERSION}/trivy_${VERSION}_Linux-64bit.tar.gz
-            tar zxvf trivy_${VERSION}_Linux-64bit.tar.gz
-            sudo mv trivy /usr/local/bin
-      - run:
-          name: Scan the latest grafana master image with trivy
-          command: trivy --exit-code 1 --quiet --auto-refresh --clear-cache grafana/grafana:master
-      - save_cache:
-          key: vulnerability-db
-          paths:
-            - $HOME/.cache/trivy
-
 workflows:
   version: 2
   build-master:
@@ -792,9 +587,7 @@ workflows:
           filters: *filter-only-master
       - codespell:
           filters: *filter-only-master
-      - lint-go:
-          filters: *filter-only-master
-      - shellcheck:
+      - backend-lint:
           filters: *filter-only-master
       - test-frontend:
           filters: *filter-only-master
@@ -810,8 +603,7 @@ workflows:
             - test-backend
             - test-frontend
             - codespell
-            - lint-go
-            - shellcheck
+            - backend-lint
             - mysql-integration-test
             - postgres-integration-test
             - build-oss-msi
@@ -823,20 +615,7 @@ workflows:
             - test-backend
             - test-frontend
             - codespell
-            - lint-go
-            - shellcheck
-            - mysql-integration-test
-            - postgres-integration-test
-          filters: *filter-only-master
-      - grafana-docker-ubuntu-master:
-          requires:
-            - build-all
-            - build-all-enterprise
-            - test-backend
-            - test-frontend
-            - codespell
-            - lint-go
-            - shellcheck
+            - backend-lint
             - mysql-integration-test
             - postgres-integration-test
           filters: *filter-only-master
@@ -846,8 +625,7 @@ workflows:
             - test-backend
             - test-frontend
             - codespell
-            - lint-go
-            - shellcheck
+            - backend-lint
             - mysql-integration-test
             - postgres-integration-test
             - build-all-enterprise
@@ -858,24 +636,10 @@ workflows:
             - test-backend
             - test-frontend
             - codespell
-            - lint-go
-            - shellcheck
+            - backend-lint
             - mysql-integration-test
             - postgres-integration-test
           filters: *filter-only-master
-      - end-to-end-test:
-          requires:
-            - grafana-docker-master
-          filters: *filter-only-master
-      - trigger-docs-update:
-          requires:
-            - end-to-end-test
-          filters: *filter-only-master
-      - release-next-packages:
-          requires:
-            - build-all
-            - test-frontend
-          filters: *filter-only-master
 
   release:
     jobs:
@@ -885,9 +649,7 @@ workflows:
           filters: *filter-only-release
       - codespell:
           filters: *filter-only-release
-      - lint-go:
-          filters: *filter-only-release
-      - shellcheck:
+      - backend-lint:
           filters: *filter-only-release
       - test-frontend:
           filters: *filter-only-release
@@ -903,8 +665,7 @@ workflows:
             - test-backend
             - test-frontend
             - codespell
-            - lint-go
-            - shellcheck
+            - backend-lint
             - mysql-integration-test
             - postgres-integration-test
             - build-oss-msi
@@ -916,8 +677,7 @@ workflows:
             - test-backend
             - test-frontend
             - codespell
-            - lint-go
-            - shellcheck
+            - backend-lint
             - mysql-integration-test
             - postgres-integration-test
           filters: *filter-only-release
@@ -928,50 +688,20 @@ workflows:
             - test-backend
             - test-frontend
             - codespell
-            - lint-go
-            - shellcheck
+            - backend-lint
             - mysql-integration-test
             - postgres-integration-test
           filters: *filter-only-release
-      - grafana-docker-ubuntu-release:
-          requires:
-            - build-all
-            - build-all-enterprise
-            - test-backend
-            - test-frontend
-            - codespell
-            - lint-go
-            - shellcheck
-            - mysql-integration-test
-            - postgres-integration-test
-          filters: *filter-only-release
-      - release-packages:
-          requires:
-            - build-all
-            - test-backend
-            - test-frontend
-            - codespell
-            - lint-go
-            - shellcheck
-            - mysql-integration-test
-            - postgres-integration-test
-            - build-oss-msi
-          filters: *filter-only-release
       - build-oss-msi:
           requires:
             - build-all
             - test-backend
             - test-frontend
             - codespell
-            - lint-go
-            - shellcheck
+            - backend-lint
             - mysql-integration-test
             - postgres-integration-test
-          filters: *filter-only-release
-      - end-to-end-test-release:
-          requires:
-            - grafana-docker-release
-          filters: *filter-only-release
+          filters: *filter-only-master
 
   build-branches-and-prs:
       jobs:
@@ -979,8 +709,6 @@ workflows:
             filters: *filter-not-release-or-master
         - build-fast-frontend:
             filters: *filter-not-release-or-master
-        - build-grafana-packages:
-            filters: *filter-not-release-or-master
         - build-fast-package:
             filters: *filter-not-release-or-master
             requires:
@@ -988,9 +716,7 @@ workflows:
               - build-fast-frontend
         - codespell:
             filters: *filter-not-release-or-master
-        - lint-go:
-            filters: *filter-not-release-or-master
-        - shellcheck:
+        - backend-lint:
             filters: *filter-not-release-or-master
         - test-frontend:
             filters: *filter-not-release-or-master
@@ -1008,20 +734,7 @@ workflows:
               - test-backend
               - test-frontend
               - codespell
-              - lint-go
-              - shellcheck
-              - mysql-integration-test
-              - postgres-integration-test
-              - cache-server-test
-            filters: *filter-not-release-or-master
-        - grafana-docker-ubuntu-pr:
-            requires:
-              - build-fast-package
-              - test-backend
-              - test-frontend
-              - codespell
-              - lint-go
-              - shellcheck
+              - backend-lint
               - mysql-integration-test
               - postgres-integration-test
               - cache-server-test
@@ -1032,16 +745,8 @@ workflows:
               - test-backend
               - test-frontend
               - codespell
-              - lint-go
-              - shellcheck
+              - backend-lint
               - mysql-integration-test
               - postgres-integration-test
               - cache-server-test
             filters: *filter-not-release-or-master
-  nightly:
-    triggers:
-      - schedule:
-          cron: "0 0 * * *"
-          filters: *filter-only-master
-    jobs:
-      - scan-docker-master

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,33 +1,20 @@
-<!--
-
-Thank you for sending a pull request! Here are some tips:
-
-1. If this is your first time, please read our contribution guide at https://github.com/grafana/grafana/blob/master/CONTRIBUTING.md
-
-2. Ensure you include and run the appropriate tests as part of your Pull Request.
-
-3. In a new feature or configuration option, an update to the documentation is necessary. Everything related to the documentation is under the docs folder in the root of the repository.
-
-4. If the Pull Request is a work in progress, make use of GitHub's "Draft PR" feature and mark it as such.
-
-5. If you can not merge your Pull Request due to a merge conflict, Rebase it. This gets it in sync with the master branch.
-
-6. Name your PR as "<FeatureArea>: Describe your change", e.g. Alerting: Prevent race condition. If it's a fix or feature relevant for the changelog describe the user impact in the title. The PR title is used to auto-generate the changelog for issues marked with the "add to changelog" label.
+<!--  Thanks for sending a pull request!  Here are some tips for you:
 
+1. If this is your first time, please read our [`CONTRIBUTING.md`](https://github.com/grafana/grafana/blob/master/CONTRIBUTING.md) guide.
+2. Ensure you have added or ran the appropriate tests for your PR.
+3. If it's a new feature or config option it will need a docs update. Docs are under the docs folder in repo root.
+4. If the PR is unfinished, mark it as a draft PR.
+5. Rebase your PR if it gets out of sync with master
+6. Name your PR as `<FeatureArea>: Describe your change`. If it's a fix or feature relevant for changelog describe the user  impact in the title. The PR title is used in changelog for issues marked with `add to changelog` label. 
 -->
 
 **What this PR does / why we need it**:
 
 **Which issue(s) this PR fixes**:
-
 <!--
-
-* Automatically closes linked issue when the Pull Request is merged.
-
-Usage: "Fixes #<issue number>", or "Fixes (paste link of issue)"
-
+*Automatically closes linked issue when PR is merged.
+Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
 -->
-
 Fixes #
 
 **Special notes for your reviewer**:

.gitignore

@@ -10,11 +10,6 @@ awsconfig
 /public/views/index.html
 /public/views/error.html
 /emails/dist
-
-# Enterprise emails
-/emails/templates/enterprise_*
-/public/emails/enterprise_*
-
 /public_gen
 /public/vendor/npm
 /tmp
@@ -44,11 +39,10 @@ public/css/*.min.css
 /data/*
 /bin/*
 
-# devenv
-/devenv/docker-compose.yaml
-/devenv/.env
-
 conf/custom.ini
+fig.yml
+devenv/docker-compose.yml
+devenv/docker-compose.yaml
 /conf/provisioning/**/custom.yaml
 /conf/provisioning/**/dev.yaml
 /conf/ldap_dev.toml
@@ -85,15 +79,8 @@ debug.test
 /scripts/build/release_publisher/release_publisher
 *.patch
 
+
 # Ignoring frontend packages specifics
 /packages/**/dist
 /packages/**/compiled
 /packages/**/.rpt2_cache
-
-theOutput/
-
-# Ignore go local build dependencies
-/scripts/go/bin/**
-
-# Ignore compilation stats from `yarn stats`
-compilation-stats.json

CONTRIBUTING.md

@@ -1,67 +1,82 @@
-# Contributing to Grafana
 
-Thank you for your interest in contributing to Grafana! We welcome all people who want to contribute in a healthy and constructive manner within our community. To help us create a safe and positive community experience for all, we require all participants to adhere to the [Code of Conduct](CODE_OF_CONDUCT.md).
+# Contributing
 
-This document is a guide to help you through the process of contributing to Grafana.
+Grafana uses GitHub to manage contributions.
+Contributions take the form of pull requests that will be reviewed by the core team.
 
-## Become a contributor
+* If you are a new contributor see: [Steps to Contribute](#steps-to-contribute)
 
-You can contribute to Grafana in several ways. Here are some examples:
+* If you have a trivial fix or improvement, go ahead and create a pull request.
 
-- Contribute to the Grafana codebase.
-- Report and triage bugs.
-- Develop community plugins and dashboards.
-- Write technical documentation and blog posts, for users and contributors.
-- Organize meetups and user groups in your local area.
-- Help others by answering questions about Grafana.
+* If you plan to do something more involved, discuss your idea on the respective [issue](https://github.com/grafana/grafana/issues) or create a [new issue](https://github.com/grafana/grafana/issues/new) if it does not exist. This will avoid unnecessary work and surely give you and us a good deal of inspiration.
 
-For more ways to contribute, check out the [Open Source Guides](https://opensource.guide/how-to-contribute/).
+* Sign our [CLA](http://docs.grafana.org/contribute/cla/).
 
-### Report bugs
+* For changes in the backend, follow the style guides used in Go [Code Review Comments](https://code.google.com/p/go-wiki/wiki/CodeReviewComments) and Peter Bourgon's [Go: Best Practices for Production Environments](http://peter.bourgon.org/go-in-production/#formatting-and-style)
 
-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.
+## Steps to Contribute
 
-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.
+Should you wish to work on a GitHub issue, check first if it is not already assigned to someone. If it is free, you claim it by commenting on the issue that you want to work on it. This is to prevent duplicated efforts from contributors on the same issue.
 
-#### Security issues
+Please check the [`beginner friendly`](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22beginner+friendly%22) and [`help wanted`](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) labels to find issues that are good for getting started. If you have questions about one of the issues, with or without the tag, please comment on them and one of the core team or the original poster will clarify it.
 
-If you believe you've found a security vulnerability, please read our [security policy](https://github.com/grafana/grafana/security/policy) for more details.
+To setup a local development environment we recommend reading [Building Grafana from source](http://docs.grafana.org/project/building_from_source/)
 
-### Suggest enhancements
 
-If you have an idea of how to improve Grafana, submit an [enhancement request](https://github.com/grafana/grafana/issues/new?labels=type%3A+feature+request&template=2-feature_request.md).
+## Pull Request Checklist
 
-We want to make Grafana accessible to even more people. Submit an [accessibility issue](https://github.com/grafana/grafana/issues/new?labels=type%3A+accessibility&template=3-accessibility.md) to help us understand what we can improve.
+* Branch from the master branch and, if needed, rebase to the current master branch before submitting your pull request. If it doesn't merge cleanly with master you may be asked to rebase your changes.
 
-### Triage issues
+* If your patch is not getting reviewed or you need a specific person to review it, you can @-reply a reviewer asking for a review in the pull request or a comment.
 
-If you don't have the knowledge or time to code, consider helping with _issue triage_. The community will thank you for saving them time by spending some of yours.
+* Add tests relevant to the fixed bug or new feature.
 
-Read more about the ways you can [Triage issues](/contribute/triage-issues.md).
+### Pull requests with new features
+Commits should be as small as possible, while ensuring that each commit is correct independently (i.e., each commit should compile and pass tests).
 
-### Answering questions
+Make sure to include `Closes #<issue number>` or `Fixes #<issue number>` in the pull request description.
 
-If you have a question and you can't find the answer in the [documentation](https://grafana.com/docs/), the next step is to ask it on the [community site](https://community.grafana.com/).
+### Pull requests with bug fixes
+Please make all changes in one commit if possible. Include `Closes #<issue number>` in bottom of the commit message.
+A commit message for a bug fix should look something like this.
 
-It's important to us to help these users, and we'd love your help. Sign up to our [community site](https://community.grafana.com/), and start helping other Grafana users by answering their questions.
+```
+avoid infinite loop in the dashboard provisioner
 
-### Your first contribution
+if one dashboard with an uid is refered to by two
+provsioners each provisioner overwrite each other.
+filling up dashboard_versions quite fast if using
+default settings.
 
-Unsure where to begin contributing to Grafana? Start by browsing issues labeled `beginner friendly` or `help wanted`.
+Closes #12864
+```
 
-- [Beginner-friendly](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22beginner+friendly%22) issues are generally straightforward to complete.
-- [Help wanted](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) issues are problems we would like the community to help us with regardless of complexity.
+If the pull request needs changes before its merged the new commits should be rebased into one commit before its merged.
 
-If you're looking to make a code change, see how to set up your environment for [local development](contribute/developer-guide.md).
+## Backend dependency management
 
-When you're ready to contribute, it's time to [Create a pull request](/contribute/create-pull-request.md).
+The Grafana project uses [Go modules](https://golang.org/cmd/go/#hdr-Modules__module_versions__and_more) to manage dependencies on external packages. This requires a working Go environment with version 1.11 or greater installed.
 
-#### Contributor License Agreement (CLA)
+All dependencies are vendored in the `vendor/` directory.
 
-Before we can accept your pull request, you need to [sign our CLA](https://grafana.com/docs/contribute/cla/). If you haven't, our CLA assistant prompts you to when you create your pull request.
+To add or update a new dependency, use the `go get` command:
 
-## Where do I go from here?
+```bash
+# Pick the latest tagged release.
+go get example.com/some/module/pkg
 
-- Set up your [development environment](contribute/developer-guide.md).
-- Learn how to [contribute documentation](contribute/documentation.md).
-- Get started [developing plugins](https://grafana.com/docs/plugins/developing/development/) for Grafana.
+# Pick a specific version.
+go get example.com/some/module/pkg@vX.Y.Z
+```
+
+Tidy up the `go.mod` and `go.sum` files and copy the new/updated dependency to the `vendor/` directory:
+
+
+```bash
+# The GO111MODULE variable can be omitted when the code isn't located in GOPATH.
+GO111MODULE=on go mod tidy
+
+GO111MODULE=on go mod vendor
+```
+
+You have to commit the changes to `go.mod`, `go.sum` and the `vendor/` directory before submitting the pull request.

Dockerfile

@@ -1,7 +1,5 @@
 # Golang build container
-FROM golang:1.13.1-alpine
-
-RUN apk add --no-cache gcc g++
+FROM golang:1.12.4
 
 WORKDIR $GOPATH/src/github.com/grafana/grafana
 
@@ -11,22 +9,13 @@ COPY vendor vendor
 RUN go mod verify
 
 COPY pkg pkg
-COPY build.go package.json ./
+COPY build.go build.go
+COPY package.json package.json
 
 RUN go run build.go build
 
 # Node build container
-FROM node:10.14.2-alpine
-
-# PhantomJS
-RUN apk add --no-cache curl &&\
-    cd /tmp && curl -Ls https://github.com/dustinblackman/phantomized/releases/download/2.1.1/dockerized-phantomjs.tar.gz | tar xz &&\
-    cp -R lib lib64 / &&\
-    cp -R usr/lib/x86_64-linux-gnu /usr/lib &&\
-    cp -R usr/share /usr/share &&\
-    cp -R etc/fonts /etc &&\
-    curl -k -Ls https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 | tar -jxf - &&\
-    cp phantomjs-2.1.1-linux-x86_64/bin/phantomjs /usr/local/bin/phantomjs
+FROM node:10.14.2
 
 WORKDIR /usr/src/app/
 
@@ -35,7 +24,7 @@ COPY packages packages
 
 RUN yarn install --pure-lockfile --no-progress
 
-COPY Gruntfile.js tsconfig.json tslint.json .browserslistrc ./
+COPY Gruntfile.js tsconfig.json tslint.json ./
 COPY public public
 COPY scripts scripts
 COPY emails emails
@@ -44,14 +33,12 @@ ENV NODE_ENV production
 RUN ./node_modules/.bin/grunt build
 
 # Final container
-FROM alpine:3.10
-
-LABEL maintainer="Grafana team <hello@grafana.com>"
+FROM debian:stretch-slim
 
 ARG GF_UID="472"
 ARG GF_GID="472"
 
-ENV PATH="/usr/share/grafana/bin:$PATH" \
+ENV PATH=/usr/share/grafana/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
     GF_PATHS_CONFIG="/etc/grafana/grafana.ini" \
     GF_PATHS_DATA="/var/lib/grafana" \
     GF_PATHS_HOME="/usr/share/grafana" \
@@ -61,14 +48,16 @@ ENV PATH="/usr/share/grafana/bin:$PATH" \
 
 WORKDIR $GF_PATHS_HOME
 
-RUN apk add --no-cache ca-certificates bash tzdata && \
-    apk add --no-cache --upgrade --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main openssl musl-utils
+RUN apt-get update && apt-get upgrade -y && \
+    apt-get install -qq -y libfontconfig1 ca-certificates && \
+    apt-get autoremove -y && \
+    rm -rf /var/lib/apt/lists/*
 
 COPY conf ./conf
 
 RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
-    addgroup -S -g $GF_GID grafana && \
-    adduser -S -u $GF_UID -G grafana grafana && \
+    groupadd -r -g $GF_GID grafana && \
+    useradd -r -u $GF_UID -g grafana grafana && \
     mkdir -p "$GF_PATHS_PROVISIONING/datasources" \
              "$GF_PATHS_PROVISIONING/dashboards" \
              "$GF_PATHS_PROVISIONING/notifiers" \
@@ -78,15 +67,7 @@ RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
     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" && \
-    chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING"
-
-# PhantomJS
-COPY --from=1 /tmp/lib /lib
-COPY --from=1 /tmp/lib64 /lib64
-COPY --from=1 /tmp/usr/lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu
-COPY --from=1 /tmp/usr/share /usr/share
-COPY --from=1 /tmp/etc/fonts /etc/fonts
-COPY --from=1 /usr/local/bin/phantomjs /usr/local/bin
+    chmod 777 -R "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING"
 
 COPY --from=0 /go/src/github.com/grafana/grafana/bin/linux-amd64/grafana-server /go/src/github.com/grafana/grafana/bin/linux-amd64/grafana-cli ./bin/
 COPY --from=1 /usr/src/app/public ./public

Dockerfile.ubuntu

@@ -1,85 +0,0 @@
-FROM golang:1.13.1 AS go-builder
-
-WORKDIR /src/grafana
-
-COPY go.mod go.sum ./
-COPY vendor vendor/
-
-RUN go mod verify
-
-COPY build.go package.json ./
-COPY pkg pkg/
-
-RUN go run build.go build
-
-FROM node:10.17 AS js-builder
-
-# PhantomJS
-RUN apt-get update && apt-get install -y curl &&\
-    curl -L https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 | tar xj &&\
-    cp phantomjs-2.1.1-linux-x86_64/bin/phantomjs /usr/local/bin/phantomjs
-
-WORKDIR /usr/src/app/
-
-COPY package.json yarn.lock ./
-COPY packages packages
-
-RUN yarn install --pure-lockfile
-
-COPY Gruntfile.js tsconfig.json tslint.json .browserslistrc ./
-COPY public public 
-COPY scripts scripts
-COPY emails emails
-
-ENV NODE_ENV production
-RUN ./node_modules/.bin/grunt build
-
-FROM ubuntu:18.10
-
-LABEL maintainer="Grafana team <hello@grafana.com>"
-EXPOSE 3000
-
-ARG GF_UID="472"
-ARG GF_GID="472"
-
-ENV PATH="/usr/share/grafana/bin:$PATH" \
-    GF_PATHS_CONFIG="/etc/grafana/grafana.ini" \
-    GF_PATHS_DATA="/var/lib/grafana" \
-    GF_PATHS_HOME="/usr/share/grafana" \
-    GF_PATHS_LOGS="/var/log/grafana" \
-    GF_PATHS_PLUGINS="/var/lib/grafana/plugins" \
-    GF_PATHS_PROVISIONING="/etc/grafana/provisioning"
-
-WORKDIR $GF_PATHS_HOME
-
-COPY conf conf
-
-# We need font libs for phantomjs, and curl should be part of the image
-RUN apt-get update && apt-get upgrade -y && apt-get install -y ca-certificates libfontconfig1 curl
-
-RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
-  addgroup --system --gid $GF_GID grafana && \
-  adduser --uid $GF_UID --system --ingroup grafana grafana && \
-  mkdir -p "$GF_PATHS_PROVISIONING/datasources" \
-             "$GF_PATHS_PROVISIONING/dashboards" \
-             "$GF_PATHS_PROVISIONING/notifiers" \
-             "$GF_PATHS_LOGS" \
-             "$GF_PATHS_PLUGINS" \
-             "$GF_PATHS_DATA" && \
-    cp conf/sample.ini "$GF_PATHS_CONFIG" && \
-    cp conf/ldap.toml /etc/grafana/ldap.toml && \
-    chown -R grafana:grafana "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
-    chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING"
-
-# PhantomJS
-COPY --from=js-builder /usr/local/bin/phantomjs /usr/local/bin/
-
-COPY --from=go-builder /src/grafana/bin/linux-amd64/grafana-server /src/grafana/bin/linux-amd64/grafana-cli bin/
-COPY --from=js-builder /usr/src/app/public public
-COPY --from=js-builder /usr/src/app/tools tools
-
-COPY tools/phantomjs/render.js tools/phantomjs/
-COPY packaging/docker/run.sh /
-
-USER grafana
-ENTRYPOINT [ "/run.sh" ]

Gruntfile.js

@@ -10,7 +10,6 @@ module.exports = function (grunt) {
     tempDir: 'tmp',
     platform: process.platform.replace('win32', 'windows'),
     enterprise: false,
-    libc: null,
   };
 
   if (grunt.option('platform')) {
@@ -31,10 +30,6 @@ module.exports = function (grunt) {
     }
   }
 
-  if (grunt.option('libc')) {
-    config.libc = grunt.option('libc');
-  }
-
   config.phjs = grunt.option('phjsToRelease');
   config.pkg.version = grunt.option('pkgVer') || config.pkg.version;
 
@@ -47,7 +42,7 @@ module.exports = function (grunt) {
   grunt.loadTasks('./scripts/grunt');
 
   // Utility function to load plugin settings into config
-  function loadConfig(config, path) {
+  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

ISSUE_TRIAGE.md

@@ -1,340 +0,0 @@
-# Triage issues
-
-The main goal of issue triage is to categorize all incoming Grafana issues and make sure each issue has all basic information needed for anyone else to understand and be able to start working on it.
-
-**Note:** This information is for Grafana project Maintainers, Owners, and Admins. If you are a Contributor, then you will not be able to perform most of the tasks in this topic.
-
-The core maintainers of the Grafana project are responsible for categorizing all incoming issues and delegating any critical or important issue to other maintainers. Currently one maintainer each week is responsible. Besides that part, triage provides an important way to contribute to an open source project. 
-
-Triage helps ensure issues resolve quickly by:
-
-* Ensuring the issue's intent and purpose is conveyed precisely. This is necessary because it can be difficult for an issue to explain how an end user experiences a problem and what actions they took.
-* Giving a contributor the information they need before they commit to resolving an issue.
-* Lowering the issue count by preventing duplicate issues.
-* Streamlining the development process by preventing duplicate discussions.
-
-If you don't have the knowledge or time to code, consider helping with triage. The community will thank you for saving them time by spending some of yours.
-
-## Simplified flowchart diagram of the issue triage process
-
-<!-- https://textik.com/#610afa78553def29 -->
-```
-                        +--------------------------+
-       +----------------+  New issue opened/       |
-       |                |  more information added  |
-       |                +-------------+------------+
-       |  Ask for more                |
-       |  information   +-------------+------------+
-       |                | All information needed   |
-       |       +--------+ to categorize the issue? +--------+
-       |       |        |                          |        |
-       |       |   NO   +--------------------------+  YES   |
-       |       |                                            |
-+------+-------+-------------+                 +------------+---------+        +----------------------------+
-|                            |                 |                      |        |                            |
-| label: needs more details  |                 | Needs investigation? +--YES---+ label: needs investigation |
-|                            |                 |                      |        |                            |
-+----------------------------+                 +----------------+-----+        +--------------+-------------+
-                                                             NO |                             |
-                                                                |               Investigate   |
-                                                    +-----------+----------+                  |
-                                                    | label: type/*        |                  |
-                                                    | label: area/*        +------------------+
-                                                    | label: datasource/*  |
-                                                    +-----|----------+-----+
-                                                          |          |
-                                                          |          |
-                                                          |       +--+--------------------+         +--------------------+
-                                                          |       |                       |         | label: priority/*  |
-                                                          |       |    Needs priority?    +--YES---+| milestone?         |
-                                                          |       |                       |         |                    |
-                                                          |       +--------------------+--+         +----+---------------+
-                                                          |                        NO  |                 |
-                                                          |                            |                 |
-                                                     +----+-------------+          +---+----------+      |
-                                                     |                  |          |              |      |
-                                                     |   Close issue    +----------+     Done     +------+
-                                                     |                  |          |              |
-                                                     +------------------+          +--------------+
-```
-
-## 1. Find uncategorized issues
-
-To get started with issue triage and finding issues that haven't been triaged you have two alternatives.
-
-### Browse unlabeled issues
-
-The easiest and straight forward way of getting started and finding issues that haven't been triaged is to browse [unlabeled issues](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+no%3Alabel) and starting from the bottom and working yourself to the top.
-
-### Subscribe to all notifications
-
-The more advanced, but recommended way is to subscribe to all notifications from this repository which means that all new issues, pull requests, comments and important status changes are sent to your configured email address. Read this [guide](https://help.github.com/en/articles/watching-and-unwatching-repositories#watching-a-single-repository) for help with setting this up.
-
-It's highly recommended that you setup filters to automatically remove emails from the inbox and label/categorize them accordingly to make it easy for you to understand when you need to act upon a notification or where to look for finding issues that haven't been triaged etc.
-
-Instructions for setting up filters in Gmail can be found [here](#setting-up-gmail-filters). Another alternative is to use [Trailer](https://github.com/ptsochantaris/trailer) or similar software.
-
-## 2. Ensure the issue contains basic information
-
-Before triaging an issue very far, make sure that the issue's author provided the standard issue information. This will help you make an educated recommendation on how to categorize the issue. The Grafana project utilizes [GitHub issue templates](https://help.github.com/en/articles/creating-issue-templates-for-your-repository) to guide  contributors to provide standard information that must be included for each type of template or type of issue.
-
-### Standard issue information that must be included
-
-Given a certain [issue template]([template](https://github.com/grafana/grafana/issues/new/choose)) have been used by the issue author or depending how the issue is perceived by the issue triage responsible, the following should help you understand what standard issue information that must be included.
-
-#### Bug report?
-
-Should explain what happened, what was expected and how to reproduce it together with any additional information that may help giving a complete picture of what happened such as screenshots, [query inspector](https://community.grafana.com/t/using-grafanas-query-inspector-to-troubleshoot-issues/2630) output and any environment related information that's applicable and/or maybe related to the reported problem:
-- Grafana version
-- Data source type & version
-- Platform & OS Grafana is installed on
-- User OS & Browser + versions
-- Using docker + what environment
-- Which plugins
-- Configuration database in use (sqlite, mysql, postgres)
-- Reverse proxy in front of Grafana, what version and configuration
-- Non-default configuration settings
-- Development environment like Go and Node versions, if applicable
-
-#### Enhancement request?
-
-Should explain what enhancement or feature that the author wants to be added and why that is needed.
-
-#### Accessibility issue?
-
-This is a mix between a bug report and enhancement request but focused on accessibility issues to help make Grafana improve keyboard navigation, screen-reader support and being accessible to everyone. The report should include relevant WCAG criteria, if applicable.
-
-#### Support request?
-
-In general, if the issue description and title is perceived as a question no more information is needed.
-
-### Good practices
-
-To make it easier for everyone to understand and find issues they're searching for it's suggested as a general rule of thumbs to:
-
-* Make sure that issue titles are named to explain the subject of the issue, has a correct spelling and doesn't include irrelevant information and/or sensitive information.
-* Make sure that issue descriptions doesn't include irrelevant information, information from template that haven't been filled out and/or sensitive information.
-* Do your best effort to change title and description or request suggested changes by adding a comment.
-
-Note: Above rules is applicable to both new and existing issues of the Grafana project.
-
-### Do you have all the information needed to categorize an issue?
-
-Depending on the issue, you might not feel all this information is needed. Use your best judgement. If you cannot triage an issue using what its author provided, explain kindly to the author that they must provide the above information to clarify the problem. Label issue with `needs more detail` and add any related `area/*` or `datasource/*` labels.
-
-If the author provides the standard information but you are still unable to triage the issue, request additional information. Do this kindly and politely because you are asking for more of the author's time.
-
-If the author does not respond to the requested information within the timespan of a week, close the issue with a kind note stating that the author can request for the issue to be reopened when the necessary information is provided.
-
-When you feel you have all the information needed you're ready to [categorizing the issue](#3-categorizing-an-issue).
-
-If you receive a notification with additional information provided but you are not anymore on issue triage and you feel you do not have time to handle it, you should delegate it to the current person on issue triage.
-
-## 3. Categorizing an issue
-
-An issue can have multiple of the following labels. Typically, a properly categorized issue should at least have:
-
-- One label identifying its type (`type/*`).
-- One or multiple labels identifying the functional areas of interest or component (`area/*`) and/or data source (`datasource/*`), if applicable.
-
-Label | Description
-------- | --------
-`type/bug` | A feature isn't working as expected given design or documentation.
-`type/feature-request` | Request for a new feature or enhancement.
-`type/docs` | Documentation problem or enhancement.
-`type/accessibility` | Accessibility problem or enhancement.
-`type/question` | Issue is or perceived as a question.
-`type/duplicate` | An existing issue of the same subject/request have already been reported.
-`type/works-as-intended` | A reported bug works as intended/by design.
-`type/build-packaging` | Build or packaging problem or enhancement.
-`area/*` | Subject is related to a functional area of interest or component.
-`datasource/*` | Subject is related to a core data source plugin.
-
-### Duplicate issue?
-
-Make sure that it's not a duplicate by searching existing issues using related terms from the issue title and description. If you think you know there are an existing issue, but can't find it please reach out to one of the maintainers and ask for help. If you identify that the issue is a duplicate of an existing issue:
-
-1. Add a comment `Duplicate of #<issue number>`. GitHub will recognize this and add some additional context to the issue activity.
-2. Close the issue and label it with `type/duplicate`.
-3. Optionally add any related `area/*` or `datasource/*` labels.
-4. If applicable, add a comment with additional information.
-
-### Bug report?
-
-If it's not perfectly clear that it's an actual bug, quickly try to reproduce it.
-
-**It's a bug/it can be reproduced:**
-
-1. Add a comment describing detailed steps for how to reproduce it, if applicable.
-2. Label the issue `type/bug` and at least one `area/*` or `datasource/*` label.
-3. If you know that maintainers wont be able to put any resources into it for some time then label the issue with `help wanted` and optionally `beginner friendly` together with pointers on which code to update to fix the bug. This should signal to the community that we would appreciate any help we can get to resolve this.
-4. Move on to [prioritizing the issue](#4-prioritization-of-issues).
-
-**It can't be reproduced:**
-1. Either [ask for more information](#2-ensure-the-issue-contains-basic-information) needed to investigate it more thoroughly.
-2. Either [delegate further investigations](#investigation-of-issues) to someone else.
-
-**It works as intended/by design:**
-1. Kindly and politely add a comment explaining briefly why we think it works as intended and close the issue.
-2. Label the issue `type/works-as-intended`.
-
-### Enhancement/feature?
-
-1. Label the issue `type/feature-request` and at least one `area/*` or `datasource/*` label.
-2. Move on to [prioritizing the issue](#4-prioritization-of-issues).
-
-### Documentation issue?
-
-First, evaluate if the documentation makes sense to be included in the Grafana project:
-
-- Is this something we want/can maintain as a project?
-- Is this referring to usage of some specific integration/tool and in that case are those a popular use case in combination with Grafana?
-- If unsure, kindly and politely add a comment explaining that we would need [upvotes](https://help.github.com/en/articles/about-conversations-on-github#reacting-to-ideas-in-comments) to identify that lots of other users wants/needs this.
-
-Second, label the issue `type/docs` and at least one `area/*` or `datasource/*` label.
-
-**Minor typo/error/lack of information:**
-
-There's a minor typo/error/lack of information that adds a lot of confusion for users and given the amount of work is a big win to make sure fixing it:
-1. Either update the documentation yourself and open a pull request.
-2. Either delegate the work to someone else by assigning that person to the issue and add the issue to next major/minor milestone.
-
-**Major error/lack of information:**
-
-1. Label the issue with `help wanted` and `beginner friendly`, if applicable, to signal that we find this important to fix and we would appreciate any help we can get from the community.
-2. Move on to [prioritizing the issue](#4-prioritization-of-issues).
-
-### Accessibility issue?
-
-1. Label the issue `type/accessibility` and at least one `area/*` or `datasource/*` label.
-
-### Support request?
-
-1. Kindly and politely direct the issue author to the [community site](https://community.grafana.com/) and explain that GitHub is mainly used for tracking bugs and feature requests. If possible, it's usually a good idea to add some pointers to the issue author's question.
-2. Close the issue and label it with `type/question`.
-
-## 4. Prioritization of issues
-
-In general bugs and enhancement issues should be labeled with a priority.
-
-This is the most difficult thing with triaging issues since it requires a lot of knowledge, context and experience before being able to think of and start feel comfortable adding a certain priority label.
-
-The key here is asking for help and discuss issues to understand how more experienced project members thinks and reason. By doing that you learn more and eventually be more and more comfortable with prioritizing issues.
-
-In any case there are uncertainty around the priorization of an issue, please ask the maintainers for help.
-
-Label | Description
-------- | --------
-`priority/critical` | Highest priority. Must be actively worked on as someone's top priority right now.
-`priority/support-subscription` | This is important for one or several customers having a paid Grafana support subscription.
-`priority/important-soon` | Must be staffed and worked on either currently, or very soon, ideally in time for the next release.
-`priority/important-longterm` | Important over the long term, but may not be staffed and/or may need multiple releases to complete.
-`priority/nice-to-have` | It's a good idea, but not scheduled for any release.
-`priority/awaiting-more-evidence` | Lowest priority. Possibly useful, but not yet enough interest in it.
-`priority/unscheduled` | Something to look into before and to be discussed during the planning of the next (upcoming) major/minor stable release.
-
-**Critical bug?**
-
-1. If a bug have been categorized and any of the following problems applies the bug should be labeled as critical and must be actively worked on as someone's top priority right now.
-
-   - Results in any data loss
-   - Critical security or performance issues
-   - Problem that makes a feature unusable
-   - Multiple users experience a severe problem affecting their business, users etc.
-
-2. Label the issue `priority/critical`.
-3. If applicable, label the issue `priority/support-subscription`.
-4. Add the issue to the next upcoming patch release milestone. Create a new milestone if there are none.
-5. Escalate the problem to the maintainers.
-6. Assign or ask a maintainer for help assigning someone to make this issue their top priority right now.
-
-**Important short-term?**
-
-1. Label the issue `priority/important-soon`.
-2. If applicable, label the issue `priority/support-subscription`.
-3. Add the issue to the next upcoming patch or major/minor stable release milestone. Ask maintainers for help if unsure if it's a patch or not. Create a new milestone if there are none.
-4. Make sure to add the issue to a suitable backlog of a GitHub project and prioritize it or assign someone to work on it now or very soon.
-5. Consider requesting [help from the community](#5-requesting-help-from-the-community), even though it may be problematic given a short amount of time until it should be released.
-
-**Important long-term?**
-
-1. Label the issue `priority/important-longterm`.
-2. Consider requesting [help from the community](#5-requesting-help-from-the-community).
-
-**Nice to have?**
-
-1. Label the issue `priority/nice-to-have`.
-2. Consider requesting [help from the community](#5-requesting-help-from-the-community).
-
-**Not critical, but unsure?**
-
-1. Label the issue `priority/unscheduled`.
-2. Consider requesting [help from the community](#5-requesting-help-from-the-community).
-
-## 5. Requesting help from the community
-
-Depending on the issue and/or priority, it's always a good idea to consider signalling to the community that help from community is appreciated and needed in case an issue is not prioritized to be worked on by maintainers. Use your best judgement. In general, when requesting help from the community it means a contribution has a good chance of getting accepted and merged.
-
-In many cases the issue author or community as a whole is more suitable to contribute changes since they're experts in their domain. It's also quite common that someone has tried to get something to work using the documentation without success and made an effort to get it to work and/or reached out to the [community site](https://community.grafana.com/) to get the missing information. In especially these areas it's more likely that there exists experts in their own domain and usually a good idea to request help from contributors:
-
-- Database setups
-- Authentication like OAuth providers and LDAP setups
-- Platform specific things
-- Reverse proxy setups
-- Alert notifiers
-
-1. Kindly and politely add a comment to signal to users subscribed to updates of the issue.
-   - Explain that the issue would be nice to get resolved, but it isn't prioritized to work on by maintainers for an unforseen future.
-   - If possible or applicable, try to help contributors getting starting by adding pointers and references to what code/files need to be changed and/or ideas of a good way to solve/implement the issue.
-2. Label the issue with `help wanted`.
-3. If applicable, label the issue with `beginner friendly` to denote that the issue is suitable for a beginner to work on.
-4. If possible, try to estimate the amount of work by adding `effort/small`, `effort/medium` or `effort/large`.
-
-## Investigation of issues
-
-When an issue has all basic information provided, but the triage responsible haven't been able to reproduce the reported problem at a first glance, the issue is labeled [Needs investigation](https://github.com/grafana/grafana/labels/needs%20investigation). Depending of the perceived severity and/or number of [upvotes](https://help.github.com/en/articles/about-conversations-on-github#reacting-to-ideas-in-comments), the investigation will either be delegated to another maintainer for further investigation or either put on hold until someone else (maintainer or contributor) picks it up and eventually start investigating it.
-
-Investigating issues can be a very time consuming task, especially for the maintainers given the huge number of combinations of plugins, data sources, platforms, databases, browsers, tools, hardware, integrations, versions and cloud services etc that are being used with Grafana. There are a certain amount of combinations that are more common than others and these are in general easier for maintainers to investigate.
-
-For some other combinations there may not be possible at all for a maintainer to setup a proper test environment for being able to investigate. In these cases we really appreciate any help we can get from the community. Otherwise the issue is highly likely to be closed.
-
-Even if you don't have the time or knowledge to investigate an issue we highly recommend that you [upvote](https://help.github.com/en/articles/about-conversations-on-github#reacting-to-ideas-in-comments) the issue if you happen to have the same problem. If you have further details that may help investigating the issue please provide as much information as possible.
-
-## External PRs
-
-Part of issue triage should also be triaging of external PRs. Main goal should be to make sure PRs from external contributors have an owner/reviewer and are not forgotten.
-
-1. Check new external PRs which do not have a reviewer.
-1. Check if there is a link to an existing issue.
-1. If not and you know which issue it is solving add the link yourself, otherwise ask the author to link the issue or create one.
-1. Assign a reviewer based on who was handling the linked issue or what code or feature does the PR touches (look at who was the last to make changes there if all else fails).
-
-## Appendix
-
-### Setting up Gmail filters
-
-If you're using Gmail it's highly recommened that you setup filters to automatically remove email from the inbox and label them accordingly to make it easy for you to understand when you need to act upon a notification or process all incoming issues that haven't been triaged.
-
-This may be setup by personal preference, but here's a working configuration for reference.
-1. Follow instructions in [gist](https://gist.github.com/marefr/9167c2e31466f6316c1cba118874e74f)
-2. In Gmail, go to Settings -> Filters and Blocked Addresses
-3. Import filters -> select xml file -> Open file
-4. Review filters
-5. Optional, Check Apply new filters to existing email
-6. Create filters
-
-This will give you a structure of labels in the sidebar similar to the following:
-```
- - Inbox
- ...
- - Github (mine)
-   - activity
-   - assigned
-   - mentions
- - Github (other)
-  - Grafana
-```
-
-* All notifications you’ll need to read/take action on shows up as unread in Github (mine) and its sub-labels.
-* All other notifications you don’t need to take action on shows up as unread in Github (other) and its sub-labels
-  * This is convenient for issue triage and to follow the activity in the Grafana project.

Makefile

@@ -1,164 +1,68 @@
-## This is a self-documented Makefile. For usage information, run `make help`:
-##
-## For more information, refer to https://suva.sh/posts/well-documented-makefiles/
-
 -include local/Makefile
 
-.PHONY: all deps-go deps-js deps build-go build-server build-cli build-js build build-docker-dev build-docker-full lint-go gosec revive golangci-lint go-vet test-go test-js test run clean devenv devenv-down revive-alerting help
-
-GO = GO111MODULE=on go
-GO_FILES ?= ./pkg/...
-SH_FILES ?= $(shell find ./scripts -name *.sh)
+.PHONY: all deps-go deps-js deps build-go build-server build-cli build-js build build-docker-dev build-docker-full lint-go test-go test-js test run clean
 
 all: deps build
 
-##@ Dependencies
+deps-go:
+	go run build.go setup
 
-deps-go: ## Install backend dependencies.
-	$(GO) run build.go setup
+deps-js: node_modules
 
-deps-js: node_modules ## Install frontend dependencies.
+deps: deps-js
 
-deps: deps-js ## Install all dependencies.
-
-node_modules: package.json yarn.lock ## Install node modules.
-	@echo "install frontend dependencies"
-	yarn install --pure-lockfile --no-progress
-
-##@ Building
-
-build-go: ## Build all Go binaries.
+build-go:
 	@echo "build go files"
-	$(GO) run build.go build
+	GO111MODULE=on go run build.go build
 
-build-server: ## Build Grafana server.
+build-server:
 	@echo "build server"
-	$(GO) run build.go build-server
+	GO111MODULE=on go run build.go build-server
 
-build-cli: ## Build Grafana CLI application.
+build-cli:
 	@echo "build in CI environment"
-	$(GO) run build.go build-cli
+	GO111MODULE=on go run build.go build-cli
 
-build-js: ## Build frontend assets.
+build-js:
 	@echo "build frontend"
 	yarn run build
 
-build: build-go build-js ## Build backend and frontend.
+build: build-go build-js
 
-scripts/go/bin/bra: scripts/go/go.mod
-	@cd scripts/go; \
-	$(GO) build -o ./bin/bra github.com/unknwon/bra
-
-run: scripts/go/bin/bra ## Build and run web server on filesystem changes.
-	@GO111MODULE=on scripts/go/bin/bra run
-
-##@ Testing
-
-test-go: ## Run tests for backend.
-	@echo "test backend"
-	$(GO) test -v ./pkg/...
-
-test-js: ## Run tests for frontend.
-	@echo "test frontend"
-	yarn test
-
-test: test-go test-js ## Run all tests.
-
-##@ Linting
-
-scripts/go/bin/revive: scripts/go/go.mod
-	@cd scripts/go; \
-	$(GO) build -o ./bin/revive github.com/mgechev/revive
-
-revive: scripts/go/bin/revive
-	@echo "lint via revive"
-	@scripts/go/bin/revive \
-		-formatter stylish \
-		-config ./scripts/go/configs/revive.toml \
-		$(GO_FILES)
-
-revive-alerting: scripts/go/bin/revive
-	@echo "lint alerting via revive"
-	@scripts/go/bin/revive \
-		-formatter stylish \
-		./pkg/services/alerting/...
-
-scripts/go/bin/golangci-lint: scripts/go/go.mod
-	@cd scripts/go; \
-	$(GO) build -o ./bin/golangci-lint github.com/golangci/golangci-lint/cmd/golangci-lint
-
-golangci-lint: scripts/go/bin/golangci-lint
-	@echo "lint via golangci-lint"
-	@scripts/go/bin/golangci-lint run \
-		--config ./scripts/go/configs/.golangci.yml \
-		$(GO_FILES)
-
-scripts/go/bin/gosec: scripts/go/go.mod
-	@cd scripts/go; \
-	$(GO) build -o ./bin/gosec github.com/securego/gosec/cmd/gosec
-
-# TODO recheck the rules and leave only necessary exclusions
-gosec: scripts/go/bin/gosec
-	@echo "lint via gosec"
-	@scripts/go/bin/gosec -quiet \
-		-exclude=G104,G107,G108,G201,G202,G204,G301,G304,G401,G402,G501 \
-		-conf=./scripts/go/configs/gosec.json \
-		$(GO_FILES)
-
-go-vet:
-	@echo "lint via go vet"
-	@$(GO) vet $(GO_FILES)
-
-lint-go: go-vet golangci-lint revive revive-alerting gosec ## Run all code checks for backend.
-
-# with disabled SC1071 we are ignored some TCL,Expect `/usr/bin/env expect` scripts
-shellcheck: $(SH_FILES) ## Run checks for shell scripts.
-	@docker run --rm -v "$$PWD:/mnt" koalaman/shellcheck:stable \
-	$(SH_FILES) -e SC1071 -e SC2162
-
-##@ Docker
-
-build-docker-dev: ## Build Docker image for development (fast).
+build-docker-dev:
 	@echo "build development container"
 	@echo "\033[92mInfo:\033[0m the frontend code is expected to be built already."
-	$(GO) run build.go -goos linux -pkg-arch amd64 ${OPT} build pkg-archive latest
+	GO111MODULE=on go run build.go -goos linux -pkg-arch amd64 ${OPT} build pkg-archive latest
 	cp dist/grafana-latest.linux-x64.tar.gz packaging/docker
 	cd packaging/docker && docker build --tag grafana/grafana:dev .
 
-build-docker-full: ## Build Docker image for development.
+build-docker-full:
 	@echo "build docker container"
 	docker build --tag grafana/grafana:dev .
 
-##@ Services
+lint-go:
+	@echo "lint go source"
+	scripts/backend-lint.sh
 
-# create docker-compose file with provided sources and start them
-# example: make devenv sources=postgres,openldap
-ifeq ($(sources),)
-devenv:
-	@printf 'You have to define sources for this command \nexample: make devenv sources=postgres,openldap\n'
-else
-devenv: devenv-down ## Start optional services, e.g. postgres, prometheus, and elasticsearch.
-	$(eval targets := $(shell echo '$(sources)' | tr "," " "))
+test-go:
+	@echo "test backend"
+	GO111MODULE=on go test -v ./pkg/...
 
-	@cd devenv; \
-	./create_docker_compose.sh $(targets) || \
-	(rm -rf {docker-compose.yaml,conf.tmp,.env}; exit 1)
+test-js:
+	@echo "test frontend"
+	yarn test
 
-	@cd devenv; \
-	docker-compose up -d --build
-endif
+test: test-go test-js
 
-devenv-down: ## Stop optional services.
-	@cd devenv; \
-	test -f docker-compose.yaml && \
-	docker-compose down || exit 0;
+run:
+	@echo "start a server"
+	./bin/grafana-server
 
-##@ Helpers
-
-clean: ## Clean up intermediate build artifacts.
+clean:
 	@echo "cleaning"
 	rm -rf node_modules
 	rm -rf public/build
 
-help: ## Display this help.
-	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z_-]+:.*?##/ { printf "  \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
+node_modules: package.json yarn.lock
+	@echo "install frontend dependencies"
+	yarn install --pure-lockfile --no-progress

PLUGIN_DEV.md

@@ -1,19 +1,20 @@
-# Plugin development 
+# Plugin Development 
 
 This document is not meant as a complete guide for developing plugins but more as a changelog for changes in
 Grafana that can impact plugin development. Whenever you as a plugin author encounter an issue with your plugin after
 upgrading Grafana please check here before creating an issue. 
 
-## Plugin development resources
+## Links
 
-- [Grafana plugin developer guide](http://docs.grafana.org/plugins/developing/development/)
-- [Webpack Grafana plugin template project](https://github.com/CorpGlory/grafana-plugin-template-webpack)
+- [Datasource plugin written in TypeScript](https://github.com/grafana/typescript-template-datasource)
 - [Simple JSON datasource plugin](https://github.com/grafana/simple-json-datasource)
+- [Plugin development guide](http://docs.grafana.org/plugins/developing/development/)
+- [Webpack Grafana plugin template project](https://github.com/CorpGlory/grafana-plugin-template-webpack)
 
-## Changes in Grafana v4.6
+## Changes in v4.6
 
 This version of Grafana has big changes that will impact a limited set of plugins. We moved from systemjs to webpack
-for built-in plugins and everything internal. External plugins still use systemjs but now with a limited 
+for built-in plugins & everything internal. External plugins still use systemjs but now with a limited 
 set of Grafana components they can import. Plugins can depend on libs like lodash & moment and internal components 
 like before using the same import paths. However since everything in Grafana is no longer accessible, a few plugins could encounter issues when importing a Grafana dependency. 
 
@@ -24,10 +25,10 @@ If you think we missed exposing a crucial lib or Grafana component let us know b
 ### Deprecated components 
 
 The angular directive `<spectrum-picker>` is now deprecated (will still work for a version more) but we recommend plugin authors
-upgrade to new `<color-picker color="ctrl.color" onChange="ctrl.onSparklineColorChange"></color-picker>`
+to upgrade to new `<color-picker color="ctrl.color" onChange="ctrl.onSparklineColorChange"></color-picker>`
 
-## Changes in Grafana v6.0
+## Changes in v6.0
 
 ### DashboardSrv.ts
 
-If you utilize [DashboardSrv](https://github.com/grafana/grafana/commit/8574dca081002f36e482b572517d8f05fd44453f#diff-1ab99561f9f6a10e1fafcddc39bc1d65) in your plugin code, `dash` was renamed to `dashboard`.
+If you utilize [DashboardSrv](https://github.com/grafana/grafana/commit/8574dca081002f36e482b572517d8f05fd44453f#diff-1ab99561f9f6a10e1fafcddc39bc1d65) in your plugin code, `dash` was renamed to `dashboard` 

README.md

@@ -1,46 +1,174 @@
-![Grafana](docs/logo-horizontal.png)
+[Grafana](https://grafana.com) [![Circle CI](https://circleci.com/gh/grafana/grafana.svg?style=svg)](https://circleci.com/gh/grafana/grafana) [![Go Report Card](https://goreportcard.com/badge/github.com/grafana/grafana)](https://goreportcard.com/report/github.com/grafana/grafana) [![codecov](https://codecov.io/gh/grafana/grafana/branch/master/graph/badge.svg)](https://codecov.io/gh/grafana/grafana)
+================
+[Website](https://grafana.com) |
+[Twitter](https://twitter.com/grafana) |
+[Community & Forum](https://community.grafana.com)
 
-The open-source platform for monitoring and observability.
+Grafana is an open source, feature rich metrics dashboard and graph editor for
+Graphite, Elasticsearch, OpenTSDB, Prometheus and InfluxDB.
 
-[![License](https://img.shields.io/github/license/grafana/grafana)](LICENSE)
-[![Circle CI](https://img.shields.io/circleci/build/gh/grafana/grafana)](https://circleci.com/gh/grafana/grafana)
-[![Go Report Card](https://goreportcard.com/badge/github.com/grafana/grafana)](https://goreportcard.com/report/github.com/grafana/grafana)
+<!---
+![](http://docs.grafana.org/assets/img/features/dashboard_ex1.png)
+-->
 
-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:
+## Installation
+Head to [docs.grafana.org](http://docs.grafana.org/installation/) for documentation or [download](https://grafana.com/get) to get the latest release.
 
-- **Visualize:** Fast and flexible client side graphs with a multitude of options. Panel plugins for many different way 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.
-- **Alerting:** Visually define alert rules for your most important metrics. Grafana will continuously evaluate and send notifications to systems like Slack, PagerDuty, VictorOps, OpsGenie.
-- **Mixed Data Sources:** Mix different data sources in the same graph! You can specify a data source on a per-query basis. This works for even custom datasources.
+## Documentation & Support
+Be sure to read the [getting started guide](http://docs.grafana.org/guides/gettingstarted/) and the other feature guides.
 
-## Get started
+## Run from master
+If you want to build a package yourself, or contribute - here is a guide for how to do that. You can always find
+the latest master builds [here](https://grafana.com/grafana/download)
 
-- [Get Grafana](https://grafana.com/get)
-- [Installation guides](http://docs.grafana.org/installation/)
+### Dependencies
 
-Unsure if Grafana is for you? Watch Grafana in action on [play.grafana.org](https://play.grafana.org/)!
+- Go (Latest Stable)
+  - bra [`go get github.com/Unknwon/bra`]
+- Node.js LTS
+  - yarn [`npm install -g yarn`]
 
-## Documentation
+### Get the project
 
-The Grafana documentation is available at [grafana.com/docs](https://grafana.com/docs/).
+**The project located in the go-path will be your working directory.**
 
-## Contributing
+```bash
+go get github.com/grafana/grafana
+cd $GOPATH/src/github.com/grafana/grafana
+```
 
-If you're interested in contributing to the Grafana project:
+### Building
 
-- Start by reading the [Contributing guide](/CONTRIBUTING.md).
-- Learn how to set up your local environment, in our [Developer guide](/contribute/developer-guide.md).
-- Explore our [beginner-friendly issues](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22beginner+friendly%22).
+#### The backend
 
-## Get involved
+```bash
+go run build.go setup
+go run build.go build
+```
 
-- 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.
+#### Frontend assets
+
+*For this you need Node.js (LTS version).*
+
+```bash
+yarn install --pure-lockfile
+```
+
+### Run and rebuild on source change
+
+#### Backend
+
+To run the backend and rebuild on source change:
+
+```bash
+$GOPATH/bin/bra run
+```
+
+#### Frontend
+
+Rebuild on file change, and serve them by Grafana's webserver (http://localhost:3000):
+
+```bash
+yarn start
+```
+
+Build the assets, rebuild on file change with Hot Module Replacement (HMR), and serve them by webpack-dev-server (http://localhost:3333):
+
+```bash
+yarn start:hot
+# OR set a theme
+env GRAFANA_THEME=light yarn start:hot
+```
+
+*Note: HMR for Angular is not supported. If you edit files in the Angular part of the app, the whole page will reload.*
+
+Run tests and rebuild on source change:
+
+```bash
+yarn jest
+```
+
+**Open grafana in your browser (default: e.g. `http://localhost:3000`) and login with admin user (default: `user/pass = admin/admin`).**
+
+### Building a Docker image
+
+There are two different ways to build a Grafana docker image. If your machine is setup for Grafana development and you run linux/amd64 you can build just the image. Otherwise, there is the option to build Grafana completely within Docker.
+
+Run the image you have built using: `docker run --rm -p 3000:3000 grafana/grafana:dev`
+
+#### Building on linux/amd64 (fast)
+
+1. Build the frontend `go run build.go build-frontend`
+2. Build the docker image `make build-docker-dev`
+
+The resulting image will be tagged as `grafana/grafana:dev`
+
+#### Building anywhere (slower)
+
+Choose this option to build on platforms other than linux/amd64 and/or not have to setup the Grafana development environment.
+
+1. `make build-docker-full` or `docker build -t grafana/grafana:dev .`
+
+The resulting image will be tagged as `grafana/grafana:dev`
+
+Notice: If you are using Docker for MacOS, be sure to set the memory limit to be larger than 2 GiB (at docker -> Preferences -> Advanced), otherwise `grunt build` may fail.
+
+## Development
+
+### Dev config
+
+Create a custom.ini in the conf directory to override default configuration options.
+You only need to add the options you want to override. Config files are applied in the order of:
+
+1. grafana.ini
+1. custom.ini
+
+In your custom.ini uncomment (remove the leading `;`) sign. And set `app_mode = development`.
+
+### Running tests
+
+#### Frontend
+Execute all frontend tests
+```bash
+yarn test
+```
+
+Writing & watching frontend tests
+
+- Start watcher: `yarn jest`
+- Jest will run all test files that end with the name ".test.ts"
+
+#### Backend
+```bash
+# Run Golang tests using sqlite3 as database (default)
+go test ./pkg/...
+
+# Run Golang tests using mysql as database - convenient to use /docker/blocks/mysql_tests
+GRAFANA_TEST_DB=mysql go test ./pkg/...
+
+# Run Golang tests using postgres as database - convenient to use /docker/blocks/postgres_tests
+GRAFANA_TEST_DB=postgres go test ./pkg/...
+```
+
+### Datasource and dashboard provisioning
+
+[Here](https://github.com/grafana/grafana/tree/master/devenv) you can find helpful scripts and docker-compose setup
+that will populate your dev environment for quicker testing end experimenting.
+
+## Contribute
+
+If you have any ideas for improvement or have found a bug, do not hesitate to open an issue.
+And if you have time, clone this repo and submit a pull request to help me make Grafana
+the kickass metrics & devops dashboard we all dream about!
+
+Read the [contributing](https://github.com/grafana/grafana/blob/master/CONTRIBUTING.md) guide then check the [`beginner friendly`](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22beginner+friendly%22) label to find issues that are easy and that we would like help with.
+
+## Plugin development
+
+Checkout the [Plugin Development Guide](http://docs.grafana.org/plugins/developing/development/) and checkout the [PLUGIN_DEV.md](https://github.com/grafana/grafana/blob/master/PLUGIN_DEV.md) file for changes in Grafana that relate to
+plugin development.
 
 ## License
 
-Grafana is distributed under the [Apache 2.0 License](https://github.com/grafana/grafana/blob/master/LICENSE).
+Grafana is distributed under [Apache 2.0 License](https://github.com/grafana/grafana/blob/master/LICENSE).
+

ROADMAP.md

@@ -1,5 +1,4 @@
-# Roadmap
-
-The roadmap is a tentative plan for the core development team. Things change constantly as pull requests come in and priorities change, but it will give you an idea of our current vision and plan. 
+This roadmap is a tentative plan for the core development team. Things change constantly as PRs come in and priorities change. 
+But it will give you an idea of our current vision and plan. 
   
-To view the Roadmap, go to the Issues tab on GitHub. There you will find three roadmap issues pinned at the top.
+Go to the Issues tab on GitHub. There you will find, at the top, 3 pinned roadmap issues.

SECURITY.md

@@ -1,20 +0,0 @@
-# Reporting security issues
-
-If you think you have found a security vulnerability, please send a report to [security@grafana.com](mailto:security@grafana.com). This address can be used for all of Grafana Labs's open source and commercial products (including but not limited to Grafana, Grafana Cloud, Grafana Enterprise, and grafana.com). We can accept only vulnerability reports at this address. 
-
-Please encrypt your message to us; please use our PGP key. The key fingerprint is:
-
-F988 7BEA 027A 049F AE8E  5CAA D125 8932 BE24 C5CA
-
-The key is available from [pgp.mit.edu](https://pgp.mit.edu/pks/lookup?op=get&search=0xF9887BEA027A049FAE8E5CAAD1258932BE24C5CA) by searching for [grafana](https://pgp.mit.edu/pks/lookup?search=grafana&op=index).
-
-Grafana Labs will send you a response indicating the next steps in handling your report. After the initial reply to your report, the security team will keep you informed of the progress towards a fix and full announcement, and may ask for additional information or guidance.
-
-**Important:** We ask you to not disclose the vulnerability before it have been fixed and announced, unless you received a response from the Grafana Labs security team that you can do so.
-
-## Security announcements
-
-We maintain a category on the community site called [Security Announcements](https://community.grafana.com/c/security-announcements),
-where we will post a summary, remediation, and mitigation details for any patch containing security fixes. 
-
-You can also subscribe to email updates to this category if you have a grafana.com account and sign on to the community site or track updates via an [RSS feed](https://community.grafana.com/c/security-announcements.rss).

SUPPORT.md

@@ -1,10 +0,0 @@
-# Get Grafana help
-------------------
-First, check the official [Grafana documentation](https://grafana.com/docs/).
-
-If you require further help or support then ask a question in the [Grafana community site](https://community.grafana.com/) or [Grafana Slack](http://slack.raintank.io/). You can also search the community site for previously answered questions, in case someone already had your problem and got help.
-
- **Please note:**
-- The Grafana project uses GitHub mainly for tracking bugs and feature requests.
-- Do not open an issue just to ask a question. The issue will be closed immediately.
-- Only submit issues for bug reports, feature requests, or enhancements.

UPGRADING_DEPENDENCIES.md

@@ -1,4 +1,4 @@
-# Guide to upgrading dependencies
+# Guide to Upgrading Dependencies
 
 Upgrading Go or Node.js requires making changes in many different files. See below for a list and explanation for each.
 
@@ -16,37 +16,25 @@ Upgrading Go or Node.js requires making changes in many different files. See bel
 - Appveyor
 - Dockerfile
 
-## Go dependencies
+## Go Dependencies
 
 The Grafana project uses [Go modules](https://golang.org/cmd/go/#hdr-Modules__module_versions__and_more) to manage dependencies on external packages. This requires a working Go environment with version 1.11 or greater installed.
 
 All dependencies are vendored in the `vendor/` directory.
 
-_Note:_ Since most developers of Grafana still use the `GOPATH` we need to specify `GO111MODULE=on` to make `go mod` and `got get` work as intended. If you have setup Grafana outside of the `GOPATH` on your machine you can skip `GO111MODULE=on` when running the commands below.
-
 To add or update a new dependency, use the `go get` command:
 
 ```bash
-# The GO111MODULE variable can be omitted when the code isn't located in GOPATH.
 # Pick the latest tagged release.
-GO111MODULE=on go get example.com/some/module/pkg
+go get example.com/some/module/pkg
 
 # Pick a specific version.
-GO111MODULE=on go get example.com/some/module/pkg@vX.Y.Z
+go get example.com/some/module/pkg@vX.Y.Z
 ```
 
 Tidy up the `go.mod` and `go.sum` files and copy the new/updated dependency to the `vendor/` directory:
 
-```bash
-# The GO111MODULE variable can be omitted when the code isn't located in GOPATH.
-GO111MODULE=on go mod tidy
-
-GO111MODULE=on go mod vendor
-```
-
-You have to commit the changes to `go.mod`, `go.sum` and the `vendor/` directory before submitting the pull request.
-
-## Node.js dependencies
+## Node.js Dependencies
 
 Updated using `yarn`.
 
@@ -72,7 +60,7 @@ Our builds run on CircleCI through our build script.
 
 The main build step (in CircleCI) is built using a custom build container that comes pre-baked with some of the necessary dependencies.
 
-Link: [grafana/build-container](https://github.com/grafana/grafana/tree/master/scripts/build/ci-build)
+Link: [grafana-build-container](https://github.com/grafana/grafana-build-container)
 
 #### Dependencies
 

build.go

@@ -33,7 +33,6 @@ var (
 	goos    string
 	gocc    string
 	cgo     bool
-	libc    string
 	pkgArch string
 	version string = "v1"
 	// deb & rpm does not support semver so have to handle their version a little differently
@@ -44,15 +43,12 @@ var (
 	workingDir            string
 	includeBuildId        bool     = true
 	buildId               string   = "0"
-	serverBinary          string   = "grafana-server"
-	cliBinary             string   = "grafana-cli"
-	binaries              []string = []string{serverBinary, cliBinary}
+	binaries              []string = []string{"grafana-server", "grafana-cli"}
 	isDev                 bool     = false
 	enterprise            bool     = false
 	skipRpmGen            bool     = false
 	skipDebGen            bool     = false
 	printGenVersion       bool     = false
-	modVendor             bool     = true
 )
 
 func main() {
@@ -66,12 +62,10 @@ func main() {
 	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.BoolVar(&cgo, "cgo-enabled", cgo, "Enable cgo")
 	flag.StringVar(&pkgArch, "pkg-arch", "", "PKG ARCH")
 	flag.StringVar(&phjsToRelease, "phjs", "", "PhantomJS binary")
 	flag.BoolVar(&race, "race", race, "Use race detector")
-	flag.BoolVar(&modVendor, "modVendor", modVendor, "Go modules use vendor folder")
 	flag.BoolVar(&includeBuildId, "includeBuildId", includeBuildId, "IncludeBuildId in package name")
 	flag.BoolVar(&enterprise, "enterprise", enterprise, "Build enterprise version of Grafana")
 	flag.StringVar(&buildIdRaw, "buildId", "0", "Build ID from CI system")
@@ -108,7 +102,7 @@ func main() {
 		case "setup":
 			setup()
 
-		case "build-srv", "build-server":
+		case "build-srv":
 			clean()
 			build("grafana-server", "./pkg/cmd/grafana-server", []string{})
 
@@ -116,6 +110,10 @@ func main() {
 			clean()
 			build("grafana-cli", "./pkg/cmd/grafana-cli", []string{})
 
+		case "build-server":
+			clean()
+			build("grafana-server", "./pkg/cmd/grafana-server", []string{})
+
 		case "build":
 			//clean()
 			for _, binary := range binaries {
@@ -174,15 +172,12 @@ func makeLatestDistCopies() {
 	}
 
 	latestMapping := map[string]string{
-		"_amd64.deb":               "dist/grafana_latest_amd64.deb",
-		".x86_64.rpm":              "dist/grafana-latest-1.x86_64.rpm",
-		".linux-amd64.tar.gz":      "dist/grafana-latest.linux-x64.tar.gz",
-		".linux-amd64-musl.tar.gz": "dist/grafana-latest.linux-x64-musl.tar.gz",
-		".linux-armv7.tar.gz":      "dist/grafana-latest.linux-armv7.tar.gz",
-		".linux-armv7-musl.tar.gz": "dist/grafana-latest.linux-armv7-musl.tar.gz",
-		".linux-armv6.tar.gz":      "dist/grafana-latest.linux-armv6.tar.gz",
-		".linux-arm64.tar.gz":      "dist/grafana-latest.linux-arm64.tar.gz",
-		".linux-arm64-musl.tar.gz": "dist/grafana-latest.linux-arm64-musl.tar.gz",
+		"_amd64.deb":          "dist/grafana_latest_amd64.deb",
+		".x86_64.rpm":         "dist/grafana-latest-1.x86_64.rpm",
+		".linux-amd64.tar.gz": "dist/grafana-latest.linux-x64.tar.gz",
+		".linux-armv7.tar.gz": "dist/grafana-latest.linux-armv7.tar.gz",
+		".linux-armv6.tar.gz": "dist/grafana-latest.linux-armv6.tar.gz",
+		".linux-arm64.tar.gz": "dist/grafana-latest.linux-arm64.tar.gz",
 	}
 
 	for _, file := range files {
@@ -235,7 +230,6 @@ type linuxPackageOptions struct {
 	packageType            string
 	packageArch            string
 	homeDir                string
-	homeBinDir             string
 	binPath                string
 	serverBinPath          string
 	cliBinPath             string
@@ -246,11 +240,10 @@ type linuxPackageOptions struct {
 	initdScriptFilePath    string
 	systemdServiceFilePath string
 
-	postinstSrc         string
-	initdScriptSrc      string
-	defaultFileSrc      string
-	systemdFileSrc      string
-	cliBinaryWrapperSrc string
+	postinstSrc    string
+	initdScriptSrc string
+	defaultFileSrc string
+	systemdFileSrc string
 
 	depends []string
 }
@@ -265,7 +258,6 @@ func createDebPackages() {
 		packageType:            "deb",
 		packageArch:            debPkgArch,
 		homeDir:                "/usr/share/grafana",
-		homeBinDir:             "/usr/share/grafana/bin",
 		binPath:                "/usr/sbin",
 		configDir:              "/etc/grafana",
 		etcDefaultPath:         "/etc/default",
@@ -273,11 +265,10 @@ func createDebPackages() {
 		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",
+		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",
 
 		depends: []string{"adduser", "libfontconfig1"},
 	})
@@ -295,7 +286,6 @@ func createRpmPackages() {
 		packageType:            "rpm",
 		packageArch:            rpmPkgArch,
 		homeDir:                "/usr/share/grafana",
-		homeBinDir:             "/usr/share/grafana/bin",
 		binPath:                "/usr/sbin",
 		configDir:              "/etc/grafana",
 		etcDefaultPath:         "/etc/sysconfig",
@@ -303,11 +293,10 @@ func createRpmPackages() {
 		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",
+		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",
 
 		depends: []string{"/sbin/service", "fontconfig", "freetype", "urw-fonts"},
 	})
@@ -334,12 +323,10 @@ func createPackage(options linuxPackageOptions) {
 	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 binary
+	for _, binary := range binaries {
+		runPrint("cp", "-p", filepath.Join(workingDir, "tmp/bin/"+binary), filepath.Join(packageRoot, "/usr/sbin/"+binary))
+	}
 	// copy init.d script
 	runPrint("cp", "-p", options.initdScriptSrc, filepath.Join(packageRoot, options.initdScriptFilePath))
 	// copy environment var file
@@ -351,13 +338,6 @@ func createPackage(options linuxPackageOptions) {
 	// 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",
@@ -411,7 +391,7 @@ func createPackage(options linuxPackageOptions) {
 		args = append(args, "--iteration", linuxPackageIteration)
 	}
 
-	// add dependencies
+	// add dependenciesj
 	for _, dep := range options.depends {
 		args = append(args, "--depends", dep)
 	}
@@ -456,9 +436,6 @@ func gruntBuildArg(task string) []string {
 	if pkgArch != "" {
 		args = append(args, fmt.Sprintf("--arch=%v", pkgArch))
 	}
-	if libc != "" {
-		args = append(args, fmt.Sprintf("--libc=%s", libc))
-	}
 	if phjsToRelease != "" {
 		args = append(args, fmt.Sprintf("--phjsToRelease=%v", phjsToRelease))
 	}
@@ -485,13 +462,9 @@ func test(pkg string) {
 }
 
 func build(binaryName, pkg string, tags []string) {
-	libcPart := ""
-	if libc != "" {
-		libcPart = fmt.Sprintf("-%s", libc)
-	}
-	binary := fmt.Sprintf("./bin/%s-%s%s/%s", goos, goarch, libcPart, binaryName)
+	binary := fmt.Sprintf("./bin/%s-%s/%s", goos, goarch, binaryName)
 	if isDev {
-		//don't include os/arch/libc in output path in dev environment
+		//don't include os and arch in output path in dev environment
 		binary = fmt.Sprintf("./bin/%s", binaryName)
 	}
 
@@ -509,9 +482,6 @@ func build(binaryName, pkg string, tags []string) {
 	if race {
 		args = append(args, "-race")
 	}
-	if modVendor {
-		args = append(args, "-mod=vendor")
-	}
 
 	args = append(args, "-o", binary)
 	args = append(args, pkg)
@@ -519,11 +489,7 @@ func build(binaryName, pkg string, tags []string) {
 	if !isDev {
 		setBuildEnv()
 		runPrint("go", "version")
-		libcPart := ""
-		if libc != "" {
-			libcPart = fmt.Sprintf("/%s", libc)
-		}
-		fmt.Printf("Targeting %s/%s%s\n", goos, goarch, libcPart)
+		fmt.Printf("Targeting %s/%s\n", goos, goarch)
 	}
 
 	runPrint("go", args...)
@@ -545,9 +511,6 @@ func ldflags() string {
 	b.WriteString(fmt.Sprintf(" -X main.commit=%s", getGitSha()))
 	b.WriteString(fmt.Sprintf(" -X main.buildstamp=%d", buildStamp()))
 	b.WriteString(fmt.Sprintf(" -X main.buildBranch=%s", getGitBranch()))
-	if v := os.Getenv("LDFLAGS"); v != "" {
-		b.WriteString(fmt.Sprintf(" -extldflags \"%s\"", v))
-	}
 	return b.String()
 }
 
@@ -612,11 +575,6 @@ func getGitSha() string {
 }
 
 func buildStamp() int64 {
-	// use SOURCE_DATE_EPOCH if set.
-	if s, _ := strconv.ParseInt(os.Getenv("SOURCE_DATE_EPOCH"), 10, 64); s > 0 {
-		return s
-	}
-
 	bs, err := runError("git", "show", "-s", "--format=%ct")
 	if err != nil {
 		return time.Now().Unix()
@@ -638,7 +596,6 @@ func runError(cmd string, args ...string) ([]byte, error) {
 func runPrint(cmd string, args ...string) {
 	log.Println(cmd, strings.Join(args, " "))
 	ecmd := exec.Command(cmd, args...)
-	ecmd.Env = append(os.Environ(), "GO111MODULE=on")
 	ecmd.Stdout = os.Stdout
 	ecmd.Stderr = os.Stderr
 	err := ecmd.Run()

conf/defaults.ini

@@ -28,7 +28,7 @@ provisioning = conf/provisioning
 
 #################################### Server ##############################
 [server]
-# Protocol (http, https, h2, socket)
+# Protocol (http, https, socket)
 protocol = http
 
 # The ip address to bind to, empty will bind to all interfaces
@@ -47,9 +47,6 @@ enforce_domain = false
 # The full public facing url
 root_url = %(protocol)s://%(domain)s:%(http_port)s/
 
-# Serve Grafana from subpath specified in `root_url` setting. By default it is set to `false` for compatibility reasons.
-serve_from_sub_path = false
-
 # Log web requests
 router_logging = false
 
@@ -116,7 +113,7 @@ type = database
 
 # cache connectionstring options
 # database: will use Grafana primary database.
-# redis: config like redis server e.g. `addr=127.0.0.1:6379,pool_size=100,db=0,ssl=false`. Only addr is required. ssl may be 'true', 'false', or 'insecure'.
+# redis: config like redis server e.g. `addr=127.0.0.1:6379,pool_size=100,db=grafana`
 # memcache: 127.0.0.1:11211
 connstr =
 
@@ -155,9 +152,6 @@ google_tag_manager_id =
 
 #################################### Security ############################
 [security]
-# disable creation of admin user on first start of grafana
-disable_initial_admin_creation = false
-
 # default admin user, created on startup
 admin_user = admin
 
@@ -185,31 +179,6 @@ cookie_samesite = lax
 # set to true if you want to allow browsers to render Grafana in a <frame>, <iframe>, <embed> or <object>. default is false.
 allow_embedding = false
 
-# Set to true if you want to enable http strict transport security (HSTS) response header.
-# This is only sent when HTTPS is enabled in this configuration.
-# HSTS tells browsers that the site should only be accessed using HTTPS.
-# The default will change to true in the next minor release, 6.3.
-strict_transport_security = false
-
-# Sets how long a browser should cache HSTS. Only applied if strict_transport_security is enabled.
-strict_transport_security_max_age_seconds = 86400
-
-# Set to true if to enable HSTS preloading option. Only applied if strict_transport_security is enabled.
-strict_transport_security_preload = false
-
-# Set to true if to enable the HSTS includeSubDomains option. Only applied if strict_transport_security is enabled.
-strict_transport_security_subdomains = false
-
-# Set to true to enable the X-Content-Type-Options response header.
-# The X-Content-Type-Options response HTTP header is a marker used by the server to indicate that the MIME types advertised
-# in the Content-Type headers should not be changed and be followed. The default will change to true in the next minor release, 6.3.
-x_content_type_options = false
-
-# Set to true to enable the X-XSS-Protection header, which tells browsers to stop pages from loading
-# when they detect reflected cross-site scripting (XSS) attacks. The default will change to true in the next minor release, 6.3.
-x_xss_protection = false
-
-
 #################################### Snapshots ###########################
 [snapshots]
 # snapshot sharing options
@@ -217,10 +186,6 @@ external_enabled = true
 external_snapshot_url = https://snapshots-origin.raintank.io
 external_snapshot_name = Publish to snapshot.raintank.io
 
-# Set to true to enable this Grafana instance act as an external snapshot server and allow unauthenticated requests for
-# creating and deleting snapshots.
-public_mode = false
-
 # remove expired snapshot
 snapshot_remove_expired = true
 
@@ -294,9 +259,6 @@ signout_redirect_url =
 # This setting is ignored if multiple OAuth providers are configured.
 oauth_auto_login = false
 
-# limit of api_key seconds to live before expiration
-api_key_max_seconds_to_live = -1
-
 #################################### Anonymous Auth ######################
 [auth.anonymous]
 # enable anonymous access
@@ -373,8 +335,6 @@ client_id = some_id
 client_secret = some_secret
 scopes = user:email
 email_attribute_name = email:primary
-email_attribute_path =
-role_attribute_path = 
 auth_url =
 token_url =
 api_url =
@@ -386,47 +346,6 @@ tls_client_key =
 tls_client_ca =
 send_client_credentials_via_post = false
 
-#################################### SAML Auth ###########################
-[auth.saml] # Enterprise only
-# Defaults to false. If true, the feature is enabled
-enabled = false
-
-# Base64-encoded public X.509 certificate. Used to sign requests to the IdP
-certificate =
-
-# Path to the public X.509 certificate. Used to sign requests to the IdP
-certificate_path =
-
-# Base64-encoded private key. Used to decrypt assertions from the IdP
-private_key =
-
-# Path to the private key. Used to decrypt assertions from the IdP
-private_key_path =
-
-# Base64-encoded IdP SAML metadata XML. Used to verify and obtain binding locations from the IdP
-idp_metadata =
-
-# Path to the SAML metadata XML. Used to verify and obtain binding locations from the IdP
-idp_metadata_path =
-
-# URL to fetch SAML IdP metadata. Used to verify and obtain binding locations from the IdP
-idp_metadata_url =
-
-# Duration, since the IdP issued a response and the SP is allowed to process it. Defaults to 90 seconds
-max_issue_delay = 90s
-
-# Duration, for how long the SP's metadata should be valid. Defaults to 48 hours
-metadata_valid_duration = 48h
-
-# Friendly name or name of the attribute within the SAML assertion to use as the user's name
-assertion_attribute_name = displayName
-
-# Friendly name or name of the attribute within the SAML assertion to use as the user's login handle
-assertion_attribute_login = mail
-
-# Friendly name or name of the attribute within the SAML assertion to use as the user's email
-assertion_attribute_email = mail
-
 #################################### Basic Auth ##########################
 [auth.basic]
 enabled = true
@@ -438,10 +357,8 @@ header_name = X-WEBAUTH-USER
 header_property = username
 auto_sign_up = true
 ldap_sync_ttl = 60
-sync_ttl = 60
 whitelist =
 headers =
-enable_login_token = false
 
 #################################### Auth LDAP ###########################
 [auth.ldap]
@@ -450,9 +367,8 @@ config_file = /etc/grafana/ldap.toml
 allow_sign_up = true
 
 # LDAP backround sync (Enterprise only)
-# At 1 am every day
-sync_cron = "0 0 1 * * *"
-active_sync_enabled = true
+sync_cron = @hourly
+active_sync_enabled = false
 
 #################################### SMTP / Emailing #####################
 [smtp]
@@ -599,10 +515,8 @@ enabled = true
 #################################### Internal Grafana Metrics ############
 # Metrics available at HTTP API Url /metrics
 [metrics]
-enabled              = true
-interval_seconds     = 10
-# Disable total stats (stat_totals_*) metrics to be generated
-disable_total_stats = false
+enabled           = true
+interval_seconds  = 10
 
 #If both are set, basic auth will be required for the metrics endpoint.
 basic_auth_username =
@@ -636,11 +550,6 @@ sampler_type = const
 # and indicates the initial sampling rate before the actual one
 # is received from the mothership
 sampler_param = 1
-# Whether or not to use Zipkin span propagation (x-b3- HTTP headers).
-zipkin_propagation = false
-# Setting this to true disables shared RPC spans.
-# Not disabling is the most common setting when using Zipkin elsewhere in your infrastructure.
-disable_shared_zipkin_spans = false
 
 #################################### External Image Storage ##############
 [external_image_storage]
@@ -675,10 +584,8 @@ container_name =
 # does not require any configuration
 
 [rendering]
-# Options to configure a remote HTTP image rendering service, e.g. using https://github.com/grafana/grafana-image-renderer.
-# URL to a remote HTTP image renderer service, e.g. http://localhost:8081/render, will enable Grafana to render panels and dashboards to PNG-images using HTTP requests to an external service.
+# Options to configure external image rendering server like https://github.com/grafana/grafana-image-renderer
 server_url =
-# If the remote HTTP image renderer service runs on a different server than the Grafana server you may have to configure this to a URL where Grafana is reachable, e.g. http://grafana.domain/.
 callback_url =
 
 [panels]
@@ -692,7 +599,3 @@ app_tls_skip_verify_insecure = false
 
 [enterprise]
 license_path =
-
-[feature_toggles]
-# enable features, separated by spaces
-enable =

conf/ldap.toml

@@ -47,7 +47,7 @@ email =  "email"
 
 # Map ldap groups to grafana org roles
 [[servers.group_mappings]]
-group_dn = "cn=admins,ou=groups,dc=grafana,dc=org"
+group_dn = "cn=admins,dc=grafana,dc=org"
 org_role = "Admin"
 # To make user an instance admin  (Grafana Admin) uncomment line below
 # grafana_admin = true
@@ -55,7 +55,7 @@ org_role = "Admin"
 # org_id = 1
 
 [[servers.group_mappings]]
-group_dn = "cn=users,ou=groups,dc=grafana,dc=org"
+group_dn = "cn=users,dc=grafana,dc=org"
 org_role = "Editor"
 
 [[servers.group_mappings]]

conf/ldap_multiple.toml

@@ -1,53 +0,0 @@
-# --- First LDAP Server ---
-
-[[servers]]
-host = "10.0.0.1"
-port = 389
-use_ssl = false
-start_tls = false
-ssl_skip_verify = false
-bind_dn = "cn=admin,dc=grafana,dc=org"
-bind_password = 'grafana'
-search_filter = "(cn=%s)"
-search_base_dns = ["ou=users,dc=grafana,dc=org"]
-
-[servers.attributes]
-name = "givenName"
-surname = "sn"
-username = "cn"
-member_of = "memberOf"
-email =  "email"
-
-[[servers.group_mappings]]
-group_dn = "cn=admins,ou=groups,dc=grafana,dc=org"
-org_role = "Admin"
-grafana_admin = true
-
-# --- Second LDAP Server ---
-
-[[servers]]
-host = "10.0.0.2"
-port = 389
-use_ssl = false
-start_tls = false
-ssl_skip_verify = false
-
-bind_dn = "cn=admin,dc=grafana,dc=org"
-bind_password = 'grafana'
-search_filter = "(cn=%s)"
-search_base_dns = ["ou=users,dc=grafana,dc=org"]
-
-[servers.attributes]
-name = "givenName"
-surname = "sn"
-username = "cn"
-member_of = "memberOf"
-email =  "email"
-
-[[servers.group_mappings]]
-group_dn = "cn=editors,ou=groups,dc=grafana,dc=org"
-org_role = "Editor"
-
-[[servers.group_mappings]]
-group_dn = "*"
-org_role = "Viewer"

conf/sample.ini

@@ -28,7 +28,7 @@
 
 #################################### Server ####################################
 [server]
-# Protocol (http, https, h2, socket)
+# Protocol (http, https, socket)
 ;protocol = http
 
 # The ip address to bind to, empty will bind to all interfaces
@@ -48,9 +48,6 @@
 # If you use reverse proxy and sub path specify full url (with sub path)
 ;root_url = http://localhost:3000
 
-# Serve Grafana from subpath specified in `root_url` setting. By default it is set to `false` for compatibility reasons.
-;serve_from_sub_path = false
-
 # Log web requests
 ;router_logging = false
 
@@ -100,7 +97,7 @@
 ;conn_max_lifetime = 14400
 
 # Set to true to log the sql calls and execution times.
-;log_queries =
+log_queries =
 
 # For "sqlite3" only. cache mode setting used for connecting to the database. (private, shared)
 ;cache_mode = private
@@ -112,7 +109,7 @@
 
 # cache connectionstring options
 # database: will use Grafana primary database.
-# redis: config like redis server e.g. `addr=127.0.0.1:6379,pool_size=100,db=0,ssl=false`. Only addr is required. ssl may be 'true', 'false', or 'insecure'.
+# redis: config like redis server e.g. `addr=127.0.0.1:6379,pool_size=100,db=grafana`
 # memcache: 127.0.0.1:11211
 ;connstr =
 
@@ -151,9 +148,6 @@
 
 #################################### Security ####################################
 [security]
-# disable creation of admin user on first start of grafana
-;disable_initial_admin_creation = false
-
 # default admin user, created on startup
 ;admin_user = admin
 
@@ -181,30 +175,6 @@
 # set to true if you want to allow browsers to render Grafana in a <frame>, <iframe>, <embed> or <object>. default is false.
 ;allow_embedding = false
 
-# Set to true if you want to enable http strict transport security (HSTS) response header.
-# This is only sent when HTTPS is enabled in this configuration.
-# HSTS tells browsers that the site should only be accessed using HTTPS.
-# The default version will change to true in the next minor release, 6.3.
-;strict_transport_security = false
-
-# Sets how long a browser should cache HSTS. Only applied if strict_transport_security is enabled.
-;strict_transport_security_max_age_seconds = 86400
-
-# Set to true if to enable HSTS preloading option. Only applied if strict_transport_security is enabled.
-;strict_transport_security_preload = false
-
-# Set to true if to enable the HSTS includeSubDomains option. Only applied if strict_transport_security is enabled.
-;strict_transport_security_subdomains = false
-
-# Set to true to enable the X-Content-Type-Options response header.
-# The X-Content-Type-Options response HTTP header is a marker used by the server to indicate that the MIME types advertised
-# in the Content-Type headers should not be changed and be followed. The default will change to true in the next minor release, 6.3.
-;x_content_type_options = false
-
-# Set to true to enable the X-XSS-Protection header, which tells browsers to stop pages from loading
-# when they detect reflected cross-site scripting (XSS) attacks. The default will change to true in the next minor release, 6.3.
-;x_xss_protection = false
-
 #################################### Snapshots ###########################
 [snapshots]
 # snapshot sharing options
@@ -212,10 +182,6 @@
 ;external_snapshot_url = https://snapshots-origin.raintank.io
 ;external_snapshot_name = Publish to snapshot.raintank.io
 
-# Set to true to enable this Grafana instance act as an external snapshot server and allow unauthenticated requests for
-# creating and deleting snapshots.
-;public_mode = false
-
 # remove expired snapshot
 ;snapshot_remove_expired = true
 
@@ -326,14 +292,11 @@
 ;client_id = some_id
 ;client_secret = some_secret
 ;scopes = user:email,read:org
-;email_attribute_name = email:primary
-;email_attribute_path =
 ;auth_url = https://foo.bar/login/oauth/authorize
 ;token_url = https://foo.bar/login/oauth/access_token
 ;api_url = https://foo.bar/user
 ;team_ids =
 ;allowed_organizations =
-;role_attribute_path =
 ;tls_skip_verify_insecure = false
 ;tls_client_cert =
 ;tls_client_key =
@@ -343,47 +306,6 @@
 ; This might be required if the OAuth provider is not RFC6749 compliant, only supporting credentials passed via POST payload
 ;send_client_credentials_via_post = false
 
-#################################### SAML Auth ###########################
-[auth.saml] # Enterprise only
-# Defaults to false. If true, the feature is enabled.
-;enabled = false
-
-# Base64-encoded public X.509 certificate. Used to sign requests to the IdP
-;certificate =
-
-# Path to the public X.509 certificate. Used to sign requests to the IdP
-;certificate_path =
-
-# Base64-encoded private key. Used to decrypt assertions from the IdP
-;private_key =
-
-;# Path to the private key. Used to decrypt assertions from the IdP
-;private_key_path =
-
-# Base64-encoded IdP SAML metadata XML. Used to verify and obtain binding locations from the IdP
-;idp_metadata =
-
-# Path to the SAML metadata XML. Used to verify and obtain binding locations from the IdP
-;idp_metadata_path =
-
-# URL to fetch SAML IdP metadata. Used to verify and obtain binding locations from the IdP
-;idp_metadata_url =
-
-# Duration, since the IdP issued a response and the SP is allowed to process it. Defaults to 90 seconds.
-;max_issue_delay = 90s
-
-# Duration, for how long the SP's metadata should be valid. Defaults to 48 hours.
-;metadata_valid_duration = 48h
-
-# Friendly name or name of the attribute within the SAML assertion to use as the user's name
-;assertion_attribute_name = displayName
-
-# Friendly name or name of the attribute within the SAML assertion to use as the user's login handle
-;assertion_attribute_login = mail
-
-# Friendly name or name of the attribute within the SAML assertion to use as the user's email
-;assertion_attribute_email = mail
-
 #################################### Grafana.com Auth ####################
 [auth.grafana_com]
 ;enabled = false
@@ -399,11 +321,9 @@
 ;header_name = X-WEBAUTH-USER
 ;header_property = username
 ;auto_sign_up = true
-;sync_ttl = 60
+;ldap_sync_ttl = 60
 ;whitelist = 192.168.1.1, 192.168.2.1
 ;headers = Email:X-User-Email, Name:X-User-Name
-# Read the auth proxy docs for details on what the setting below enables
-;enable_login_token = false
 
 #################################### Basic Auth ##########################
 [auth.basic]
@@ -415,17 +335,12 @@
 ;config_file = /etc/grafana/ldap.toml
 ;allow_sign_up = true
 
-# LDAP backround sync (Enterprise only)
-# At 1 am every day
-;sync_cron = "0 0 1 * * *"
-;active_sync_enabled = true
-
 #################################### SMTP / Emailing ##########################
 [smtp]
 ;enabled = false
 ;host = localhost:25
 ;user =
-# If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;"""
+# If the password contains # or ; you have to wrap it with trippel quotes. Ex """#password;"""
 ;password =
 ;cert_file =
 ;key_file =
@@ -532,8 +447,6 @@
 [metrics]
 # Disable / Enable internal metrics
 ;enabled           = true
-# Disable total stats (stat_totals_*) metrics to be generated
-;disable_total_stats = false
 
 # Publish interval
 ;interval_seconds  = 10
@@ -560,11 +473,6 @@
 # and indicates the initial sampling rate before the actual one
 # is received from the mothership
 ;sampler_param = 1
-# Whether or not to use Zipkin propagation (x-b3- HTTP headers).
-;zipkin_propagation = false
-# Setting this to true disables shared RPC spans.
-# Not disabling is the most common setting when using Zipkin elsewhere in your infrastructure.
-;disable_shared_zipkin_spans = false
 
 #################################### Grafana.com integration  ##########################
 # Url used to import dashboards directly from Grafana.com
@@ -604,10 +512,8 @@
 # does not require any configuration
 
 [rendering]
-# Options to configure a remote HTTP image rendering service, e.g. using https://github.com/grafana/grafana-image-renderer.
-# URL to a remote HTTP image renderer service, e.g. http://localhost:8081/render, will enable Grafana to render panels and dashboards to PNG-images using HTTP requests to an external service.
+# Options to configure external image rendering server like https://github.com/grafana/grafana-image-renderer
 ;server_url =
-# If the remote HTTP image renderer service runs on a different server than the Grafana server you may have to configure this to a URL where Grafana is reachable, e.g. http://grafana.domain/.
 ;callback_url =
 
 [enterprise]
@@ -621,3 +527,4 @@
 [plugins]
 ;enable_alpha = false
 ;app_tls_skip_verify_insecure = false
+

contribute/README.md

@@ -1,16 +0,0 @@
-# Contribute
-
-This directory contains guides for contributors to the Grafana project.
-
-- [Create a pull request](create-pull-request.md)
-- [Contributing documentation](documentation.md)
-- [Developer guide](developer-guide.md)
-- [Triage issues](triage-issues.md)
-
-The `style-guides` directory contains style guides for the Grafana software project and documentation.
-
-- [Backend style guide](style-guides/backend.md) for how to style and format backend functionality and code.
-- [Documentation style guide](style-guides/documentation-style-guide.md) for how to style and format documentation.
-- [Frontend style guide](style-guides/frontend.md) for how to style and format the user-facing functionality and code.
-- [Redux framework](style-guides/redux.md) for designing the Grafana redux framework.
-- [Themes style guide](style-guides/themes.md) for designing and updating Grafana themes.

contribute/architecture/README.md

@@ -1,10 +0,0 @@
-# Architecture
-
-Are you looking to take on contributions with bigger impact? These guides help you get a better understanding of the structure and design of the Grafana codebase.
-
-Learn more about the backend architecture:
-
-- Part 1: [Services](services.md) 
-- Part 2: [Communication](communication.md)
-- Part 3: [Database](database.md)
-

contribute/architecture/communication.md

@@ -1,123 +0,0 @@
-# Communication
-
-Grafana uses a _bus_ to pass messages between different parts of the application. All communication over the bus happens synchronously.
-
-There are three types of messages: _events_, _commands_, and _queries_.
-
-## Events
-
-An event is something that happened in the past. Since an event has already happened, you can't change it. Instead, you can react to events by triggering additional application logic to be run, whenever they occur.
-
-> Because they happened in the past, event names are written in past tense, such as `UserCreated`, and `OrgUpdated`.
-
-### Subscribe to an event
-
-In order to react to an event, you first need to _subscribe_ to it. 
-
-To subscribe to an event, register an _event listener_ in the service's `Init` method:
-
-```go
-func (s *MyService) Init() error {
-    s.bus.AddEventListener(s.UserCreated)
-    return nil
-}
-
-func (s *MyService) UserCreated(event *events.UserCreated) error {
-    // ...
-}
-```
-
-**Tip:** Browse the available events in the `events` package.
-
-### Publish an event
-
-If you want to let other parts of the application react to changes in a service, you can publish your own events:
-
-```go
-event := &events.StickersSentEvent {
-    UserID: "taylor",
-    Count:   1,
-}
-if err := s.bus.Publish(event); err != nil {
-    return err
-}
-```
-
-## Commands
-
-A command is a request for an action to be taken. Unlike an event's fire-and-forget approach, a command can fail as it is handled. The handler will then return an error.
-
-> Because we request an operation to be performed, command are written in imperative mood, such as `CreateFolderCommand`, and `DeletePlaylistCommand`.
-
-### Dispatch a command
-
-To dispatch a command, pass the object to the `Dispatch` method:
-
-```go
-cmd := &models.SendStickersCommand {
-    UserID: "taylor",
-    Count: 1,
-}
-if err := s.bus.Dispatch(cmd); err != nil {
-  if err == bus.ErrHandlerNotFound {
-    return nil
-  }
-  return err
-}
-```
-
-**Note:** `Dispatch` will return an error if no handler is registered for that command.
-
-**Tip:** Browse the available commands in the `models` package.
-
-### Handle commands
-
-Let others parts of the application dispatch commands to a service, by registering a _command handler_:
-
-To handle a command, register a command handler in the `Init` function.
-
-```go
-func (s *MyService) Init() error {
-    s.bus.AddHandler(s.SendStickers)
-    return nil
-}
-
-func (s *MyService) SendStickers(cmd *models.SendStickersCommand) error {
-    // ...
-}
-```
-
-**Note:** The handler method may return an error if unable to complete the command.
-
-## Queries
-
-A command handler can optionally populate the command sent it. This pattern is commonly used to implement _queries_.
-
-### Making a query
-
-To make a query, dispatch the query instance just like you would a command. When the `Dispatch` method returns, the `Results` field contains the result of the query.
-
-```go
-query := &models.FindDashboardQuery{
-    ID: "foo",
-}
-if err := bus.Dispatch(query); err != nil {
-    return err
-}
-// The query now contains a result.
-for _, item := range query.Results {
-    // ...
-}
-```
-
-### Return query results
-
-To return results for a query, set any of the fields on the query argument before returning:
-
-```go
-func (s *MyService) FindDashboard(query *models.FindDashboardQuery) error {
-    // ...
-    query.Result = dashboard
-    return nil
-}
-```

contribute/architecture/database.md

@@ -1,123 +0,0 @@
-# Database
-
-Grafana uses a database to persist settings between restarts. In fact, if you don't specify one, Grafana creates a [SQLite3](https://www.sqlite.org/) database file on your local disk. This guide explains how to store and retrieve data from the database.
-
-Grafana supports the [following databases](https://grafana.com/docs/installation/requirements/#database):
-
-- [MySQL](https://www.mysql.com/)
-- [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/).
-
-[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.
-
-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:
-
-- [Services](services.md) are command handlers that _contain business logic_.
-- `sqlstore` handlers are command handlers that _access the database_.
-
-### Register a `sqlstore` handler
-
-> **Deprecated:** Refer to the [deprecation note for `sqlstore` handlers](#sqlstore-handlers).
-
-To register a handler:
-
-- Create a new file `myrepo.go` in the `sqlstore` package.
-- Create a [command handler](communication.md#handle-commands).
-- Register the handler in the `init` function:
-
-```go
-func init() {
-    bus.AddHandler("sql", DeleteDashboard)
-}
-
-func DeleteDashboard(cmd *models.DeleteDashboardCommand) error {
-    return inTransaction(func(sess *DBSession) error {
-        _, err := sess.Exec("DELETE FROM dashboards WHERE dashboard_id=?", cmd.DashboardID)
-        return err
-    })
-}
-```
-
-Here, `inTransaction` is a helper function in the `sqlstore` package that provides a session, that lets you execute SQL statements.
-
-## `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.
-
-To use the `SqlStore`, inject the `SQLStore` in your service struct:
-
-```go
-type MyService struct {
-    SQLStore *sqlstore.SqlStore `inject:""`
-}
-```
-
-You can now make SQL queries in any of your [command handlers](communication.md#handle-commands) or [event listeners](communication.md#subscribe-to-an-event):
-
-```go
-func (s *MyService) DeleteDashboard(cmd *models.DeleteDashboardCommand) error {
-    if err := s.SQLStore.WithDbSession(ctx, func(sess *sqlstore.DBSession) error {
-        _, err := sess.Exec("DELETE FROM dashboards WHERE dashboard_id=?", cmd.DashboardID)
-        return err
-    })
-}
-```
-
-For transactions, use the `WithTransactionalDbSession` method instead.
-
-## Migrations
-
-As Grafana evolves, it becomes necessary to create _schema migrations_ for one or more database tables.
-
-To see all the types of migrations you can add, refer to [migrations.go](/pkg/services/sqlstore/migrator/migrations.go).
-
-Before you add a migration, make sure that you:
-
-- Never change a migration that has been committed and pushed to master.
-- Always add new migrations, to change or undo previous migrations.
-
-Add a migration using one of the following methods:
-
-- Add migrations in the `migrations` package.
-- Implement the `DatabaseMigrator` for the service.
-
-**Important:** If there are previous migrations for a service, use that method. By adding migrations using both methods, you risk running migrations in the wrong order.
-
-### Add migrations in `migrations` package
-
-Most services have their migrations located in the [migrations](/pkg/services/sqlstore/migrations/migrations.go) package.
-
-To add a migration:
-
-- Open the [migrations.go](/pkg/services/sqlstore/migrations/migrations.go) file.
-- In the `AddMigrations` function, find the `addXxxMigration` function for the service you want to create a migration for.
-- At the end of the `addXxxMigration` function, register your migration:
-
-[Example](https://github.com/grafana/grafana/blob/00d0640b6e778ddaca021670fe851fe00982acf2/pkg/services/sqlstore/migrations/migrations.go#L55-L70)
-
-### Implement `DatabaseMigrator`
-
-During initialization, SQL store queries the service registry, and runs migrations for every service that implements the [DatabaseMigrator](https://github.com/grafana/grafana/blob/44c2007498c76c2dbb48e8366b4af410f1ee1b98/pkg/registry/registry.go#L101-L106) interface.
-
-To add a migration:
-
-- If needed, add the `AddMigration(mg *migrator.Migrator)` method to the service.
-- At the end of the `AddMigration` method, register your migration:
-
-```go
-func (s *MyService) AddMigration(mg *migrator.Migrator) {
-    // ...
-
-    mg.AddMigration("Add column age", NewAddColumnMigration(table, &Column{
-        Name:     "age",
-        Type:     migrator.DB_BigInt,
-        Nullable: true,
-    }))
-}
-```

contribute/architecture/services.md

@@ -1,69 +0,0 @@
-# Services
-
-A Grafana _service_ encapsulates and exposes application logic to the rest of the application, through a set of related operations. 
-
-Before a service can start communicating with the rest of Grafana, it needs to be registered in the _service registry_.
-
-The service registry keeps track of all available services during runtime. On start-up, Grafana uses the registry to build a dependency graph of services, a _service graph_.
-
-Even though the services in Grafana do different things, they share a number of patterns. To better understand how a service works, let's build one from scratch!
-
-## Create a service
-
-To start building a service:
-
-- Create a new Go package `mysvc` in the [pkg/services](/pkg/services) directory.
-- Create a `service.go` file inside your new directory.
-
-All services need to implement the [Service](https://godoc.org/github.com/grafana/grafana/pkg/registry#Service) interface:
-
-```go
-type MyService struct {
-}
-
-func (s *MyService) Init() error {
-    return nil
-}
-```
-
-The `Init` method is used to initialize and configure the service to make it ready to use. Services that return an error halt Grafana's startup process and cause the error to be logged as it exits.
-
-## Register a service
-
-Every service needs to be registered with the application for it to be included in the service graph.
-
-To register a service, call the `registry.RegisterService` function in a `init` function within your package.
-
-```go
-func init() {
-    registry.RegisterService(&MyService{})
-}
-```
-
-`init` functions are only run whenever a package is imported, so we also need to import the package in the application. In the `server.go` file under `pkg/cmd/grafana-server`, import the package we just created:
-
-```go
-import _ "github.com/grafana/grafana/pkg/services/mysvc"
-```
-
-## Dependencies
-
-Grafana uses the [inject](https://github.com/facebookgo/inject) package to inject dependencies during runtime. 
-
-For example, to access the [bus](communication.md), add it to the `MyService` struct:
-
-```go
-type MyService struct {
-    Bus bus.Bus `inject:""`
-}
-```
-
-You can also inject other services in the same way:
-
-```go
-type MyService struct {
-    Service other.Service `inject:""`
-}
-```
-
-**Note:** Any injected dependency needs to be an exported field. Any unexported fields result in a runtime error.

contribute/create-pull-request.md

@@ -1,95 +0,0 @@
-# Create a pull request
-
-We're excited that you're considering making a contribution to the Grafana project! This document guides you through the process of creating a [pull request](https://help.github.com/en/articles/about-pull-requests/).
-
-## Before you begin
-
-We know you're excited to create your first pull request. Before we get started, read these resources first:
-
-- Learn how to start [Contributing to Grafana](/CONTRIBUTING.md).
-- Make sure your code follows the relevant [style guides](/contribute/style-guides).
-
-## Your first pull request
-
-If this is your first time contributing to an open-source project on GitHub, make sure you read about [Creating a pull request](https://help.github.com/en/articles/creating-a-pull-request).
-
-To increase the chance of having your pull request accepted, make sure your pull request follows these guidelines:
-
-- Title and description matches the implementation.
-- Commits within the pull request follow the [Formatting guidelines](#Formatting-guidelines). 
-- The pull request closes one related issue.
-- The pull request contains necessary tests that verify the intended behavior.
-- If your pull request has conflicts, rebase your branch onto the master branch.
-
-If the pull request fixes a bug:
-
-- The pull request description must include `Closes #<issue number>` or `Fixes #<issue number>`.
-- To avoid regressions, the pull request should include tests that replicate the fixed bug.
-
-### Frontend-specific guidelines
-
-Pull requests for frontend contributions must:
-
-- Use [Emotion](/contribute/style-guides/styling.md) for styling.
-- Not increase the Angular code base.
-- Not use `any` or `{}` without reason.
-- Not contain large React components that could easily be split into several smaller components.
-- Not contain backend calls directly from components—use actions and Redux instead.
-
-Pull requests for Redux contributions must:
-
-- Use the `actionCreatorFactory` and `reducerFactory` helpers instead of traditional switch statement reducers in Redux. Refer to [Redux framework](/contribute/style-guides/redux.md) for more details.
-- Use `reducerTester` to test reducers. Refer to [Redux framework](/contribute/style-guides/redux.md) for more details.
-- Not contain code that mutates state in reducers or thunks.
-- Not contain code that accesses the reducers state slice directly. Instead, the code should use state selectors to access state.
-
-## Code review
-
-Once you've created a pull request, the next step is to have someone review your change. A review is a learning opportunity for both the reviewer and the author of the pull request.
-
-If you think a specific person needs to review your pull request, then you can tag them in the description or in a comment. Tag a user by typing the `@` symbol followed by their GitHub username.
-
-We recommend that you read [How to do a code review](https://google.github.io/eng-practices/review/reviewer/) to learn more about code reviews.
-
-## Formatting guidelines
-
-A well-written pull request minimizes the time to get your change accepted. These guidelines help you write good commit messages and descriptions for your pull requests.
-
-### Commit message format
-
-Grafana uses the guidelines for commit messages outlined in [How to Write a Git Commit Message](https://chris.beams.io/posts/git-commit/), with the following additions:
-
-- Subject line must begin with the _area_ of the commit.
-- A footer in the form of an optional [keyword and issue reference](https://help.github.com/en/articles/closing-issues-using-keywords).
-
-#### Area
-
-The area should use upper camel case, e.g. UpperCamelCase.
-
-Prefer using one of the following areas:
-
-- **Build:** Changes to the build system, or external dependencies.
-- **Chore:** Changes that don't affect functionality.
-- **Dashboard:** Changes to the Dashboard feature.
-- **Docs:** Changes to documentation.
-- **Explore:** Changes to the Explore feature.
-- **Plugins:** Changes to any of the plugins.
-
-For changes to data sources, the area should be the name of the data source, e.g., AzureMonitor, Graphite, and Prometheus.
-
-For changes to panels, the area should be the name of the panel, suffixed with Panel, e.g., GraphPanel, SinglestatPanel, and TablePanel.
-
-**Examples**
-
-- `Build: Support publishing MSI to grafana.com`
-- `Explore: Add Live option for supported data sources`
-- `GraphPanel: Fix legend sorting issues`
-- `Docs: Changed url to URL in all documentation files`
-
-### Pull request titles
-
-The Grafana team _squashes_ all commits into one when we accept a pull request. The title of the pull request becomes the subject line of the squashed commit message. We still encourage contributors to write informative commit messages, as they becomes a part of the Git commit body.
-
-We use the pull request title when we generate change logs for releases. As such, we strive to make the title as informative as possible.
-
-Make sure that the title for your pull request uses the same format as the subject line in the commit message.

contribute/developer-guide.md

@@ -1,204 +0,0 @@
-# Developer guide
-
-This guide helps you get started developing Grafana.
-
-Before you begin, you might want to read [How to contribute to Grafana as a junior dev](https://medium.com/@ivanahuckova/how-to-contribute-to-grafana-as-junior-dev-c01fe3064502) by [Ivana Huckova](https://medium.com/@ivanahuckova).
-
-
-## Dependencies
-
-Make sure you have the following dependencies installed before setting up your developer environment:
-
-- [Git](https://git-scm.com/)
-- [Go](https://golang.org/dl/)
-- [Node.js (Long Term Support)](https://nodejs.org)
-- [Yarn](https://yarnpkg.com)
-
-### macOS
-
-We recommend using [Homebrew](https://brew.sh/) for installing any missing dependencies:
-
-```
-brew install git
-brew install go
-brew install node
-
-npm install -g yarn
-```
-
-## Download Grafana
-
-We recommend using Go to download the source code for the Grafana project:
-
-1. Add `export GOPATH=$HOME/go/` to the bottom of your `$HOME/.bash_profile`.
-1. Open a terminal and run `go get github.com/grafana/grafana` in your terminal. This command downloads, and installs Grafana to your `$GOPATH`.
-1. Open `$GOPATH/src/github.com/grafana/grafana` in your favorite code editor.
-
-## Build Grafana
-
-Grafana consists of two components; the _frontend_, and the _backend_.
-
-### Frontend
-
-Before we can build the frontend assets, we need to install the dependencies:
-
-```
-yarn install --pure-lockfile
-```
-
-After the command has finished, we can start building our source code:
-
-```
-yarn start
-```
-
-Once `yarn start` has built the assets, it will continue to do so whenever any of the files change. This means you don't have to manually build the assets whenever every time you change the code.
-
-Next, we'll build the web server that will serve the frontend assets we just built.
-
-### Backend
-
-Build and run the backend by running `make run` in the root directory of the repository. This command compiles the Go source code and starts a web server.
-
-> Are you having problems with [too many open files](#troubleshooting)?
-
-By default, you can access the web server at `http://localhost:3000/`.
-
-Log in using the default credentials:
-
-| username | password |
-| -------- | -------- |
-| `admin`  | `admin`  |
-
-When you log in for the first time, Grafana asks you to change your password.
-
-## Test Grafana
-
-The test suite consists of three types of tests: _Frontend tests_, _backend tests_, and _end-to-end tests_.
-
-### Run frontend tests
-
-We use [jest](https://jestjs.io/) for our frontend tests. Run them using Yarn:
-
-```
-yarn jest
-```
-
-### Run backend tests
-
-If you're developing for the backend, run the tests with the standard Go tool:
-
-```
-go test -v ./pkg/...
-```
-
-### Run end-to-end tests
-
-The end-to-end tests in Grafana uses [puppeteer](https://github.com/GoogleChrome/puppeteer) to run automated scripts in a headless Chrome browser. To run the tests:
-
-```
-yarn e2e-tests
-```
-
-By default, the end-to-end tests assumes Grafana is available on `localhost:3000`. To use a specific URL, set the `BASE_URL` environment variable:
-
-```
-BASE_URL=http://localhost:3333 yarn e2e-tests
-```
-
-To follow the tests in the browser while they're running, add the `BROWSER` and `SLOWMO` environment variables:
-
-```
-BROWSER=1 SLOWMO=1 yarn e2e-tests
-```
-
-## Configure Grafana for development
-
-The default configuration, `grafana.ini`, is located in the `conf` directory. 
-
-To override the default configuration, create a `custom.ini` file in the `conf` directory. You only need to add the options you wish to override.
-
-Enable the development mode, by adding the following line in your `custom.ini`:
-
-```
-app_mode = development
-```
-
-
-### Add data sources
-
-By now, you should be able to build and test a change you've made to the Grafana source code. In most cases, you need to add at least one data source to verify the change.
-
-To set up data sources for your development environment, go to the [devenv](/devenv) directory in the Grafana repository:
-
-```
-cd devenv
-```
-
-Run the `setup.sh` script to set up a set of data sources and dashboards in your local Grafana instance. The script creates a set of data sources called **gdev-\<type\>**, and a set of dashboards located in a folder called **gdev dashboards**.
-
-Some of the data sources require databases to run in the background.
-
-Installing and configuring databases can be a tricky business. Grafana uses [Docker](https://docker.com) to make the task of setting up databases a little easier. Make sure you [install Docker](https://docs.docker.com/docker-for-mac/install/) before proceeding to the next step.
-
-In the root directory of your Grafana repository, run the following command:
-
-```
-make devenv sources=influxdb,loki
-```
-
-The script generates a Docker Compose file with the databases you specify as `sources`, and runs them in the background.
-
-See the repository for all the [available data sources](/devenv/docker/blocks). Note that some data sources have specific Docker images for macOS, e.g. `prometheus_mac`.
-
-## Build a Docker image
-
-To build a Docker image, run:
-
-```
-make build-docker-full
-```
-
-The resulting image will be tagged as grafana/grafana:dev.
-
-**Note:** If you've already set up a local development environment, and you're running a `linux/amd64` machine, you can speed up building the Docker image:
-
-1. Build the frontend: `go run build.go build-frontend`.
-1. Build the Docker image: `make build-docker-dev`.
-
-**Note:** If you are using Docker for macOS, be sure to set the memory limit to be larger than 2 GiB. Otherwise `grunt build` may fail. The memory limit settings are available under **Docker Desktop** -> **Preferences** -> **Advanced**.
-
-## Troubleshooting
-
-Are you having issues with setting up your environment? Here are some tips that might help.
-
-### Too many open files when running `make run`
-
-Depending on your environment, you may have to increase the maximum number of open files allowed.
-
-To see how many open files are allowed, run:
-
-```
-ulimit -a
-```
-
-To change the number of open files allowed, run:
-
-```
-ulimit -S -n 2048
-```
-
-The number of files needed may be different on your environment. To determine the number of open files needed by `make run`, run:
-
-```
-find ./conf ./pkg ./public/views | wc -l
-```
-
-Another alternative is to limit the files being watched. The directories that are watched for changes are listed in the `.bra.toml` file in the root directory. 
-
-## Next steps
-
-- Read our [style guides](/contribute/style-guides).
-- Learn how to [Create a pull request](/contribute/create-pull-request.md).
-- Read [How to contribute to Grafana as a junior dev](https://medium.com/@ivanahuckova/how-to-contribute-to-grafana-as-junior-dev-c01fe3064502) by [Ivana Huckova](https://medium.com/@ivanahuckova).
-- Read about the [architecture](architecture).

contribute/documentation.md

@@ -1,42 +0,0 @@
-# Contributing to documentation
-
-This documents guides you through the process of contributing to the Grafana documentation. Make sure you've read the guide for [Contributing to Grafana](/CONTRIBUTING.md).
-
-## Your first contribution
-
-If you’re unsure about where to start, check out some of our [open docs issues](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3Atype%2Fdocs).
-
-Sometimes it can be difficult to understand an issue when you're just getting started. Refer to this list of [beginner-friendly issues](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3Atype%2Fdocs+label%3A"beginner+friendly") for tasks suitable for first-time contributors.
-
-When you’ve found an issue you want to work on, please comment on the issue to let other people know you intend to work on it.
-
-If you encounter any misspellings or violations to the style guide, please let us know by submitting an issue (or just fix them if they are minor changes).
-
-On every page in the [documentation](https://grafana.com/docs/) are two links in the upper right corner:
-
-- **Edit this page** takes you directly to the file on GitHub where you can contribute a fix.
-- **Request doc changes** prepares an issue on GitHub with relevant information already filled in.
-
-## Join our community
-
-For general discussions on documentation, you’re welcome to join the `#docs` channel on our [public Grafana Slack](http://slack.raintank.io) team.
-
-## Style and formatting
-
-All Grafana documentation is written using [Markdown](https://en.wikipedia.org/wiki/Markdown), and can be found in the [docs](/docs) directory in the [Grafana GitHub repository](https://github.com/grafana/grafana). The [documentation website](https://grafana.com/docs) is generated with [Hugo](https://gohugo.io) which uses [Blackfriday](https://github.com/russross/blackfriday) as its Markdown rendering engine.
-
-### Documentation structure
-
-The Grafana documentation is organized into topics, called _sections_. You can take a look at the current build at [grafana.com/docs/](https://grafana.com/docs/).
-
-Each top-level section is located under the [docs/sources](/docs/sources) directory. Subsections are added by creating a subdirectory in the directory of the parent section.
-
-For each section, an `_index.md` file provides an overview of the topic.
-
-### Style guide
-
-Refer to the [Documentation style guide](style-guides/documentation-style-guide.md) for information about Grafana style, word choice, and grammar conventions.
-
-### Spelling
-
-The [codespell](https://github.com/codespell-project/codespell) tool is run for every change to catch common misspellings.

contribute/style-guides/backend.md

@@ -1,45 +0,0 @@
-# Backend style guide
-
-Grafanas backend has been developed for a long time with a mix of code styles.  This guide explains how we want to write Go code in the future.
-
-Unless stated otherwise, use the guidelines listed in the following articles:
-
-- [Effective Go](https://golang.org/doc/effective_go.html)
-- [Code Review Comments](https://github.com/golang/go/wiki/CodeReviewComments)
-- [Go: Best Practices for Production Environments](http://peter.bourgon.org/go-in-production/#formatting-and-style)
-
-## Linting and formatting
-
-To ensure consistency across the Go codebase, we require all code to pass a number of linter checks.
-
-We use the standard following linters:
-
-- [gofmt](https://golang.org/cmd/gofmt/)
-- [golint](https://github.com/golang/lint)
-- [go vet](https://golang.org/cmd/vet/)
-
-In addition to the standard linters, we also use:
-
-- [revive](https://revive.run/) with a [custom config](https://github.com/grafana/grafana/blob/master/conf/revive.toml)
-- [GolangCI-Lint](https://github.com/golangci/golangci-lint)
-- [gosec](https://github.com/securego/gosec)
-
-To run all linters, use the `lint-go` Makefile target:
-
-```bash
-make lint-go
-```
-
-## Testing
-
-We value clean and readable code, that is loosely coupled and covered by unit tests. This makes it easier to collaborate and maintain the code.
-
-Tests must use the standard library, `testing`. For assertions, prefer using [testify](https://github.com/stretchr/testify).
-
-The majority of our tests uses [GoConvey](http://goconvey.co/) but that's something we want to avoid going forward.
-
-In the `sqlstore` package we do database operations in tests and while some might say that's not suited for unit tests. We think they are fast enough and provide a lot of value.
-
-## General guidelines
-
-- Avoid using import aliases, e.g. `import m "github.com/grafana/grafana/pkg/models"`.

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

@@ -1,122 +0,0 @@
-# Documentation style guide
-
-This style guide applies to all documentation created for Grafana products.
-
-## Contributing
-
-The *Documentation style guide* is a living document. Add to it whenever a style decision is made or a question is answered regarding style, grammar, or word choice.
-
-## Published guides
-
-For all items not covered in this guide, refer to the [Microsoft Style Guide](https://docs.microsoft.com/en-us/style-guide/welcome/) and the [Chicago Manual of Style](https://www.chicagomanualofstyle.org/home.html).
-
-## Spelling
-
-The [codespell](https://github.com/codespell-project/codespell) tool is run for every change to catch common misspellings.
-
-## Grafana-specific style
-
-The following sections provide general guidelines on topics specific to Grafana documentation. Note that for the most part, these are *guidelines*, not rigid rules. If you have questions, ask in the #docs channel of Grafana Slack.
-
-### General
-
-* Use active voice. Avoid passive voice.
-  - Passive: The heatmap visualization is displayed.
-  - Active: Grafana displays the heatmap visualization.
-* 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.
-* Do not use an ampersand (&) as an abbreviation for "and." 
-  - **Exceptions:** If an ampersand is used in the Grafana UI, then match the UI.
-
-### File naming conventions
-
-- 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
-
-### Headings
-
-* Write headings in sentence case, not title case.
-  - This is sentence case
-  - This Is Title Case
-* Task topic headings start with a verb.
-  - 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.
-* 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 no go h1, h2, h3, h2, h3, h2.
-* Don't include parenthetical words like (Important!) in headings.
-
-### Images
-
-* Preferred format is .png
-* File extension should be all lowercase.
-* Preferred DPI is 72.
-* 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.
-
-### 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.
-  - "Keyboard shortcuts" when referring to the submenu topic.
-* Generic and plural versions are always lowercase.
-  - Lowercase "dashboard" when referring to a dashboard generally.
-  - Lowercase "dashboards" when referring to multiple dashboards.
-* **Exceptions:** If a term is lowercased in the Grafana UI, then match the UI.
-
-### Links and references
-
-When referencing another document, use "Refer to" rather than alternatives such as "See" or "Check out."
-
-Always give the reader some idea of what to expect in the reference. Avoid blind references, such as, "Refer to [this file](link)."
-
-When possible, use the exact title of the page or section you are linking to as the link text.
-
-**Example**
-* Refer to the [Documentation style guide](documentation-style-guide.md) for information about word usage and capitalization guidelines.
-
-### Word usage
-
-Grafana products has some words, abbreviations, and slang particular to this discourse community.
-
-#### data source
-
-Two words, not one
-
-**Exceptions:**
-* "datasource" used as an identifier
-* "datasource" in a URL
-* "Open source" should be hyphenated when used as an adjective, e.g. *open-source software*. The open form should be preferred when used as a noun, e.g. *Grafana is open source*.
-* Use "data source" instead of "datasource" unless used as an identifier, in code, or as part of a URL.
-* Spell out "repository" and avoid the shorter "repo."
-* Use "Unix" as the preferred spelling (as opposed to "UNIX", or "unix") when referring to the family of operating systems.
-
-#### display (verb)
-
-*Display* is a transitive verb, which means it always needs a direct object.
-* Correct, active voice: Grafana displays your list of active alarms.
-* Correct, but passive voice: Your list of active alarms is displayed.
-* Incorrect: The list of active alarms displays.
-
-#### open source, open-source
-
-Hyphenate when used as an adjective. For example: _open-source software._ 
-
-Do not hyphenate when it is used as a noun. For example: _Open source is the best way to develop software._
-
-#### setup, set up
-
-Two words if used as a verb, one word if used as a noun.
-
-**Examples**
-
-* Set up the workspace.
-* Initial setup might take five minutes.

contribute/style-guides/styling.md

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

contribute/style-guides/themes.md

@@ -1,137 +0,0 @@
-# Theming Grafana
-
-## Overview
-
-**Themes are implemented in Typescript.** That's because our goal is to share variables between Grafana Typescript code and SASS files. Theme definitions are located in `packages/grafana-ui/src/themes/[default|dark|light].ts` files. `default.ts` file holds common variables like typography and spacing definitions, while `[light|dark].ts` primarily specify colors used in themes.
-
-## Usage
-### Using themes in React components
-
-#### Using `ThemeContext` directly
-
-```tsx
-import { ThemeContext } from '@grafana/ui';
-
-<ThemeContext.Consumer>{theme => <Foo theme={theme} />}</ThemeContext.Consumer>;
-```
-
-or
-
-```tsx
-import React, { useContext } from 'react';
-import { ThemeContext } from '@grafana/ui';
-
-const Foo: React.FunctionComponent<FooProps> = () => {
-  const theme = useContext(ThemeContext);
-
-  // Your component has access to the theme variables now
-}
-
-```
-
-#### Using `withTheme` higher-order component (HOC)
-
-With this method your component will be automatically wrapped in `ThemeContext.Consumer` and provided with current theme via `theme` prop. Component used with `withTheme` must implement `Themeable` interface.
-
-```ts
-import  { ThemeContext, Themeable } from '@grafana/ui';
-
-interface FooProps extends Themeable {}
-
-const Foo: React.FunctionComponent<FooProps> = () => ...
-
-export default withTheme(Foo);
-```
-
-### Test components that use ThemeContext
-
-When implementing snapshot tests for components that use the `withTheme` HOC, the snapshot will contain the entire theme object. Any change to the theme renders the snapshot outdated.
-
-To make your snapshot theme independent, use the `mockThemeContext` helper function:
-
-```tsx
-import { mockThemeContext } from '@grafana/ui';
-import { MyComponent } from './MyComponent';
-
-describe('MyComponent', () => {
-  let restoreThemeContext;
-
-  beforeAll(() => {
-    // Create ThemeContext mock before any snapshot test is executed
-    restoreThemeContext = mockThemeContext({ type: GrafanaThemeType.Dark });
-  });
-
-  afterAll(() => {
-    // Make sure the theme is restored after snapshot tests are performed
-    restoreThemeContext();
-  });
-
-  it('renders correctyl', () => {
-    const wrapper = mount(<MyComponent />)
-    expect(wrapper).toMatchSnapshot();
-  });
-});
-```
-
-### Using themes in Storybook
-
-All stories are wrapped with `ThemeContext.Provider` using global decorator. To render `Themeable` component that's not wrapped by `withTheme` HOC you either create a new component in your story:
-
-```tsx
-// Foo.story.tsx
-const FooWithTheme = withTheme(Foo);
-
-FooStories.add('Story' () => {
-  return <FooWithTheme />
-});
-```
-
-or use `renderComponentWithTheme` helper:
-
-```tsx
-// Bar.story.tsx
-
-BarStories.add('Story' () => {
-  return renderComponentWithTheme(Bar, /* pass props here */)
-});
-```
-
-### Using themes in Angular code
-
-There should be very few cases where theme would be used in Angular context. For this purpose there is a function available that retrieves current theme: `import { getCurrentTheme } from app/core/utils/ConfigProvider`. Angular components should be migrated to React, or if that's not possible at the moment, styled using SASS.
-
-
-## FAQ
-### How can I modify SASS variable files?
-> For the following to apply you need to run `yarn dev` task.
-
-`[_variables|_variables.dark|_variables.light].generated.scss` files are the ones that are referenced in the main SASS files for SASS variables to be available. **These files are automatically generated and should never be modified by hand!**.
-
-#### If you need to modify *SASS variable value* you need to modify corresponding Typescript file that is a source of the variables:
-- `_variables.generated.scss` - modify `grafana-ui/src/themes/default.ts`
-- `_variables.light.generated.scss` - modify `grafana-ui/src/themes/light.ts`
-- `_variables.dark.generated.scss` - modify `grafana-ui/src/themes/dark.ts`
-
-#### If you need to *add new variable* to SASS variables you need to modify corresponding template file:
-- `_variables.generated.scss` - modify `grafana-ui/src/themes/_variables.scss.tmpl.ts`
-- `_variables.light.generated.scss` - modify `grafana-ui/src/themes/_variables.light.scss.tmpl.ts`
-- `_variables.dark.generated.scss` - modify `grafana-ui/src/themes/_variables.dark.scss.tmpl.ts`
-
-
-## Limitations
-### You must ensure ThemeContext provider is available in a React tree
-  By default all react2angular directives have `ThemeContext.Provider` ensured. But, there are cases where we create another React tree via `ReactDOM.render`. This happens in case of graph legend rendering and `ReactContainer` directive. In such cases theme consumption will fail. To make sure theme context is available in such cases, you need to wrap your rendered component with ThemeContext.Provider using `provideTheme` function:
-
-```ts
-// graph.ts
-import { provideTheme } from 'app/core/utils/ConfigProvider';
-
-// Create component with ThemeContext.Provider first.
-// Otherwise React will create new components every time it renders!
-const LegendWithThemeProvider = provideTheme(Legend);
-
-const legendReactElem = React.createElement(LegendWithThemeProvider, legendProps);
-ReactDOM.render(legendReactElem, this.legendElem, () => this.renderPanel());
-```
-
-`provideTheme` makes current theme available via ThemeContext by checking if user has `lightTheme` set in her boot data.

contribute/triage-issues.md

@@ -1,32 +0,0 @@
-# Triage issues
-
-Triage helps ensure that issues resolve quickly by:
-
-- Ensuring the issue's intent and purpose is conveyed precisely. This is necessary because it can be difficult for an issue to explain how an end user experiences a problem and what actions they took.
-- Giving a contributor the information they need before they commit to resolving an issue.
-- Lowering the issue count by preventing duplicate issues.
-- Streamlining the development process by preventing duplicate discussions.
-
-This document gives you some ideas on what you can do to help. For more information, read more about [how the core Grafana team triage issues](/ISSUE_TRIAGE.md).
-
-## Improve issues
-
-Improve issues by suggesting improvements to the title and description. If you think an issue has formatting issues, bad language, or grammatical errors, post a comment to let the author and maintainers know.
-
-## Report resolved issues
-
-If you think an issue has been resolved, or is no longer relevant, suggest us to close it. Add a comment on the issue, where you explain the reason it should be closed. Make sure to include any related issues and pull requests.
-
-## Investigate issues
-
-Investigate issues that we haven't been able to reproduce yet. In some cases, there are many combinations of panels, dashboards, and data sources that make it difficult for us to reproduce certain issues. Help us by adding more information.
-
-## Vote on issues
-
-Use [GitHub reactions](https://help.github.com/en/articles/about-conversations-on-github#reacting-to-ideas-in-comments) to let us know what's important to you. Vote on bugs if you've experienced the same problem. **Don't vote, or react, by commenting on the issue.**
-
-Read more about [how we prioritize issues](/ISSUE_TRIAGE.md#4-prioritization-of-issues).
-
-## Report duplicates
-
-If you find two issues that describe the same thing, add a comment in one of the issues, with a reference (`#<issue number>`) to the other. Explain why you think the issue is duplicated.

devenv/README.md

@@ -1,40 +1,33 @@
-# Set up your development environment
+This folder contains useful scripts and configuration for...
 
-This folder contains useful scripts and configuration so you can:
+* Configuring dev datasources in Grafana
+* Configuring dev & test scenarios dashboards.
+* Creating docker-compose file with DBs and fake data.
 
-* Configure data sources in Grafana for development.
-* Configure dashboards for development and test scenarios.
-* Create docker-compose file with databases and fake data.
 
-## Install Docker
-
-Grafana uses [Docker](https://docker.com) to make the task of setting up databases a little easier. If you do not have it already, make sure you [install Docker](https://docs.docker.com/docker-for-mac/install/) before proceeding to the next step.
-
-## Developer dashboards and data sources
+# Dev dashboards and data sources
 
 ```bash
 ./setup.sh
 ```
 
-After restarting the Grafana server, there should be a number of data sources named `gdev-<type>` provisioned as well as
-a dashboard folder named `gdev dashboards`. This folder contains dashboard and panel features tests dashboards. 
+After restarting grafana server there should now be a number of datasources named `gdev-<type>` provisioned as well as
+a dashboard folder named `gdev dashboards`. This folder contains dashboard & panel features tests dashboards. 
 
-Please update these dashboards or make new ones as new panels and dashboards features are developed or new bugs are
+#### Dev dashboards
+
+Please update these dashboards or make new ones as new panels & dashboards features are developed or new bugs are
 found. The dashboards are located in the `devenv/dev-dashboards` folder. 
 
-## docker-compose with databases
+# docker-compose with databases
 
-This command creates a docker-compose file with specified databases configured and ready to run. Each database has
-a prepared image with some fake data ready to use. For available databases, see `docker/blocks` directory. Notice that
+```bash
+./create_docker_compose.sh influxdb prometheus2 elastic5
+docker-compose up
+```
+
+This command will create a docker compose file with specified databases configured and ready to run. Each database has
+a prepared image with some fake data ready to use. For available databases see `docker/blocks` directory. Mind that
 for some databases there are multiple images, for example there is prometheus_mac specifically for Macs or different
 version.
 
-```bash
-make devenv sources=influxdb,prometheus2,elastic5
-```
-
-Some of the blocks support dynamic change of the image version used in the Docker file. The signature looks like this: 
-
-```bash
-make devenv sources=postgres,openldap postgres_version=9.2
-```

devenv/create_docker_compose.sh

@@ -8,8 +8,8 @@ grafana_config_file=conf.tmp
 grafana_config=config
 
 compose_header_file=docker/compose_header.yml
-compose_file=docker-compose.yaml
-env_file=.env
+fig_file=docker-compose.yaml
+fig_config=docker-compose.yaml
 
 if [ "$#" == 0 ]; then
     blocks=`ls $blocks_dir`
@@ -24,15 +24,15 @@ if [ "$#" == 0 ]; then
     exit 0
 fi
 
-for file in $grafana_config_file $compose_file $env_file; do
+for file in $grafana_config_file $fig_file; do
     if [ -e $file ]; then
         echo "Deleting $file"
         rm $file
     fi
 done
 
-echo "Adding Compose header to $compose_file"
-cat $compose_header_file >> $compose_file
+echo "Adding Compose header to $fig_file"
+cat $compose_header_file >> $fig_file
 
 for dir in $@; do
     current_dir=$blocks_dir/$dir
@@ -47,16 +47,10 @@ for dir in $@; do
         echo "" >> $grafana_config_file
     fi
 
-    if [ -e $current_dir/$compose_file ]; then
-        echo "Adding $current_dir/$compose_file to $compose_file"
-        cat $current_dir/$compose_file >> $compose_file
-        echo "" >> $compose_file
-    fi
-
-    if [ -e $current_dir/$env_file ]; then
-        echo "Adding $current_dir/$env_file to .env"
-        cat $current_dir/$env_file >> .env
-        echo "" >> .env
+    if [ -e $current_dir/$fig_config ]; then
+        echo "Adding $current_dir/$fig_config to $fig_file"
+        cat $current_dir/$fig_config >> $fig_file
+        echo "" >> $fig_file
     fi
 done
 

devenv/dashboards.yaml

@@ -5,7 +5,6 @@ providers:
    folder: 'gdev dashboards'
    folderUid: ''
    type: file
-   allowUiUpdates: false
    updateIntervalSeconds: 60
    options:
      path: devenv/dev-dashboards

devenv/datasources.yaml

@@ -1,11 +1,10 @@
-
 apiVersion: 1
 
 datasources:
   - name: gdev-graphite
     type: graphite
     access: proxy
-    url: http://localhost:8180
+    url: http://localhost:8080
     jsonData:
       graphiteVersion: "1.1"
 
@@ -14,11 +13,6 @@ datasources:
     access: proxy
     url: http://localhost:9090
 
-  - name: gdev-slow-prometheus
-    type: prometheus
-    access: proxy
-    url: http://localhost:3011
-
   - name: gdev-testdata
     type: testdata
     isDefault: true
@@ -34,17 +28,6 @@ datasources:
     secureJsonData:
       password: grafana
 
-  - name: gdev-influxdb-telegraf
-    type: influxdb
-    access: proxy
-    database: telegraf
-    user: grafana
-    url: http://localhost:8086
-    jsonData:
-      timeInterval: "10s"
-    secureJsonData:
-      password: grafana
-
   - name: gdev-opentsdb
     type: opentsdb
     access: proxy
@@ -153,20 +136,6 @@ datasources:
       interval: Daily
       timeField: "@timestamp"
       esVersion: 70
-      timeInterval: "10s"
-      logMessageField: message
-      logLevelField: fields.level
-
-  - name: gdev-elasticsearch-v7-metricbeat
-    type: elasticsearch
-    access: proxy
-    database: "[metricbeat-]YYYY.MM.DD"
-    url: http://localhost:12200
-    jsonData:
-      interval: Daily
-      timeField: "@timestamp"
-      esVersion: 70
-      timeInterval: "10s"
 
   - name: gdev-mysql
     type: mysql

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

@@ -28,7 +28,11 @@
           "value": "triggered"
         }
       ],
-      "colors": ["#299c46", "rgba(237, 129, 40, 0.89)", "#d44a3a"],
+      "colors": [
+        "#299c46",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
       "d3DivId": "d3_svg_4",
       "datasource": "gdev-testdata",
       "decimals": 2,
@@ -111,7 +115,11 @@
       },
       "id": 4,
       "links": [],
-      "notcolors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
+      "notcolors": [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+      ],
       "operatorName": "avg",
       "operatorOptions": [
         {
@@ -876,8 +884,8 @@
               "value": "celsius"
             },
             {
-              "text": "Fahrenheit (°F)",
-              "value": "fahrenheit"
+              "text": "Farenheit (°F)",
+              "value": "farenheit"
             },
             {
               "text": "Kelvin (K)",
@@ -1106,7 +1114,11 @@
           "value": "triggered"
         }
       ],
-      "colors": ["#299c46", "rgba(237, 129, 40, 0.89)", "#d44a3a"],
+      "colors": [
+        "#299c46",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
       "d3DivId": "d3_svg_5",
       "datasource": "gdev-testdata",
       "decimals": 2,
@@ -1189,7 +1201,11 @@
       },
       "id": 5,
       "links": [],
-      "notcolors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
+      "notcolors": [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+      ],
       "operatorName": "avg",
       "operatorOptions": [
         {
@@ -1975,8 +1991,8 @@
               "value": "celsius"
             },
             {
-              "text": "Fahrenheit (°F)",
-              "value": "fahrenheit"
+              "text": "Farenheit (°F)",
+              "value": "farenheit"
             },
             {
               "text": "Kelvin (K)",
@@ -2205,7 +2221,11 @@
           "value": "triggered"
         }
       ],
-      "colors": ["#299c46", "rgba(237, 129, 40, 0.89)", "#d44a3a"],
+      "colors": [
+        "#299c46",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
       "d3DivId": "d3_svg_2",
       "datasource": "gdev-testdata",
       "decimals": 2,
@@ -2288,7 +2308,11 @@
       },
       "id": 2,
       "links": [],
-      "notcolors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
+      "notcolors": [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+      ],
       "operatorName": "avg",
       "operatorOptions": [
         {
@@ -3054,8 +3078,8 @@
               "value": "celsius"
             },
             {
-              "text": "Fahrenheit (°F)",
-              "value": "fahrenheit"
+              "text": "Farenheit (°F)",
+              "value": "farenheit"
             },
             {
               "text": "Kelvin (K)",
@@ -3276,7 +3300,10 @@
   ],
   "schemaVersion": 16,
   "style": "dark",
-  "tags": ["panel-test", "gdev"],
+  "tags": [
+    "panel-test",
+    "gdev"
+  ],
   "templating": {
     "list": []
   },
@@ -3285,8 +3312,29 @@
     "to": "now"
   },
   "timepicker": {
-    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
-    "time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
+    "refresh_intervals": [
+      "5s",
+      "10s",
+      "30s",
+      "1m",
+      "5m",
+      "15m",
+      "30m",
+      "1h",
+      "2h",
+      "1d"
+    ],
+    "time_options": [
+      "5m",
+      "15m",
+      "1h",
+      "6h",
+      "12h",
+      "24h",
+      "2d",
+      "7d",
+      "30d"
+    ]
   },
   "timezone": "",
   "title": "Panel Tests - Polystat",

devenv/dev-dashboards/feature-templating/testdata-datalinks.json

@@ -1,510 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": "-- Grafana --",
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "type": "dashboard"
-      }
-    ]
-  },
-  "editable": true,
-  "gnetId": null,
-  "graphTooltip": 0,
-  "iteration": 1568372030444,
-  "links": [],
-  "panels": [
-    {
-      "content": "## Data link variables overview\n\nThis dashboard presents variables that one can use when creating *data links*. All links redirect to this dashboard and this panel represents the values that were interpolated in the link that was clicked.\n\n\n#### Series variables\n1. **Name:** <span style=\"color: orange;\">$seriesName</span>\n2. **label.datacenter:** <span style=\"color: orange;\">$labelDatacenter</span>\n3. **label.datacenter.region:** <span style=\"color: orange;\">$labelDatacenterRegion</span>\n\n#### Field variables\n1. **Name:** <span style=\"color: orange;\">$fieldName</span>\n\n#### Value variables\n1. **Time:** <span style=\"color: orange;\">$valueTime</span>\n2. **Numeric:** <span style=\"color: orange;\">$valueNumeric</span>\n3. **Text:** <span style=\"color: orange;\">$valueText</span>\n4. **Calc:** <span style=\"color: orange;\">$valueCalc</span>\n\n",
-      "gridPos": {
-        "h": 16,
-        "w": 6,
-        "x": 0,
-        "y": 0
-      },
-      "id": 8,
-      "mode": "markdown",
-      "options": {},
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "",
-      "transparent": true,
-      "type": "text"
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 8,
-        "w": 9,
-        "x": 6,
-        "y": 0
-      },
-      "id": 2,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": [
-          {
-            "targetBlank": false,
-            "title": "Drill it down",
-            "url": "http://localhost:3000/d/wfTJJL5Wz/datalinks-source?var-seriesName=${__series.name}&var-labelDatacenter=${__series.labels.datacenter}&var-labelDatacenterRegion=${__series.labels[\"datacenter.region\"]}&var-valueTime=${__value.time}&var-valueNumeric=${__value.numeric}&var-valueText=${__value.text}"
-          }
-        ]
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "alias": "Foo datacenter",
-          "labels": "datacenter=foo,datacenter.region=us-east-1",
-          "refId": "A",
-          "scenarioId": "random_walk"
-        },
-        {
-          "alias": "Bar datacenter",
-          "labels": "datacenter=bar,datacenter.region=us-east-2",
-          "refId": "B",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Multiple series",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 8,
-        "w": 9,
-        "x": 15,
-        "y": 0
-      },
-      "id": 9,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": [
-          {
-            "targetBlank": false,
-            "title": "Drill it down",
-            "url": "http://localhost:3000/d/wfTJJL5Wz/datalinks-source?var-seriesName=${__series.name}&var-valueTime=${__value.time}&var-valueNumeric=${__value.numeric}&var-valueText=${__value.text}&var-fieldName=${__field.name}"
-          }
-        ]
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "alias": "Foo datacenter",
-          "labels": "datacenter=foo,datacenter.region=us-east-1",
-          "refId": "A",
-          "scenarioId": "random_walk_table",
-          "stringInput": ""
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Multiple fields",
-      "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
-      }
-    },
-    {
-      "cacheTimeout": null,
-      "datasource": "-- Dashboard --",
-      "gridPos": {
-        "h": 8,
-        "w": 9,
-        "x": 6,
-        "y": 8
-      },
-      "id": 6,
-      "links": [],
-      "options": {
-        "displayMode": "lcd",
-        "fieldOptions": {
-          "calcs": ["last"],
-          "defaults": {
-            "links": [
-              {
-                "targetBlank": true,
-                "title": "Drill it down!",
-                "url": "http://localhost:3000/d/wfTJJL5Wz/datalinks-source\n?var-fieldName=${__field.name}\n&var-labelDatacenter=${__series.labels.datacenter}\n&var-labelDatacenterRegion=${__series.labels[\"datacenter.region\"]}\n&var-valueNumeric=${__value.numeric}\n&var-valueText=${__value.text}\n&var-valueCalc=${__value.calc}"
-              }
-            ],
-            "mappings": [
-              {
-                "id": 0,
-                "op": "=",
-                "text": "N/A",
-                "type": 1,
-                "value": "null"
-              }
-            ],
-            "max": 100,
-            "min": 0,
-            "nullValueMode": "connected",
-            "thresholds": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ],
-            "title": "${__series.name} - $__calc",
-            "unit": "none"
-          },
-          "override": {},
-          "values": false
-        },
-        "orientation": "horizontal"
-      },
-      "pluginVersion": "6.4.0-pre",
-      "targets": [
-        {
-          "panelId": 2,
-          "refId": "A"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Value reducers 1",
-      "type": "bargauge"
-    },
-    {
-      "datasource": "-- Dashboard --",
-      "gridPos": {
-        "h": 8,
-        "w": 9,
-        "x": 15,
-        "y": 8
-      },
-      "id": 4,
-      "options": {
-        "fieldOptions": {
-          "calcs": ["mean"],
-          "defaults": {
-            "links": [
-              {
-                "title": "Drill it down",
-                "url": "http://localhost:3000/d/wfTJJL5Wz/datalinks-source?var-fieldName=${__field.name}&var-labelDatacenter=${__series.labels.datacenter}&var-labelDatacenterRegion=${__series.labels[\"datacenter.region\"]}&var-valueNumeric=${__value.numeric}&var-valueText=${__value.text}&var-valueCalc=${__value.calc}"
-              }
-            ],
-            "mappings": [],
-            "max": 100,
-            "min": 0,
-            "thresholds": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ],
-            "title": "${__series.name} - $__calc"
-          },
-          "override": {},
-          "values": false
-        },
-        "orientation": "auto",
-        "showThresholdLabels": false,
-        "showThresholdMarkers": true
-      },
-      "pluginVersion": "6.4.0-pre",
-      "targets": [
-        {
-          "panelId": 2,
-          "refId": "A"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Value reducers 2",
-      "type": "gauge"
-    }
-  ],
-  "schemaVersion": 20,
-  "style": "dark",
-  "tags": ["gdev", "templating"],
-  "templating": {
-    "list": [
-      {
-        "current": {
-          "text": "",
-          "value": ""
-        },
-        "hide": 2,
-        "label": "Series name",
-        "name": "seriesName",
-        "options": [
-          {
-            "text": "",
-            "value": ""
-          }
-        ],
-        "query": "",
-        "skipUrlSync": false,
-        "type": "textbox"
-      },
-      {
-        "current": {
-          "text": "",
-          "value": ""
-        },
-        "hide": 2,
-        "label": null,
-        "name": "labelDatacenter",
-        "options": [
-          {
-            "text": "",
-            "value": ""
-          }
-        ],
-        "query": "",
-        "skipUrlSync": false,
-        "type": "textbox"
-      },
-      {
-        "current": {
-          "text": "",
-          "value": ""
-        },
-        "hide": 2,
-        "label": null,
-        "name": "labelDatacenterRegion",
-        "options": [
-          {
-            "text": "",
-            "value": ""
-          }
-        ],
-        "query": "",
-        "skipUrlSync": false,
-        "type": "textbox"
-      },
-      {
-        "current": {
-          "text": "",
-          "value": ""
-        },
-        "hide": 2,
-        "label": null,
-        "name": "valueTime",
-        "options": [
-          {
-            "text": "",
-            "value": ""
-          }
-        ],
-        "query": "",
-        "skipUrlSync": false,
-        "type": "textbox"
-      },
-      {
-        "current": {
-          "text": "",
-          "value": ""
-        },
-        "hide": 2,
-        "label": null,
-        "name": "valueNumeric",
-        "options": [
-          {
-            "text": "",
-            "value": ""
-          }
-        ],
-        "query": "",
-        "skipUrlSync": false,
-        "type": "textbox"
-      },
-      {
-        "current": {
-          "text": "",
-          "value": ""
-        },
-        "hide": 2,
-        "label": null,
-        "name": "valueText",
-        "options": [
-          {
-            "text": "",
-            "value": ""
-          }
-        ],
-        "query": "",
-        "skipUrlSync": false,
-        "type": "textbox"
-      },
-      {
-        "current": {
-          "text": "",
-          "value": ""
-        },
-        "hide": 2,
-        "label": null,
-        "name": "valueCalc",
-        "options": [
-          {
-            "text": "",
-            "value": ""
-          }
-        ],
-        "query": "",
-        "skipUrlSync": false,
-        "type": "textbox"
-      },
-      {
-        "current": {
-          "text": "",
-          "value": ""
-        },
-        "hide": 2,
-        "label": null,
-        "name": "fieldName",
-        "options": [
-          {
-            "text": "",
-            "value": ""
-          }
-        ],
-        "query": "",
-        "skipUrlSync": false,
-        "type": "textbox"
-      }
-    ]
-  },
-  "time": {
-    "from": "now-6h",
-    "to": "now"
-  },
-  "timepicker": {
-    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
-  },
-  "timezone": "",
-  "title": "Datalinks - variables",
-  "uid": "wfTJJL5Wz",
-  "version": 1
-}

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

@@ -1,307 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": "-- Grafana --",
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "type": "dashboard"
-      }
-    ]
-  },
-  "editable": true,
-  "gnetId": null,
-  "graphTooltip": 0,
-  "links": [],
-  "panels": [
-    {
-      "content": "## Data center = $datacenter\n\n### server = $server\n\n#### pod = $pod",
-      "gridPos": {
-        "h": 6,
-        "w": 15,
-        "x": 0,
-        "y": 0
-      },
-      "id": 4,
-      "mode": "markdown",
-      "options": {},
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Panel Title",
-      "type": "text"
-    },
-    {
-      "cacheTimeout": null,
-      "colorBackground": false,
-      "colorValue": false,
-      "colors": ["#299c46", "rgba(237, 129, 40, 0.89)", "#d44a3a"],
-      "format": "none",
-      "gauge": {
-        "maxValue": 100,
-        "minValue": 0,
-        "show": false,
-        "thresholdLabels": false,
-        "thresholdMarkers": true
-      },
-      "gridPos": {
-        "h": 6,
-        "w": 9,
-        "x": 15,
-        "y": 0
-      },
-      "id": 6,
-      "interval": null,
-      "links": [
-        {
-          "targetBlank": true,
-          "title": "Overview dashboard",
-          "url": "d/-Y-tnEDWk/dashboard-tests-nested-template-variables?orgId=1&${__all_variables}&${__url_time_range}"
-        }
-      ],
-      "mappingType": 1,
-      "mappingTypes": [
-        {
-          "name": "value to text",
-          "value": 1
-        },
-        {
-          "name": "range to text",
-          "value": 2
-        }
-      ],
-      "maxDataPoints": 100,
-      "nullPointMode": "connected",
-      "nullText": null,
-      "options": {},
-      "postfix": "",
-      "postfixFontSize": "50%",
-      "prefix": "",
-      "prefixFontSize": "50%",
-      "rangeMaps": [
-        {
-          "from": "null",
-          "text": "N/A",
-          "to": "null"
-        }
-      ],
-      "sparkline": {
-        "fillColor": "rgba(31, 118, 189, 0.18)",
-        "full": false,
-        "lineColor": "rgb(31, 120, 193)",
-        "show": true,
-        "ymax": null,
-        "ymin": null
-      },
-      "tableColumn": "",
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "thresholds": "",
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Panel drilldown link test",
-      "type": "singlestat",
-      "valueFontSize": "80%",
-      "valueMaps": [
-        {
-          "op": "=",
-          "text": "N/A",
-          "value": "null"
-        }
-      ],
-      "valueName": "avg"
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "gdev-testdata",
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 13,
-        "w": 24,
-        "x": 0,
-        "y": 6
-      },
-      "id": 2,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "alias": "$datacenter.$server.$pod",
-          "refId": "A",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Panel Title",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    }
-  ],
-  "refresh": false,
-  "schemaVersion": 19,
-  "style": "dark",
-  "tags": ["gdev", "templating"],
-  "templating": {
-    "list": [
-      {
-        "allValue": null,
-        "current": {
-          "text": "A",
-          "value": ["A"]
-        },
-        "datasource": "TestData DB-1",
-        "definition": "*",
-        "hide": 0,
-        "includeAll": true,
-        "label": null,
-        "multi": true,
-        "name": "datacenter",
-        "options": [],
-        "query": "*",
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 0,
-        "tagValuesQuery": "",
-        "tags": [],
-        "tagsQuery": "",
-        "type": "query",
-        "useTags": false
-      },
-      {
-        "allValue": null,
-        "current": {
-          "text": "AA",
-          "value": ["AA"]
-        },
-        "datasource": "TestData DB-1",
-        "definition": "$datacenter.*",
-        "hide": 0,
-        "includeAll": true,
-        "label": null,
-        "multi": true,
-        "name": "server",
-        "options": [],
-        "query": "$datacenter.*",
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 0,
-        "tagValuesQuery": "",
-        "tags": [],
-        "tagsQuery": "",
-        "type": "query",
-        "useTags": false
-      },
-      {
-        "allValue": null,
-        "current": {
-          "text": "All",
-          "value": ["$__all"]
-        },
-        "datasource": "gdev-testdata",
-        "definition": "$datacenter.$server.*",
-        "hide": 0,
-        "includeAll": true,
-        "label": null,
-        "multi": true,
-        "name": "pod",
-        "options": [],
-        "query": "$datacenter.$server.*",
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 0,
-        "tagValuesQuery": "",
-        "tags": [],
-        "tagsQuery": "",
-        "type": "query",
-        "useTags": false
-      }
-    ]
-  },
-  "time": {
-    "from": "now-1h",
-    "to": "now"
-  },
-  "timepicker": {
-    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
-  },
-  "timezone": "",
-  "title": "Templating - Nested Variables Drilldown",
-  "uid": "O6GmNPvWk",
-  "version": 8
-}

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

@@ -1,412 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": "-- Grafana --",
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "type": "dashboard"
-      }
-    ]
-  },
-  "editable": true,
-  "gnetId": null,
-  "graphTooltip": 0,
-  "id": 13844,
-  "iteration": 1566896059256,
-  "links": [],
-  "panels": [
-    {
-      "content": "## Data center = $datacenter\n\n### server = $server\n\n#### pod = $pod",
-      "gridPos": {
-        "h": 9,
-        "w": 12,
-        "x": 0,
-        "y": 0
-      },
-      "id": 4,
-      "mode": "markdown",
-      "options": {},
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Panel Title",
-      "type": "text"
-    },
-    {
-      "cacheTimeout": null,
-      "colorBackground": false,
-      "colorValue": false,
-      "colors": ["#299c46", "rgba(237, 129, 40, 0.89)", "#d44a3a"],
-      "datasource": "gdev-testdata",
-      "format": "none",
-      "gauge": {
-        "maxValue": 100,
-        "minValue": 0,
-        "show": false,
-        "thresholdLabels": false,
-        "thresholdMarkers": true
-      },
-      "gridPos": {
-        "h": 9,
-        "w": 4,
-        "x": 12,
-        "y": 0
-      },
-      "id": 6,
-      "interval": null,
-      "links": [
-        {
-          "targetBlank": true,
-          "title": "Drilldown detail dashboard",
-          "url": "d/O6GmNPvWk/dashboard-tests-nested-template-variables-drilldown?orgId=1&${__all_variables}&${__url_time_range}"
-        }
-      ],
-      "mappingType": 1,
-      "mappingTypes": [],
-      "maxDataPoints": 100,
-      "nullPointMode": "connected",
-      "nullText": null,
-      "options": {},
-      "postfix": "",
-      "postfixFontSize": "50%",
-      "prefix": "",
-      "prefixFontSize": "50%",
-      "rangeMaps": [
-        {
-          "from": "null",
-          "text": "N/A",
-          "to": "null"
-        }
-      ],
-      "sparkline": {
-        "fillColor": "rgba(31, 118, 189, 0.18)",
-        "full": false,
-        "lineColor": "rgb(31, 120, 193)",
-        "show": true,
-        "ymax": null,
-        "ymin": null
-      },
-      "tableColumn": "",
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "thresholds": "",
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Panel drilldown link test",
-      "type": "singlestat",
-      "valueFontSize": "80%",
-      "valueMaps": [
-        {
-          "op": "=",
-          "text": "N/A",
-          "value": "null"
-        }
-      ],
-      "valueName": "avg"
-    },
-    {
-      "cacheTimeout": null,
-      "gridPos": {
-        "h": 9,
-        "w": 4,
-        "x": 16,
-        "y": 0
-      },
-      "id": 8,
-      "links": [],
-      "options": {
-        "fieldOptions": {
-          "calcs": ["mean"],
-          "defaults": {
-            "links": [
-              {
-                "targetBlank": true,
-                "title": "Go to drilldown",
-                "url": "/d/O6GmNPvWk/dashboard-tests-nested-template-variables-drilldown?orgId=1&${__all_variables}&${__url_time_range}"
-              }
-            ],
-            "mappings": [],
-            "max": 100,
-            "min": 0,
-            "nullValueMode": "connected",
-            "thresholds": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ],
-            "unit": "none"
-          },
-          "override": {},
-          "values": false
-        },
-        "orientation": "horizontal",
-        "showThresholdLabels": false,
-        "showThresholdMarkers": true
-      },
-      "pluginVersion": "6.4.0-pre",
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "React gauge datalink",
-      "type": "gauge"
-    },
-    {
-      "cacheTimeout": null,
-      "gridPos": {
-        "h": 9,
-        "w": 4,
-        "x": 20,
-        "y": 0
-      },
-      "id": 9,
-      "links": [],
-      "options": {
-        "displayMode": "basic",
-        "fieldOptions": {
-          "calcs": ["mean"],
-          "defaults": {
-            "links": [
-              {
-                "targetBlank": true,
-                "title": "Go to drilldown",
-                "url": "/d/O6GmNPvWk/dashboard-tests-nested-template-variables-drilldown?orgId=1&${__all_variables}&${__url_time_range}"
-              }
-            ],
-            "mappings": [],
-            "max": 100,
-            "min": 0,
-            "nullValueMode": "connected",
-            "thresholds": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ],
-            "unit": "none"
-          },
-          "override": {},
-          "values": false
-        },
-        "orientation": "vertical"
-      },
-      "pluginVersion": "6.4.0-pre",
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "React gauge datalink",
-      "type": "bargauge"
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "gdev-testdata",
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 13,
-        "w": 24,
-        "x": 0,
-        "y": 9
-      },
-      "id": 2,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "alias": "$datacenter.$server.$pod",
-          "refId": "A",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Panel Title",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    }
-  ],
-  "refresh": false,
-  "schemaVersion": 19,
-  "style": "dark",
-  "tags": ["gdev", "templating"],
-  "templating": {
-    "list": [
-      {
-        "allValue": null,
-        "current": {
-          "text": "A",
-          "value": ["A"]
-        },
-        "datasource": "gdev-testdata",
-        "definition": "*",
-        "hide": 0,
-        "includeAll": true,
-        "label": null,
-        "multi": true,
-        "name": "datacenter",
-        "options": [],
-        "query": "*",
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 0,
-        "tagValuesQuery": "",
-        "tags": [],
-        "tagsQuery": "",
-        "type": "query",
-        "useTags": false
-      },
-      {
-        "allValue": null,
-        "current": {
-          "text": "AA",
-          "value": ["AA"]
-        },
-        "datasource": "gdev-testdata",
-        "definition": "$datacenter.*",
-        "hide": 0,
-        "includeAll": true,
-        "label": null,
-        "multi": true,
-        "name": "server",
-        "options": [],
-        "query": "$datacenter.*",
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 0,
-        "tagValuesQuery": "",
-        "tags": [],
-        "tagsQuery": "",
-        "type": "query",
-        "useTags": false
-      },
-      {
-        "allValue": null,
-        "current": {
-          "text": "All",
-          "value": ["$__all"]
-        },
-        "datasource": "gdev-testdata",
-        "definition": "$datacenter.$server.*",
-        "hide": 0,
-        "includeAll": true,
-        "label": null,
-        "multi": true,
-        "name": "pod",
-        "options": [],
-        "query": "$datacenter.$server.*",
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 0,
-        "tagValuesQuery": "",
-        "tags": [],
-        "tagsQuery": "",
-        "type": "query",
-        "useTags": false
-      }
-    ]
-  },
-  "time": {
-    "from": "now-1h",
-    "to": "now"
-  },
-  "timepicker": {
-    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
-  },
-  "timezone": "",
-  "title": "Templating - Nested Template Variables",
-  "uid": "-Y-tnEDWk",
-  "version": 2
-}

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

@@ -1,322 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": "-- Grafana --",
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "type": "dashboard"
-      }
-    ]
-  },
-  "editable": true,
-  "gnetId": null,
-  "graphTooltip": 0,
-  "links": [],
-  "panels": [
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "fill": 0,
-      "fillGradient": 6,
-      "gridPos": {
-        "h": 15,
-        "w": 12,
-        "x": 0,
-        "y": 0
-      },
-      "id": 2,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": true,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "1,20,90,30,5,0,100"
-        },
-        {
-          "refId": "B",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "1,20,90,30,5,-100,200"
-        },
-        {
-          "refId": "C",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "2.5,3.5,4.5,10.5,20.5,21.5,19.5"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Raw Data Graph",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "datasource": "-- Dashboard --",
-      "gridPos": {
-        "h": 5,
-        "w": 12,
-        "x": 12,
-        "y": 0
-      },
-      "id": 4,
-      "options": {
-        "fieldOptions": {
-          "calcs": ["lastNotNull"],
-          "defaults": {
-            "mappings": [],
-            "max": 100,
-            "min": 0,
-            "thresholds": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "override": {},
-          "values": false
-        },
-        "orientation": "auto",
-        "showThresholdLabels": false,
-        "showThresholdMarkers": true
-      },
-      "pluginVersion": "6.4.0-pre",
-      "targets": [
-        {
-          "panelId": 2,
-          "refId": "A"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Last non nulll",
-      "type": "gauge"
-    },
-    {
-      "datasource": "-- Dashboard --",
-      "gridPos": {
-        "h": 5,
-        "w": 12,
-        "x": 12,
-        "y": 5
-      },
-      "id": 6,
-      "options": {
-        "fieldOptions": {
-          "calcs": ["min"],
-          "defaults": {
-            "mappings": [],
-            "max": 100,
-            "min": 0,
-            "thresholds": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "override": {},
-          "values": false
-        },
-        "orientation": "auto",
-        "showThresholdLabels": false,
-        "showThresholdMarkers": true
-      },
-      "pluginVersion": "6.4.0-pre",
-      "targets": [
-        {
-          "panelId": 2,
-          "refId": "A"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "min",
-      "type": "gauge"
-    },
-    {
-      "datasource": "-- Dashboard --",
-      "gridPos": {
-        "h": 5,
-        "w": 12,
-        "x": 12,
-        "y": 10
-      },
-      "id": 5,
-      "options": {
-        "displayMode": "basic",
-        "fieldOptions": {
-          "calcs": ["max"],
-          "defaults": {
-            "mappings": [],
-            "max": 200,
-            "min": 0,
-            "thresholds": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "blue",
-                "value": 40
-              },
-              {
-                "color": "red",
-                "value": 120
-              }
-            ]
-          },
-          "override": {},
-          "values": false
-        },
-        "orientation": "vertical"
-      },
-      "pluginVersion": "6.4.0-pre",
-      "targets": [
-        {
-          "panelId": 2,
-          "refId": "A"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Max",
-      "type": "bargauge"
-    },
-    {
-      "columns": [],
-      "datasource": "-- Dashboard --",
-      "fontSize": "100%",
-      "gridPos": {
-        "h": 10,
-        "w": 24,
-        "x": 0,
-        "y": 15
-      },
-      "id": 8,
-      "options": {},
-      "pageSize": null,
-      "showHeader": true,
-      "sort": {
-        "col": 0,
-        "desc": true
-      },
-      "styles": [
-        {
-          "alias": "Time",
-          "dateFormat": "YYYY-MM-DD HH:mm:ss",
-          "pattern": "Time",
-          "type": "date"
-        },
-        {
-          "alias": "",
-          "colorMode": null,
-          "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
-          "decimals": 2,
-          "pattern": "/.*/",
-          "thresholds": [],
-          "type": "number",
-          "unit": "short"
-        }
-      ],
-      "targets": [
-        {
-          "panelId": 2,
-          "refId": "A"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Panel Title",
-      "transform": "timeseries_to_columns",
-      "type": "table"
-    }
-  ],
-  "schemaVersion": 19,
-  "style": "dark",
-  "tags": ["gdev", "datasource-test"],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-6h",
-    "to": "now"
-  },
-  "timepicker": {
-    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
-  },
-  "timezone": "",
-  "title": "Datasource tests -  Shared Queries",
-  "uid": "ZqZnVvFZz",
-  "version": 10
-}

devenv/dev-dashboards/panel-gauge/gauge-multi-series.json

@@ -21,62 +21,79 @@
       "datasource": "gdev-testdata",
       "gridPos": {
         "h": 8,
-        "w": 20,
+        "w": 24,
         "x": 0,
         "y": 0
       },
       "id": 6,
       "links": [],
-      "options": {
-        "fieldOptions": {
-          "calcs": ["mean"],
-          "defaults": {
-            "decimals": 0,
-            "max": 100,
-            "min": 0,
-            "unit": "none"
-          },
-          "mappings": [],
-          "override": {},
-          "thresholds": [
-            {
-              "color": "#7EB26D",
-              "index": 0,
-              "value": null
-            },
-            {
-              "color": "#EAB839",
-              "index": 1,
-              "value": 50
-            },
-            {
-              "color": "#6ED0E0",
-              "index": 2,
-              "value": 75
-            },
-            {
-              "color": "#EF843C",
-              "index": 3,
-              "value": 87.5
-            },
-            {
-              "color": "#E24D42",
-              "index": 4,
-              "value": 93.75
-            },
-            {
-              "color": "#1F78C1",
-              "index": 5,
-              "value": 96.875
-            }
-          ],
-          "values": false
+      "options-gauge": {
+        "decimals": 0,
+        "maxValue": 100,
+        "minValue": 0,
+        "options": {
+          "decimals": 0,
+          "maxValue": 100,
+          "minValue": 0,
+          "prefix": "",
+          "showThresholdLabels": false,
+          "showThresholdMarkers": true,
+          "stat": "avg",
+          "suffix": "",
+          "thresholds": [],
+          "unit": "none",
+          "valueMappings": []
         },
-        "orientation": "auto",
+        "prefix": "",
         "showThresholdLabels": false,
-        "showThresholdMarkers": true
+        "showThresholdMarkers": true,
+        "stat": "avg",
+        "suffix": "",
+        "thresholds": [
+          {
+            "color": "#1F78C1",
+            "index": 5,
+            "value": 96.875
+          },
+          {
+            "color": "#E24D42",
+            "index": 4,
+            "value": 93.75
+          },
+          {
+            "color": "#EF843C",
+            "index": 3,
+            "value": 87.5
+          },
+          {
+            "color": "#6ED0E0",
+            "index": 2,
+            "value": 75
+          },
+          {
+            "color": "#EAB839",
+            "index": 1,
+            "value": 50
+          },
+          {
+            "color": "#7EB26D",
+            "index": 0,
+            "value": null
+          }
+        ],
+        "unit": "none",
+        "valueMappings": [
+          {
+            "from": "50",
+            "id": 1,
+            "operator": "",
+            "text": "Hello :) ",
+            "to": "90",
+            "type": 2,
+            "value": ""
+          }
+        ]
       },
-      "pluginVersion": "6.3.0-pre",
       "targets": [
         {
           "refId": "A",
@@ -107,115 +124,50 @@
     {
       "datasource": "gdev-testdata",
       "gridPos": {
-        "h": 28,
-        "w": 4,
-        "x": 20,
-        "y": 0
-      },
-      "id": 4,
-      "links": [],
-      "options": {
-        "fieldOptions": {
-          "calcs": ["max"],
-          "defaults": {
-            "decimals": 0,
-            "max": "200",
-            "min": 0,
-            "unit": "none"
-          },
-          "mappings": [],
-          "override": {},
-          "thresholds": [
-            {
-              "color": "#7EB26D",
-              "index": 0,
-              "value": null
-            },
-            {
-              "color": "#EAB839",
-              "index": 1,
-              "value": 50
-            },
-            {
-              "color": "#6ED0E0",
-              "index": 2,
-              "value": 75
-            }
-          ],
-          "values": false
-        },
-        "orientation": "auto",
-        "showThresholdLabels": false,
-        "showThresholdMarkers": true
-      },
-      "pluginVersion": "6.3.0-pre",
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "B",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "C",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "D",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "E",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Vertical",
-      "type": "gauge"
-    },
-    {
-      "datasource": "gdev-testdata",
-      "gridPos": {
-        "h": 20,
-        "w": 20,
+        "h": 8,
+        "w": 24,
         "x": 0,
         "y": 8
       },
       "id": 2,
       "links": [],
-      "options": {
-        "fieldOptions": {
-          "calcs": ["mean"],
-          "defaults": {
-            "decimals": 0,
-            "max": 100,
-            "min": 0,
-            "unit": "none"
-          },
-          "mappings": [],
-          "override": {},
-          "thresholds": [
-            {
-              "color": "#7EB26D",
-              "index": 0,
-              "value": null
-            },
-            {
-              "color": "#EAB839",
-              "index": 1,
-              "value": 50
-            }
-          ],
-          "values": false
+      "options-gauge": {
+        "decimals": 0,
+        "maxValue": 100,
+        "minValue": 0,
+        "options": {
+          "decimals": 0,
+          "maxValue": 100,
+          "minValue": 0,
+          "prefix": "",
+          "showThresholdLabels": false,
+          "showThresholdMarkers": true,
+          "stat": "avg",
+          "suffix": "",
+          "thresholds": [],
+          "unit": "none",
+          "valueMappings": []
         },
-        "orientation": "auto",
+        "prefix": "",
         "showThresholdLabels": false,
-        "showThresholdMarkers": true
+        "showThresholdMarkers": true,
+        "stat": "avg",
+        "suffix": "",
+        "thresholds": [
+          {
+            "color": "#EAB839",
+            "index": 1,
+            "value": 50
+          },
+          {
+            "color": "#7EB26D",
+            "index": 0,
+            "value": null
+          }
+        ],
+        "unit": "none",
+        "valueMappings": []
       },
-      "pluginVersion": "6.3.0-pre",
       "targets": [
         {
           "refId": "A",
@@ -242,9 +194,88 @@
       "timeShift": null,
       "title": "Repeat horizontal",
       "type": "gauge"
+    },
+    {
+      "datasource": "gdev-testdata",
+      "gridPos": {
+        "h": 14,
+        "w": 5,
+        "x": 0,
+        "y": 16
+      },
+      "id": 4,
+      "links": [],
+      "options-gauge": {
+        "decimals": 0,
+        "maxValue": "200",
+        "minValue": 0,
+        "options": {
+          "decimals": 0,
+          "maxValue": 100,
+          "minValue": 0,
+          "prefix": "",
+          "showThresholdLabels": false,
+          "showThresholdMarkers": true,
+          "stat": "avg",
+          "suffix": "",
+          "thresholds": [],
+          "unit": "none",
+          "valueMappings": []
+        },
+        "prefix": "",
+        "showThresholdLabels": false,
+        "showThresholdMarkers": true,
+        "stat": "max",
+        "suffix": "",
+        "thresholds": [
+          {
+            "color": "#6ED0E0",
+            "index": 2,
+            "value": 75
+          },
+          {
+            "color": "#EAB839",
+            "index": 1,
+            "value": 50
+          },
+          {
+            "color": "#7EB26D",
+            "index": 0,
+            "value": null
+          }
+        ],
+        "unit": "none",
+        "valueMappings": []
+      },
+      "targets": [
+        {
+          "refId": "A",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "B",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "C",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "D",
+          "scenarioId": "random_walk"
+        },
+        {
+          "refId": "E",
+          "scenarioId": "random_walk"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Vertical",
+      "type": "gauge"
     }
   ],
-  "schemaVersion": 18,
+  "schemaVersion": 17,
   "style": "dark",
   "tags": ["panel-tests", "gdev", "gauge"],
   "templating": {
@@ -261,5 +292,5 @@
   "timezone": "",
   "title": "Panel Tests - Gauge Multi Series",
   "uid": "szkuR1umk",
-  "version": 2
+  "version": 7
 }

devenv/dev-dashboards/panel-gauge/gauge_tests.json

@@ -44,7 +44,7 @@
       "nullPointMode": "null",
       "options-gauge": {
         "baseColor": "#299c46",
-        "decimals": 2,
+        "decimals": "2",
         "maxValue": 100,
         "minValue": 0,
         "options": {
@@ -111,7 +111,7 @@
       "nullPointMode": "null",
       "options-gauge": {
         "baseColor": "#299c46",
-        "decimals": null,
+        "decimals": "",
         "maxValue": 100,
         "minValue": 0,
         "options": {
@@ -178,7 +178,7 @@
       "nullPointMode": "null",
       "options-gauge": {
         "baseColor": "#299c46",
-        "decimals": null,
+        "decimals": "",
         "maxValue": 100,
         "minValue": 0,
         "options": {

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

@@ -1,383 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": "-- Grafana --",
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "type": "dashboard"
-      }
-    ]
-  },
-  "editable": true,
-  "gnetId": null,
-  "graphTooltip": 0,
-  "links": [],
-  "panels": [
-    {
-      "aliasColors": {
-        "A-series": "rgb(48, 139, 237)"
-      },
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "fill": 1,
-      "fillGradient": 5,
-      "gridPos": {
-        "h": 8,
-        "w": 11,
-        "x": 0,
-        "y": 0
-      },
-      "id": 2,
-      "interval": "1m",
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 2,
-      "links": [],
-      "nullPointMode": "null",
-      "options": {},
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Req/s",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {
-        "A-series": "rgb(87, 186, 242)"
-      },
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "fill": 4,
-      "fillGradient": 4,
-      "gridPos": {
-        "h": 15,
-        "w": 13,
-        "x": 11,
-        "y": 0
-      },
-      "id": 11,
-      "interval": "1m",
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "options": {},
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Req/s",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {
-        "A-series": "red"
-      },
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "fill": 1,
-      "fillGradient": 5,
-      "gridPos": {
-        "h": 7,
-        "w": 11,
-        "x": 0,
-        "y": 8
-      },
-      "id": 7,
-      "interval": "1m",
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "options": {},
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Memory",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "decgbytes",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {
-        "A-series": "green"
-      },
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "fill": 2,
-      "fillGradient": 10,
-      "gridPos": {
-        "h": 8,
-        "w": 24,
-        "x": 0,
-        "y": 15
-      },
-      "id": 10,
-      "interval": "1m",
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 0,
-      "links": [],
-      "nullPointMode": "null",
-      "options": {},
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Req/s",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    }
-  ],
-  "schemaVersion": 18,
-  "style": "dark",
-  "tags": ["gdev", "panel-tests", "graph"],
-  "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 - Gradient Area Fills",
-  "uid": "37Dq903mk",
-  "version": 25
-}

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

@@ -1,810 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": "-- Grafana --",
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "type": "dashboard"
-      }
-    ]
-  },
-  "editable": true,
-  "gnetId": null,
-  "graphTooltip": 0,
-  "links": [],
-  "panels": [
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 7,
-        "w": 8,
-        "x": 0,
-        "y": 0
-      },
-      "id": 7,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "0,500,1000,3000,2500,4000,4500,5000,7000,7500,8000,8500,9000,9500,10000"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Data from 0 - 10K (unit short)",
-      "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": "10000",
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 7,
-        "w": 8,
-        "x": 8,
-        "y": 0
-      },
-      "id": 5,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "0,500,1000,3000,2500,4000,4500,5000,7000,7500,8000,8500,9000,9500,10000"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Data from 0 - 10K (unit bytes metric)",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "decbytes",
-          "label": null,
-          "logBase": 1,
-          "max": "10000",
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 7,
-        "w": 8,
-        "x": 16,
-        "y": 0
-      },
-      "id": 4,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "0,500,1000,3000,2500,4000,4500,5000,7000,7500,8000,8500,9000,9500,10000"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Data from 0 - 10K (unit bytes IEC)",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "bytes",
-          "label": null,
-          "logBase": 1,
-          "max": "10000",
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 9,
-        "w": 8,
-        "x": 0,
-        "y": 7
-      },
-      "id": 2,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "0,500,1000,3000,2500,4000,4500,5000,7000,7500,8000,8500,9000,9500,10000"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Data from 0 - 10K (unit short)",
-      "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": "10000",
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 9,
-        "w": 8,
-        "x": 8,
-        "y": 7
-      },
-      "id": 3,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "0.001,0.0002,0.0003"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Data from 0.0002 - 0.001 (unit short)",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "decimals": null,
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 9,
-        "w": 8,
-        "x": 16,
-        "y": 7
-      },
-      "id": 6,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "12000,15000,20000"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Data from 12000 - 30000 (unit ms)",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "decimals": null,
-          "format": "ms",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "description": "",
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 9,
-        "w": 8,
-        "x": 0,
-        "y": 16
-      },
-      "id": 9,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "0,10000000000"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Data from 0 - 1B (unit short)",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "description": "",
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 9,
-        "w": 8,
-        "x": 8,
-        "y": 16
-      },
-      "id": 10,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "0,10000000000"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Data from 0 - 1B (unit bytes)",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "decimals": null,
-          "format": "decbytes",
-          "label": "",
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 11,
-        "w": 8,
-        "x": 16,
-        "y": 16
-      },
-      "id": 8,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "12000,15000,20000"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Data from 12000 - 30000 (unit ms)",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "decimals": null,
-          "format": "ms",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    }
-  ],
-  "refresh": false,
-  "schemaVersion": 19,
-  "style": "dark",
-  "tags": ["gdev", "panel-tests"],
-  "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 - Y axis ticks",
-  "uid": "P7vAAhvZk",
-  "version": 1
-}

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

@@ -876,8 +876,8 @@
               "value": "celsius"
             },
             {
-              "text": "Fahrenheit (°F)",
-              "value": "fahrenheit"
+              "text": "Farenheit (°F)",
+              "value": "farenheit"
             },
             {
               "text": "Kelvin (K)",
@@ -1975,8 +1975,8 @@
               "value": "celsius"
             },
             {
-              "text": "Fahrenheit (°F)",
-              "value": "fahrenheit"
+              "text": "Farenheit (°F)",
+              "value": "farenheit"
             },
             {
               "text": "Kelvin (K)",
@@ -3054,8 +3054,8 @@
               "value": "celsius"
             },
             {
-              "text": "Fahrenheit (°F)",
-              "value": "fahrenheit"
+              "text": "Farenheit (°F)",
+              "value": "farenheit"
             },
             {
               "text": "Kelvin (K)",

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

@@ -501,237 +501,6 @@
         }
       ],
       "valueName": "current"
-    },
-    {
-      "cacheTimeout": null,
-      "colorBackground": false,
-      "colorPrefix": false,
-      "colorValue": false,
-      "colors": ["#299c46", "rgba(237, 129, 40, 0.89)", "#d44a3a"],
-      "datasource": "gdev-testdata",
-      "decimals": null,
-      "description": "",
-      "format": "none",
-      "gauge": {
-        "maxValue": 150,
-        "minValue": 0,
-        "show": false,
-        "thresholdLabels": false,
-        "thresholdMarkers": true
-      },
-      "gridPos": {
-        "h": 4,
-        "w": 8,
-        "x": 0,
-        "y": 14
-      },
-      "id": 8,
-      "interval": null,
-      "links": [],
-      "mappingType": 1,
-      "mappingTypes": [
-        {
-          "name": "value to text",
-          "value": 1
-        },
-        {
-          "name": "range to text",
-          "value": 2
-        }
-      ],
-      "maxDataPoints": 100,
-      "nullPointMode": "connected",
-      "nullText": null,
-      "options": {},
-      "postfix": "",
-      "postfixFontSize": "50%",
-      "prefix": "",
-      "prefixFontSize": "50%",
-      "rangeMaps": [
-        {
-          "from": "null",
-          "text": "N/A",
-          "to": "null"
-        }
-      ],
-      "sparkline": {
-        "fillColor": "rgba(31, 118, 189, 0.18)",
-        "full": true,
-        "lineColor": "rgb(31, 120, 193)",
-        "show": false
-      },
-      "tableColumn": "Info",
-      "targets": [
-        {
-          "alias": "",
-          "expr": "",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "refId": "A",
-          "scenarioId": "random_walk_table",
-          "stringInput": ""
-        }
-      ],
-      "thresholds": "81,90",
-      "title": "TableData 'Info' string Column",
-      "type": "singlestat",
-      "valueFontSize": "80%",
-      "valueMaps": [],
-      "valueName": "current"
-    },
-    {
-      "cacheTimeout": null,
-      "colorBackground": false,
-      "colorPrefix": false,
-      "colorValue": false,
-      "colors": ["#299c46", "rgba(237, 129, 40, 0.89)", "#d44a3a"],
-      "datasource": "gdev-testdata",
-      "decimals": 2,
-      "description": "",
-      "format": "celsius",
-      "gauge": {
-        "maxValue": 150,
-        "minValue": 0,
-        "show": false,
-        "thresholdLabels": false,
-        "thresholdMarkers": true
-      },
-      "gridPos": {
-        "h": 4,
-        "w": 8,
-        "x": 8,
-        "y": 14
-      },
-      "id": 9,
-      "interval": null,
-      "links": [],
-      "mappingType": 1,
-      "mappingTypes": [
-        {
-          "name": "value to text",
-          "value": 1
-        },
-        {
-          "name": "range to text",
-          "value": 2
-        }
-      ],
-      "maxDataPoints": 100,
-      "nullPointMode": "connected",
-      "nullText": null,
-      "options": {},
-      "postfix": "",
-      "postfixFontSize": "50%",
-      "prefix": "",
-      "prefixFontSize": "50%",
-      "rangeMaps": [
-        {
-          "from": "null",
-          "text": "N/A",
-          "to": "null"
-        }
-      ],
-      "sparkline": {
-        "fillColor": "rgba(31, 118, 189, 0.18)",
-        "full": true,
-        "lineColor": "rgb(31, 120, 193)",
-        "show": false
-      },
-      "tableColumn": "Min",
-      "targets": [
-        {
-          "alias": "",
-          "expr": "",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "refId": "A",
-          "scenarioId": "random_walk_table",
-          "stringInput": ""
-        }
-      ],
-      "thresholds": "81,90",
-      "title": "TableData 'Value' as temp Column",
-      "type": "singlestat",
-      "valueFontSize": "80%",
-      "valueMaps": [],
-      "valueName": "current"
-    },
-    {
-      "cacheTimeout": null,
-      "colorBackground": false,
-      "colorPrefix": false,
-      "colorValue": false,
-      "colors": ["#299c46", "rgba(237, 129, 40, 0.89)", "#d44a3a"],
-      "datasource": "gdev-testdata",
-      "decimals": null,
-      "description": "",
-      "format": "dateTimeFromNow",
-      "gauge": {
-        "maxValue": 150,
-        "minValue": 0,
-        "show": false,
-        "thresholdLabels": false,
-        "thresholdMarkers": true
-      },
-      "gridPos": {
-        "h": 4,
-        "w": 8,
-        "x": 16,
-        "y": 14
-      },
-      "id": 10,
-      "interval": null,
-      "links": [],
-      "mappingType": 1,
-      "mappingTypes": [
-        {
-          "name": "value to text",
-          "value": 1
-        },
-        {
-          "name": "range to text",
-          "value": 2
-        }
-      ],
-      "maxDataPoints": 100,
-      "nullPointMode": "connected",
-      "nullText": null,
-      "options": {},
-      "postfix": "",
-      "postfixFontSize": "50%",
-      "prefix": "",
-      "prefixFontSize": "50%",
-      "rangeMaps": [
-        {
-          "from": "null",
-          "text": "N/A",
-          "to": "null"
-        }
-      ],
-      "sparkline": {
-        "fillColor": "rgba(31, 118, 189, 0.18)",
-        "full": true,
-        "lineColor": "rgb(31, 120, 193)",
-        "show": false
-      },
-      "tableColumn": "time",
-      "targets": [
-        {
-          "alias": "",
-          "expr": "",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "refId": "A",
-          "scenarioId": "random_walk",
-          "stringInput": ""
-        }
-      ],
-      "thresholds": "81,90",
-      "title": "last_time display (a few seconds ago)",
-      "type": "singlestat",
-      "valueFontSize": "80%",
-      "valueMaps": [],
-      "valueName": "last_time"
     }
   ],
   "refresh": false,

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

@@ -1,647 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": "-- Grafana --",
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "type": "dashboard"
-      }
-    ]
-  },
-  "editable": true,
-  "gnetId": null,
-  "graphTooltip": 0,
-  "links": [],
-  "panels": [
-    {
-      "datasource": null,
-      "gridPos": {
-        "h": 7,
-        "w": 20,
-        "x": 0,
-        "y": 0
-      },
-      "id": 2,
-      "interval": "10m",
-      "options": {
-        "colorMode": 0,
-        "displayMode": 2,
-        "fieldOptions": {
-          "calcs": ["mean"],
-          "defaults": {
-            "mappings": [],
-            "max": 100,
-            "min": 0,
-            "thresholds": [
-              {
-                "color": "blue",
-                "value": null
-              },
-              {
-                "color": "green",
-                "value": 10
-              },
-              {
-                "color": "purple",
-                "value": 20
-              },
-              {
-                "color": "orange",
-                "value": 40
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ],
-            "unit": "percent"
-          },
-          "override": {},
-          "values": false
-        },
-        "orientation": "auto",
-        "sparkline": {
-          "show": true
-        }
-      },
-      "pluginVersion": "6.5.0-pre",
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "B",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "C",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "D",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "E",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "F",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "G",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Panel Title",
-      "type": "singlestat2"
-    },
-    {
-      "datasource": null,
-      "gridPos": {
-        "h": 20,
-        "w": 4,
-        "x": 20,
-        "y": 0
-      },
-      "id": 8,
-      "interval": "10m",
-      "options": {
-        "colorMode": 0,
-        "displayMode": 2,
-        "fieldOptions": {
-          "calcs": ["mean"],
-          "defaults": {
-            "mappings": [],
-            "max": 100,
-            "min": 0,
-            "thresholds": [
-              {
-                "color": "blue",
-                "value": null
-              },
-              {
-                "color": "green",
-                "value": 10
-              },
-              {
-                "color": "purple",
-                "value": 20
-              },
-              {
-                "color": "orange",
-                "value": 40
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ],
-            "unit": "percent"
-          },
-          "override": {},
-          "values": false
-        },
-        "orientation": "auto",
-        "sparkline": {
-          "show": true
-        }
-      },
-      "pluginVersion": "6.5.0-pre",
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "B",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "C",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "D",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "E",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "F",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "G",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Panel Title",
-      "type": "singlestat2"
-    },
-    {
-      "datasource": null,
-      "gridPos": {
-        "h": 3,
-        "w": 20,
-        "x": 0,
-        "y": 7
-      },
-      "id": 6,
-      "interval": "10m",
-      "options": {
-        "colorMode": 0,
-        "displayMode": 2,
-        "fieldOptions": {
-          "calcs": ["mean"],
-          "defaults": {
-            "mappings": [],
-            "max": 100,
-            "min": 0,
-            "thresholds": [
-              {
-                "color": "blue",
-                "value": null
-              },
-              {
-                "color": "green",
-                "value": 10
-              },
-              {
-                "color": "purple",
-                "value": 20
-              },
-              {
-                "color": "orange",
-                "value": 40
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ],
-            "unit": "percent"
-          },
-          "override": {},
-          "values": false
-        },
-        "orientation": "auto",
-        "sparkline": {
-          "show": true
-        }
-      },
-      "pluginVersion": "6.5.0-pre",
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "B",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "C",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "D",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "E",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "F",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "G",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Panel Title",
-      "type": "singlestat2"
-    },
-    {
-      "datasource": null,
-      "gridPos": {
-        "h": 6,
-        "w": 20,
-        "x": 0,
-        "y": 10
-      },
-      "id": 3,
-      "interval": "10m",
-      "options": {
-        "colorMode": 0,
-        "displayMode": 3,
-        "fieldOptions": {
-          "calcs": ["mean"],
-          "defaults": {
-            "mappings": [],
-            "max": 100,
-            "min": 0,
-            "thresholds": [
-              {
-                "color": "blue",
-                "value": null
-              },
-              {
-                "color": "green",
-                "value": 10
-              },
-              {
-                "color": "purple",
-                "value": 20
-              },
-              {
-                "color": "orange",
-                "value": 40
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ],
-            "unit": "percent"
-          },
-          "override": {},
-          "values": false
-        },
-        "orientation": "auto",
-        "sparkline": {
-          "show": true
-        }
-      },
-      "pluginVersion": "6.5.0-pre",
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "B",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "C",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "D",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "E",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "F",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "G",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Panel Title",
-      "type": "singlestat2"
-    },
-    {
-      "datasource": null,
-      "gridPos": {
-        "h": 6,
-        "w": 20,
-        "x": 0,
-        "y": 16
-      },
-      "id": 4,
-      "interval": "10m",
-      "options": {
-        "colorMode": 0,
-        "displayMode": 0,
-        "fieldOptions": {
-          "calcs": ["mean"],
-          "defaults": {
-            "mappings": [],
-            "max": 100,
-            "min": 0,
-            "thresholds": [
-              {
-                "color": "blue",
-                "value": null
-              },
-              {
-                "color": "green",
-                "value": 10
-              },
-              {
-                "color": "purple",
-                "value": 20
-              },
-              {
-                "color": "orange",
-                "value": 40
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ],
-            "unit": "percent"
-          },
-          "override": {},
-          "values": false
-        },
-        "orientation": "auto",
-        "sparkline": {
-          "show": true
-        }
-      },
-      "pluginVersion": "6.5.0-pre",
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "B",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "C",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "D",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "E",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "F",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "G",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Panel Title",
-      "type": "singlestat2"
-    },
-    {
-      "datasource": null,
-      "gridPos": {
-        "h": 21,
-        "w": 4,
-        "x": 20,
-        "y": 20
-      },
-      "id": 9,
-      "interval": "10m",
-      "options": {
-        "colorMode": 0,
-        "displayMode": 0,
-        "fieldOptions": {
-          "calcs": ["mean"],
-          "defaults": {
-            "mappings": [],
-            "max": 100,
-            "min": 0,
-            "thresholds": [
-              {
-                "color": "blue",
-                "value": null
-              },
-              {
-                "color": "green",
-                "value": 10
-              },
-              {
-                "color": "purple",
-                "value": 20
-              },
-              {
-                "color": "orange",
-                "value": 40
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ],
-            "unit": "percent"
-          },
-          "override": {},
-          "values": false
-        },
-        "orientation": "auto",
-        "sparkline": {
-          "show": true
-        }
-      },
-      "pluginVersion": "6.5.0-pre",
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "B",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "C",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "D",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "E",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "F",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "G",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Panel Title",
-      "type": "singlestat2"
-    },
-    {
-      "datasource": null,
-      "gridPos": {
-        "h": 6,
-        "w": 20,
-        "x": 0,
-        "y": 22
-      },
-      "id": 5,
-      "interval": "10m",
-      "options": {
-        "colorMode": 0,
-        "displayMode": 1,
-        "fieldOptions": {
-          "calcs": ["mean"],
-          "defaults": {
-            "mappings": [],
-            "max": 100,
-            "min": 0,
-            "thresholds": [
-              {
-                "color": "blue",
-                "value": null
-              },
-              {
-                "color": "green",
-                "value": 10
-              },
-              {
-                "color": "purple",
-                "value": 20
-              },
-              {
-                "color": "orange",
-                "value": 40
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ],
-            "unit": "percent"
-          },
-          "override": {},
-          "values": false
-        },
-        "orientation": "auto",
-        "sparkline": {
-          "show": true
-        }
-      },
-      "pluginVersion": "6.5.0-pre",
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "B",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "C",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "D",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "E",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "F",
-          "scenarioId": "random_walk"
-        },
-        {
-          "refId": "G",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Panel Title",
-      "type": "singlestat2"
-    }
-  ],
-  "schemaVersion": 20,
-  "style": "dark",
-  "tags": ["gdev", "panel-tests"],
-  "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 - Stat",
-  "uid": "jWWHNJpWz",
-  "version": 6
-}

devenv/docker/blocks/apache_proxy_mac/Dockerfile

@@ -1,4 +0,0 @@
-FROM jmferrer/apache2-reverse-proxy:latest
-
-COPY ports.conf /etc/apache2/sites-enabled
-COPY proxy.conf /etc/apache2/sites-enabled

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

@@ -1,10 +0,0 @@
-# This will proxy all requests for http://localhost:10081/grafana/ to
-# http://localhost:3000 (Grafana running locally)
-#
-# Please note that you'll need to change the root_url in the Grafana configuration:
-# root_url = %(protocol)s://%(domain)s:10081/grafana/
-
-  apacheproxy:
-    build: docker/blocks/apache_proxy_mac
-    ports:
-      - "10081:10081"

devenv/docker/blocks/apache_proxy_mac/ports.conf

@@ -1 +0,0 @@
-Listen 10081

devenv/docker/blocks/apache_proxy_mac/proxy.conf

@@ -1,4 +0,0 @@
-<VirtualHost *:10081>
-    ProxyPass /grafana/ http://host.docker.internal:3000/
-    ProxyPassReverse /grafana/ http://host.docker.internal:3000/
-</VirtualHost>

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

@@ -21,19 +21,3 @@
       - ./docker/blocks/elastic7/filebeat.yml:/usr/share/filebeat/filebeat.yml:ro
       - /var/log:/var/log:ro
       - ../data/log:/var/log/grafana:ro
-
-  metricbeat7:
-    image: docker.elastic.co/beats/metricbeat-oss:7.0.0
-    network_mode: host
-    command: metricbeat -e -strict.perms=false
-    user: root
-    volumes:
-      - ./docker/blocks/elastic7/metricbeat.yml:/usr/share/metricbeat/metricbeat.yml:ro
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-
-  kibana7:
-    image: docker.elastic.co/kibana/kibana-oss:7.0.0
-    ports:
-      - "5601:5601"
-    environment:
-      ELASTICSEARCH_HOSTS: http://elasticsearch7:9200

devenv/docker/blocks/elastic7/metricbeat.yml

@@ -1,38 +0,0 @@
-metricbeat.config:
-  modules:
-    path: ${path.config}/modules.d/*.yml
-    # Reload module configs as they change:
-    reload.enabled: false
-
-metricbeat.autodiscover:
-  providers:
-    - type: docker
-      hints.enabled: true
-
-metricbeat.modules:
-- module: docker
-  metricsets:
-    - "container"
-    - "cpu"
-    - "diskio"
-    - "healthcheck"
-    - "info"
-    #- "image"
-    - "memory"
-    - "network"
-  hosts: ["unix:///var/run/docker.sock"]
-  period: 10s
-  enabled: true
-
-processors:
-  - add_cloud_metadata: ~
-
-output.elasticsearch:
-  hosts: ["localhost:12200"]
-  index: "metricbeat-%{+yyyy.MM.dd}"
-
-setup.template.name: "metricbeat"
-setup.template.pattern: "metricbeat-*"
-setup.template.settings:
-  index.number_of_shards: 1
-  index.number_of_replicas: 1

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

@@ -1,5 +1,5 @@
   influxdb:
-    image: influxdb:1.7.6
+    image: influxdb:latest
     container_name: influxdb
     ports:
       - '2004:2004'
@@ -15,13 +15,3 @@
     environment:
       FD_DATASOURCE: influxdb
       FD_PORT: 8086
-
-  telegraf:
-    image: telegraf:1.10.4
-    links:
-      - influxdb
-    volumes:
-      - ./docker/blocks/influxdb/telegraf.conf:/etc/telegraf/telegraf.conf:ro
-      - /var/log:/var/log
-      - ../data/log:/var/log/grafana
-

devenv/docker/blocks/multiple-openldap/admins-ldap-server.Dockerfile

@@ -1,30 +0,0 @@
-# Fork of https://github.com/dinkel/docker-openldap
-
-FROM debian:jessie
-
-LABEL maintainer="Grafana team <hello@grafana.com>"
-
-ENV OPENLDAP_VERSION 2.4.40
-
-RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
-        slapd=${OPENLDAP_VERSION}* \
-        ldap-utils && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN mv /etc/ldap /etc/ldap.dist
-
-EXPOSE 389
-
-VOLUME ["/etc/ldap", "/var/lib/ldap"]
-
-COPY admins-ldap-server/modules/ /etc/ldap.dist/modules
-COPY admins-ldap-server/prepopulate/ /etc/ldap.dist/prepopulate
-
-COPY ./entrypoint.sh /entrypoint.sh
-COPY ./prepopulate.sh /prepopulate.sh
-
-ENTRYPOINT ["/entrypoint.sh"]
-
-CMD ["slapd", "-d", "32768", "-u", "openldap", "-g", "openldap"]

devenv/docker/blocks/multiple-openldap/admins-ldap-server/modules/memberof.ldif

@@ -1,33 +0,0 @@
-dn: cn=module,cn=config
-cn: module
-objectClass: olcModuleList
-objectClass: top
-olcModulePath: /usr/lib/ldap
-olcModuleLoad: memberof.la
-
-dn: olcOverlay={0}memberof,olcDatabase={1}hdb,cn=config
-objectClass: olcConfig
-objectClass: olcMemberOf
-objectClass: olcOverlayConfig
-objectClass: top
-olcOverlay: memberof
-olcMemberOfDangling: ignore
-olcMemberOfRefInt: TRUE
-olcMemberOfGroupOC: groupOfNames
-olcMemberOfMemberAD: member
-olcMemberOfMemberOfAD: memberOf
-
-dn: cn=module,cn=config
-cn: module
-objectClass: olcModuleList
-objectClass: top
-olcModulePath: /usr/lib/ldap
-olcModuleLoad: refint.la
-
-dn: olcOverlay={1}refint,olcDatabase={1}hdb,cn=config
-objectClass: olcConfig
-objectClass: olcOverlayConfig
-objectClass: olcRefintConfig
-objectClass: top
-olcOverlay: {1}refint
-olcRefintAttribute: memberof member manager owner

devenv/docker/blocks/multiple-openldap/admins-ldap-server/prepopulate/1_units.ldif

@@ -1,9 +0,0 @@
-dn: ou=groups,dc=grafana,dc=org
-ou: Groups
-objectclass: top
-objectclass: organizationalUnit
-
-dn: ou=users,dc=grafana,dc=org
-ou: Users
-objectclass: top
-objectclass: organizationalUnit

devenv/docker/blocks/multiple-openldap/admins-ldap-server/prepopulate/2_users.ldif

@@ -1,20 +0,0 @@
-# ldap-admin
-dn: cn=ldap-admin,ou=users,dc=grafana,dc=org
-mail: ldap-admin@grafana.com
-userPassword: grafana
-objectClass: person
-objectClass: top
-objectClass: inetOrgPerson
-objectClass: organizationalPerson
-sn: ldap-admin
-cn: ldap-admin
-
-dn: cn=ldap-torkel,ou=users,dc=grafana,dc=org
-mail: ldap-torkel@grafana.com
-userPassword: grafana
-objectClass: person
-objectClass: top
-objectClass: inetOrgPerson
-objectClass: organizationalPerson
-sn: ldap-torkel
-cn: ldap-torkel

devenv/docker/blocks/multiple-openldap/admins-ldap-server/prepopulate/3_groups.ldif

@@ -1,6 +0,0 @@
-dn: cn=admins,ou=groups,dc=grafana,dc=org
-cn: admins
-objectClass: groupOfNames
-objectClass: top
-member: cn=ldap-admin,ou=users,dc=grafana,dc=org
-member: cn=ldap-torkel,ou=users,dc=grafana,dc=org

devenv/docker/blocks/multiple-openldap/docker-compose.yaml

@@ -1,23 +0,0 @@
-  admins-openldap:
-    build: 
-      context: docker/blocks/multiple-openldap
-      dockerfile: ./admins-ldap-server.Dockerfile
-    environment:
-      SLAPD_PASSWORD: grafana
-      SLAPD_DOMAIN: grafana.org
-      SLAPD_ADDITIONAL_MODULES: memberof
-    ports:
-      - "389:389"
-
-  openldap:
-    build: 
-      context: docker/blocks/multiple-openldap
-      dockerfile: ./ldap-server.Dockerfile
-    environment:
-      SLAPD_PASSWORD: grafana
-      SLAPD_DOMAIN: grafana.org
-      SLAPD_ADDITIONAL_MODULES: memberof
-    ports:
-      - "388:389"
-
-

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

@@ -1,98 +0,0 @@
-#!/bin/bash
-
-# When not limiting the open file descritors limit, the memory consumption of
-# slapd is absurdly high. See https://github.com/docker/docker/issues/8231
-ulimit -n 8192
-
-
-set -e
-
-chown -R openldap:openldap /var/lib/ldap/
-
-if [[ ! -d /etc/ldap/slapd.d ]]; then
-
-    if [[ -z "$SLAPD_PASSWORD" ]]; then
-        echo -n >&2 "Error: Container not configured and SLAPD_PASSWORD not set. "
-        echo >&2 "Did you forget to add -e SLAPD_PASSWORD=... ?"
-        exit 1
-    fi
-
-    if [[ -z "$SLAPD_DOMAIN" ]]; then
-        echo -n >&2 "Error: Container not configured and SLAPD_DOMAIN not set. "
-        echo >&2 "Did you forget to add -e SLAPD_DOMAIN=... ?"
-        exit 1
-    fi
-
-    SLAPD_ORGANIZATION="${SLAPD_ORGANIZATION:-${SLAPD_DOMAIN}}"
-
-    cp -a /etc/ldap.dist/* /etc/ldap
-
-    cat <<-EOF | debconf-set-selections
-        slapd slapd/no_configuration boolean false
-        slapd slapd/password1 password $SLAPD_PASSWORD
-        slapd slapd/password2 password $SLAPD_PASSWORD
-        slapd shared/organization string $SLAPD_ORGANIZATION
-        slapd slapd/domain string $SLAPD_DOMAIN
-        slapd slapd/backend select HDB
-        slapd slapd/allow_ldap_v2 boolean false
-        slapd slapd/purge_database boolean false
-        slapd slapd/move_old_database boolean true
-EOF
-
-    dpkg-reconfigure -f noninteractive slapd >/dev/null 2>&1
-
-    dc_string=""
-
-    IFS="."; declare -a dc_parts=($SLAPD_DOMAIN)
-
-    for dc_part in "${dc_parts[@]}"; do
-        dc_string="$dc_string,dc=$dc_part"
-    done
-
-    base_string="BASE ${dc_string:1}"
-
-    sed -i "s/^#BASE.*/${base_string}/g" /etc/ldap/ldap.conf
-
-    if [[ -n "$SLAPD_CONFIG_PASSWORD" ]]; then
-        password_hash=`slappasswd -s "${SLAPD_CONFIG_PASSWORD}"`
-
-        sed_safe_password_hash=${password_hash//\//\\\/}
-
-        slapcat -n0 -F /etc/ldap/slapd.d -l /tmp/config.ldif
-        sed -i "s/\(olcRootDN: cn=admin,cn=config\)/\1\nolcRootPW: ${sed_safe_password_hash}/g" /tmp/config.ldif
-        rm -rf /etc/ldap/slapd.d/*
-        slapadd -n0 -F /etc/ldap/slapd.d -l /tmp/config.ldif >/dev/null 2>&1
-    fi
-
-    if [[ -n "$SLAPD_ADDITIONAL_SCHEMAS" ]]; then
-        IFS=","; declare -a schemas=($SLAPD_ADDITIONAL_SCHEMAS); unset IFS
-
-        for schema in "${schemas[@]}"; do
-            slapadd -n0 -F /etc/ldap/slapd.d -l "/etc/ldap/schema/${schema}.ldif" >/dev/null 2>&1
-        done
-    fi
-
-    if [[ -n "$SLAPD_ADDITIONAL_MODULES" ]]; then
-        IFS=","; declare -a modules=($SLAPD_ADDITIONAL_MODULES); unset IFS
-
-        for module in "${modules[@]}"; do
-          echo "Adding module ${module}"
-          slapadd -n0 -F /etc/ldap/slapd.d -l "/etc/ldap/modules/${module}.ldif" >/dev/null 2>&1
-        done
-    fi
-
-    # This needs to run in background
-    # Will prepopulate entries after ldap daemon has started
-    ./prepopulate.sh &
-
-    chown -R openldap:openldap /etc/ldap/slapd.d/ /var/lib/ldap/ /var/run/slapd/
-else
-    slapd_configs_in_env=`env | grep 'SLAPD_'`
-
-    if [ -n "${slapd_configs_in_env:+x}" ]; then
-        echo "Info: Container already configured, therefore ignoring SLAPD_xxx environment variables"
-    fi
-fi
-
-exec "$@"
-

devenv/docker/blocks/multiple-openldap/ldap-server.Dockerfile

@@ -1,30 +0,0 @@
-# Fork of https://github.com/dinkel/docker-openldap
-
-FROM debian:jessie
-
-LABEL maintainer="Grafana team <hello@grafana.com>"
-
-ENV OPENLDAP_VERSION 2.4.40
-
-RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
-        slapd=${OPENLDAP_VERSION}* \
-        ldap-utils && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN mv /etc/ldap /etc/ldap.dist
-
-EXPOSE 389
-
-VOLUME ["/etc/ldap", "/var/lib/ldap"]
-
-COPY ldap-server/modules/ /etc/ldap.dist/modules
-COPY ldap-server/prepopulate/ /etc/ldap.dist/prepopulate
-
-COPY ./entrypoint.sh /entrypoint.sh
-COPY ./prepopulate.sh /prepopulate.sh
-
-ENTRYPOINT ["/entrypoint.sh"]
-
-CMD ["slapd", "-d", "32768", "-u", "openldap", "-g", "openldap"]

devenv/docker/blocks/multiple-openldap/ldap-server/modules/memberof.ldif

@@ -1,33 +0,0 @@
-dn: cn=module,cn=config
-cn: module
-objectClass: olcModuleList
-objectClass: top
-olcModulePath: /usr/lib/ldap
-olcModuleLoad: memberof.la
-
-dn: olcOverlay={0}memberof,olcDatabase={1}hdb,cn=config
-objectClass: olcConfig
-objectClass: olcMemberOf
-objectClass: olcOverlayConfig
-objectClass: top
-olcOverlay: memberof
-olcMemberOfDangling: ignore
-olcMemberOfRefInt: TRUE
-olcMemberOfGroupOC: groupOfNames
-olcMemberOfMemberAD: member
-olcMemberOfMemberOfAD: memberOf
-
-dn: cn=module,cn=config
-cn: module
-objectClass: olcModuleList
-objectClass: top
-olcModulePath: /usr/lib/ldap
-olcModuleLoad: refint.la
-
-dn: olcOverlay={1}refint,olcDatabase={1}hdb,cn=config
-objectClass: olcConfig
-objectClass: olcOverlayConfig
-objectClass: olcRefintConfig
-objectClass: top
-olcOverlay: {1}refint
-olcRefintAttribute: memberof member manager owner

devenv/docker/blocks/multiple-openldap/ldap-server/prepopulate/1_units.ldif

@@ -1,9 +0,0 @@
-dn: ou=groups,dc=grafana,dc=org
-ou: Groups
-objectclass: top
-objectclass: organizationalUnit
-
-dn: ou=users,dc=grafana,dc=org
-ou: Users
-objectclass: top
-objectclass: organizationalUnit

devenv/docker/blocks/multiple-openldap/ldap-server/prepopulate/2_users.ldif

@@ -1,59 +0,0 @@
-dn: cn=ldap-editor,ou=users,dc=grafana,dc=org
-mail: ldap-editor@grafana.com
-userPassword: grafana
-objectClass: person
-objectClass: top
-objectClass: inetOrgPerson
-objectClass: organizationalPerson
-sn: ldap-editor
-cn: ldap-editor
-
-dn: cn=ldap-viewer,ou=users,dc=grafana,dc=org
-mail: ldap-viewer@grafana.com
-userPassword: grafana
-objectClass: person
-objectClass: top
-objectClass: inetOrgPerson
-objectClass: organizationalPerson
-sn: ldap-viewer
-cn: ldap-viewer
-
-dn: cn=ldap-carl,ou=users,dc=grafana,dc=org
-mail: ldap-carl@grafana.com
-userPassword: grafana
-objectClass: person
-objectClass: top
-objectClass: inetOrgPerson
-objectClass: organizationalPerson
-sn: ldap-carl
-cn: ldap-carl
-
-dn: cn=ldap-daniel,ou=users,dc=grafana,dc=org
-mail: ldap-daniel@grafana.com
-userPassword: grafana
-objectClass: person
-objectClass: top
-objectClass: inetOrgPerson
-objectClass: organizationalPerson
-sn: ldap-daniel
-cn: ldap-daniel
-
-dn: cn=ldap-leo,ou=users,dc=grafana,dc=org
-mail: ldap-leo@grafana.com
-userPassword: grafana
-objectClass: person
-objectClass: top
-objectClass: inetOrgPerson
-objectClass: organizationalPerson
-sn: ldap-leo
-cn: ldap-leo
-
-dn: cn=ldap-tobias,ou=users,dc=grafana,dc=org
-mail: ldap-tobias@grafana.com
-userPassword: grafana
-objectClass: person
-objectClass: top
-objectClass: inetOrgPerson
-objectClass: organizationalPerson
-sn: ldap-tobias
-cn: ldap-tobias

devenv/docker/blocks/multiple-openldap/ldap-server/prepopulate/3_groups.ldif

@@ -1,23 +0,0 @@
-dn: cn=admins,ou=groups,dc=grafana,dc=org
-cn: admins
-objectClass: groupOfNames
-objectClass: top
-
-dn: cn=editors,ou=groups,dc=grafana,dc=org
-cn: editors
-objectClass: groupOfNames
-member: cn=ldap-editor,ou=users,dc=grafana,dc=org
-
-dn: cn=backend,ou=groups,dc=grafana,dc=org
-cn: backend
-objectClass: groupOfNames
-member: cn=ldap-carl,ou=users,dc=grafana,dc=org
-member: cn=ldap-leo,ou=users,dc=grafana,dc=org
-member: cn=ldap-torkel,ou=users,dc=grafana,dc=org
-
-dn: cn=frontend,ou=groups,dc=grafana,dc=org
-cn: frontend
-objectClass: groupOfNames
-member: cn=ldap-torkel,ou=users,dc=grafana,dc=org
-member: cn=ldap-daniel,ou=users,dc=grafana,dc=org
-member: cn=ldap-leo,ou=users,dc=grafana,dc=org

devenv/docker/blocks/multiple-openldap/ldap_dev.toml

@@ -1,59 +0,0 @@
-# To troubleshoot and get more log info enable ldap debug logging in grafana.ini
-# [log]
-# filters = ldap:debug
-
-# For the verbose comments options see "openldap" env block
-
-# --- First LDAP Server (only admins) ---
-
-[[servers]]
-host = "127.0.0.1"
-port = 389
-use_ssl = false
-start_tls = false
-ssl_skip_verify = false
-bind_dn = "cn=admin,dc=grafana,dc=org"
-bind_password = 'grafana'
-search_filter = "(cn=%s)"
-search_base_dns = ["ou=users,dc=grafana,dc=org"]
-
-[servers.attributes]
-name = "givenName"
-surname = "sn"
-username = "cn"
-member_of = "memberOf"
-email =  "email"
-
-[[servers.group_mappings]]
-group_dn = "cn=admins,ou=groups,dc=grafana,dc=org"
-org_role = "Admin"
-grafana_admin = true
-
-# --- Second LDAP Server (rest of the users) ---
-
-[[servers]]
-host = "127.0.0.1"
-port = 388
-use_ssl = false
-start_tls = false
-ssl_skip_verify = false
-
-bind_dn = "cn=admin,dc=grafana,dc=org"
-bind_password = 'grafana'
-search_filter = "(cn=%s)"
-search_base_dns = ["ou=users,dc=grafana,dc=org"]
-
-[servers.attributes]
-name = "givenName"
-surname = "sn"
-username = "cn"
-member_of = "memberOf"
-email =  "email"
-
-[[servers.group_mappings]]
-group_dn = "cn=editors,ou=groups,dc=grafana,dc=org"
-org_role = "Editor"
-
-[[servers.group_mappings]]
-group_dn = "*"
-org_role = "Viewer"

devenv/docker/blocks/multiple-openldap/notes.md

@@ -1,38 +0,0 @@
-# Notes on Multiple OpenLdap Docker Block
-
-This is very similar to openldap docker block, but it creates multiple ldap servers instead of one.
-
-Any ldif files added to the prepopulate subdirectory will be automatically imported into the OpenLdap database.
-
-"admins-ldap-server" block contains admin group and admin users. The "ldap-server" block has all the rest of the users. See below for the full list of users.
-
-This blocks are here to help with testing multiple LDAP servers, for any other LDAP related development and testing "openldap" block should be used.
-
-## Enabling LDAP in Grafana
-
-Copy the ldap_dev.toml file in this folder into your `conf` folder (it is gitignored already). To enable it in the .ini file to get Grafana to use this block:
-
-```ini
-[auth.ldap]
-enabled = true
-config_file = conf/ldap_dev.toml
-; allow_sign_up = true
-```
-
-## Groups & Users
-
-admins
-  ldap-admin
-  ldap-torkel
-backend
-  ldap-carl
-  ldap-torkel
-  ldap-leo
-frontend
-  ldap-torkel
-  ldap-tobias
-  ldap-daniel
-editors
-  ldap-editor
-no groups
-  ldap-viewer

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

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-echo "Pre-populating ldap entries, first waiting for ldap to start"
-
-sleep 3
-
-adminUserDn="cn=admin,dc=grafana,dc=org"
-adminPassword="grafana"
-
-for file in `ls /etc/ldap/prepopulate/*.ldif`; do
-  ldapadd -x -D $adminUserDn -w $adminPassword -f "$file"
-done
-
-

devenv/docker/blocks/mysql/.env

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

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

@@ -1,5 +1,5 @@
   mysql:
-    image: mysql:${mysql_version}
+    image: mysql:5.6
     environment:
       MYSQL_ROOT_PASSWORD: rootpass
       MYSQL_DATABASE: grafana

devenv/docker/blocks/nginx_proxy/nginx_login_only.conf

@@ -1,42 +0,0 @@
-events { worker_connections 1024; }
-
-http {
-  sendfile on;
-
-  proxy_redirect     off;
-  proxy_set_header   Host $host;
-  proxy_set_header   X-Real-IP $remote_addr;
-  proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
-  proxy_set_header   X-Forwarded-Host $server_name;
-
-  server {
-    listen 10080;
-
-    location /grafana/ {
-      ################################################################
-      # Enable these settings to test with basic auth and an auth proxy header
-      # the htpasswd file contains an admin user with password admin and
-      # user1: grafana and user2: grafana
-      ################################################################
-
-
-      ################################################################
-      # To use the auth proxy header, set the following in custom.ini:
-      # [auth.proxy]
-      # enabled = true
-      # header_name = X-WEBAUTH-USER
-      # header_property = username
-      ################################################################
-
-      location /grafana/login {
-        auth_basic "Restricted Content";
-        auth_basic_user_file /etc/nginx/htpasswd;
-        proxy_set_header X-WEBAUTH-USER $remote_user;
-        proxy_pass http://localhost:3000/login;
-      }
-
-      proxy_set_header Authorization "";
-      proxy_pass http://localhost:3000/;
-    }
-  }
-}

devenv/docker/blocks/nginx_proxy_mac/Dockerfile

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

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

@@ -1,11 +0,0 @@
-# This will proxy all requests for http://localhost:10080/grafana/ to
-# http://localhost:3000 (Grafana running locally)
-#
-# Please note that you'll need to change the root_url in the Grafana configuration:
-# root_url = %(protocol)s://%(domain)s:10080/grafana/
-
-  nginxproxy:
-    build: docker/blocks/nginx_proxy_mac
-    ports:
-      - "10080:10080"
-

devenv/docker/blocks/nginx_proxy_mac/htpasswd

@@ -1,3 +0,0 @@
-user1:$apr1$1odeeQb.$kwV8D/VAAGUDU7pnHuKoV0
-user2:$apr1$A2kf25r.$6S0kp3C7vIuixS5CL0XA9.
-admin:$apr1$IWn4DoRR$E2ol7fS/dkI18eU4bXnBO1

devenv/docker/blocks/nginx_proxy_mac/nginx.conf

@@ -1,39 +0,0 @@
-events { worker_connections 1024; }
-
-http {
-  sendfile on;
-
-  proxy_redirect     off;
-  proxy_set_header   Host $host;
-  proxy_set_header   X-Real-IP $remote_addr;
-  proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
-  proxy_set_header   X-Forwarded-Host $server_name;
-
-  server {
-    listen 10080;
-
-    location /grafana/ {
-      ################################################################
-      # Enable these settings to test with basic auth and an auth proxy header
-      # the htpasswd file contains an admin user with password admin and
-      # user1: grafana and user2: grafana
-      ################################################################
-
-      # auth_basic "Restricted Content";
-      # auth_basic_user_file /etc/nginx/htpasswd;
-
-      ################################################################
-      # To use the auth proxy header, set the following in custom.ini:
-      # [auth.proxy]
-      # enabled = true
-      # header_name = X-WEBAUTH-USER
-      # header_property = username
-      ################################################################
-
-      # proxy_set_header X-WEBAUTH-USER $remote_user;
-
-      # this url works only on mac
-      proxy_pass http://host.docker.internal:3000/;
-    }
-  }
-}

devenv/docker/blocks/openldap/Dockerfile

@@ -2,7 +2,7 @@
 
 FROM debian:jessie
 
-LABEL maintainer="Grafana team <hello@grafana.com>"
+LABEL maintainer="Christian Luginbühl <dinke@pimprecords.com>"
 
 ENV OPENLDAP_VERSION 2.4.40
 
@@ -19,8 +19,6 @@ EXPOSE 389
 
 VOLUME ["/etc/ldap", "/var/lib/ldap"]
 
-COPY ldap.conf /etc/ldap.dist/ldap.conf
-
 COPY modules/ /etc/ldap.dist/modules
 COPY prepopulate/ /etc/ldap.dist/prepopulate
 

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

@@ -1,5 +1,4 @@
   openldap:
-    container_name: ldap
     build: docker/blocks/openldap
     environment:
       SLAPD_PASSWORD: grafana

devenv/docker/blocks/openldap/entrypoint.sh

@@ -49,6 +49,10 @@ EOF
         dc_string="$dc_string,dc=$dc_part"
     done
 
+    base_string="BASE ${dc_string:1}"
+
+    sed -i "s/^#BASE.*/${base_string}/g" /etc/ldap/ldap.conf
+
     if [[ -n "$SLAPD_CONFIG_PASSWORD" ]]; then
         password_hash=`slappasswd -s "${SLAPD_CONFIG_PASSWORD}"`
 

devenv/docker/blocks/openldap/ldap.conf

@@ -1,16 +0,0 @@
-#
-# LDAP Defaults
-#
-
-# See ldap.conf(5) for details
-# This file should be world readable but not world writable.
-
-BASE dc=grafana,dc=org
-#URI	ldap://ldap.example.com ldap://ldap-master.example.com:666
-
-SIZELIMIT	1000
-#TIMELIMIT	15
-#DEREF		never
-
-# TLS certificates (needed for GnuTLS)
-TLS_CACERT	/etc/ssl/certs/ca-certificates.crt

devenv/docker/blocks/openldap/ldap_dev.toml

@@ -28,6 +28,38 @@ search_filter = "(cn=%s)"
 # An array of base dns to search through
 search_base_dns = ["dc=grafana,dc=org"]
 
+# In POSIX LDAP schemas, without memberOf attribute a secondary query must be made for groups.
+# This is done by enabling group_search_filter below. You must also set member_of= "cn"
+# in [servers.attributes] below.
+
+# Users with nested/recursive group membership and an LDAP server that supports LDAP_MATCHING_RULE_IN_CHAIN
+# can set group_search_filter, group_search_filter_user_attribute, group_search_base_dns and member_of
+# below in such a way that the user's recursive group membership is considered.
+#
+# Nested Groups + Active Directory (AD) Example:
+#
+#   AD groups store the Distinguished Names (DNs) of members, so your filter must
+#   recursively search your groups for the authenticating user's DN. For example:
+#
+#     group_search_filter = "(member:1.2.840.113556.1.4.1941:=%s)"
+#     group_search_filter_user_attribute = "distinguishedName"
+#     group_search_base_dns = ["ou=groups,dc=grafana,dc=org"]
+#
+#     [servers.attributes]
+#     ...
+#     member_of = "distinguishedName"
+
+## Group search filter, to retrieve the groups of which the user is a member (only set if memberOf attribute is not available)
+# group_search_filter = "(&(objectClass=posixGroup)(memberUid=%s))"
+## Group search filter user attribute defines what user attribute gets substituted for %s in group_search_filter.
+## Defaults to the value of username in [server.attributes]
+## Valid options are any of your values in [servers.attributes]
+## If you are using nested groups you probably want to set this and member_of in
+## [servers.attributes] to "distinguishedName"
+# group_search_filter_user_attribute = "distinguishedName"
+## An array of the base DNs to search through for groups. Typically uses ou=groups
+# group_search_base_dns = ["ou=groups,dc=grafana,dc=org"]
+
 # Specify names of the ldap attributes your ldap uses
 [servers.attributes]
 name = "givenName"

devenv/docker/blocks/openldap/ldap_posix_dev.toml

@@ -1,57 +0,0 @@
-# To troubleshoot and get more log info enable ldap debug logging in grafana.ini
-# [log]
-# filters = ldap:debug
-
-[[servers]]
-# Ldap server host (specify multiple hosts space separated)
-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
-use_ssl = false
-# Set to true if connect ldap server with STARTTLS pattern (create connection in insecure, then upgrade to secure connection with TLS)
-start_tls = false
-# set to true if you want to skip ssl cert validation
-ssl_skip_verify = false
-# set to the path to your root CA certificate or leave unset to use system defaults
-# root_ca_cert = "/path/to/certificate.crt"
-
-# Search user bind dn
-bind_dn = "cn=admin,dc=grafana,dc=org"
-# Search user bind password
-# If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;"""
-bind_password = 'grafana'
-
-# An array of base dns to search through
-search_base_dns = ["dc=grafana,dc=org"]
-
-search_filter = "(uid=%s)"
-
-group_search_filter = "(&(objectClass=posixGroup)(memberUid=%s))"
-group_search_filter_user_attribute = "uid"
-group_search_base_dns = ["ou=groups,dc=grafana,dc=org"]
-
-[servers.attributes]
-name = "givenName"
-surname = "sn"
-username = "cn"
-member_of = "memberOf"
-email =  "email"
-
-# Map ldap groups to grafana org roles
-[[servers.group_mappings]]
-group_dn = "cn=posix-admins,ou=groups,dc=grafana,dc=org"
-org_role = "Admin"
-grafana_admin = true
-
-# The Grafana organization database id, optional, if left out the default org (id 1) will be used
-# org_id = 1
-
-[[servers.group_mappings]]
-group_dn = "cn=editors,ou=groups,dc=grafana,dc=org"
-org_role = "Editor"
-
-[[servers.group_mappings]]
-# If you want to match all (or no ldap groups) then you can use wildcard
-group_dn = "*"
-org_role = "Viewer"

devenv/docker/blocks/openldap/notes.md

@@ -2,6 +2,8 @@
 
 Any ldif files added to the prepopulate subdirectory will be automatically imported into the OpenLdap database.
 
+The ldif files add eight users, `ldap-admin`, `ldap-editor`, `ldap-viewer`, `ldap-carl`, `ldap-daniel`, `ldap-leo`, `ldap-tobias` and `ldap-torkel`. Two groups, `admins` and `users`, are added that correspond with the group mappings in the default conf/ldap.toml. `ldap-admin` is a member of `admins` and `ldap-editor` is a member of `users`.
+
 Note that users that are added here need to specify a `memberOf` attribute manually as well as the `member` attribute for the group. The `memberOf` module usually does this automatically (if you add a group in Apache Directory Studio for example) but this does not work in the entrypoint script as it uses the `slapadd` command to add entries before the server has started and before the `memberOf` module is loaded.
 
 After adding ldif files to `prepopulate`:
@@ -12,7 +14,7 @@ After adding ldif files to `prepopulate`:
 
 ## Enabling LDAP in Grafana
 
-If you want to use users/groups with `memberOf` support Copy the ldap_dev.toml file in this folder into your `conf` folder (it is gitignored already). To enable it in the .ini file to get Grafana to use this block:
+Copy the ldap_dev.toml file in this folder into your `conf` folder (it is gitignored already). To enable it in the .ini file to get Grafana to use this block:
 
 ```ini
 [auth.ldap]
@@ -21,13 +23,12 @@ config_file = conf/ldap_dev.toml
 ; allow_sign_up = true
 ```
 
-Otherwise perform same actions for `ldap_dev_posix.toml` config.
-
-## Groups & Users
+Test groups & users
 
 admins
   ldap-admin
   ldap-torkel
+  ldap-daniel
 backend
   ldap-carl
   ldap-torkel
@@ -40,11 +41,3 @@ editors
   ldap-editors
 no groups
   ldap-viewer
-
-
-## Groups & Users (POSIX)
-
-admins
-  ldap-posix-admin
-no groups
-  ldap-posix

devenv/docker/blocks/openldap/prepopulate/2_users.ldif

@@ -78,31 +78,3 @@ objectClass: inetOrgPerson
 objectClass: organizationalPerson
 sn: ldap-torkel
 cn: ldap-torkel
-
-# admin for posix group (without support for memberOf attribute)
-dn: uid=ldap-posix-admin,ou=users,dc=grafana,dc=org
-mail: ldap-posix-admin@grafana.com
-userPassword: grafana
-objectclass: top
-objectclass: posixAccount
-objectclass: inetOrgPerson
-homedirectory: /home/ldap-posix-admin
-sn: ldap-posix-admin
-cn: ldap-posix-admin
-uid: ldap-posix-admin
-uidnumber: 1
-gidnumber: 1
-
-# user for posix group (without support for memberOf attribute)
-dn: uid=ldap-posix,ou=users,dc=grafana,dc=org
-mail: ldap-posix@grafana.com
-userPassword: grafana
-objectclass: top
-objectclass: posixAccount
-objectclass: inetOrgPerson
-homedirectory: /home/ldap-posix
-sn: ldap-posix
-cn: ldap-posix
-uid: ldap-posix
-uidnumber: 2
-gidnumber: 2

devenv/docker/blocks/openldap/prepopulate/3_groups.ldif

@@ -23,21 +23,3 @@ objectClass: groupOfNames
 member: cn=ldap-torkel,ou=users,dc=grafana,dc=org
 member: cn=ldap-daniel,ou=users,dc=grafana,dc=org
 member: cn=ldap-leo,ou=users,dc=grafana,dc=org
-
-# -- POSIX --
-
-# posix admin group (without support for memberOf attribute)
-dn: cn=posix-admins,ou=groups,dc=grafana,dc=org
-cn: admins
-objectClass: top
-objectClass: posixGroup
-gidNumber: 1
-memberUid: ldap-posix-admin
-
-# posix group (without support for memberOf attribute)
-dn: cn=posix,ou=groups,dc=grafana,dc=org
-cn: viewers
-objectClass: top
-objectClass: posixGroup
-gidNumber: 2
-memberUid: ldap-posix

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

@@ -1,5 +1,5 @@
   opentsdb:
-    image: petergrace/opentsdb-docker:latest
+    image: opower/opentsdb:latest
     ports:
       - "4242:4242"
 

devenv/docker/blocks/postgres/.env

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

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

@@ -1,5 +1,5 @@
   postgrestest:
-    image: postgres:${postgres_version}
+    image: postgres:9.3
     environment:
       POSTGRES_USER: grafana
       POSTGRES_PASSWORD: password

devenv/docker/blocks/prometheus_basic_auth_proxy/Dockerfile

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

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

@@ -1,6 +0,0 @@
-# This will proxy all requests for http://localhost:10090 to
-# http://prometheus:9090 (Prometheus inside the docker compose)
-
-  nginxproxy:
-    build: docker/blocks/nginx_proxy
-    network_mode: host

devenv/docker/blocks/prometheus_basic_auth_proxy/htpasswd

@@ -1 +0,0 @@
-prom:$apr1$bfu32njz$HHDDTjaeWHDzQs2UMXP.C1

devenv/docker/blocks/prometheus_basic_auth_proxy/nginx.conf

@@ -1,34 +0,0 @@
-events { }
-
-http {
-  server {
-
-    listen 10090;
-
-    location / {
-
-      # Removes any Access-Control-Allow-Origin from Prometheus itself. When accessing from browser, having * or
-      # multiple values is not allowed in some cases
-      proxy_hide_header Access-Control-Allow-Origin;
-
-      # Allow the origin access. This is kinda wildcard but for browser it seems more strict and is needed for
-      # withCredentials requests.
-      add_header Access-Control-Allow-Origin $http_origin;
-
-      # When using withCredentials requests this must be true.
-      add_header Access-Control-Allow-Credentials true;
-
-      # Ask for basic auth except for pre flight OPTIONS request.
-      limit_except OPTIONS {
-        ################################################################
-        # The htpasswd file contains user:
-        # prom: test
-        ################################################################
-        auth_basic "prom";
-        auth_basic_user_file /etc/nginx/htpasswd;
-      }
-
-      proxy_pass http://prometheus:9090/;
-    }
-  }
-}