Merge branch 'master' of github.com:grafana/grafana

pkg/cmd/grafana-server/main.go

@@ -56,7 +56,7 @@ func main() {
 	setting.BuildCommit = commit
 	setting.BuildCommit = commit
 	setting.BuildStamp = buildstampInt64
 	setting.BuildStamp = buildstampInt64
 
 
-	go listenToSystemSignels()
+	go listenToSystemSignals()
 
 
 	flag.Parse()
 	flag.Parse()
 	writePIDFile()
 	writePIDFile()
@@ -116,7 +116,7 @@ func writePIDFile() {
 	}
 	}
 }
 }
 
 
-func listenToSystemSignels() {
+func listenToSystemSignals() {
 	signalChan := make(chan os.Signal, 1)
 	signalChan := make(chan os.Signal, 1)
 	code := 0
 	code := 0
 
 

pkg/log/log.go

@@ -32,11 +32,25 @@ func New(logger string, ctx ...interface{}) Logger {
 }
 }
 
 
 func Trace(format string, v ...interface{}) {
 func Trace(format string, v ...interface{}) {
-	Root.Debug(fmt.Sprintf(format, v))
+	var message string
+	if len(v) > 0 {
+		message = fmt.Sprintf(format, v)
+	} else {
+		message = format
+	}
+
+	Root.Debug(message)
 }
 }
 
 
 func Debug(format string, v ...interface{}) {
 func Debug(format string, v ...interface{}) {
-	Root.Debug(fmt.Sprintf(format, v))
+	var message string
+	if len(v) > 0 {
+		message = fmt.Sprintf(format, v)
+	} else {
+		message = format
+	}
+
+	Root.Debug(message)
 }
 }
 
 
 func Debug2(message string, v ...interface{}) {
 func Debug2(message string, v ...interface{}) {

pkg/plugins/update_checker.go

@@ -11,6 +11,10 @@ import (
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/setting"
 )
 )
 
 
+var (
+	httpClient http.Client = http.Client{Timeout: time.Duration(10 * time.Second)}
+)
+
 type GrafanaNetPlugin struct {
 type GrafanaNetPlugin struct {
 	Slug    string `json:"slug"`
 	Slug    string `json:"slug"`
 	Version string `json:"version"`
 	Version string `json:"version"`
@@ -54,10 +58,8 @@ func getAllExternalPluginSlugs() string {
 func checkForUpdates() {
 func checkForUpdates() {
 	log.Trace("Checking for updates")
 	log.Trace("Checking for updates")
 
 
-	client := http.Client{Timeout: time.Duration(5 * time.Second)}
-
 	pluginSlugs := getAllExternalPluginSlugs()
 	pluginSlugs := getAllExternalPluginSlugs()
-	resp, err := client.Get("https://grafana.net/api/plugins/versioncheck?slugIn=" + pluginSlugs + "&grafanaVersion=" + setting.BuildVersion)
+	resp, err := httpClient.Get("https://grafana.net/api/plugins/versioncheck?slugIn=" + pluginSlugs + "&grafanaVersion=" + setting.BuildVersion)
 
 
 	if err != nil {
 	if err != nil {
 		log.Trace("Failed to get plugins repo from grafana.net, %v", err.Error())
 		log.Trace("Failed to get plugins repo from grafana.net, %v", err.Error())
@@ -88,7 +90,7 @@ func checkForUpdates() {
 		}
 		}
 	}
 	}
 
 
-	resp2, err := client.Get("https://raw.githubusercontent.com/grafana/grafana/master/latest.json")
+	resp2, err := httpClient.Get("https://raw.githubusercontent.com/grafana/grafana/master/latest.json")
 	if err != nil {
 	if err != nil {
 		log.Trace("Failed to get latest.json repo from github: %v", err.Error())
 		log.Trace("Failed to get latest.json repo from github: %v", err.Error())
 		return
 		return

pkg/services/sqlstore/alert.go

@@ -92,7 +92,7 @@ func HandleAlertsQuery(query *m.GetAlertsQuery) error {
 		params = append(params, query.Limit)
 		params = append(params, query.Limit)
 	}
 	}
 
 
-	sql.WriteString("ORDER BY name ASC")
+	sql.WriteString(" ORDER BY name ASC")
 
 
 	alerts := make([]*m.Alert, 0)
 	alerts := make([]*m.Alert, 0)
 	if err := x.Sql(sql.String(), params...).Find(&alerts); err != nil {
 	if err := x.Sql(sql.String(), params...).Find(&alerts); err != nil {

pkg/services/sqlstore/alert_notification.go

@@ -66,7 +66,8 @@ func GetAlertNotificationsToSend(query *m.GetAlertNotificationsToSendQuery) erro
 	sql.WriteString(` WHERE alert_notification.org_id = ?`)
 	sql.WriteString(` WHERE alert_notification.org_id = ?`)
 	params = append(params, query.OrgId)
 	params = append(params, query.OrgId)
 
 
-	sql.WriteString(` AND ((alert_notification.is_default = 1)`)
+	sql.WriteString(` AND ((alert_notification.is_default = ?)`)
+	params = append(params, dialect.BooleanStr(true))
 	if len(query.Ids) > 0 {
 	if len(query.Ids) > 0 {
 		sql.WriteString(` OR alert_notification.id IN (?` + strings.Repeat(",?", len(query.Ids)-1) + ")")
 		sql.WriteString(` OR alert_notification.id IN (?` + strings.Repeat(",?", len(query.Ids)-1) + ")")
 		for _, v := range query.Ids {
 		for _, v := range query.Ids {

pkg/services/sqlstore/annotation.go

@@ -75,7 +75,7 @@ func (r *SqlAnnotationRepo) Find(query *annotations.ItemQuery) ([]*annotations.I
 		query.Limit = 10
 		query.Limit = 10
 	}
 	}
 
 
-	sql.WriteString(fmt.Sprintf("ORDER BY epoch DESC LIMIT %v", query.Limit))
+	sql.WriteString(fmt.Sprintf(" ORDER BY epoch DESC LIMIT %v", query.Limit))
 
 
 	items := make([]*annotations.Item, 0)
 	items := make([]*annotations.Item, 0)
 	if err := x.Sql(sql.String(), params...).Find(&items); err != nil {
 	if err := x.Sql(sql.String(), params...).Find(&items); err != nil {

pkg/services/sqlstore/migrator/dialect.go

@@ -18,6 +18,7 @@ type Dialect interface {
 	SupportEngine() bool
 	SupportEngine() bool
 	LikeStr() string
 	LikeStr() string
 	Default(col *Column) string
 	Default(col *Column) string
+	BooleanStr(bool) string
 
 
 	CreateIndexSql(tableName string, index *Index) string
 	CreateIndexSql(tableName string, index *Index) string
 	CreateTableSql(table *Table) string
 	CreateTableSql(table *Table) string

pkg/services/sqlstore/migrator/mysql_dialect.go

@@ -29,6 +29,10 @@ func (db *Mysql) AutoIncrStr() string {
 	return "AUTO_INCREMENT"
 	return "AUTO_INCREMENT"
 }
 }
 
 
+func (db *Mysql) BooleanStr(value bool) string {
+	return strconv.FormatBool(value)
+}
+
 func (db *Mysql) SqlType(c *Column) string {
 func (db *Mysql) SqlType(c *Column) string {
 	var res string
 	var res string
 	switch c.Type {
 	switch c.Type {

pkg/services/sqlstore/migrator/postgres_dialect.go

@@ -36,6 +36,10 @@ func (db *Postgres) AutoIncrStr() string {
 	return ""
 	return ""
 }
 }
 
 
+func (db *Postgres) BooleanStr(value bool) string {
+	return strconv.FormatBool(value)
+}
+
 func (b *Postgres) Default(col *Column) string {
 func (b *Postgres) Default(col *Column) string {
 	if col.Type == DB_Bool {
 	if col.Type == DB_Bool {
 		if col.Default == "0" {
 		if col.Default == "0" {

pkg/services/sqlstore/migrator/sqlite_dialect.go

@@ -29,6 +29,13 @@ func (db *Sqlite3) AutoIncrStr() string {
 	return "AUTOINCREMENT"
 	return "AUTOINCREMENT"
 }
 }
 
 
+func (db *Sqlite3) BooleanStr(value bool) string {
+	if value {
+		return "1"
+	}
+	return "0"
+}
+
 func (db *Sqlite3) SqlType(c *Column) string {
 func (db *Sqlite3) SqlType(c *Column) string {
 	switch c.Type {
 	switch c.Type {
 	case DB_Date, DB_DateTime, DB_TimeStamp, DB_Time:
 	case DB_Date, DB_DateTime, DB_TimeStamp, DB_Time:

pkg/tsdb/prometheus/prometheus.go

 package prometheus
 package prometheus
 
 
 import (
 import (
-	"context"
 	"fmt"
 	"fmt"
 	"net/http"
 	"net/http"
 	"regexp"
 	"regexp"
@@ -11,6 +10,7 @@ import (
 	"github.com/grafana/grafana/pkg/log"
 	"github.com/grafana/grafana/pkg/log"
 	"github.com/grafana/grafana/pkg/tsdb"
 	"github.com/grafana/grafana/pkg/tsdb"
 	"github.com/prometheus/client_golang/api/prometheus"
 	"github.com/prometheus/client_golang/api/prometheus"
+	"golang.org/x/net/context"
 	pmodel "github.com/prometheus/common/model"
 	pmodel "github.com/prometheus/common/model"
 )
 )
 
 

scripts/circle-test.sh

@@ -25,6 +25,7 @@ exit_if_fail npm run coveralls
 
 
 test -z "$(gofmt -s -l ./pkg/... | tee /dev/stderr)"
 test -z "$(gofmt -s -l ./pkg/... | tee /dev/stderr)"
 
 
+exit_if_fail go run build.go setup
 exit_if_fail go run build.go build
 exit_if_fail go run build.go build
 
 
 exit_if_fail go vet ./pkg/...
 exit_if_fail go vet ./pkg/...