Merge branch 'master' into docs-5.1

.bra.toml

@@ -12,6 +12,6 @@ watch_dirs = [
 watch_exts = [".go", ".ini", ".toml"]
 watch_exts = [".go", ".ini", ".toml"]
 build_delay = 1500
 build_delay = 1500
 cmds = [
 cmds = [
-  ["go", "run", "build.go", "-dev", "build"],
+  ["go", "run", "build.go", "-dev", "build-server"],
 	["./bin/grafana-server", "cfg:app_mode=development"]
 	["./bin/grafana-server", "cfg:app_mode=development"]
 ]
 ]

.circleci/config.yml

@@ -17,6 +17,22 @@ jobs:
           name: check documentation spelling errors
           name: check documentation spelling errors
           command: 'codespell -I ./words_to_ignore.txt docs/'
           command: 'codespell -I ./words_to_ignore.txt docs/'
 
 
+  gometalinter:
+    docker:
+      - image: circleci/golang:1.10
+    working_directory: /go/src/github.com/grafana/grafana
+    steps:
+      - checkout
+      - run:
+          name: install gometalinter tool
+          command: 'go get -u github.com/alecthomas/gometalinter'
+      - run:
+          name: install linters
+          command: 'gometalinter --install'
+      - run:
+          name: run some linters
+          command: 'gometalinter --vendor --deadline 6m --disable-all --enable=structcheck --enable=unconvert --enable=varcheck ./...'
+
   test-frontend:
   test-frontend:
     docker:
     docker:
       - image: circleci/node:6.11.4
       - image: circleci/node:6.11.4
@@ -123,6 +139,10 @@ workflows:
           filters:
           filters:
             tags:
             tags:
               only: /.*/
               only: /.*/
+      - gometalinter:
+          filters:
+            tags:
+              only: /.*/
       - build:
       - build:
           filters:
           filters:
             tags:
             tags:

pkg/cmd/grafana-cli/commands/remove_command.go

@@ -3,12 +3,11 @@ package commands
 import (
 import (
 	"errors"
 	"errors"
 	"fmt"
 	"fmt"
-	m "github.com/grafana/grafana/pkg/cmd/grafana-cli/models"
-	services "github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
 	"strings"
 	"strings"
+
+	services "github.com/grafana/grafana/pkg/cmd/grafana-cli/services"
 )
 )
 
 
-var getPluginss func(path string) []m.InstalledPlugin = services.GetLocalPlugins
 var removePlugin func(pluginPath, id string) error = services.RemoveInstalledPlugin
 var removePlugin func(pluginPath, id string) error = services.RemoveInstalledPlugin
 
 
 func removeCommand(c CommandLine) error {
 func removeCommand(c CommandLine) error {

pkg/cmd/grafana-server/main.go

@@ -33,7 +33,6 @@ import (
 var version = "5.0.0"
 var version = "5.0.0"
 var commit = "NA"
 var commit = "NA"
 var buildstamp string
 var buildstamp string
-var build_date string
 
 
 var configFile = flag.String("config", "", "path to config file")
 var configFile = flag.String("config", "", "path to config file")
 var homePath = flag.String("homepath", "", "path to grafana install/home path, defaults to working directory")
 var homePath = flag.String("homepath", "", "path to grafana install/home path, defaults to working directory")

pkg/components/dashdiffs/compare.go

@@ -6,7 +6,6 @@ import (
 
 
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/log"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/models"
 	diff "github.com/yudai/gojsondiff"
 	diff "github.com/yudai/gojsondiff"
 	deltaFormatter "github.com/yudai/gojsondiff/formatter"
 	deltaFormatter "github.com/yudai/gojsondiff/formatter"
@@ -15,11 +14,8 @@ import (
 var (
 var (
 	// ErrUnsupportedDiffType occurs when an invalid diff type is used.
 	// ErrUnsupportedDiffType occurs when an invalid diff type is used.
 	ErrUnsupportedDiffType = errors.New("dashdiff: unsupported diff type")
 	ErrUnsupportedDiffType = errors.New("dashdiff: unsupported diff type")
-
 	// ErrNilDiff occurs when two compared interfaces are identical.
 	// ErrNilDiff occurs when two compared interfaces are identical.
 	ErrNilDiff = errors.New("dashdiff: diff is nil")
 	ErrNilDiff = errors.New("dashdiff: diff is nil")
-
-	diffLogger = log.New("dashdiffs")
 )
 )
 
 
 type DiffType int
 type DiffType int

pkg/services/alerting/engine.go

@@ -15,8 +15,8 @@ import (
 )
 )
 
 
 type Engine struct {
 type Engine struct {
-	execQueue     chan *Job
-	clock         clock.Clock
+	execQueue chan *Job
+	//clock         clock.Clock
 	ticker        *Ticker
 	ticker        *Ticker
 	scheduler     Scheduler
 	scheduler     Scheduler
 	evalHandler   EvalHandler
 	evalHandler   EvalHandler

pkg/services/alerting/reader.go

@@ -16,7 +16,7 @@ type RuleReader interface {
 
 
 type DefaultRuleReader struct {
 type DefaultRuleReader struct {
 	sync.RWMutex
 	sync.RWMutex
-	serverID       string
+	//serverID       string
 	serverPosition int
 	serverPosition int
 	clusterSize    int
 	clusterSize    int
 	log            log.Logger
 	log            log.Logger

pkg/services/notifications/webhook.go

@@ -101,7 +101,3 @@ func sendWebRequestSync(ctx context.Context, webhook *Webhook) error {
 	webhookLog.Debug("Webhook failed", "statuscode", resp.Status, "body", string(body))
 	webhookLog.Debug("Webhook failed", "statuscode", resp.Status, "body", string(body))
 	return fmt.Errorf("Webhook response status %v", resp.Status)
 	return fmt.Errorf("Webhook response status %v", resp.Status)
 }
 }
-
-var addToWebhookQueue = func(msg *Webhook) {
-	webhookQueue <- msg
-}

pkg/services/provisioning/datasources/config_reader_test.go

@@ -12,7 +12,6 @@ import (
 
 
 var (
 var (
 	logger                          log.Logger = log.New("fake.log")
 	logger                          log.Logger = log.New("fake.log")
-	oneDatasourcesConfig            string     = ""
 	twoDatasourcesConfig            string     = "./test-configs/two-datasources"
 	twoDatasourcesConfig            string     = "./test-configs/two-datasources"
 	twoDatasourcesConfigPurgeOthers string     = "./test-configs/insert-two-delete-two"
 	twoDatasourcesConfigPurgeOthers string     = "./test-configs/insert-two-delete-two"
 	doubleDatasourcesConfig         string     = "./test-configs/double-default"
 	doubleDatasourcesConfig         string     = "./test-configs/double-default"

pkg/services/sqlstore/migrations/migrations_test.go

@@ -8,11 +8,8 @@ import (
 	"github.com/grafana/grafana/pkg/services/sqlstore/sqlutil"
 	"github.com/grafana/grafana/pkg/services/sqlstore/sqlutil"
 
 
 	. "github.com/smartystreets/goconvey/convey"
 	. "github.com/smartystreets/goconvey/convey"
-	//"github.com/grafana/grafana/pkg/log"
 )
 )
 
 
-var indexTypes = []string{"Unknown", "INDEX", "UNIQUE INDEX"}
-
 func TestMigrations(t *testing.T) {
 func TestMigrations(t *testing.T) {
 	testDBs := []sqlutil.TestDB{
 	testDBs := []sqlutil.TestDB{
 		sqlutil.TestDB_Sqlite3,
 		sqlutil.TestDB_Sqlite3,

pkg/services/sqlstore/migrator/migrations.go

@@ -179,7 +179,7 @@ type CopyTableDataMigration struct {
 	targetTable string
 	targetTable string
 	sourceCols  []string
 	sourceCols  []string
 	targetCols  []string
 	targetCols  []string
-	colMap      map[string]string
+	//colMap      map[string]string
 }
 }
 
 
 func NewCopyTableDataMigration(targetTable string, sourceTable string, colMap map[string]string) *CopyTableDataMigration {
 func NewCopyTableDataMigration(targetTable string, sourceTable string, colMap map[string]string) *CopyTableDataMigration {