Merge branch 'master' into linting_provisioning_notifiers

* master: (135 commits)
  Docs: Changelog update 7.05 & latest.json update (grafana#25941)
  Fix: Value mappings match against string values (grafana#25929)
  Grafana-UI: Add FileUpload (grafana#25835)
  Query history: Add search for query history and starred queries (grafana#25747)
  Explore: Remove legend formatting when switching from panel to Explore (grafana#25848)
  Added options to customize chart data listening (grafana#25918)
  Provisioning: Use folders structure from the file system to create desired folders in dashboard provisioning. (grafana#23117)
  CircleCI: Upgrade grabpl (grafana#25939)
  DataLinks: Add internal links in table and allow custom query (grafana#25613)
  Docker: Upgrade to base on Alpine 3.12 (grafana#25936)
  TimeZonePicker: added possibility to toggle if internal time zones should be included or not. (grafana#25934)
  grafana/ui: Fix storybook dev (grafana#25928)
  Chore: Disable scopelint for tests (grafana#25923)
  Explore/Loki: Fix field type in table for instant queries (grafana#25907)
  Explore/Loki: Show results of instant queries only in table and time series only in graph (grafana#25845)
  grafana-ui: Make output chunks correct (grafana#25922)
  Chore: Fix spelling (grafana#25905)
  chore: fix lint breaking build (grafana#25916)
  Explore: Add join transform for timeseries shown in table (grafana#25906)
  Backend: use latest Go plugin sdk (grafana#25909)
  ...

.circleci/config.yml

@@ -35,13 +35,13 @@ executors:
       - image: cimg/base:stable
   node:
     docker:
-      - image: cimg/node:12.16
+      - image: cimg/node:12.18
   go:
     docker:
       - image: cimg/go:1.14
   grafana-build:
     docker:
-      - image: grafana/build-container:1.2.19
+      - image: grafana/build-container:1.2.20
   grafana-publish:
     docker:
       - image: grafana/grafana-ci-deploy:1.2.5
@@ -56,7 +56,7 @@ commands:
       - run:
           name: "Install Grafana build pipeline tool"
           command: |
-            VERSION=0.4.11
+            VERSION=0.4.16
             curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v${VERSION}/grabpl
             chmod +x grabpl
             mv grabpl /tmp
@@ -625,11 +625,12 @@ jobs:
       - run:
           name: Install gcloud SDK
           command: |
-            echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | \
-              sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
-            curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | \
-              sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add -
-            sudo apt-get update && sudo apt-get install google-cloud-sdk
+            VERSION=298.0.0
+            curl -fLO https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-${VERSION}-linux-x86_64.tar.gz
+            echo 0d58f451331abf43d080fa997c8e580d64897627e30be74f6d8f983ccfabef1e \
+              google-cloud-sdk-${VERSION}-linux-x86_64.tar.gz | sha256sum --check --strict --status
+            tar xf google-cloud-sdk-${VERSION}-linux-x86_64.tar.gz
+            ./google-cloud-sdk/install.sh -q
       # XXX: Is this necessary?
       - run: docker run --privileged linuxkit/binfmt:v0.6
       - run:
@@ -639,6 +640,7 @@ jobs:
       - run:
           name: Build Docker images
           command: |
+            source google-cloud-sdk/path.bash.inc
             if [[ -n $CIRCLE_TAG || $CIRCLE_BRANCH == "chore/test-release-pipeline" || $CIRCLE_BRANCH == "master" ]]; then
               # It's a full build
               /tmp/grabpl build-docker --jobs 4 --edition << parameters.edition >> \
@@ -811,21 +813,22 @@ jobs:
           name: Install Go linters
           command: |
             pushd /tmp
-            curl -fLO https://github.com/golangci/golangci-lint/releases/download/v1.24.0/golangci-lint-1.24.0-linux-amd64.tar.gz
-            echo 241ca454102e909de04957ff8a5754c757cefa255758b3e1fba8a4533d19d179 \
-              golangci-lint-1.24.0-linux-amd64.tar.gz | sha256sum --check --strict --status
-            tar -xf golangci-lint-1.24.0-linux-amd64.tar.gz
-            sudo mv golangci-lint-1.24.0-linux-amd64/golangci-lint /usr/local/bin/
+            VERSION=1.27.0
+            curl -fLO https://github.com/golangci/golangci-lint/releases/download/v${VERSION}/golangci-lint-${VERSION}-linux-amd64.tar.gz
+            echo 8d345e4e88520e21c113d81978e89ad77fc5b13bfdf20e5bca86b83fc4261272 \
+              golangci-lint-${VERSION}-linux-amd64.tar.gz | sha256sum --check --strict --status
+            tar -xf golangci-lint-${VERSION}-linux-amd64.tar.gz
+            sudo mv golangci-lint-${VERSION}-linux-amd64/golangci-lint /usr/local/bin/
             popd
-            make scripts/go/bin/revive scripts/go/bin/gosec
+            make scripts/go/bin/revive
       - run:
           name: Lint Go
           command: |
-            go vet ./pkg/...
-            golangci-lint run -v -j 4 --config scripts/go/configs/ci/.golangci.yml -E deadcode -E gofmt \
-              -E gosimple -E ineffassign -E structcheck -E typecheck ./pkg/...
-            golangci-lint run -v -j 4 --config scripts/go/configs/ci/.golangci.yml -E unconvert -E unused \
-              -E varcheck -E goconst -E errcheck -E staticcheck ./pkg/...
+            # To save memory, run in two batches
+            golangci-lint run -v -j 4 --config scripts/go/configs/ci/.golangci.toml -E deadcode -E depguard -E dogsled \
+              -E errcheck -E goconst -E golint -E gosec -E gosimple -E govet -E scopelint ./pkg/...
+            golangci-lint run -v -j 4 --config scripts/go/configs/ci/.golangci.toml -E ineffassign \
+              -E rowserrcheck -E staticcheck -E structcheck -E typecheck -E unconvert -E unused -E varcheck ./pkg/...
             ./scripts/go/bin/revive -formatter stylish -config ./scripts/go/configs/revive.toml ./pkg/...
             ./scripts/go/bin/revive -formatter stylish -config ./scripts/go/configs/revive-strict.toml \
               -exclude ./pkg/plugins/backendplugin/pluginextensionv2/... \
@@ -836,9 +839,6 @@ jobs:
               ./pkg/services/provisioning/values/... \
               ./pkg/plugins/backendplugin/...
 
-            ./scripts/go/bin/gosec -quiet -exclude=G104,G107,G108,G201,G202,G204,G301,G304,G401,G402,G501 \
-              -conf=./scripts/go/configs/gosec.json ./pkg/...
-
   test-frontend:
     executor: node
     steps:

.gitignore

@@ -15,6 +15,7 @@ awsconfig
 .yarnrc
 .yarn/
 vendor/
+.eslintcache
 
 # Enterprise emails
 /emails/templates/enterprise_*
@@ -46,6 +47,7 @@ public/css/*.min.css
 .DS_Store
 .vscode/
 .vs/
+.eslintcache
 
 /data/*
 /bin/*