Merge remote-tracking branch 'upstream/master' into docs-5.1

.circleci/config.yml

@@ -117,7 +117,7 @@ jobs:
       - image: circleci/python:2.7-stretch
     steps:
       - attach_workspace:
-          at: dist
+          at: .
       - run:
           name: install awscli
           command: 'sudo pip install awscli'
@@ -139,10 +139,6 @@ workflows:
           filters:
             tags:
               only: /.*/
-      - gometalinter:
-          filters:
-            tags:
-              only: /.*/
       - build:
           filters:
             tags:

CHANGELOG.md

-# 5.1.0 (unreleased)
+# 5.1.0-beta1 (2018-04-20)
 
 * **MSSQL**: New Microsoft SQL Server data source [#10093](https://github.com/grafana/grafana/pull/10093), [#11298](https://github.com/grafana/grafana/pull/11298), thx [@linuxchips](https://github.com/linuxchips)
 * **Prometheus**: The heatmap panel now support Prometheus histograms [#10009](https://github.com/grafana/grafana/issues/10009)

docs/sources/installation/debian.md

@@ -16,6 +16,7 @@ weight = 1
 Description | Download
 ------------ | -------------
 Stable for Debian-based Linux | [grafana_5.0.4_amd64.deb](https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana_5.0.4_amd64.deb)
+Beta for Debian-based Linux | [grafana_5.1.0-beta1_amd64.deb](https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana_5.1.0-beta1_amd64.deb)
 
 Read [Upgrading Grafana]({{< relref "installation/upgrading.md" >}}) for tips and guidance on updating an existing
 installation.
@@ -29,6 +30,13 @@ sudo apt-get install -y adduser libfontconfig
 sudo dpkg -i grafana_5.0.4_amd64.deb
 ```
 
+## Install Latest Beta
+```bash
+wget https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana_5.1.0-beta1_amd64.deb
+sudo apt-get install -y adduser libfontconfig
+sudo dpkg -i grafana_5.1.0-beta1_amd64.deb
+```
+
 ## APT Repository
 
 Add the following line to your `/etc/apt/sources.list` file.

docs/sources/installation/rpm.md

@@ -16,6 +16,7 @@ weight = 2
 Description | Download
 ------------ | -------------
 Stable for CentOS / Fedora / OpenSuse / Redhat Linux | [5.0.4 (x86-64 rpm)](https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.0.4-1.x86_64.rpm)
+Latest Beta for CentOS / Fedora / OpenSuse / Redhat Linux | [5.1.0-beta1 (x86-64 rpm)](https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.1.0-beta1.x86_64.rpm)
 
 
 Read [Upgrading Grafana]({{< relref "installation/upgrading.md" >}}) for tips and guidance on updating an existing
@@ -29,6 +30,12 @@ You can install Grafana using Yum directly.
 $ sudo yum install https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.0.4-1.x86_64.rpm
 ```
 
+## Install Beta
+
+```bash
+$ sudo yum install https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.1.0-beta1.x86_64.rpm
+```
+
 Or install manually using `rpm`.
 
 #### On CentOS / Fedora / Redhat:

docs/sources/installation/windows.md

@@ -13,6 +13,7 @@ weight = 3
 Description | Download
 ------------ | -------------
 Latest stable package for Windows | [grafana-5.0.4.windows-x64.zip](https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.0.4.windows-x64.zip)
+Latest beta package for Windows | [grafana.5.1.0-beta1.windows-x64.zip](https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.0.0-beta5.windows-x64.zip)
 
 Read [Upgrading Grafana]({{< relref "installation/upgrading.md" >}}) for tips and guidance on updating an existing
 installation.

packaging/publish/publish_testing.sh

 #! /usr/bin/env bash
-deb_ver=5.0.0-beta5
-rpm_ver=5.0.0-beta5
+deb_ver=5.1.0-beta1
+rpm_ver=5.1.0-beta1
 
 wget https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana_${deb_ver}_amd64.deb
 

pkg/cmd/grafana-cli/services/services.go

@@ -10,6 +10,7 @@ import (
 	"net/http"
 	"net/url"
 	"path"
+	"runtime"
 	"time"
 
 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
@@ -155,6 +156,8 @@ func sendRequest(repoUrl string, subPaths ...string) ([]byte, error) {
 	req, err := http.NewRequest(http.MethodGet, u.String(), nil)
 
 	req.Header.Set("grafana-version", grafanaVersion)
+	req.Header.Set("grafana-os", runtime.GOOS)
+	req.Header.Set("grafana-arch", runtime.GOARCH)
 	req.Header.Set("User-Agent", "grafana "+grafanaVersion)
 
 	if err != nil {

public/sass/components/_gf-form.scss

@@ -341,19 +341,19 @@ $input-border: 1px solid $input-border-color;
   margin-right: $gf-form-margin;
   position: relative;
   background-color: $input-bg;
-  padding-right: $input-padding-x;
   border: $input-border;
   border-radius: $input-border-radius;
 
   &::after {
     position: absolute;
     top: 35%;
-    right: $input-padding-x/2;
+    right: $input-padding-x;
     background-color: transparent;
     color: $input-color;
     font: normal normal normal $font-size-sm/1 FontAwesome;
     content: '\f0d7';
     pointer-events: none;
+    font-size: 11px;
   }
 
   .gf-form-input {