Merge remote-tracking branch 'grafana/master' into columnar2

* grafana/master:
  Packages: Temporarily skip canary releases if packages build fail (grafana#18577)
  Update latest.json to latest stable version (grafana#18575)
  Docs: Update changelog for v6.3.3 (grafana#18569)
  Graph: Fixed issue clicking on series line icon (grafana#18563)
  grafana/toolkit: Unpublish previous "next" version when releasing a new one (grafana#18552)

CHANGELOG.md

@@ -1,5 +1,20 @@
 # 6.4.0 (unreleased)
 
+# 6.3.3 (2019-08-15)
+
+### Bug Fixes
+* **Annotations**: Fix failing annotation query when time series query is cancelled. [#18532](https://github.com/grafana/grafana/pull/18532), [@dprokop](https://github.com/dprokop)
+* **Auth**: Do not set SameSite cookie attribute if cookie_samesite is none. [#18462](https://github.com/grafana/grafana/pull/18462), [@papagian](https://github.com/papagian)
+* **DataLinks**: Apply scoped variables to data links correctly. [#18454](https://github.com/grafana/grafana/pull/18454), [@dprokop](https://github.com/dprokop)
+* **DataLinks**: Respect timezone when displaying datapoint's timestamp in graph context menu. [#18461](https://github.com/grafana/grafana/pull/18461), [@dprokop](https://github.com/dprokop)
+* **DataLinks**: Use datapoint timestamp correctly when interpolating variables. [#18459](https://github.com/grafana/grafana/pull/18459), [@dprokop](https://github.com/dprokop)
+* **Explore**: Fix loading error for empty queries. [#18488](https://github.com/grafana/grafana/pull/18488), [@davkal](https://github.com/davkal)
+* **Graph**: Fixes legend issue clicking on series line icon and issue with horizontal scrollbar being visible on windows. [#18563](https://github.com/grafana/grafana/pull/18563), [@torkelo](https://github.com/torkelo)
+* **Graphite**: Avoid glob of single-value array variables . [#18420](https://github.com/grafana/grafana/pull/18420), [@gotjosh](https://github.com/gotjosh)
+* **Prometheus**: Fix queries with label_replace remove the $1 match when loading query editor. [#18480](https://github.com/grafana/grafana/pull/18480), [@hugohaggmark](https://github.com/hugohaggmark)
+* **Prometheus**: More consistently allows for multi-line queries in editor. [#18362](https://github.com/grafana/grafana/pull/18362), [@kaydelaney](https://github.com/kaydelaney)
+* **TimeSeries**: Assume values are all numbers. [#18540](https://github.com/grafana/grafana/pull/18540), [@ryantxu](https://github.com/ryantxu)
+
 # 6.3.2 (2019-08-07)
 
 ### Bug Fixes

latest.json

@@ -1,4 +1,4 @@
 {
-  "stable": "6.3.2",
-  "testing": "6.3.2"
+  "stable": "6.3.3",
+  "testing": "6.3.3"
 }

packages/grafana-ui/src/components/CustomScrollbar/CustomScrollbar.tsx

@@ -77,7 +77,7 @@ export class CustomScrollbar extends Component<Props> {
         {...passedProps}
         className={cx(
           css`
-            visibility: ${hideTrack ? 'none' : 'visible'};
+            visibility: ${hideTrack ? 'hidden' : 'visible'};
           `,
           track
         )}

scripts/circle-release-next-packages.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 function parse_git_hash() {
   git rev-parse --short HEAD 2> /dev/null | sed "s/\(.*\)/\1/"
@@ -11,9 +11,20 @@ function prapare_version_commit () {
   git commit -am "Version commit"
 }
 
-#Get current version from lerna.json
+function unpublish_previous_canary () {
+  echo $'\nUnpublishing previous canary packages'
+  for PACKAGE in ui toolkit data runtime
+  do
+    # dist-tag next to be changed to canary when https://github.com/grafana/grafana/pull/18195 is merged
+    CURRENT_CANARY=$(npm view @grafana/${PACKAGE} dist-tags.next)
+    echo "Unpublish @grafana/${PACKAGE}@${CURRENT_CANARY}"
+    npm unpublish "@grafana/${PACKAGE}@${CURRENT_CANARY}"
+  done
+}
+
+# Get current version from lerna.json
 PACKAGE_VERSION=$(grep '"version"' lerna.json | cut -d '"' -f 4)
-# Get short current commit's has
+# Get  current commit's short hash
 GIT_SHA=$(parse_git_hash)
 
 echo "Commit: ${GIT_SHA}"
@@ -31,11 +42,20 @@ else
   echo $'\nGit status:'
   git status -s
 
+
   echo $'\nBuilding packages'
   yarn packages:build
 
+  exit_status=$?
+  if [ $exit_status -eq 1 ]; then
+    echo "Packages build failed, skipping canary release"
+    # TODO: notify on slack/email?
+    exit
+  fi
   prapare_version_commit
 
+  unpublish_previous_canary
+
   echo $'\nPublishing packages'
   yarn packages:publishNext
 fi