diff --git a/CHANGELOG.md b/CHANGELOG.md index 5baddec644d..cb4019eb3ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ * **Graph panel**: Fixed problem with auto decimals on y axis when datamin=datamax, fixes [#6070](https://github.com/grafana/grafana/pull/6070) * **Snapshot**: Can view embedded panels/png rendered panels in snapshots without login, fixes [#3769](https://github.com/grafana/grafana/pull/3769) * **Elasticsearch**: Fix for query template variable when looking up terms without query, no longer relies on elasticsearch default field, fixes [#3887](https://github.com/grafana/grafana/pull/3887) +* **Elasticsearch**: Fix for displaying IP address used in terms aggregations, fixes [#4393](https://github.com/grafana/grafana/pull/4393) * **PNG Rendering**: Fix for server side rendering when using auth proxy, fixes [#5906](https://github.com/grafana/grafana/pull/5906) # 3.1.2 (unreleased) diff --git a/Makefile b/Makefile index e335993b8b0..40597a33f79 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,28 @@ all: deps build -deps: +deps-go: go run build.go setup + +deps-js: npm install -build: +deps: deps-go deps-js + +build-go: go run build.go build + +build-js: npm run build -test: +build: build-go build-js + +test-go: go test -v ./pkg/... + +test-js: npm test +test: test-go test-js + run: ./bin/grafana-server diff --git a/README.md b/README.md index fac9cb94c88..c9e48a3bd90 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ Be sure to read the [getting started guide](http://docs.grafana.org/guides/getti ## Run from master If you want to build a package yourself, or contribute. Here is a guide for how to do that. You can always find -the latest master builds [here](http://grafana.org/download/builds) +the latest master builds [here](http://grafana.org/builds) ### Dependencies diff --git a/appveyor.yml b/appveyor.yml index 1b6027b5eb6..22f0e5606dc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -25,7 +25,10 @@ install: build_script: - go run build.go build - grunt release + #- 7z a grafana.zip %APPVEYOR_BUILD_FOLDER%\dist\* + - cp dist/* . artifacts: - - path: dist/* + - path: grafana-*windows-ia32.zip + #- path: dist/* name: binzip diff --git a/build.go b/build.go index 202caa1837b..a457a49a2c8 100644 --- a/build.go +++ b/build.go @@ -5,6 +5,7 @@ package main import ( "bytes" "crypto/md5" + "crypto/sha1" "encoding/json" "flag" "fmt" @@ -85,17 +86,21 @@ func main() { case "package": grunt(gruntBuildArg("release")...) createLinuxPackages() + sha1FilesInDist() case "pkg-rpm": grunt(gruntBuildArg("release")...) createRpmPackages() + sha1FilesInDist() case "pkg-deb": grunt(gruntBuildArg("release")...) createDebPackages() + sha1FilesInDist() case "latest": makeLatestDistCopies() + sha1FilesInDist() case "clean": clean() @@ -501,3 +506,38 @@ func md5File(file string) error { return out.Close() } + +func sha1FilesInDist() { + filepath.Walk("./dist", func(path string, f os.FileInfo, err error) error { + if strings.Contains(path, ".sha1") == false { + sha1File(path) + } + return nil + }) +} + +func sha1File(file string) error { + fd, err := os.Open(file) + if err != nil { + return err + } + defer fd.Close() + + h := sha1.New() + _, err = io.Copy(h, fd) + if err != nil { + return err + } + + out, err := os.Create(file + ".sha1") + if err != nil { + return err + } + + _, err = fmt.Fprintf(out, "%x\n", h.Sum(nil)) + if err != nil { + return err + } + + return out.Close() +} diff --git a/circle.yml b/circle.yml index 007d0b29217..39dc626df04 100644 --- a/circle.yml +++ b/circle.yml @@ -28,3 +28,4 @@ deployment: owner: grafana commands: - ./scripts/trigger_grafana_packer.sh ${TRIGGER_GRAFANA_PACKER_CIRCLECI_TOKEN} + - ./scripts/trigger_windows_build.sh ${APPVEYOR_TOKEN} diff --git a/conf/defaults.ini b/conf/defaults.ini index 39e10280645..cbc239937c6 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -267,6 +267,7 @@ auto_sign_up = true [auth.ldap] enabled = false config_file = /etc/grafana/ldap.toml +allow_sign_up = true #################################### SMTP / Emailing ##################### [smtp] @@ -292,6 +293,9 @@ mode = console, file # Either "debug", "info", "warn", "error", "critical", default is "info" level = info +# optional settings to set different levels for specific loggers. Ex filters = sqlstore:debug +filters = + # For "console" mode only [log.console] level = @@ -401,7 +405,8 @@ global_session = -1 # \______(_______;;;)__;;;) [alerting] -enabled = true +# Makes it possible to turn off alert rule execution. +execute_alerts = true #################################### Internal Grafana Metrics ############ # Metrics available at HTTP API Url /api/metrics @@ -421,7 +426,7 @@ url = https://grafana.net #################################### External Image Storage ############## [external_image_storage] # You can choose between (s3, webdav) -provider = s3 +provider = [external_image_storage.s3] bucket_url = diff --git a/conf/sample.ini b/conf/sample.ini index bb575a596b0..e1ed408210a 100644 --- a/conf/sample.ini +++ b/conf/sample.ini @@ -252,6 +252,7 @@ [auth.ldap] ;enabled = false ;config_file = /etc/grafana/ldap.toml +;allow_sign_up = true #################################### SMTP / Emailing ########################## [smtp] @@ -276,6 +277,10 @@ # Either "trace", "debug", "info", "warn", "error", "critical", default is "info" ;level = info +# optional settings to set different levels for specific loggers. Ex filters = sqlstore:debug +;filters = + + # For "console" mode only [log.console] ;level = @@ -350,7 +355,8 @@ # \______(_______;;;)__;;;) [alerting] -;enabled = false +# Makes it possible to turn off alert rule execution. +;execute_alerts = true #################################### Internal Grafana Metrics ########################## # Metrics available at HTTP API Url /api/metrics @@ -375,8 +381,8 @@ #################################### External image storage ########################## [external_image_storage] # Used for uploading images to public servers so they can be included in slack/email messages. -# you can choose between (s3, webdav or internal) -;provider = s3 +# you can choose between (s3, webdav) +;provider = [external_image_storage.s3] ;bucket_url = diff --git a/docker/blocks/influxdb/fig b/docker/blocks/influxdb/fig index bdb4a274634..7b83bb2bab4 100644 --- a/docker/blocks/influxdb/fig +++ b/docker/blocks/influxdb/fig @@ -1,5 +1,7 @@ influxdb: - image: tutum/influxdb:0.12 + #image: influxdb/influxdb:1.0-alpine + image: influxdb:latest + container_name: influxdb ports: - "2004:2004" - "8083:8083" diff --git a/docs/sources/installation/configuration.md b/docs/sources/installation/configuration.md index 9a7a480f482..e3e435d1194 100644 --- a/docs/sources/installation/configuration.md +++ b/docs/sources/installation/configuration.md @@ -30,6 +30,9 @@ using environment variables using the syntax: Where the section name is the text within the brackets. Everything should be upper case, `.` should be replaced by `_`. For example, given these configuration settings: + # default section + instance_name = ${HOSTNAME} + [security] admin_user = admin @@ -39,6 +42,7 @@ should be upper case, `.` should be replaced by `_`. For example, given these co Then you can override them using: + export GF_DEFAULT_INSTANCE_NAME=my-instance export GF_SECURITY_ADMIN_USER=true export GF_AUTH_GOOGLE_CLIENT_SECRET=newS3cretKey @@ -528,7 +532,7 @@ Use space to separate multiple modes, e.g. "console file" ### level Either "debug", "info", "warn", "error", "critical", default is "info" -### filter +### filters optional settings to set different levels for specific loggers. Ex `filters = sqlstore:debug` diff --git a/docs/sources/reference/graph.md b/docs/sources/reference/graph.md index 9c2ab63fbaa..2e26334347e 100644 --- a/docs/sources/reference/graph.md +++ b/docs/sources/reference/graph.md @@ -91,7 +91,7 @@ The legend values are calculated client side by Grafana and depend on what type aggregation or point consolidation you metric query is using. All the above legend values cannot be correct at the same time. For example if you plot a rate like requests/second, this is probably using average as aggregator, then the Total in the legend will not represent the total number of requests. -It is just the sum of all data data points received by Grafana. +It is just the sum of all data points received by Grafana. ## Display styles diff --git a/pkg/api/alerting.go b/pkg/api/alerting.go index 460ad56e1ab..40b117835ec 100644 --- a/pkg/api/alerting.go +++ b/pkg/api/alerting.go @@ -252,33 +252,30 @@ func NotificationTest(c *middleware.Context, dto dtos.NotificationTestCommand) R return ApiSuccess("Test notification sent") } -func getAlertIdForRequest(c *middleware.Context) (int64, error) { - alertId := c.QueryInt64("alertId") - panelId := c.QueryInt64("panelId") - dashboardId := c.QueryInt64("dashboardId") - - if alertId == 0 && dashboardId == 0 && panelId == 0 { - return 0, fmt.Errorf("Missing alertId or dashboardId and panelId") +//POST /api/:alertId/pause +func PauseAlert(c *middleware.Context, dto dtos.PauseAlertCommand) Response { + cmd := models.PauseAlertCommand{ + OrgId: c.OrgId, + AlertId: c.ParamsInt64("alertId"), + Paused: dto.Paused, } - if alertId == 0 { - //fetch alertId - query := models.GetAlertsQuery{ - OrgId: c.OrgId, - DashboardId: dashboardId, - PanelId: panelId, - } - - if err := bus.Dispatch(&query); err != nil { - return 0, err - } - - if len(query.Result) != 1 { - return 0, fmt.Errorf("PanelId is not unique on dashboard") - } - - alertId = query.Result[0].Id + if err := bus.Dispatch(&cmd); err != nil { + return ApiError(500, "", err) } - return alertId, nil + var response models.AlertStateType = models.AlertStateNoData + pausedState := "un paused" + if cmd.Paused { + response = models.AlertStatePaused + pausedState = "paused" + } + + result := map[string]interface{}{ + "alertId": cmd.AlertId, + "state": response, + "message": "alert " + pausedState, + } + + return Json(200, result) } diff --git a/pkg/api/api.go b/pkg/api/api.go index deb29d730eb..5609536e213 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -252,6 +252,7 @@ func Register(r *macaron.Macaron) { r.Group("/alerts", func() { r.Post("/test", bind(dtos.AlertTestCommand{}), wrap(AlertTest)) + r.Post("/:alertId/pause", ValidateOrgAlert, bind(dtos.PauseAlertCommand{}), wrap(PauseAlert)) r.Get("/:alertId", ValidateOrgAlert, wrap(GetAlert)) r.Get("/", wrap(GetAlerts)) r.Get("/states-for-dashboard", wrap(GetAlertStatesForDashboard)) diff --git a/pkg/api/cloudwatch/metrics.go b/pkg/api/cloudwatch/metrics.go index 4d5fa1f52db..23814407182 100644 --- a/pkg/api/cloudwatch/metrics.go +++ b/pkg/api/cloudwatch/metrics.go @@ -29,7 +29,7 @@ var customMetricsDimensionsMap map[string]map[string]map[string]*CustomMetricsCa func init() { metricsMap = map[string][]string{ "AWS/ApiGateway": {"4XXError", "5XXError", "CacheHitCount", "CacheMissCount", "Count", "IntegrationLatency", "Latency"}, - "AWS/ApplicationELB": {"ActiveConnectionCount", "ClientTLSNegotiationErrorCount", "HealthyHostCount", "HTTPCode_ELB_4XX_Count", "HTTPCode_ELB_5XX_Count", "HTTPCode_Target_2XX_Count", "HTTPCode_Target_3XX_Count", "HTTPCode_Target_4XX_Count", "HTTPCode_Target_5XX_Count", "NewConnectionCount", "ProcessedBytes", "RejectedConnectionCount", "RequestCount", "TargetConnectionErrorCount", "TargetResponseTime", "TargetTLSNegotiationErrorCount", "UnhealthyHostCount"}, + "AWS/ApplicationELB": {"ActiveConnectionCount", "ClientTLSNegotiationErrorCount", "HealthyHostCount", "HTTPCode_ELB_4XX_Count", "HTTPCode_ELB_5XX_Count", "HTTPCode_Target_2XX_Count", "HTTPCode_Target_3XX_Count", "HTTPCode_Target_4XX_Count", "HTTPCode_Target_5XX_Count", "NewConnectionCount", "ProcessedBytes", "RejectedConnectionCount", "RequestCount", "TargetConnectionErrorCount", "TargetResponseTime", "TargetTLSNegotiationErrorCount", "UnHealthyHostCount"}, "AWS/AutoScaling": {"GroupMinSize", "GroupMaxSize", "GroupDesiredCapacity", "GroupInServiceInstances", "GroupPendingInstances", "GroupStandbyInstances", "GroupTerminatingInstances", "GroupTotalInstances"}, "AWS/Billing": {"EstimatedCharges"}, "AWS/CloudFront": {"Requests", "BytesDownloaded", "BytesUploaded", "TotalErrorRate", "4xxErrorRate", "5xxErrorRate"}, diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go index 1812226aa90..29a38e43bd6 100644 --- a/pkg/api/dashboard.go +++ b/pkg/api/dashboard.go @@ -153,16 +153,14 @@ func PostDashboard(c *middleware.Context, cmd m.SaveDashboardCommand) Response { return ApiError(500, "Failed to save dashboard", err) } - if setting.AlertingEnabled { - alertCmd := alerting.UpdateDashboardAlertsCommand{ - OrgId: c.OrgId, - UserId: c.UserId, - Dashboard: cmd.Result, - } + alertCmd := alerting.UpdateDashboardAlertsCommand{ + OrgId: c.OrgId, + UserId: c.UserId, + Dashboard: cmd.Result, + } - if err := bus.Dispatch(&alertCmd); err != nil { - return ApiError(500, "Failed to save alerts", err) - } + if err := bus.Dispatch(&alertCmd); err != nil { + return ApiError(500, "Failed to save alerts", err) } c.TimeRequest(metrics.M_Api_Dashboard_Save) diff --git a/pkg/api/dtos/alerting.go b/pkg/api/dtos/alerting.go index e024768cd5e..bf4d7f4353e 100644 --- a/pkg/api/dtos/alerting.go +++ b/pkg/api/dtos/alerting.go @@ -58,3 +58,8 @@ type NotificationTestCommand struct { Type string `json:"type"` Settings *simplejson.Json `json:"settings"` } + +type PauseAlertCommand struct { + AlertId int64 `json:"alertId"` + Paused bool `json:"paused"` +} diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go index 5a324aa1331..d599dd10735 100644 --- a/pkg/api/frontendsettings.go +++ b/pkg/api/frontendsettings.go @@ -145,7 +145,6 @@ func getFrontendSettingsMap(c *middleware.Context) (map[string]interface{}, erro "hasUpdate": plugins.GrafanaHasUpdate, "env": setting.Env, }, - "alertingEnabled": setting.AlertingEnabled, } return jsonObj, nil diff --git a/pkg/api/gnetproxy.go b/pkg/api/gnetproxy.go index 8c21a0f03a7..7761729b8af 100644 --- a/pkg/api/gnetproxy.go +++ b/pkg/api/gnetproxy.go @@ -36,6 +36,7 @@ func ReverseProxyGnetReq(proxyPath string) *httputil.ReverseProxy { // clear cookie headers req.Header.Del("Cookie") req.Header.Del("Set-Cookie") + req.Header.Del("Authorization") } return &httputil.ReverseProxy{Director: director} diff --git a/pkg/api/index.go b/pkg/api/index.go index 385810b942e..99a5f78f9c9 100644 --- a/pkg/api/index.go +++ b/pkg/api/index.go @@ -102,7 +102,7 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) { Children: dashboardChildNavs, }) - if setting.AlertingEnabled && (c.OrgRole == m.ROLE_ADMIN || c.OrgRole == m.ROLE_EDITOR) { + if c.OrgRole == m.ROLE_ADMIN || c.OrgRole == m.ROLE_EDITOR { alertChildNavs := []*dtos.NavLink{ {Text: "Alert List", Url: setting.AppSubUrl + "/alerting/list"}, {Text: "Notifications", Url: setting.AppSubUrl + "/alerting/notifications"}, diff --git a/pkg/api/login_oauth.go b/pkg/api/login_oauth.go index bc222361b25..a8b32e93d3c 100644 --- a/pkg/api/login_oauth.go +++ b/pkg/api/login_oauth.go @@ -1,9 +1,17 @@ package api import ( + "crypto/rand" + "crypto/tls" + "crypto/x509" + "encoding/base64" "errors" "fmt" + "io/ioutil" + "log" + "net/http" + "golang.org/x/net/context" "golang.org/x/oauth2" "github.com/grafana/grafana/pkg/bus" @@ -14,6 +22,12 @@ import ( "github.com/grafana/grafana/pkg/social" ) +func GenStateString() string { + rnd := make([]byte, 32) + rand.Read(rnd) + return base64.StdEncoding.EncodeToString(rnd) +} + func OAuthLogin(ctx *middleware.Context) { if setting.OAuthService == nil { ctx.Handle(404, "login.OAuthLogin(oauth service not enabled)", nil) @@ -27,14 +41,63 @@ func OAuthLogin(ctx *middleware.Context) { return } + error := ctx.Query("error") + if error != "" { + errorDesc := ctx.Query("error_description") + ctx.Logger.Info("OAuthLogin Failed", "error", error, "errorDesc", errorDesc) + ctx.Redirect(setting.AppSubUrl + "/login?failCode=1003") + return + } + code := ctx.Query("code") if code == "" { - ctx.Redirect(connect.AuthCodeURL("", oauth2.AccessTypeOnline)) + state := GenStateString() + ctx.Session.Set(middleware.SESS_KEY_OAUTH_STATE, state) + ctx.Redirect(connect.AuthCodeURL(state, oauth2.AccessTypeOnline)) + return + } + + // verify state string + savedState := ctx.Session.Get(middleware.SESS_KEY_OAUTH_STATE).(string) + queryState := ctx.Query("state") + if savedState != queryState { + ctx.Handle(500, "login.OAuthLogin(state mismatch)", nil) return } // handle call back - token, err := connect.Exchange(oauth2.NoContext, code) + + // initialize oauth2 context + oauthCtx := oauth2.NoContext + if setting.OAuthService.OAuthInfos[name].TlsClientCert != "" { + cert, err := tls.LoadX509KeyPair(setting.OAuthService.OAuthInfos[name].TlsClientCert, setting.OAuthService.OAuthInfos[name].TlsClientKey) + if err != nil { + log.Fatal(err) + } + + // Load CA cert + caCert, err := ioutil.ReadFile(setting.OAuthService.OAuthInfos[name].TlsClientCa) + if err != nil { + log.Fatal(err) + } + caCertPool := x509.NewCertPool() + caCertPool.AppendCertsFromPEM(caCert) + + tr := &http.Transport{ + TLSClientConfig: &tls.Config{ + InsecureSkipVerify: true, + Certificates: []tls.Certificate{cert}, + RootCAs: caCertPool, + }, + } + sslcli := &http.Client{Transport: tr} + + oauthCtx = context.TODO() + oauthCtx = context.WithValue(oauthCtx, oauth2.HTTPClient, sslcli) + } + + // get token from provider + token, err := connect.Exchange(oauthCtx, code) if err != nil { ctx.Handle(500, "login.OAuthLogin(NewTransportWithCode)", err) return @@ -42,7 +105,11 @@ func OAuthLogin(ctx *middleware.Context) { ctx.Logger.Debug("OAuthLogin Got token") - userInfo, err := connect.UserInfo(token) + // set up oauth2 client + client := connect.Client(oauthCtx, token) + + // get user info + userInfo, err := connect.UserInfo(client) if err != nil { if err == social.ErrMissingTeamMembership { ctx.Redirect(setting.AppSubUrl + "/login?failCode=1000") @@ -82,7 +149,7 @@ func OAuthLogin(ctx *middleware.Context) { return } cmd := m.CreateUserCommand{ - Login: userInfo.Email, + Login: userInfo.Login, Email: userInfo.Email, Name: userInfo.Name, Company: userInfo.Company, diff --git a/pkg/cmd/grafana-cli/services/services.go b/pkg/cmd/grafana-cli/services/services.go index e2ccce8418f..8fda71a607b 100644 --- a/pkg/cmd/grafana-cli/services/services.go +++ b/pkg/cmd/grafana-cli/services/services.go @@ -149,6 +149,9 @@ func createRequest(repoUrl string, subPaths ...string) ([]byte, error) { } res, err := HttpClient.Do(req) + if res.StatusCode/100 != 2 { + return []byte{}, fmt.Errorf("Api returned invalid status: %s", res.Status) + } body, err := ioutil.ReadAll(res.Body) defer res.Body.Close() diff --git a/pkg/cmd/grafana-server/main.go b/pkg/cmd/grafana-server/main.go index aa519bfe308..24f5170ffb9 100644 --- a/pkg/cmd/grafana-server/main.go +++ b/pkg/cmd/grafana-server/main.go @@ -20,6 +20,7 @@ import ( _ "github.com/grafana/grafana/pkg/services/alerting/conditions" _ "github.com/grafana/grafana/pkg/services/alerting/notifiers" _ "github.com/grafana/grafana/pkg/tsdb/graphite" + _ "github.com/grafana/grafana/pkg/tsdb/influxdb" _ "github.com/grafana/grafana/pkg/tsdb/opentsdb" _ "github.com/grafana/grafana/pkg/tsdb/prometheus" _ "github.com/grafana/grafana/pkg/tsdb/testdata" diff --git a/pkg/cmd/grafana-server/server.go b/pkg/cmd/grafana-server/server.go index 0b8628602a7..2a4682cbb4b 100644 --- a/pkg/cmd/grafana-server/server.go +++ b/pkg/cmd/grafana-server/server.go @@ -59,7 +59,7 @@ func (g *GrafanaServerImpl) Start() { plugins.Init() // init alerting - if setting.AlertingEnabled { + if setting.ExecuteAlerts { engine := alerting.NewEngine() g.childRoutines.Go(func() error { return engine.Run(g.context) }) } diff --git a/pkg/components/imguploader/imguploader.go b/pkg/components/imguploader/imguploader.go index 1de46e7fd1d..1cbe55c8572 100644 --- a/pkg/components/imguploader/imguploader.go +++ b/pkg/components/imguploader/imguploader.go @@ -10,6 +10,13 @@ type ImageUploader interface { Upload(path string) (string, error) } +type NopImageUploader struct { +} + +func (NopImageUploader) Upload(path string) (string, error) { + return "", nil +} + func NewImageUploader() (ImageUploader, error) { switch setting.ImageUploadProvider { @@ -53,5 +60,5 @@ func NewImageUploader() (ImageUploader, error) { return NewWebdavImageUploader(url, username, password) } - return nil, fmt.Errorf("could not find specified provider") + return NopImageUploader{}, nil } diff --git a/pkg/login/ldap.go b/pkg/login/ldap.go index d8c916bb765..97a34f129b1 100644 --- a/pkg/login/ldap.go +++ b/pkg/login/ldap.go @@ -13,6 +13,7 @@ import ( "github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/log" m "github.com/grafana/grafana/pkg/models" + "github.com/grafana/grafana/pkg/setting" ) type ldapAuther struct { @@ -29,7 +30,7 @@ func (a *ldapAuther) Dial() error { var err error var certPool *x509.CertPool if a.server.RootCACert != "" { - certPool := x509.NewCertPool() + certPool = x509.NewCertPool() for _, caCertFile := range strings.Split(a.server.RootCACert, " ") { if pem, err := ioutil.ReadFile(caCertFile); err != nil { return err @@ -132,8 +133,10 @@ func (a *ldapAuther) getGrafanaUserFor(ldapUser *ldapUserInfo) (*m.User, error) // get user from grafana db userQuery := m.GetUserByLoginQuery{LoginOrEmail: ldapUser.Username} if err := bus.Dispatch(&userQuery); err != nil { - if err == m.ErrUserNotFound { + if err == m.ErrUserNotFound && setting.LdapAllowSignup { return a.createGrafanaUser(ldapUser) + } else if err == m.ErrUserNotFound { + return nil, ErrInvalidCredentials } else { return nil, err } diff --git a/pkg/middleware/session.go b/pkg/middleware/session.go index ee6462be37a..d575189f4de 100644 --- a/pkg/middleware/session.go +++ b/pkg/middleware/session.go @@ -13,6 +13,7 @@ import ( const ( SESS_KEY_USERID = "uid" + SESS_KEY_OAUTH_STATE = "state" ) var sessionManager *session.Manager diff --git a/pkg/models/alert.go b/pkg/models/alert.go index 938be8ddbd4..f50bb3193dc 100644 --- a/pkg/models/alert.go +++ b/pkg/models/alert.go @@ -101,6 +101,12 @@ type SaveAlertsCommand struct { Alerts []*Alert } +type PauseAlertCommand struct { + OrgId int64 + AlertId int64 + Paused bool +} + type SetAlertStateCommand struct { AlertId int64 OrgId int64 diff --git a/pkg/services/alerting/conditions/evaluator.go b/pkg/services/alerting/conditions/evaluator.go index 1c154e17ec2..19c268f2671 100644 --- a/pkg/services/alerting/conditions/evaluator.go +++ b/pkg/services/alerting/conditions/evaluator.go @@ -28,7 +28,7 @@ type ThresholdEvaluator struct { Threshold float64 } -func newThresholdEvaludator(typ string, model *simplejson.Json) (*ThresholdEvaluator, error) { +func newThresholdEvaluator(typ string, model *simplejson.Json) (*ThresholdEvaluator, error) { params := model.Get("params").MustArray() if len(params) == 0 { return nil, alerting.ValidationError{Reason: "Evaluator missing threshold parameter"} @@ -111,7 +111,7 @@ func NewAlertEvaluator(model *simplejson.Json) (AlertEvaluator, error) { } if inSlice(typ, defaultTypes) { - return newThresholdEvaludator(typ, model) + return newThresholdEvaluator(typ, model) } if inSlice(typ, rangedTypes) { @@ -122,7 +122,7 @@ func NewAlertEvaluator(model *simplejson.Json) (AlertEvaluator, error) { return &NoDataEvaluator{}, nil } - return nil, alerting.ValidationError{Reason: "Evaludator invalid evaluator type"} + return nil, alerting.ValidationError{Reason: "Evaluator invalid evaluator type: " + typ} } func inSlice(a string, list []string) bool { diff --git a/pkg/services/alerting/conditions/query.go b/pkg/services/alerting/conditions/query.go index b37123df5c3..a9a99ba919e 100644 --- a/pkg/services/alerting/conditions/query.go +++ b/pkg/services/alerting/conditions/query.go @@ -82,7 +82,7 @@ func (c *QueryCondition) executeQuery(context *alerting.EvalContext, timeRange * req := c.getRequestForAlertRule(getDsInfo.Result, timeRange) result := make(tsdb.TimeSeriesSlice, 0) - resp, err := c.HandleRequest(context.Context, req) + resp, err := c.HandleRequest(context.Ctx, req) if err != nil { return nil, fmt.Errorf("tsdb.HandleRequest() error %v", err) } @@ -123,6 +123,7 @@ func (c *QueryCondition) getRequestForAlertRule(datasource *m.DataSource, timeRa BasicAuth: datasource.BasicAuth, BasicAuthUser: datasource.BasicAuthUser, BasicAuthPassword: datasource.BasicAuthPassword, + JsonData: datasource.JsonData, }, }, }, diff --git a/pkg/services/alerting/conditions/reducer_test.go b/pkg/services/alerting/conditions/reducer_test.go index 67765f9c310..198a52b746a 100644 --- a/pkg/services/alerting/conditions/reducer_test.go +++ b/pkg/services/alerting/conditions/reducer_test.go @@ -3,6 +3,8 @@ package conditions import ( "testing" + "gopkg.in/guregu/null.v3" + "github.com/grafana/grafana/pkg/tsdb" . "github.com/smartystreets/goconvey/convey" ) @@ -43,7 +45,7 @@ func testReducer(typ string, datapoints ...float64) float64 { } for idx := range datapoints { - series.Points = append(series.Points, tsdb.NewTimePoint(datapoints[idx], 1234134)) + series.Points = append(series.Points, tsdb.NewTimePoint(null.FloatFrom(datapoints[idx]), 1234134)) } return reducer.Reduce(series).Float64 diff --git a/pkg/services/alerting/eval_context.go b/pkg/services/alerting/eval_context.go index 4903069b887..d9aaec28b0a 100644 --- a/pkg/services/alerting/eval_context.go +++ b/pkg/services/alerting/eval_context.go @@ -28,23 +28,7 @@ type EvalContext struct { NoDataFound bool RetryCount int - Context context.Context -} - -func (evalContext *EvalContext) Deadline() (deadline time.Time, ok bool) { - return evalContext.Deadline() -} - -func (evalContext *EvalContext) Done() <-chan struct{} { - return evalContext.Context.Done() -} - -func (evalContext *EvalContext) Err() error { - return evalContext.Context.Err() -} - -func (evalContext *EvalContext) Value(key interface{}) interface{} { - return evalContext.Context.Value(key) + Ctx context.Context } type StateDescription struct { @@ -103,6 +87,10 @@ func (c *EvalContext) GetDashboardSlug() (string, error) { } func (c *EvalContext) GetRuleUrl() (string, error) { + if c.IsTestRun { + return setting.AppUrl, nil + } + if slug, err := c.GetDashboardSlug(); err != nil { return "", err } else { @@ -113,7 +101,7 @@ func (c *EvalContext) GetRuleUrl() (string, error) { func NewEvalContext(alertCtx context.Context, rule *Rule) *EvalContext { return &EvalContext{ - Context: alertCtx, + Ctx: alertCtx, StartTime: time.Now(), Rule: rule, Logs: make([]*ResultLogEntry, 0), diff --git a/pkg/services/alerting/extractor.go b/pkg/services/alerting/extractor.go index 6a8be4f6deb..d78e84f6974 100644 --- a/pkg/services/alerting/extractor.go +++ b/pkg/services/alerting/extractor.go @@ -80,6 +80,11 @@ func (e *DashAlertExtractor) GetAlerts() ([]*m.Alert, error) { continue } + frequency, err := getTimeDurationStringToSeconds(jsonAlert.Get("frequency").MustString()) + if err != nil { + return nil, ValidationError{Reason: "Could not parse frequency"} + } + alert := &m.Alert{ DashboardId: e.Dash.Id, OrgId: e.OrgId, @@ -88,7 +93,7 @@ func (e *DashAlertExtractor) GetAlerts() ([]*m.Alert, error) { Name: jsonAlert.Get("name").MustString(), Handler: jsonAlert.Get("handler").MustInt64(), Message: jsonAlert.Get("message").MustString(), - Frequency: getTimeDurationStringToSeconds(jsonAlert.Get("frequency").MustString()), + Frequency: frequency, } for _, condition := range jsonAlert.Get("conditions").MustArray() { @@ -115,13 +120,17 @@ func (e *DashAlertExtractor) GetAlerts() ([]*m.Alert, error) { jsonQuery.SetPath([]string{"datasourceId"}, datasource.Id) } + if interval, err := panel.Get("interval").String(); err == nil { + panelQuery.Set("interval", interval) + } + jsonQuery.Set("model", panelQuery.Interface()) } alert.Settings = jsonAlert // validate - _, err := NewRuleFromDBAlert(alert) + _, err = NewRuleFromDBAlert(alert) if err == nil && alert.ValidToSave() { alerts = append(alerts, alert) } else { diff --git a/pkg/services/alerting/extractor_test.go b/pkg/services/alerting/extractor_test.go index f82210f1b1a..e72e6d938d8 100644 --- a/pkg/services/alerting/extractor_test.go +++ b/pkg/services/alerting/extractor_test.go @@ -6,6 +6,7 @@ import ( "github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/components/simplejson" m "github.com/grafana/grafana/pkg/models" + "github.com/grafana/grafana/pkg/setting" . "github.com/smartystreets/goconvey/convey" ) @@ -17,8 +18,35 @@ func TestAlertRuleExtraction(t *testing.T) { return &FakeCondition{}, nil }) - Convey("Parsing and validating alerts from dashboards", func() { - json := `{ + setting.NewConfigContext(&setting.CommandLineArgs{ + HomePath: "../../../", + }) + + // mock data + defaultDs := &m.DataSource{Id: 12, OrgId: 1, Name: "I am default", IsDefault: true} + graphite2Ds := &m.DataSource{Id: 15, OrgId: 1, Name: "graphite2"} + influxDBDs := &m.DataSource{Id: 16, OrgId: 1, Name: "InfluxDB"} + + bus.AddHandler("test", func(query *m.GetDataSourcesQuery) error { + query.Result = []*m.DataSource{defaultDs, graphite2Ds} + return nil + }) + + bus.AddHandler("test", func(query *m.GetDataSourceByNameQuery) error { + if query.Name == defaultDs.Name { + query.Result = defaultDs + } + if query.Name == graphite2Ds.Name { + query.Result = graphite2Ds + } + if query.Name == influxDBDs.Name { + query.Result = influxDBDs + } + return nil + }) + + json := ` + { "id": 57, "title": "Graphite 4", "originalTitle": "Graphite 4", @@ -80,32 +108,16 @@ func TestAlertRuleExtraction(t *testing.T) { ] } ] - }` + }` + + Convey("Parsing and validating dashboard containing graphite alerts", func() { + dashJson, err := simplejson.NewJson([]byte(json)) So(err, ShouldBeNil) dash := m.NewDashboardFromJson(dashJson) extractor := NewDashAlertExtractor(dash, 1) - // mock data - defaultDs := &m.DataSource{Id: 12, OrgId: 2, Name: "I am default", IsDefault: true} - graphite2Ds := &m.DataSource{Id: 15, OrgId: 2, Name: "graphite2"} - - bus.AddHandler("test", func(query *m.GetDataSourcesQuery) error { - query.Result = []*m.DataSource{defaultDs, graphite2Ds} - return nil - }) - - bus.AddHandler("test", func(query *m.GetDataSourceByNameQuery) error { - if query.Name == defaultDs.Name { - query.Result = defaultDs - } - if query.Name == graphite2Ds.Name { - query.Result = graphite2Ds - } - return nil - }) - alerts, err := extractor.GetAlerts() Convey("Get rules without error", func() { @@ -119,6 +131,9 @@ func TestAlertRuleExtraction(t *testing.T) { So(v.DashboardId, ShouldEqual, 57) So(v.Name, ShouldNotBeEmpty) So(v.Message, ShouldNotBeEmpty) + + settings := simplejson.NewFromAny(v.Settings) + So(settings.Get("interval").MustString(""), ShouldEqual, "") } Convey("should extract handler property", func() { @@ -156,5 +171,317 @@ func TestAlertRuleExtraction(t *testing.T) { }) }) }) + + Convey("Parse and validate dashboard containing influxdb alert", func() { + + json2 := `{ + "id": 4, + "title": "Influxdb", + "tags": [ + "apa" + ], + "style": "dark", + "timezone": "browser", + "editable": true, + "hideControls": false, + "sharedCrosshair": false, + "rows": [ + { + "collapse": false, + "editable": true, + "height": "450px", + "panels": [ + { + "alert": { + "conditions": [ + { + "evaluator": { + "params": [ + 10 + ], + "type": "gt" + }, + "query": { + "params": [ + "B", + "5m", + "now" + ] + }, + "reducer": { + "params": [], + "type": "avg" + }, + "type": "query" + } + ], + "frequency": "3s", + "handler": 1, + "name": "Influxdb", + "noDataState": "no_data", + "notifications": [ + { + "id": 6 + } + ] + }, + "alerting": {}, + "aliasColors": { + "logins.count.count": "#890F02" + }, + "bars": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fill": 1, + "grid": {}, + "id": 1, + "interval": ">10s", + "isNew": true, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "connected", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "span": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$interval" + ], + "type": "time" + }, + { + "params": [ + "datacenter" + ], + "type": "tag" + }, + { + "params": [ + "none" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "logins.count", + "policy": "default", + "query": "SELECT 8 * count(\"value\") FROM \"logins.count\" WHERE $timeFilter GROUP BY time($interval), \"datacenter\" fill(none)", + "rawQuery": true, + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "count" + } + ] + ], + "tags": [] + }, + { + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": true, + "measurement": "cpu", + "policy": "default", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ], + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "sum" + } + ] + ], + "tags": [] + } + ], + "thresholds": [ + { + "colorMode": "critical", + "fill": true, + "line": true, + "op": "gt", + "value": 10 + } + ], + "timeFrom": null, + "timeShift": null, + "title": "Panel Title", + "tooltip": { + "msResolution": false, + "ordering": "alphabetical", + "shared": true, + "sort": 0, + "value_type": "cumulative" + }, + "type": "graph", + "xaxis": { + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ] + }, + { + "editable": true, + "error": false, + "id": 2, + "isNew": true, + "limit": 10, + "links": [], + "show": "current", + "span": 2, + "stateFilter": [ + "alerting" + ], + "title": "Alert status", + "type": "alertlist" + } + ], + "title": "Row" + } + ], + "time": { + "from": "now-5m", + "to": "now" + }, + "timepicker": { + "now": true, + "refresh_intervals": [ + "5s", + "10s", + "30s", + "1m", + "5m", + "15m", + "30m", + "1h", + "2h", + "1d" + ], + "time_options": [ + "5m", + "15m", + "1h", + "6h", + "12h", + "24h", + "2d", + "7d", + "30d" + ] + }, + "templating": { + "list": [] + }, + "annotations": { + "list": [] + }, + "schemaVersion": 13, + "version": 120, + "links": [], + "gnetId": null + }` + + dashJson, err := simplejson.NewJson([]byte(json2)) + So(err, ShouldBeNil) + dash := m.NewDashboardFromJson(dashJson) + extractor := NewDashAlertExtractor(dash, 1) + + alerts, err := extractor.GetAlerts() + + Convey("Get rules without error", func() { + So(err, ShouldBeNil) + }) + + Convey("should be able to read interval", func() { + So(len(alerts), ShouldEqual, 1) + + for _, alert := range alerts { + So(alert.DashboardId, ShouldEqual, 4) + + conditions := alert.Settings.Get("conditions").MustArray() + cond := simplejson.NewFromAny(conditions[0]) + + So(cond.Get("query").Get("model").Get("interval").MustString(), ShouldEqual, ">10s") + } + }) + }) }) } diff --git a/pkg/services/alerting/interfaces.go b/pkg/services/alerting/interfaces.go index 88c006f9e47..583e12a120d 100644 --- a/pkg/services/alerting/interfaces.go +++ b/pkg/services/alerting/interfaces.go @@ -16,6 +16,9 @@ type Notifier interface { GetType() string NeedsImage() bool PassesFilter(rule *Rule) bool + + GetNotifierId() int64 + GetIsDefault() bool } type Condition interface { diff --git a/pkg/services/alerting/notifier.go b/pkg/services/alerting/notifier.go index c44ea777595..2017d9d7670 100644 --- a/pkg/services/alerting/notifier.go +++ b/pkg/services/alerting/notifier.go @@ -35,14 +35,22 @@ func (n *RootNotifier) PassesFilter(rule *Rule) bool { return false } -func (n *RootNotifier) Notify(context *EvalContext) error { - n.log.Info("Sending notifications for", "ruleId", context.Rule.Id) +func (n *RootNotifier) GetNotifierId() int64 { + return 0 +} +func (n *RootNotifier) GetIsDefault() bool { + return false +} + +func (n *RootNotifier) Notify(context *EvalContext) error { notifiers, err := n.getNotifiers(context.Rule.OrgId, context.Rule.Notifications, context) if err != nil { return err } + n.log.Info("Sending notifications for", "ruleId", context.Rule.Id, "Amount to send", len(notifiers)) + if len(notifiers) == 0 { return nil } @@ -57,11 +65,12 @@ func (n *RootNotifier) Notify(context *EvalContext) error { } func (n *RootNotifier) sendNotifications(context *EvalContext, notifiers []Notifier) error { - g, _ := errgroup.WithContext(context.Context) + g, _ := errgroup.WithContext(context.Ctx) for _, notifier := range notifiers { - n.log.Info("Sending notification", "firing", context.Firing, "type", notifier.GetType()) - g.Go(func() error { return notifier.Notify(context) }) + not := notifier //avoid updating scope variable in go routine + n.log.Info("Sending notification", "type", not.GetType(), "id", not.GetNotifierId(), "isDefault", not.GetIsDefault()) + g.Go(func() error { return not.Notify(context) }) } return g.Wait() diff --git a/pkg/services/alerting/notifier_test.go b/pkg/services/alerting/notifier_test.go index 5c79187078f..5e378dec890 100644 --- a/pkg/services/alerting/notifier_test.go +++ b/pkg/services/alerting/notifier_test.go @@ -22,6 +22,14 @@ func (fn *FakeNotifier) NeedsImage() bool { return true } +func (n *FakeNotifier) GetNotifierId() int64 { + return 0 +} + +func (n *FakeNotifier) GetIsDefault() bool { + return false +} + func (fn *FakeNotifier) Notify(alertResult *EvalContext) error { return nil } func (fn *FakeNotifier) PassesFilter(rule *Rule) bool { diff --git a/pkg/services/alerting/notifiers/base.go b/pkg/services/alerting/notifiers/base.go index 27c2a625d17..f1e748207d8 100644 --- a/pkg/services/alerting/notifiers/base.go +++ b/pkg/services/alerting/notifiers/base.go @@ -6,13 +6,19 @@ import ( ) type NotifierBase struct { - Name string - Type string + Name string + Type string + Id int64 + IsDeault bool } -func NewNotifierBase(name, notifierType string, model *simplejson.Json) NotifierBase { - base := NotifierBase{Name: name, Type: notifierType} - return base +func NewNotifierBase(id int64, isDefault bool, name, notifierType string, model *simplejson.Json) NotifierBase { + return NotifierBase{ + Id: id, + Name: name, + IsDeault: isDefault, + Type: notifierType, + } } func (n *NotifierBase) PassesFilter(rule *alerting.Rule) bool { @@ -26,3 +32,11 @@ func (n *NotifierBase) GetType() string { func (n *NotifierBase) NeedsImage() bool { return true } + +func (n *NotifierBase) GetNotifierId() int64 { + return n.Id +} + +func (n *NotifierBase) GetIsDefault() bool { + return n.IsDeault +} diff --git a/pkg/services/alerting/notifiers/email.go b/pkg/services/alerting/notifiers/email.go index dfb12e9cb7b..2b9dd4fd1b2 100644 --- a/pkg/services/alerting/notifiers/email.go +++ b/pkg/services/alerting/notifiers/email.go @@ -29,7 +29,7 @@ func NewEmailNotifier(model *m.AlertNotification) (alerting.Notifier, error) { } return &EmailNotifier{ - NotifierBase: NewNotifierBase(model.Name, model.Type, model.Settings), + NotifierBase: NewNotifierBase(model.Id, model.IsDefault, model.Name, model.Type, model.Settings), Addresses: strings.Split(addressesString, "\n"), log: log.New("alerting.notifier.email"), }, nil @@ -63,7 +63,7 @@ func (this *EmailNotifier) Notify(evalContext *alerting.EvalContext) error { }, } - err = bus.DispatchCtx(evalContext, cmd) + err = bus.DispatchCtx(evalContext.Ctx, cmd) if err != nil { this.log.Error("Failed to send alert notification email", "error", err) diff --git a/pkg/services/alerting/notifiers/slack.go b/pkg/services/alerting/notifiers/slack.go index ff71ae5d8c8..7238af179d7 100644 --- a/pkg/services/alerting/notifiers/slack.go +++ b/pkg/services/alerting/notifiers/slack.go @@ -23,7 +23,7 @@ func NewSlackNotifier(model *m.AlertNotification) (alerting.Notifier, error) { } return &SlackNotifier{ - NotifierBase: NewNotifierBase(model.Name, model.Type, model.Settings), + NotifierBase: NewNotifierBase(model.Id, model.IsDefault, model.Name, model.Type, model.Settings), Url: url, log: log.New("alerting.notifier.slack"), }, nil @@ -90,7 +90,7 @@ func (this *SlackNotifier) Notify(evalContext *alerting.EvalContext) error { data, _ := json.Marshal(&body) cmd := &m.SendWebhookSync{Url: this.Url, Body: string(data)} - if err := bus.DispatchCtx(evalContext, cmd); err != nil { + if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil { this.log.Error("Failed to send slack notification", "error", err, "webhook", this.Name) } diff --git a/pkg/services/alerting/notifiers/webhook.go b/pkg/services/alerting/notifiers/webhook.go index 223ea2a5d54..979ce2e8a98 100644 --- a/pkg/services/alerting/notifiers/webhook.go +++ b/pkg/services/alerting/notifiers/webhook.go @@ -20,7 +20,7 @@ func NewWebHookNotifier(model *m.AlertNotification) (alerting.Notifier, error) { } return &WebhookNotifier{ - NotifierBase: NewNotifierBase(model.Name, model.Type, model.Settings), + NotifierBase: NewNotifierBase(model.Id, model.IsDefault, model.Name, model.Type, model.Settings), Url: url, User: model.Settings.Get("user").MustString(), Password: model.Settings.Get("password").MustString(), @@ -65,7 +65,7 @@ func (this *WebhookNotifier) Notify(evalContext *alerting.EvalContext) error { Body: string(body), } - if err := bus.DispatchCtx(evalContext, cmd); err != nil { + if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil { this.log.Error("Failed to send webhook", "error", err, "webhook", this.Name) } diff --git a/pkg/services/alerting/rule.go b/pkg/services/alerting/rule.go index 5f59b60b64f..bfbb28b99fb 100644 --- a/pkg/services/alerting/rule.go +++ b/pkg/services/alerting/rule.go @@ -43,17 +43,27 @@ var unitMultiplier = map[string]int{ "h": 3600, } -func getTimeDurationStringToSeconds(str string) int64 { +func getTimeDurationStringToSeconds(str string) (int64, error) { multiplier := 1 - value, _ := strconv.Atoi(ValueFormatRegex.FindAllString(str, 1)[0]) + matches := ValueFormatRegex.FindAllString(str, 1) + + if len(matches) <= 0 { + return 0, fmt.Errorf("Frequency could not be parsed") + } + + value, err := strconv.Atoi(matches[0]) + if err != nil { + return 0, err + } + unit := UnitFormatRegex.FindAllString(str, 1)[0] if val, ok := unitMultiplier[unit]; ok { multiplier = val } - return int64(value * multiplier) + return int64(value * multiplier), nil } func NewRuleFromDBAlert(ruleDef *m.Alert) (*Rule, error) { diff --git a/pkg/services/alerting/rule_test.go b/pkg/services/alerting/rule_test.go index 622904ec3fc..6144c01d54d 100644 --- a/pkg/services/alerting/rule_test.go +++ b/pkg/services/alerting/rule_test.go @@ -20,25 +20,30 @@ func TestAlertRuleModel(t *testing.T) { }) Convey("Can parse seconds", func() { - seconds := getTimeDurationStringToSeconds("10s") + seconds, _ := getTimeDurationStringToSeconds("10s") So(seconds, ShouldEqual, 10) }) Convey("Can parse minutes", func() { - seconds := getTimeDurationStringToSeconds("10m") + seconds, _ := getTimeDurationStringToSeconds("10m") So(seconds, ShouldEqual, 600) }) Convey("Can parse hours", func() { - seconds := getTimeDurationStringToSeconds("1h") + seconds, _ := getTimeDurationStringToSeconds("1h") So(seconds, ShouldEqual, 3600) }) Convey("defaults to seconds", func() { - seconds := getTimeDurationStringToSeconds("1o") + seconds, _ := getTimeDurationStringToSeconds("1o") So(seconds, ShouldEqual, 1) }) + Convey("should return err for empty string", func() { + _, err := getTimeDurationStringToSeconds("") + So(err, ShouldNotBeNil) + }) + Convey("can construct alert rule model", func() { json := ` { diff --git a/pkg/services/alerting/scheduler.go b/pkg/services/alerting/scheduler.go index 9d20796f3dc..b6ef1a63ff8 100644 --- a/pkg/services/alerting/scheduler.go +++ b/pkg/services/alerting/scheduler.go @@ -5,6 +5,7 @@ import ( "time" "github.com/grafana/grafana/pkg/log" + "github.com/grafana/grafana/pkg/models" ) type SchedulerImpl struct { @@ -48,7 +49,7 @@ func (s *SchedulerImpl) Tick(tickTime time.Time, execQueue chan *Job) { now := tickTime.Unix() for _, job := range s.jobs { - if job.Running { + if job.Running || job.Rule.State == models.AlertStatePaused { continue } diff --git a/pkg/services/sqlstore/alert.go b/pkg/services/sqlstore/alert.go index 61397017943..76ea268bc04 100644 --- a/pkg/services/sqlstore/alert.go +++ b/pkg/services/sqlstore/alert.go @@ -18,6 +18,7 @@ func init() { bus.AddHandler("sql", GetAllAlertQueryHandler) bus.AddHandler("sql", SetAlertState) bus.AddHandler("sql", GetAlertStatesForDashboard) + bus.AddHandler("sql", PauseAlertRule) } func GetAlertById(query *m.GetAlertByIdQuery) error { @@ -243,6 +244,29 @@ func SetAlertState(cmd *m.SetAlertStateCommand) error { }) } +func PauseAlertRule(cmd *m.PauseAlertCommand) error { + return inTransaction(func(sess *xorm.Session) error { + alert := m.Alert{} + + if has, err := sess.Id(cmd.AlertId).Get(&alert); err != nil { + return err + } else if !has { + return fmt.Errorf("Could not find alert") + } + + var newState m.AlertStateType + if cmd.Paused { + newState = m.AlertStatePaused + } else { + newState = m.AlertStateNoData + } + alert.State = newState + + sess.Id(alert.Id).Update(&alert) + return nil + }) +} + func GetAlertStatesForDashboard(query *m.GetAlertStatesForDashboardQuery) error { var rawSql = `SELECT id, diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go index 46f70215c1f..94d93d3743e 100644 --- a/pkg/setting/setting.go +++ b/pkg/setting/setting.go @@ -134,8 +134,9 @@ var ( GoogleTagManagerId string // LDAP - LdapEnabled bool - LdapConfigFile string + LdapEnabled bool + LdapConfigFile string + LdapAllowSignup bool = true // SMTP email settings Smtp SmtpSettings @@ -144,7 +145,7 @@ var ( Quota QuotaSettings // Alerting - AlertingEnabled bool + ExecuteAlerts bool // logger logger log.Logger @@ -460,7 +461,7 @@ func NewConfigContext(args *CommandLineArgs) error { Env = Cfg.Section("").Key("app_mode").MustString("development") InstanceName = Cfg.Section("").Key("instance_name").MustString("unknown_instance_name") - PluginsPath = Cfg.Section("paths").Key("plugins").String() + PluginsPath = makeAbsolute(Cfg.Section("paths").Key("plugins").String(), HomePath) server := Cfg.Section("server") AppUrl, AppSubUrl = parseAppUrlAndSubUrl(server) @@ -551,9 +552,10 @@ func NewConfigContext(args *CommandLineArgs) error { ldapSec := Cfg.Section("auth.ldap") LdapEnabled = ldapSec.Key("enabled").MustBool(false) LdapConfigFile = ldapSec.Key("config_file").String() + LdapAllowSignup = ldapSec.Key("allow_sign_up").MustBool(true) alerting := Cfg.Section("alerting") - AlertingEnabled = alerting.Key("enabled").MustBool(false) + ExecuteAlerts = alerting.Key("execute_alerts").MustBool(true) readSessionConfig() readSmtpSettings() diff --git a/pkg/setting/setting_oauth.go b/pkg/setting/setting_oauth.go index 8d51343e635..e652310a621 100644 --- a/pkg/setting/setting_oauth.go +++ b/pkg/setting/setting_oauth.go @@ -9,6 +9,9 @@ type OAuthInfo struct { ApiUrl string AllowSignup bool Name string + TlsClientCert string + TlsClientKey string + TlsClientCa string } type OAuther struct { diff --git a/pkg/social/generic_oauth.go b/pkg/social/generic_oauth.go index f016c87e201..4b7ec065bc3 100644 --- a/pkg/social/generic_oauth.go +++ b/pkg/social/generic_oauth.go @@ -5,7 +5,6 @@ import ( "errors" "fmt" "net/http" - "strconv" "github.com/grafana/grafana/pkg/models" @@ -160,15 +159,16 @@ func (s *GenericOAuth) FetchOrganizations(client *http.Client) ([]string, error) return logins, nil } -func (s *GenericOAuth) UserInfo(token *oauth2.Token) (*BasicUserInfo, error) { +func (s *GenericOAuth) UserInfo(client *http.Client) (*BasicUserInfo, error) { var data struct { - Id int `json:"id"` - Name string `json:"login"` - Email string `json:"email"` + Name string `json:"name"` + Login string `json:"login"` + Username string `json:"username"` + Email string `json:"email"` + Attributes map[string][]string `json:"attributes"` } var err error - client := s.Client(oauth2.NoContext, token) r, err := client.Get(s.apiUrl) if err != nil { return nil, err @@ -181,11 +181,30 @@ func (s *GenericOAuth) UserInfo(token *oauth2.Token) (*BasicUserInfo, error) { } userInfo := &BasicUserInfo{ - Identity: strconv.Itoa(data.Id), Name: data.Name, + Login: data.Login, Email: data.Email, } + if (userInfo.Email == "" && data.Attributes["email:primary"] != nil) { + userInfo.Email = data.Attributes["email:primary"][0] + } + + if userInfo.Email == "" { + userInfo.Email, err = s.FetchPrivateEmail(client) + if err != nil { + return nil, err + } + } + + if (userInfo.Login == "" && data.Username != "") { + userInfo.Login = data.Username + } + + if (userInfo.Login == "") { + userInfo.Login = data.Email + } + if !s.IsTeamMember(client) { return nil, errors.New("User not a member of one of the required teams") } @@ -194,12 +213,5 @@ func (s *GenericOAuth) UserInfo(token *oauth2.Token) (*BasicUserInfo, error) { return nil, errors.New("User not a member of one of the required organizations") } - if userInfo.Email == "" { - userInfo.Email, err = s.FetchPrivateEmail(client) - if err != nil { - return nil, err - } - } - return userInfo, nil } diff --git a/pkg/social/github_oauth.go b/pkg/social/github_oauth.go index 40c8f2a2f7c..f3a9d4ece0f 100644 --- a/pkg/social/github_oauth.go +++ b/pkg/social/github_oauth.go @@ -5,7 +5,6 @@ import ( "errors" "fmt" "net/http" - "strconv" "github.com/grafana/grafana/pkg/models" @@ -168,15 +167,14 @@ func (s *SocialGithub) FetchOrganizations(client *http.Client) ([]string, error) return logins, nil } -func (s *SocialGithub) UserInfo(token *oauth2.Token) (*BasicUserInfo, error) { +func (s *SocialGithub) UserInfo(client *http.Client) (*BasicUserInfo, error) { var data struct { Id int `json:"id"` - Name string `json:"login"` + Login string `json:"login"` Email string `json:"email"` } var err error - client := s.Client(oauth2.NoContext, token) r, err := client.Get(s.apiUrl) if err != nil { return nil, err @@ -189,8 +187,8 @@ func (s *SocialGithub) UserInfo(token *oauth2.Token) (*BasicUserInfo, error) { } userInfo := &BasicUserInfo{ - Identity: strconv.Itoa(data.Id), - Name: data.Name, + Name: data.Login, + Login: data.Login, Email: data.Email, } diff --git a/pkg/social/google_oauth.go b/pkg/social/google_oauth.go index 7f0fdcc250a..a2687d58f81 100644 --- a/pkg/social/google_oauth.go +++ b/pkg/social/google_oauth.go @@ -2,6 +2,7 @@ package social import ( "encoding/json" + "net/http" "github.com/grafana/grafana/pkg/models" @@ -27,15 +28,13 @@ func (s *SocialGoogle) IsSignupAllowed() bool { return s.allowSignup } -func (s *SocialGoogle) UserInfo(token *oauth2.Token) (*BasicUserInfo, error) { +func (s *SocialGoogle) UserInfo(client *http.Client) (*BasicUserInfo, error) { var data struct { - Id string `json:"id"` Name string `json:"name"` Email string `json:"email"` } var err error - client := s.Client(oauth2.NoContext, token) r, err := client.Get(s.apiUrl) if err != nil { return nil, err @@ -45,7 +44,6 @@ func (s *SocialGoogle) UserInfo(token *oauth2.Token) (*BasicUserInfo, error) { return nil, err } return &BasicUserInfo{ - Identity: data.Id, Name: data.Name, Email: data.Email, }, nil diff --git a/pkg/social/grafananet_oauth.go b/pkg/social/grafananet_oauth.go index 80c1aaedb45..119b7a31cfc 100644 --- a/pkg/social/grafananet_oauth.go +++ b/pkg/social/grafananet_oauth.go @@ -2,9 +2,7 @@ package social import ( "encoding/json" - "fmt" "net/http" - "strconv" "github.com/grafana/grafana/pkg/models" @@ -18,6 +16,10 @@ type SocialGrafanaNet struct { allowSignup bool } +type OrgRecord struct { + Login string `json:"login"` +} + func (s *SocialGrafanaNet) Type() int { return int(models.GRAFANANET) } @@ -30,19 +32,14 @@ func (s *SocialGrafanaNet) IsSignupAllowed() bool { return s.allowSignup } -func (s *SocialGrafanaNet) IsOrganizationMember(client *http.Client) bool { +func (s *SocialGrafanaNet) IsOrganizationMember(organizations []OrgRecord) bool { if len(s.allowedOrganizations) == 0 { return true } - organizations, err := s.FetchOrganizations(client) - if err != nil { - return false - } - for _, allowedOrganization := range s.allowedOrganizations { for _, organization := range organizations { - if organization == allowedOrganization { + if organization.Login == allowedOrganization { return true } } @@ -51,43 +48,16 @@ func (s *SocialGrafanaNet) IsOrganizationMember(client *http.Client) bool { return false } -func (s *SocialGrafanaNet) FetchOrganizations(client *http.Client) ([]string, error) { - type Record struct { - Login string `json:"login"` - } - - url := fmt.Sprintf(s.url + "/api/oauth2/user/orgs") - r, err := client.Get(url) - if err != nil { - return nil, err - } - - defer r.Body.Close() - - var records []Record - - if err = json.NewDecoder(r.Body).Decode(&records); err != nil { - return nil, err - } - - var logins = make([]string, len(records)) - for i, record := range records { - logins[i] = record.Login - } - - return logins, nil -} - -func (s *SocialGrafanaNet) UserInfo(token *oauth2.Token) (*BasicUserInfo, error) { +func (s *SocialGrafanaNet) UserInfo(client *http.Client) (*BasicUserInfo, error) { var data struct { - Id int `json:"id"` - Name string `json:"login"` + Name string `json:"name"` + Login string `json:"username"` Email string `json:"email"` Role string `json:"role"` + Orgs []OrgRecord `json:"orgs"` } var err error - client := s.Client(oauth2.NoContext, token) r, err := client.Get(s.url + "/api/oauth2/user") if err != nil { return nil, err @@ -100,13 +70,13 @@ func (s *SocialGrafanaNet) UserInfo(token *oauth2.Token) (*BasicUserInfo, error) } userInfo := &BasicUserInfo{ - Identity: strconv.Itoa(data.Id), Name: data.Name, + Login: data.Login, Email: data.Email, Role: data.Role, } - if !s.IsOrganizationMember(client) { + if !s.IsOrganizationMember(data.Orgs) { return nil, ErrMissingOrganizationMembership } diff --git a/pkg/social/social.go b/pkg/social/social.go index 4dbc70d71a9..f70bdd70843 100644 --- a/pkg/social/social.go +++ b/pkg/social/social.go @@ -1,16 +1,16 @@ package social import ( + "net/http" "strings" - "github.com/grafana/grafana/pkg/setting" "golang.org/x/net/context" - "golang.org/x/oauth2" + + "github.com/grafana/grafana/pkg/setting" ) type BasicUserInfo struct { - Identity string Name string Email string Login string @@ -20,12 +20,13 @@ type BasicUserInfo struct { type SocialConnector interface { Type() int - UserInfo(token *oauth2.Token) (*BasicUserInfo, error) + UserInfo(client *http.Client) (*BasicUserInfo, error) IsEmailAllowed(email string) bool IsSignupAllowed() bool AuthCodeURL(state string, opts ...oauth2.AuthCodeOption) string Exchange(ctx context.Context, code string) (*oauth2.Token, error) + Client(ctx context.Context, t *oauth2.Token) *http.Client } var ( @@ -52,6 +53,9 @@ func NewOAuthService() { AllowedDomains: sec.Key("allowed_domains").Strings(" "), AllowSignup: sec.Key("allow_sign_up").MustBool(), Name: sec.Key("name").MustString(name), + TlsClientCert: sec.Key("tls_client_cert").String(), + TlsClientKey: sec.Key("tls_client_key").String(), + TlsClientCa: sec.Key("tls_client_ca").String(), } if !info.Enabled { @@ -59,6 +63,7 @@ func NewOAuthService() { } setting.OAuthService.OAuthInfos[name] = info + config := oauth2.Config{ ClientID: info.ClientId, ClientSecret: info.ClientSecret, @@ -85,9 +90,10 @@ func NewOAuthService() { // Google. if name == "google" { SocialMap["google"] = &SocialGoogle{ - Config: &config, allowedDomains: info.AllowedDomains, - apiUrl: info.ApiUrl, - allowSignup: info.AllowSignup, + Config: &config, + allowedDomains: info.AllowedDomains, + apiUrl: info.ApiUrl, + allowSignup: info.AllowSignup, } } @@ -104,15 +110,15 @@ func NewOAuthService() { } if name == "grafananet" { - config := oauth2.Config{ + config = oauth2.Config{ ClientID: info.ClientId, ClientSecret: info.ClientSecret, - Endpoint: oauth2.Endpoint{ - AuthURL: setting.GrafanaNetUrl + "/oauth2/authorize", - TokenURL: setting.GrafanaNetUrl + "/api/oauth2/token", + Endpoint: oauth2.Endpoint{ + AuthURL: setting.GrafanaNetUrl + "/oauth2/authorize", + TokenURL: setting.GrafanaNetUrl + "/api/oauth2/token", }, - RedirectURL: strings.TrimSuffix(setting.AppUrl, "/") + SocialBaseUrl + name, - Scopes: info.Scopes, + RedirectURL: strings.TrimSuffix(setting.AppUrl, "/") + SocialBaseUrl + name, + Scopes: info.Scopes, } SocialMap["grafananet"] = &SocialGrafanaNet{ diff --git a/pkg/tsdb/executor.go b/pkg/tsdb/executor.go index 97736ef4678..cc1d592dcd5 100644 --- a/pkg/tsdb/executor.go +++ b/pkg/tsdb/executor.go @@ -3,7 +3,7 @@ package tsdb import "context" type Executor interface { - Execute(ctx context.Context, queries QuerySlice, context *QueryContext) *BatchResult + Execute(ctx context.Context, queries QuerySlice, query *QueryContext) *BatchResult } var registry map[string]GetExecutorFn diff --git a/pkg/tsdb/graphite/graphite.go b/pkg/tsdb/graphite/graphite.go index 774bca4bca2..a2783a107fe 100644 --- a/pkg/tsdb/graphite/graphite.go +++ b/pkg/tsdb/graphite/graphite.go @@ -57,7 +57,11 @@ func (e *GraphiteExecutor) Execute(ctx context.Context, queries tsdb.QuerySlice, } for _, query := range queries { - formData["target"] = []string{query.Model.Get("target").MustString()} + if fullTarget, err := query.Model.Get("targetFull").String(); err == nil { + formData["target"] = []string{fullTarget} + } else { + formData["target"] = []string{query.Model.Get("target").MustString()} + } } if setting.Env == setting.DEV { diff --git a/pkg/tsdb/influxdb/influxdb.go b/pkg/tsdb/influxdb/influxdb.go new file mode 100644 index 00000000000..22f6230ed6d --- /dev/null +++ b/pkg/tsdb/influxdb/influxdb.go @@ -0,0 +1,133 @@ +package influxdb + +import ( + "context" + "crypto/tls" + "encoding/json" + "fmt" + "net/http" + "net/url" + "path" + "time" + + "golang.org/x/net/context/ctxhttp" + + "github.com/grafana/grafana/pkg/log" + "github.com/grafana/grafana/pkg/tsdb" +) + +type InfluxDBExecutor struct { + *tsdb.DataSourceInfo + QueryParser *InfluxdbQueryParser + QueryBuilder *QueryBuilder + ResponseParser *ResponseParser +} + +func NewInfluxDBExecutor(dsInfo *tsdb.DataSourceInfo) tsdb.Executor { + return &InfluxDBExecutor{ + DataSourceInfo: dsInfo, + QueryParser: &InfluxdbQueryParser{}, + QueryBuilder: &QueryBuilder{}, + ResponseParser: &ResponseParser{}, + } +} + +var ( + glog log.Logger + HttpClient *http.Client +) + +func init() { + glog = log.New("tsdb.influxdb") + tsdb.RegisterExecutor("influxdb", NewInfluxDBExecutor) + + tr := &http.Transport{ + TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, + } + + HttpClient = &http.Client{ + Timeout: time.Duration(15 * time.Second), + Transport: tr, + } +} + +func (e *InfluxDBExecutor) Execute(ctx context.Context, queries tsdb.QuerySlice, context *tsdb.QueryContext) *tsdb.BatchResult { + result := &tsdb.BatchResult{} + + query, err := e.getQuery(queries, context) + if err != nil { + return result.WithError(err) + } + + glog.Debug("Influxdb query", "raw query", query) + + req, err := e.createRequest(query) + if err != nil { + return result.WithError(err) + } + + resp, err := ctxhttp.Do(ctx, HttpClient, req) + if err != nil { + return result.WithError(err) + } + + if resp.StatusCode/100 != 2 { + return result.WithError(fmt.Errorf("Influxdb returned statuscode invalid status code: %v", resp.Status)) + } + + var response Response + dec := json.NewDecoder(resp.Body) + dec.UseNumber() + err = dec.Decode(&response) + if err != nil { + return result.WithError(err) + } + + result.QueryResults = make(map[string]*tsdb.QueryResult) + result.QueryResults["A"] = e.ResponseParser.Parse(&response) + + return result +} + +func (e *InfluxDBExecutor) getQuery(queries tsdb.QuerySlice, context *tsdb.QueryContext) (string, error) { + for _, v := range queries { + + query, err := e.QueryParser.Parse(v.Model, e.DataSourceInfo) + if err != nil { + return "", err + } + + rawQuery, err := e.QueryBuilder.Build(query, context) + if err != nil { + return "", err + } + + return rawQuery, nil + } + + return "", fmt.Errorf("query request contains no queries") +} + +func (e *InfluxDBExecutor) createRequest(query string) (*http.Request, error) { + u, _ := url.Parse(e.Url) + u.Path = path.Join(u.Path, "query") + + req, err := http.NewRequest(http.MethodGet, u.String(), nil) + if err != nil { + return nil, err + } + + params := req.URL.Query() + params.Set("q", query) + params.Set("db", e.Database) + params.Set("epoch", "s") + req.URL.RawQuery = params.Encode() + + req.Header.Set("User-Agent", "Grafana") + if e.BasicAuth { + req.SetBasicAuth(e.BasicAuthUser, e.BasicAuthPassword) + } + + glog.Debug("Influxdb request", "url", req.URL.String()) + return req, nil +} diff --git a/pkg/tsdb/influxdb/model_parser.go b/pkg/tsdb/influxdb/model_parser.go new file mode 100644 index 00000000000..ff8977f925b --- /dev/null +++ b/pkg/tsdb/influxdb/model_parser.go @@ -0,0 +1,162 @@ +package influxdb + +import ( + "strconv" + + "github.com/grafana/grafana/pkg/components/simplejson" + "github.com/grafana/grafana/pkg/tsdb" +) + +type InfluxdbQueryParser struct{} + +func (qp *InfluxdbQueryParser) Parse(model *simplejson.Json, dsInfo *tsdb.DataSourceInfo) (*Query, error) { + policy := model.Get("policy").MustString("default") + rawQuery := model.Get("query").MustString("") + interval := model.Get("interval").MustString("") + + measurement := model.Get("measurement").MustString("") + + resultFormat, err := model.Get("resultFormat").String() + if err != nil { + return nil, err + } + + tags, err := qp.parseTags(model) + if err != nil { + return nil, err + } + + groupBys, err := qp.parseGroupBy(model) + if err != nil { + return nil, err + } + + selects, err := qp.parseSelects(model) + if err != nil { + return nil, err + } + + if interval == "" { + dsInterval := dsInfo.JsonData.Get("timeInterval").MustString("") + if dsInterval != "" { + interval = dsInterval + } + } + + return &Query{ + Measurement: measurement, + Policy: policy, + ResultFormat: resultFormat, + GroupBy: groupBys, + Tags: tags, + Selects: selects, + RawQuery: rawQuery, + Interval: interval, + }, nil +} + +func (qp *InfluxdbQueryParser) parseSelects(model *simplejson.Json) ([]*Select, error) { + var result []*Select + + for _, selectObj := range model.Get("select").MustArray() { + selectJson := simplejson.NewFromAny(selectObj) + var parts Select + + for _, partObj := range selectJson.MustArray() { + part := simplejson.NewFromAny(partObj) + queryPart, err := qp.parseQueryPart(part) + if err != nil { + return nil, err + } + + parts = append(parts, *queryPart) + } + + result = append(result, &parts) + } + + return result, nil +} + +func (*InfluxdbQueryParser) parseTags(model *simplejson.Json) ([]*Tag, error) { + var result []*Tag + for _, t := range model.Get("tags").MustArray() { + tagJson := simplejson.NewFromAny(t) + tag := &Tag{} + var err error + + tag.Key, err = tagJson.Get("key").String() + if err != nil { + return nil, err + } + + tag.Value, err = tagJson.Get("value").String() + if err != nil { + return nil, err + } + + operator, err := tagJson.Get("operator").String() + if err == nil { + tag.Operator = operator + } + + condition, err := tagJson.Get("condition").String() + if err == nil { + tag.Condition = condition + } + + result = append(result, tag) + } + + return result, nil +} + +func (*InfluxdbQueryParser) parseQueryPart(model *simplejson.Json) (*QueryPart, error) { + typ, err := model.Get("type").String() + if err != nil { + return nil, err + } + + var params []string + for _, paramObj := range model.Get("params").MustArray() { + param := simplejson.NewFromAny(paramObj) + + stringParam, err := param.String() + if err == nil { + params = append(params, stringParam) + continue + } + + intParam, err := param.Int() + if err == nil { + params = append(params, strconv.Itoa(intParam)) + continue + } + + return nil, err + + } + + qp, err := NewQueryPart(typ, params) + if err != nil { + return nil, err + } + + return qp, nil +} + +func (qp *InfluxdbQueryParser) parseGroupBy(model *simplejson.Json) ([]*QueryPart, error) { + var result []*QueryPart + + for _, groupObj := range model.Get("groupBy").MustArray() { + groupJson := simplejson.NewFromAny(groupObj) + queryPart, err := qp.parseQueryPart(groupJson) + + if err != nil { + return nil, err + } + result = append(result, queryPart) + } + + return result, nil +} diff --git a/pkg/tsdb/influxdb/model_parser_test.go b/pkg/tsdb/influxdb/model_parser_test.go new file mode 100644 index 00000000000..8f43cc7d70f --- /dev/null +++ b/pkg/tsdb/influxdb/model_parser_test.go @@ -0,0 +1,178 @@ +package influxdb + +import ( + "testing" + + "github.com/grafana/grafana/pkg/components/simplejson" + "github.com/grafana/grafana/pkg/tsdb" + . "github.com/smartystreets/goconvey/convey" +) + +func TestInfluxdbQueryParser(t *testing.T) { + Convey("Influxdb query parser", t, func() { + + parser := &InfluxdbQueryParser{} + dsInfo := &tsdb.DataSourceInfo{ + JsonData: simplejson.New(), + } + + Convey("can parse influxdb json model", func() { + json := ` + { + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$interval" + ], + "type": "time" + }, + { + "params": [ + "datacenter" + ], + "type": "tag" + }, + { + "params": [ + "none" + ], + "type": "fill" + } + ], + "measurement": "logins.count", + "policy": "default", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "type": "field", + "params": [ + "value" + ] + }, + { + "type": "count", + "params": [] + } + ], + [ + { + "type": "field", + "params": [ + "value" + ] + }, + { + "type": "bottom", + "params": [ + 3 + ] + } + ], + [ + { + "type": "field", + "params": [ + "value" + ] + }, + { + "type": "mean", + "params": [] + }, + { + "type": "math", + "params": [ + " / 100" + ] + } + ] + ], + "tags": [ + { + "key": "datacenter", + "operator": "=", + "value": "America" + }, + { + "condition": "OR", + "key": "hostname", + "operator": "=", + "value": "server1" + } + ] + } + ` + dsInfo.JsonData.Set("timeInterval", ">20s") + modelJson, err := simplejson.NewJson([]byte(json)) + So(err, ShouldBeNil) + + res, err := parser.Parse(modelJson, dsInfo) + So(err, ShouldBeNil) + So(len(res.GroupBy), ShouldEqual, 3) + So(len(res.Selects), ShouldEqual, 3) + So(len(res.Tags), ShouldEqual, 2) + So(res.Interval, ShouldEqual, ">20s") + }) + + Convey("can part raw query json model", func() { + json := ` + { + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "interval": ">10s", + "policy": "default", + "query": "RawDummieQuery", + "rawQuery": true, + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [ + + ], + "type": "mean" + } + ] + ], + "tags": [ + + ] + } + ` + + modelJson, err := simplejson.NewJson([]byte(json)) + So(err, ShouldBeNil) + + res, err := parser.Parse(modelJson, dsInfo) + So(err, ShouldBeNil) + So(res.RawQuery, ShouldEqual, "RawDummieQuery") + So(len(res.GroupBy), ShouldEqual, 2) + So(len(res.Selects), ShouldEqual, 1) + So(len(res.Tags), ShouldEqual, 0) + So(res.Interval, ShouldEqual, ">10s") + }) + }) +} diff --git a/pkg/tsdb/influxdb/models.go b/pkg/tsdb/influxdb/models.go new file mode 100644 index 00000000000..7903616ff22 --- /dev/null +++ b/pkg/tsdb/influxdb/models.go @@ -0,0 +1,49 @@ +package influxdb + +type Query struct { + Measurement string + Policy string + ResultFormat string + Tags []*Tag + GroupBy []*QueryPart + Selects []*Select + RawQuery string + + Interval string +} + +type Tag struct { + Key string + Operator string + Value string + Condition string +} + +type Select []QueryPart + +type InfluxDbSelect struct { + Type string +} + +type Response struct { + Results []Result + Err error +} + +type Result struct { + Series []Row + Messages []*Message + Err error +} + +type Message struct { + Level string `json:"level,omitempty"` + Text string `json:"text,omitempty"` +} + +type Row struct { + Name string `json:"name,omitempty"` + Tags map[string]string `json:"tags,omitempty"` + Columns []string `json:"columns,omitempty"` + Values [][]interface{} `json:"values,omitempty"` +} diff --git a/pkg/tsdb/influxdb/query_builder.go b/pkg/tsdb/influxdb/query_builder.go new file mode 100644 index 00000000000..bf0dc084c49 --- /dev/null +++ b/pkg/tsdb/influxdb/query_builder.go @@ -0,0 +1,116 @@ +package influxdb + +import ( + "fmt" + "strings" + + "github.com/grafana/grafana/pkg/tsdb" +) + +type QueryBuilder struct{} + +func (qb *QueryBuilder) Build(query *Query, queryContext *tsdb.QueryContext) (string, error) { + if query.RawQuery != "" { + q := query.RawQuery + + q = strings.Replace(q, "$timeFilter", qb.renderTimeFilter(query, queryContext), 1) + q = strings.Replace(q, "$interval", tsdb.CalculateInterval(queryContext.TimeRange), 1) + + return q, nil + } + + res := qb.renderSelectors(query, queryContext) + res += qb.renderMeasurement(query) + res += qb.renderWhereClause(query) + res += qb.renderTimeFilter(query, queryContext) + res += qb.renderGroupBy(query, queryContext) + + return res, nil +} + +func (qb *QueryBuilder) renderTags(query *Query) []string { + var res []string + for i, tag := range query.Tags { + str := "" + + if i > 0 { + if tag.Condition == "" { + str += "AND" + } else { + str += tag.Condition + } + str += " " + } + + res = append(res, fmt.Sprintf(`%s"%s" %s '%s'`, str, tag.Key, tag.Operator, tag.Value)) + } + + return res +} + +func (qb *QueryBuilder) renderTimeFilter(query *Query, queryContext *tsdb.QueryContext) string { + from := "now() - " + queryContext.TimeRange.From + to := "" + + if queryContext.TimeRange.To != "now" && queryContext.TimeRange.To != "" { + to = " and time < now() - " + strings.Replace(queryContext.TimeRange.To, "now-", "", 1) + } + + return fmt.Sprintf("time > %s%s", from, to) +} + +func (qb *QueryBuilder) renderSelectors(query *Query, queryContext *tsdb.QueryContext) string { + res := "SELECT " + + var selectors []string + for _, sel := range query.Selects { + + stk := "" + for _, s := range *sel { + stk = s.Render(query, queryContext, stk) + } + selectors = append(selectors, stk) + } + + return res + strings.Join(selectors, ", ") +} + +func (qb *QueryBuilder) renderMeasurement(query *Query) string { + policy := "" + if query.Policy == "" || query.Policy == "default" { + policy = "" + } else { + policy = `"` + query.Policy + `".` + } + return fmt.Sprintf(` FROM %s"%s"`, policy, query.Measurement) +} + +func (qb *QueryBuilder) renderWhereClause(query *Query) string { + res := " WHERE " + conditions := qb.renderTags(query) + res += strings.Join(conditions, " ") + if len(conditions) > 0 { + res += " AND " + } + + return res +} + +func (qb *QueryBuilder) renderGroupBy(query *Query, queryContext *tsdb.QueryContext) string { + groupBy := "" + for i, group := range query.GroupBy { + if i == 0 { + groupBy += " GROUP BY" + } + + if i > 0 && group.Type != "fill" { + groupBy += ", " //fill is so very special. fill is a creep, fill is a weirdo + } else { + groupBy += " " + } + + groupBy += group.Render(query, queryContext, "") + } + + return groupBy +} diff --git a/pkg/tsdb/influxdb/query_builder_test.go b/pkg/tsdb/influxdb/query_builder_test.go new file mode 100644 index 00000000000..4552f85b28a --- /dev/null +++ b/pkg/tsdb/influxdb/query_builder_test.go @@ -0,0 +1,87 @@ +package influxdb + +import ( + "testing" + + "github.com/grafana/grafana/pkg/tsdb" + . "github.com/smartystreets/goconvey/convey" +) + +func TestInfluxdbQueryBuilder(t *testing.T) { + + Convey("Influxdb query builder", t, func() { + builder := QueryBuilder{} + + qp1, _ := NewQueryPart("field", []string{"value"}) + qp2, _ := NewQueryPart("mean", []string{}) + + groupBy1, _ := NewQueryPart("time", []string{"$interval"}) + groupBy2, _ := NewQueryPart("tag", []string{"datacenter"}) + groupBy3, _ := NewQueryPart("fill", []string{"null"}) + + tag1 := &Tag{Key: "hostname", Value: "server1", Operator: "="} + tag2 := &Tag{Key: "hostname", Value: "server2", Operator: "=", Condition: "OR"} + + queryContext := &tsdb.QueryContext{ + TimeRange: tsdb.NewTimeRange("5m", "now"), + } + + Convey("can build simple query", func() { + query := &Query{ + Selects: []*Select{{*qp1, *qp2}}, + Measurement: "cpu", + Policy: "policy", + GroupBy: []*QueryPart{groupBy1, groupBy3}, + Interval: "10s", + } + + rawQuery, err := builder.Build(query, queryContext) + So(err, ShouldBeNil) + So(rawQuery, ShouldEqual, `SELECT mean("value") FROM "policy"."cpu" WHERE time > now() - 5m GROUP BY time(10s) fill(null)`) + }) + + Convey("can build query with group bys", func() { + query := &Query{ + Selects: []*Select{{*qp1, *qp2}}, + Measurement: "cpu", + GroupBy: []*QueryPart{groupBy1, groupBy2, groupBy3}, + Tags: []*Tag{tag1, tag2}, + Interval: "5s", + } + + rawQuery, err := builder.Build(query, queryContext) + So(err, ShouldBeNil) + So(rawQuery, ShouldEqual, `SELECT mean("value") FROM "cpu" WHERE "hostname" = 'server1' OR "hostname" = 'server2' AND time > now() - 5m GROUP BY time(5s), "datacenter" fill(null)`) + }) + + Convey("can render time range", func() { + query := Query{} + builder := &QueryBuilder{} + Convey("render from: 2h to now-1h", func() { + query := Query{} + queryContext := &tsdb.QueryContext{TimeRange: tsdb.NewTimeRange("2h", "now-1h")} + So(builder.renderTimeFilter(&query, queryContext), ShouldEqual, "time > now() - 2h and time < now() - 1h") + }) + + Convey("render from: 10m", func() { + queryContext := &tsdb.QueryContext{TimeRange: tsdb.NewTimeRange("10m", "now")} + So(builder.renderTimeFilter(&query, queryContext), ShouldEqual, "time > now() - 10m") + }) + }) + + Convey("can build query from raw query", func() { + query := &Query{ + Selects: []*Select{{*qp1, *qp2}}, + Measurement: "cpu", + Policy: "policy", + GroupBy: []*QueryPart{groupBy1, groupBy3}, + Interval: "10s", + RawQuery: "Raw query", + } + + rawQuery, err := builder.Build(query, queryContext) + So(err, ShouldBeNil) + So(rawQuery, ShouldEqual, `Raw query`) + }) + }) +} diff --git a/pkg/tsdb/influxdb/query_part.go b/pkg/tsdb/influxdb/query_part.go new file mode 100644 index 00000000000..d634bc5c817 --- /dev/null +++ b/pkg/tsdb/influxdb/query_part.go @@ -0,0 +1,166 @@ +package influxdb + +import ( + "fmt" + "strings" + "time" + + "github.com/grafana/grafana/pkg/tsdb" +) + +var renders map[string]QueryDefinition + +type DefinitionParameters struct { + Name string + Type string +} + +type QueryDefinition struct { + Renderer func(query *Query, queryContext *tsdb.QueryContext, part *QueryPart, innerExpr string) string + Params []DefinitionParameters +} + +func init() { + renders = make(map[string]QueryDefinition) + + renders["field"] = QueryDefinition{Renderer: fieldRenderer} + + renders["spread"] = QueryDefinition{Renderer: functionRenderer} + renders["count"] = QueryDefinition{Renderer: functionRenderer} + renders["distinct"] = QueryDefinition{Renderer: functionRenderer} + renders["integral"] = QueryDefinition{Renderer: functionRenderer} + renders["mean"] = QueryDefinition{Renderer: functionRenderer} + renders["median"] = QueryDefinition{Renderer: functionRenderer} + renders["sum"] = QueryDefinition{Renderer: functionRenderer} + + renders["derivative"] = QueryDefinition{ + Renderer: functionRenderer, + Params: []DefinitionParameters{{Name: "duration", Type: "interval"}}, + } + + renders["non_negative_derivative"] = QueryDefinition{ + Renderer: functionRenderer, + Params: []DefinitionParameters{{Name: "duration", Type: "interval"}}, + } + renders["difference"] = QueryDefinition{Renderer: functionRenderer} + renders["moving_average"] = QueryDefinition{ + Renderer: functionRenderer, + Params: []DefinitionParameters{{Name: "window", Type: "number"}}, + } + renders["stddev"] = QueryDefinition{Renderer: functionRenderer} + renders["time"] = QueryDefinition{ + Renderer: functionRenderer, + Params: []DefinitionParameters{{Name: "interval", Type: "time"}}, + } + renders["fill"] = QueryDefinition{ + Renderer: functionRenderer, + Params: []DefinitionParameters{{Name: "fill", Type: "string"}}, + } + renders["elapsed"] = QueryDefinition{ + Renderer: functionRenderer, + Params: []DefinitionParameters{{Name: "duration", Type: "interval"}}, + } + renders["bottom"] = QueryDefinition{ + Renderer: functionRenderer, + Params: []DefinitionParameters{{Name: "count", Type: "int"}}, + } + + renders["first"] = QueryDefinition{Renderer: functionRenderer} + renders["last"] = QueryDefinition{Renderer: functionRenderer} + renders["max"] = QueryDefinition{Renderer: functionRenderer} + renders["min"] = QueryDefinition{Renderer: functionRenderer} + renders["percentile"] = QueryDefinition{ + Renderer: functionRenderer, + Params: []DefinitionParameters{{Name: "nth", Type: "int"}}, + } + renders["top"] = QueryDefinition{ + Renderer: functionRenderer, + Params: []DefinitionParameters{{Name: "count", Type: "int"}}, + } + renders["tag"] = QueryDefinition{ + Renderer: fieldRenderer, + Params: []DefinitionParameters{{Name: "tag", Type: "string"}}, + } + + renders["math"] = QueryDefinition{Renderer: suffixRenderer} + renders["alias"] = QueryDefinition{Renderer: aliasRenderer} +} + +func fieldRenderer(query *Query, queryContext *tsdb.QueryContext, part *QueryPart, innerExpr string) string { + if part.Params[0] == "*" { + return "*" + } + return fmt.Sprintf(`"%s"`, part.Params[0]) +} + +func getDefinedInterval(query *Query, queryContext *tsdb.QueryContext) string { + setInterval := strings.Replace(strings.Replace(query.Interval, "<", "", 1), ">", "", 1) + defaultInterval := tsdb.CalculateInterval(queryContext.TimeRange) + + if strings.Contains(query.Interval, ">") { + parsedDefaultInterval, err := time.ParseDuration(defaultInterval) + parsedSetInterval, err2 := time.ParseDuration(setInterval) + + if err == nil && err2 == nil && parsedDefaultInterval > parsedSetInterval { + return defaultInterval + } + } + + return setInterval +} + +func functionRenderer(query *Query, queryContext *tsdb.QueryContext, part *QueryPart, innerExpr string) string { + for i, param := range part.Params { + if param == "$interval" { + if query.Interval != "" { + part.Params[i] = getDefinedInterval(query, queryContext) + } else { + part.Params[i] = tsdb.CalculateInterval(queryContext.TimeRange) + } + } + } + + if innerExpr != "" { + part.Params = append([]string{innerExpr}, part.Params...) + } + + params := strings.Join(part.Params, ", ") + + return fmt.Sprintf("%s(%s)", part.Type, params) +} + +func suffixRenderer(query *Query, queryContext *tsdb.QueryContext, part *QueryPart, innerExpr string) string { + return fmt.Sprintf("%s %s", innerExpr, part.Params[0]) +} + +func aliasRenderer(query *Query, queryContext *tsdb.QueryContext, part *QueryPart, innerExpr string) string { + return fmt.Sprintf(`%s AS "%s"`, innerExpr, part.Params[0]) +} + +func (r QueryDefinition) Render(query *Query, queryContext *tsdb.QueryContext, part *QueryPart, innerExpr string) string { + return r.Renderer(query, queryContext, part, innerExpr) +} + +func NewQueryPart(typ string, params []string) (*QueryPart, error) { + def, exist := renders[typ] + + if !exist { + return nil, fmt.Errorf("Missing query definition for %s", typ) + } + + return &QueryPart{ + Type: typ, + Params: params, + Def: def, + }, nil +} + +type QueryPart struct { + Def QueryDefinition + Type string + Params []string +} + +func (qp *QueryPart) Render(query *Query, queryContext *tsdb.QueryContext, expr string) string { + return qp.Def.Renderer(query, queryContext, qp, expr) +} diff --git a/pkg/tsdb/influxdb/query_part_test.go b/pkg/tsdb/influxdb/query_part_test.go new file mode 100644 index 00000000000..456a7fb8d59 --- /dev/null +++ b/pkg/tsdb/influxdb/query_part_test.go @@ -0,0 +1,93 @@ +package influxdb + +import ( + "testing" + + "github.com/grafana/grafana/pkg/tsdb" + . "github.com/smartystreets/goconvey/convey" +) + +func TestInfluxdbQueryPart(t *testing.T) { + Convey("Influxdb query parts", t, func() { + + queryContext := &tsdb.QueryContext{TimeRange: tsdb.NewTimeRange("5m", "now")} + query := &Query{} + + Convey("render field ", func() { + part, err := NewQueryPart("field", []string{"value"}) + So(err, ShouldBeNil) + + res := part.Render(query, queryContext, "value") + So(res, ShouldEqual, `"value"`) + }) + + Convey("render nested part", func() { + part, err := NewQueryPart("derivative", []string{"10s"}) + So(err, ShouldBeNil) + + res := part.Render(query, queryContext, "mean(value)") + So(res, ShouldEqual, "derivative(mean(value), 10s)") + }) + + Convey("render bottom", func() { + part, err := NewQueryPart("bottom", []string{"3"}) + So(err, ShouldBeNil) + + res := part.Render(query, queryContext, "value") + So(res, ShouldEqual, "bottom(value, 3)") + }) + + Convey("render time", func() { + part, err := NewQueryPart("time", []string{"$interval"}) + So(err, ShouldBeNil) + + res := part.Render(query, queryContext, "") + So(res, ShouldEqual, "time(200ms)") + }) + + Convey("render time interval >10s", func() { + part, err := NewQueryPart("time", []string{"$interval"}) + So(err, ShouldBeNil) + + query.Interval = ">10s" + + res := part.Render(query, queryContext, "") + So(res, ShouldEqual, "time(10s)") + }) + + Convey("render time interval >1s and higher interval calculation", func() { + part, err := NewQueryPart("time", []string{"$interval"}) + queryContext := &tsdb.QueryContext{TimeRange: tsdb.NewTimeRange("1y", "now")} + So(err, ShouldBeNil) + + query.Interval = ">1s" + + res := part.Render(query, queryContext, "") + So(res, ShouldEqual, "time(168h)") + }) + + Convey("render spread", func() { + part, err := NewQueryPart("spread", []string{}) + So(err, ShouldBeNil) + + res := part.Render(query, queryContext, "value") + So(res, ShouldEqual, `spread(value)`) + }) + + Convey("render suffix", func() { + part, err := NewQueryPart("math", []string{"/ 100"}) + So(err, ShouldBeNil) + + res := part.Render(query, queryContext, "mean(value)") + So(res, ShouldEqual, "mean(value) / 100") + }) + + Convey("render alias", func() { + part, err := NewQueryPart("alias", []string{"test"}) + So(err, ShouldBeNil) + + res := part.Render(query, queryContext, "mean(value)") + So(res, ShouldEqual, `mean(value) AS "test"`) + }) + }) +} diff --git a/pkg/tsdb/influxdb/response_parser.go b/pkg/tsdb/influxdb/response_parser.go new file mode 100644 index 00000000000..44afa910b27 --- /dev/null +++ b/pkg/tsdb/influxdb/response_parser.go @@ -0,0 +1,94 @@ +package influxdb + +import ( + "encoding/json" + "fmt" + "strings" + + "github.com/grafana/grafana/pkg/tsdb" + "gopkg.in/guregu/null.v3" +) + +type ResponseParser struct{} + +func (rp *ResponseParser) Parse(response *Response) *tsdb.QueryResult { + queryRes := tsdb.NewQueryResult() + + for _, result := range response.Results { + queryRes.Series = append(queryRes.Series, rp.transformRows(result.Series, queryRes)...) + } + + return queryRes +} + +func (rp *ResponseParser) transformRows(rows []Row, queryResult *tsdb.QueryResult) tsdb.TimeSeriesSlice { + var result tsdb.TimeSeriesSlice + + for _, row := range rows { + for columnIndex, column := range row.Columns { + if column == "time" { + continue + } + + var points tsdb.TimeSeriesPoints + for _, valuePair := range row.Values { + point, err := rp.parseTimepoint(valuePair, columnIndex) + if err == nil { + points = append(points, point) + } + } + result = append(result, &tsdb.TimeSeries{ + Name: rp.formatSerieName(row, column), + Points: points, + }) + } + } + + return result +} + +func (rp *ResponseParser) formatSerieName(row Row, column string) string { + var tags []string + + for k, v := range row.Tags { + tags = append(tags, fmt.Sprintf("%s: %s", k, v)) + } + + tagText := "" + if len(tags) > 0 { + tagText = fmt.Sprintf(" { %s }", strings.Join(tags, " ")) + } + + return fmt.Sprintf("%s.%s%s", row.Name, column, tagText) +} + +func (rp *ResponseParser) parseTimepoint(valuePair []interface{}, valuePosition int) (tsdb.TimePoint, error) { + var value null.Float = rp.parseValue(valuePair[valuePosition]) + + timestampNumber, _ := valuePair[0].(json.Number) + timestamp, err := timestampNumber.Float64() + if err != nil { + return tsdb.TimePoint{}, err + } + + return tsdb.NewTimePoint(value, timestamp), nil +} + +func (rp *ResponseParser) parseValue(value interface{}) null.Float { + number, ok := value.(json.Number) + if !ok { + return null.FloatFromPtr(nil) + } + + fvalue, err := number.Float64() + if err == nil { + return null.FloatFrom(fvalue) + } + + ivalue, err := number.Int64() + if err == nil { + return null.FloatFrom(float64(ivalue)) + } + + return null.FloatFromPtr(nil) +} diff --git a/pkg/tsdb/influxdb/response_parser_test.go b/pkg/tsdb/influxdb/response_parser_test.go new file mode 100644 index 00000000000..b45f98a1fff --- /dev/null +++ b/pkg/tsdb/influxdb/response_parser_test.go @@ -0,0 +1,59 @@ +package influxdb + +import ( + "encoding/json" + "testing" + + . "github.com/smartystreets/goconvey/convey" +) + +func TestInfluxdbResponseParser(t *testing.T) { + Convey("Influxdb response parser", t, func() { + + parser := &ResponseParser{} + + response := &Response{ + Results: []Result{ + Result{ + Series: []Row{ + { + Name: "cpu", + Columns: []string{"time", "mean", "sum"}, + Tags: map[string]string{"datacenter": "America"}, + Values: [][]interface{}{ + {json.Number("111"), json.Number("222"), json.Number("333")}, + {json.Number("111"), json.Number("222"), json.Number("333")}, + {json.Number("111"), json.Number("null"), json.Number("333")}, + }, + }, + }, + }, + }, + } + + result := parser.Parse(response) + + Convey("can parse all series", func() { + So(len(result.Series), ShouldEqual, 2) + }) + + Convey("can parse all points", func() { + So(len(result.Series[0].Points), ShouldEqual, 3) + So(len(result.Series[1].Points), ShouldEqual, 3) + }) + + Convey("can parse multi row result", func() { + So(result.Series[0].Points[1][0].Float64, ShouldEqual, float64(222)) + So(result.Series[1].Points[1][0].Float64, ShouldEqual, float64(333)) + }) + + Convey("can parse null points", func() { + So(result.Series[0].Points[2][0].Valid, ShouldBeFalse) + }) + + Convey("can format serie names", func() { + So(result.Series[0].Name, ShouldEqual, "cpu.mean { datacenter: America }") + So(result.Series[1].Name, ShouldEqual, "cpu.sum { datacenter: America }") + }) + }) +} diff --git a/pkg/tsdb/interval.go b/pkg/tsdb/interval.go new file mode 100644 index 00000000000..71caf122c13 --- /dev/null +++ b/pkg/tsdb/interval.go @@ -0,0 +1,145 @@ +package tsdb + +import ( + "fmt" + "time" +) + +var ( + defaultRes int64 = 1500 + minInterval time.Duration = 1 * time.Millisecond + year time.Duration = time.Hour * 24 * 365 + day time.Duration = time.Hour * 24 * 365 +) + +func CalculateInterval(timerange *TimeRange) string { + interval := time.Duration((timerange.MustGetTo().UnixNano() - timerange.MustGetFrom().UnixNano()) / defaultRes) + + if interval < minInterval { + return formatDuration(minInterval) + } + + return formatDuration(roundInterval(interval)) +} + +func formatDuration(inter time.Duration) string { + if inter >= year { + return fmt.Sprintf("%dy", inter/year) + } + + if inter >= day { + return fmt.Sprintf("%dd", inter/day) + } + + if inter >= time.Hour { + return fmt.Sprintf("%dh", inter/time.Hour) + } + + if inter >= time.Minute { + return fmt.Sprintf("%dm", inter/time.Minute) + } + + if inter >= time.Second { + return fmt.Sprintf("%ds", inter/time.Second) + } + + if inter >= time.Millisecond { + return fmt.Sprintf("%dms", inter/time.Millisecond) + } + + return "1ms" +} + +func roundInterval(interval time.Duration) time.Duration { + switch true { + // 0.015s + case interval <= 15*time.Millisecond: + return time.Millisecond * 10 // 0.01s + // 0.035s + case interval <= 35*time.Millisecond: + return time.Millisecond * 20 // 0.02s + // 0.075s + case interval <= 75*time.Millisecond: + return time.Millisecond * 50 // 0.05s + // 0.15s + case interval <= 150*time.Millisecond: + return time.Millisecond * 100 // 0.1s + // 0.35s + case interval <= 350*time.Millisecond: + return time.Millisecond * 200 // 0.2s + // 0.75s + case interval <= 750*time.Millisecond: + return time.Millisecond * 500 // 0.5s + // 1.5s + case interval <= 1500*time.Millisecond: + return time.Millisecond * 1000 // 1s + // 3.5s + case interval <= 3500*time.Millisecond: + return time.Millisecond * 2000 // 2s + // 7.5s + case interval <= 7500*time.Millisecond: + return time.Millisecond * 5000 // 5s + // 12.5s + case interval <= 12500*time.Millisecond: + return time.Millisecond * 10000 // 10s + // 17.5s + case interval <= 17500*time.Millisecond: + return time.Millisecond * 15000 // 15s + // 25s + case interval <= 25000*time.Millisecond: + return time.Millisecond * 20000 // 20s + // 45s + case interval <= 45000*time.Millisecond: + return time.Millisecond * 30000 // 30s + // 1.5m + case interval <= 90000*time.Millisecond: + return time.Millisecond * 60000 // 1m + // 3.5m + case interval <= 210000*time.Millisecond: + return time.Millisecond * 120000 // 2m + // 7.5m + case interval <= 450000*time.Millisecond: + return time.Millisecond * 300000 // 5m + // 12.5m + case interval <= 750000*time.Millisecond: + return time.Millisecond * 600000 // 10m + // 12.5m + case interval <= 1050000*time.Millisecond: + return time.Millisecond * 900000 // 15m + // 25m + case interval <= 1500000*time.Millisecond: + return time.Millisecond * 1200000 // 20m + // 45m + case interval <= 2700000*time.Millisecond: + return time.Millisecond * 1800000 // 30m + // 1.5h + case interval <= 5400000*time.Millisecond: + return time.Millisecond * 3600000 // 1h + // 2.5h + case interval <= 9000000*time.Millisecond: + return time.Millisecond * 7200000 // 2h + // 4.5h + case interval <= 16200000*time.Millisecond: + return time.Millisecond * 10800000 // 3h + // 9h + case interval <= 32400000*time.Millisecond: + return time.Millisecond * 21600000 // 6h + // 24h + case interval <= 86400000*time.Millisecond: + return time.Millisecond * 43200000 // 12h + // 48h + case interval <= 172800000*time.Millisecond: + return time.Millisecond * 86400000 // 24h + // 1w + case interval <= 604800000*time.Millisecond: + return time.Millisecond * 86400000 // 24h + // 3w + case interval <= 1814400000*time.Millisecond: + return time.Millisecond * 604800000 // 1w + // 2y + case interval < 3628800000*time.Millisecond: + return time.Millisecond * 2592000000 // 30d + default: + return time.Millisecond * 31536000000 // 1y + } +} diff --git a/pkg/tsdb/interval_test.go b/pkg/tsdb/interval_test.go new file mode 100644 index 00000000000..c06e1879668 --- /dev/null +++ b/pkg/tsdb/interval_test.go @@ -0,0 +1,57 @@ +package tsdb + +import ( + "testing" + "time" + + "github.com/grafana/grafana/pkg/setting" + . "github.com/smartystreets/goconvey/convey" +) + +func TestInterval(t *testing.T) { + Convey("Default interval ", t, func() { + setting.NewConfigContext(&setting.CommandLineArgs{ + HomePath: "../../", + }) + + Convey("for 5min", func() { + tr := NewTimeRange("5m", "now") + + interval := CalculateInterval(tr) + So(interval, ShouldEqual, "200ms") + }) + + Convey("for 15min", func() { + tr := NewTimeRange("15m", "now") + + interval := CalculateInterval(tr) + So(interval, ShouldEqual, "500ms") + }) + + Convey("for 30min", func() { + tr := NewTimeRange("30m", "now") + + interval := CalculateInterval(tr) + So(interval, ShouldEqual, "1s") + }) + + Convey("for 1h", func() { + tr := NewTimeRange("1h", "now") + + interval := CalculateInterval(tr) + So(interval, ShouldEqual, "2s") + }) + + Convey("Round interval", func() { + So(roundInterval(time.Millisecond*30), ShouldEqual, time.Millisecond*20) + So(roundInterval(time.Millisecond*45), ShouldEqual, time.Millisecond*50) + }) + + Convey("Format value", func() { + So(formatDuration(time.Second*61), ShouldEqual, "1m") + So(formatDuration(time.Millisecond*30), ShouldEqual, "30ms") + So(formatDuration(time.Hour*23), ShouldEqual, "23h") + So(formatDuration(time.Hour*24*367), ShouldEqual, "1y") + }) + }) +} diff --git a/pkg/tsdb/models.go b/pkg/tsdb/models.go index bbf7bba7ac7..366709cfba7 100644 --- a/pkg/tsdb/models.go +++ b/pkg/tsdb/models.go @@ -39,6 +39,7 @@ type DataSourceInfo struct { BasicAuth bool BasicAuthUser string BasicAuthPassword string + JsonData *simplejson.Json } type BatchTiming struct { @@ -51,6 +52,11 @@ type BatchResult struct { Timings *BatchTiming } +func (br *BatchResult) WithError(err error) *BatchResult { + br.Error = err + return br +} + type QueryResult struct { Error error `json:"error"` RefId string `json:"refId"` @@ -72,15 +78,15 @@ func NewQueryResult() *QueryResult { } } -func NewTimePoint(value float64, timestamp float64) TimePoint { - return TimePoint{null.FloatFrom(value), null.FloatFrom(timestamp)} +func NewTimePoint(value null.Float, timestamp float64) TimePoint { + return TimePoint{value, null.FloatFrom(timestamp)} } func NewTimeSeriesPointsFromArgs(values ...float64) TimeSeriesPoints { points := make(TimeSeriesPoints, 0) for i := 0; i < len(values); i += 2 { - points = append(points, NewTimePoint(values[i], values[i+1])) + points = append(points, NewTimePoint(null.FloatFrom(values[i]), values[i+1])) } return points diff --git a/pkg/tsdb/prometheus/prometheus.go b/pkg/tsdb/prometheus/prometheus.go index 98d4c72fd03..85f6b621c1c 100644 --- a/pkg/tsdb/prometheus/prometheus.go +++ b/pkg/tsdb/prometheus/prometheus.go @@ -8,6 +8,8 @@ import ( "strings" "time" + "gopkg.in/guregu/null.v3" + "github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/tsdb" "github.com/prometheus/client_golang/api/prometheus" @@ -50,12 +52,12 @@ func (e *PrometheusExecutor) Execute(ctx context.Context, queries tsdb.QuerySlic client, err := e.getClient() if err != nil { - return resultWithError(result, err) + return result.WithError(err) } query, err := parseQuery(queries, queryContext) if err != nil { - return resultWithError(result, err) + return result.WithError(err) } timeRange := prometheus.Range{ @@ -67,12 +69,12 @@ func (e *PrometheusExecutor) Execute(ctx context.Context, queries tsdb.QuerySlic value, err := client.QueryRange(ctx, query.Expr, timeRange) if err != nil { - return resultWithError(result, err) + return result.WithError(err) } queryResult, err := parseResponse(value, query) if err != nil { - return resultWithError(result, err) + return result.WithError(err) } result.QueryResults = queryResult return result @@ -145,7 +147,7 @@ func parseResponse(value pmodel.Value, query *PrometheusQuery) (map[string]*tsdb } for _, k := range v.Values { - series.Points = append(series.Points, tsdb.NewTimePoint(float64(k.Value), float64(k.Timestamp.Unix()*1000))) + series.Points = append(series.Points, tsdb.NewTimePoint(null.FloatFrom(float64(k.Value)), float64(k.Timestamp.Unix()*1000))) } queryRes.Series = append(queryRes.Series, &series) @@ -155,7 +157,8 @@ func parseResponse(value pmodel.Value, query *PrometheusQuery) (map[string]*tsdb return queryResults, nil } +/* func resultWithError(result *tsdb.BatchResult, err error) *tsdb.BatchResult { result.Error = err return result -} +}*/ diff --git a/pkg/tsdb/request.go b/pkg/tsdb/request.go index 88c6eb81eac..2934443bc53 100644 --- a/pkg/tsdb/request.go +++ b/pkg/tsdb/request.go @@ -51,6 +51,8 @@ func HandleRequest(ctx context.Context, req *Request) (*Response, error) { go batch.process(ctx, context) } } + case <-ctx.Done(): + return nil, ctx.Err() } } diff --git a/pkg/tsdb/testdata/scenarios.go b/pkg/tsdb/testdata/scenarios.go index e90b0d4df79..73963fc9844 100644 --- a/pkg/tsdb/testdata/scenarios.go +++ b/pkg/tsdb/testdata/scenarios.go @@ -6,6 +6,8 @@ import ( "strings" "time" + "gopkg.in/guregu/null.v3" + "github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/tsdb" ) @@ -42,7 +44,7 @@ func init() { walker := rand.Float64() * 100 for i := int64(0); i < 10000 && timeWalkerMs < to; i++ { - points = append(points, tsdb.NewTimePoint(walker, float64(timeWalkerMs))) + points = append(points, tsdb.NewTimePoint(null.FloatFrom(walker), float64(timeWalkerMs))) walker += rand.Float64() - 0.5 timeWalkerMs += query.IntervalMs @@ -73,7 +75,7 @@ func init() { series := newSeriesForQuery(query) outsideTime := context.TimeRange.MustGetFrom().Add(-1*time.Hour).Unix() * 1000 - series.Points = append(series.Points, tsdb.NewTimePoint(10, float64(outsideTime))) + series.Points = append(series.Points, tsdb.NewTimePoint(null.FloatFrom(10), float64(outsideTime))) queryRes.Series = append(queryRes.Series, series) return queryRes @@ -88,10 +90,13 @@ func init() { queryRes := tsdb.NewQueryResult() stringInput := query.Model.Get("stringInput").MustString() - values := []float64{} + values := []null.Float{} for _, strVal := range strings.Split(stringInput, ",") { + if strVal == "null" { + values = append(values, null.FloatFromPtr(nil)) + } if val, err := strconv.ParseFloat(strVal, 64); err == nil { - values = append(values, val) + values = append(values, null.FloatFrom(val)) } } @@ -105,7 +110,7 @@ func init() { step := (endTime - startTime) / int64(len(values)-1) for _, val := range values { - series.Points = append(series.Points, tsdb.NewTimePoint(val, float64(startTime))) + series.Points = append(series.Points, tsdb.TimePoint{val, null.FloatFrom(float64(startTime))}) startTime += step } diff --git a/public/app/core/components/query_part/query_part_editor.ts b/public/app/core/components/query_part/query_part_editor.ts index 7bc309d1bd2..ae53eb31001 100644 --- a/public/app/core/components/query_part/query_part_editor.ts +++ b/public/app/core/components/query_part/query_part_editor.ts @@ -128,11 +128,9 @@ export function queryPartEditorDirective($compile, templateSrv) { } $scope.showActionsMenu = function() { - if ($scope.partActions.length === 0) { - $scope.handleEvent({$event: {name: 'get-part-actions'}}).then(res => { - $scope.partActions = res; - }); - } + $scope.handleEvent({$event: {name: 'get-part-actions'}}).then(res => { + $scope.partActions = res; + }); }; $scope.triggerPartAction = function(action) { diff --git a/public/app/core/controllers/login_ctrl.js b/public/app/core/controllers/login_ctrl.js index 4b03dddf973..fa3af3d10f0 100644 --- a/public/app/core/controllers/login_ctrl.js +++ b/public/app/core/controllers/login_ctrl.js @@ -11,6 +11,7 @@ function (angular, _, coreModule, config) { "1000": "Required team membership not fulfilled", "1001": "Required organization membership not fulfilled", "1002": "Required email domain not fulfilled", + "1003": "Login provider denied login request", }; coreModule.default.controller('LoginCtrl', function($scope, backendSrv, contextSrv, $location) { diff --git a/public/app/core/directives/metric_segment.js b/public/app/core/directives/metric_segment.js index cc662aa67ca..c3e51dc7a0c 100644 --- a/public/app/core/directives/metric_segment.js +++ b/public/app/core/directives/metric_segment.js @@ -43,7 +43,7 @@ function (_, $, coreModule) { var selected = _.find($scope.altSegments, {value: value}); if (selected) { segment.value = selected.value; - segment.html = selected.html; + segment.html = selected.html || selected.value; segment.fake = false; segment.expandable = selected.expandable; } @@ -186,25 +186,26 @@ function (_, $, coreModule) { $scope.getOptionsInternal = function() { if ($scope.options) { - var optionSegments = _.map($scope.options, function(option) { - return uiSegmentSrv.newSegment({value: option.text}); - }); - return $q.when(optionSegments); + cachedOptions = $scope.options; + return $q.when(_.map($scope.options, function(option) { + return {value: option.text}; + })); } else { return $scope.getOptions().then(function(options) { cachedOptions = options; - return _.map(options, function(option) { - return uiSegmentSrv.newSegment({value: option.text}); + return _.map(options, function(option) { + if (option.html) { + return option; + } + return {value: option.text}; }); }); } }; $scope.onSegmentChange = function() { - var options = $scope.options || cachedOptions; - - if (options) { - var option = _.find(options, {text: $scope.segment.value}); + if (cachedOptions) { + var option = _.find(cachedOptions, {text: $scope.segment.value}); if (option && option.value !== $scope.property) { $scope.property = option.value; } else if (attrs.custom !== 'false') { diff --git a/public/app/features/alerting/alert_list_ctrl.ts b/public/app/features/alerting/alert_list_ctrl.ts index 4b429e961a7..b2287759a9b 100644 --- a/public/app/features/alerting/alert_list_ctrl.ts +++ b/public/app/features/alerting/alert_list_ctrl.ts @@ -23,7 +23,7 @@ export class AlertListCtrl { }; /** @ngInject */ - constructor(private backendSrv, private $location) { + constructor(private backendSrv, private $location, private $scope) { var params = $location.search(); this.filters.state = params.state || null; this.loadAlerts(); @@ -43,6 +43,19 @@ export class AlertListCtrl { }); } + pauseAlertRule(alertId: any) { + var alert = _.find(this.alerts, {id: alertId}); + + var payload = { + paused: alert.state !== "paused" + }; + + this.backendSrv.post(`/api/alerts/${alert.id}/pause`, payload).then(result => { + alert.state = result.state; + alert.stateModel = alertDef.getStateDisplayModel(result.state); + }); + } + openHowTo() { appEvents.emit('show-modal', { src: 'public/app/features/alerting/partials/alert_howto.html', diff --git a/public/app/features/alerting/alert_tab_ctrl.ts b/public/app/features/alerting/alert_tab_ctrl.ts index 0ea5d5fd804..b7e0e4ac218 100644 --- a/public/app/features/alerting/alert_tab_ctrl.ts +++ b/public/app/features/alerting/alert_tab_ctrl.ts @@ -156,7 +156,7 @@ export class AlertTabCtrl { for (let addedNotification of alert.notifications) { var model = _.find(this.notifications, {id: addedNotification.id}); - if (model) { + if (model && model.isDefault === false) { model.iconClass = this.getNotificationIcon(model.type); this.alertNotifications.push(model); } @@ -231,7 +231,7 @@ export class AlertTabCtrl { this.datasourceSrv.get(datasourceName).then(ds => { if (!ds.meta.alerting) { this.error = 'The datasource does not support alerting queries'; - } else if (this.templateSrv.variableExists(foundTarget.target)) { + } else if (ds.targetContainsTemplate(foundTarget)) { this.error = 'Template variables are not supported in alert queries'; } else { this.error = ''; @@ -315,6 +315,7 @@ export class AlertTabCtrl { this.alert = null; this.panel.thresholds = []; this.conditionModels = []; + this.panelCtrl.alertState = null; this.panelCtrl.render(); } }); diff --git a/public/app/features/alerting/partials/alert_list.html b/public/app/features/alerting/partials/alert_list.html index a8678bc4cdc..685aa1f2db8 100644 --- a/public/app/features/alerting/partials/alert_list.html +++ b/public/app/features/alerting/partials/alert_list.html @@ -29,7 +29,10 @@
- + + + +
diff --git a/public/app/features/alerting/partials/alert_tab.html b/public/app/features/alerting/partials/alert_tab.html index bb6fe7547b2..07ff28dcddb 100644 --- a/public/app/features/alerting/partials/alert_tab.html +++ b/public/app/features/alerting/partials/alert_tab.html @@ -52,9 +52,9 @@
- + - +
-
+
-
+
@@ -47,7 +47,7 @@
-
+
diff --git a/public/app/features/plugins/plugin_edit_ctrl.ts b/public/app/features/plugins/plugin_edit_ctrl.ts index ba9b4ad1d2b..8d7f360aeeb 100644 --- a/public/app/features/plugins/plugin_edit_ctrl.ts +++ b/public/app/features/plugins/plugin_edit_ctrl.ts @@ -27,7 +27,7 @@ export class PluginEditCtrl { this.model = {}; this.pluginId = $routeParams.pluginId; this.tabIndex = 0; - this.tabs = ['Overview']; + this.tabs = ['Readme']; this.preUpdateHook = () => Promise.resolve(); this.postUpdateHook = () => Promise.resolve(); @@ -48,13 +48,13 @@ export class PluginEditCtrl { }); if (this.model.type === 'app') { - this.tabIndex = 1; - this.tabs.push('Config'); - this.hasDashboards = _.find(result.includes, {type: 'dashboard'}); if (this.hasDashboards) { - this.tabs.push('Dashboards'); + this.tabs.unshift('Dashboards'); } + + this.tabs.unshift('Config'); + this.tabIndex = 0; } return this.initReadme(); diff --git a/public/app/plugins/app/testdata/dashboards/graph_last_1h.json b/public/app/plugins/app/testdata/dashboards/graph_last_1h.json index 757dd48e50f..c64ab84f338 100644 --- a/public/app/plugins/app/testdata/dashboards/graph_last_1h.json +++ b/public/app/plugins/app/testdata/dashboards/graph_last_1h.json @@ -1,5 +1,5 @@ { - "revision": 4, + "revision": 5, "title": "TestData - Graph Panel Last 1h", "tags": [ "grafana-test" @@ -320,124 +320,376 @@ ] }, { - "title": "", - "error": false, - "span": 4, - "editable": true, - "type": "text", - "isNew": true, - "id": 6, - "mode": "markdown", "content": "Just verify that the tooltip time has millisecond resolution ", - "links": [] + "editable": true, + "error": false, + "id": 6, + "isNew": true, + "links": [], + "mode": "markdown", + "span": 4, + "title": "", + "type": "text" } ], "title": "New row" }, { - "title": "New row", - "height": 336, - "editable": true, "collapse": false, + "editable": true, + "height": 336, "panels": [ { - "title": "2 yaxis and axis lables", - "error": false, - "span": 7.99561403508772, - "editable": true, - "type": "graph", - "isNew": true, - "id": 5, - "targets": [ - { - "target": "", - "refId": "A", - "scenarioId": "csv_metric_values", - "stringInput": "1,20,90,30,5,0" - }, - { - "target": "", - "refId": "B", - "scenarioId": "csv_metric_values", - "stringInput": "2000,3000,4000,1000,3000,10000" - } - ], + "aliasColors": {}, + "bars": false, "datasource": "Grafana TestData", - "renderer": "flot", - "yaxes": [ - { - "label": "Perecent", - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "percent" - }, - { - "label": "Pressure", - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "short" - } - ], - "xaxis": { + "editable": true, + "error": false, + "fill": 1, + "id": 5, + "isNew": true, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, "show": true, - "mode": "time", - "name": null, - "values": [] + "total": false, + "values": false }, "lines": true, - "fill": 1, "linewidth": 2, - "points": false, - "pointradius": 5, - "bars": false, - "stack": false, - "percentage": false, - "legend": { - "show": true, - "values": false, - "min": false, - "max": false, - "current": false, - "total": false, - "avg": false - }, + "links": [], "nullPointMode": "connected", - "steppedLine": false, - "tooltip": { - "value_type": "cumulative", - "shared": true, - "sort": 0, - "msResolution": false - }, - "timeFrom": null, - "timeShift": null, - "aliasColors": {}, + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", "seriesOverrides": [ { "alias": "B-series", "yaxis": 2 } ], + "span": 7.99561403508772, + "stack": false, + "steppedLine": false, + "targets": [ + { + "refId": "A", + "scenarioId": "csv_metric_values", + "stringInput": "1,20,90,30,5,0", + "target": "" + }, + { + "refId": "B", + "scenarioId": "csv_metric_values", + "stringInput": "2000,3000,4000,1000,3000,10000", + "target": "" + } + ], "thresholds": [], - "links": [] + "timeFrom": null, + "timeShift": null, + "title": "2 yaxis and axis lables", + "tooltip": { + "msResolution": false, + "shared": true, + "sort": 0, + "value_type": "cumulative" + }, + "type": "graph", + "xaxis": { + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "percent", + "label": "Perecent", + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": "Pressure", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ] }, { - "title": "", - "error": false, - "span": 4.00438596491228, - "editable": true, - "type": "text", - "isNew": true, - "id": 7, - "mode": "markdown", "content": "Verify that axis labels look ok", - "links": [] + "editable": true, + "error": false, + "id": 7, + "isNew": true, + "links": [], + "mode": "markdown", + "span": 4.00438596491228, + "title": "", + "type": "text" } - ] + ], + "title": "New row" + }, + { + "collapse": false, + "editable": true, + "height": "250px", + "panels": [ + { + "aliasColors": {}, + "bars": false, + "datasource": "Grafana TestData", + "editable": true, + "error": false, + "fill": 1, + "id": 8, + "isNew": true, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "connected", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "span": 4, + "stack": false, + "steppedLine": false, + "targets": [ + { + "refId": "B", + "scenarioId": "csv_metric_values", + "stringInput": "1,20,null,null,null,null,null,null,100,10,10,20,30,40,10", + "target": "" + } + ], + "thresholds": [], + "timeFrom": null, + "timeShift": null, + "title": "null value connected", + "tooltip": { + "msResolution": false, + "shared": true, + "sort": 0, + "value_type": "cumulative" + }, + "type": "graph", + "xaxis": { + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ] + }, + { + "aliasColors": {}, + "bars": false, + "datasource": "Grafana TestData", + "editable": true, + "error": false, + "fill": 1, + "id": 10, + "isNew": true, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "null as zero", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "span": 3, + "stack": false, + "steppedLine": false, + "targets": [ + { + "refId": "B", + "scenarioId": "csv_metric_values", + "stringInput": "1,20,null,null,null,null,null,null,100,10,10,20,30,40,10", + "target": "" + } + ], + "thresholds": [], + "timeFrom": null, + "timeShift": null, + "title": "null value null as zero", + "tooltip": { + "msResolution": false, + "shared": true, + "sort": 0, + "value_type": "cumulative" + }, + "type": "graph", + "xaxis": { + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ] + }, + { + "aliasColors": {}, + "bars": false, + "datasource": "Grafana TestData", + "editable": true, + "error": false, + "fill": 1, + "id": 9, + "isNew": true, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "null", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [ + { + "alias": "B-series", + "zindex": -3 + } + ], + "span": 5, + "stack": true, + "steppedLine": false, + "targets": [ + { + "hide": false, + "refId": "B", + "scenarioId": "csv_metric_values", + "stringInput": "1,20,null,null,null,null,null,null,100,10,10,20,30,40,10", + "target": "" + }, + { + "alias": "", + "hide": false, + "refId": "A", + "scenarioId": "csv_metric_values", + "stringInput": "1,20,90,30,5,10,20,30,40,40,40,100,10,20,20", + "target": "" + }, + { + "alias": "", + "hide": false, + "refId": "C", + "scenarioId": "csv_metric_values", + "stringInput": "1,20,90,30,5,10,20,30,40,40,40,100,10,20,20", + "target": "" + } + ], + "thresholds": [], + "timeFrom": null, + "timeShift": null, + "title": "Stacking value ontop of nulls", + "tooltip": { + "msResolution": false, + "shared": true, + "sort": 0, + "value_type": "cumulative" + }, + "type": "graph", + "xaxis": { + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ] + } + ], + "title": "New row" } ], "time": { @@ -477,7 +729,7 @@ }, "refresh": false, "schemaVersion": 13, - "version": 3, + "version": 13, "links": [], "gnetId": null } diff --git a/public/app/plugins/app/testdata/plugin.json b/public/app/plugins/app/testdata/plugin.json index 6742ad04ecb..63f88df8140 100644 --- a/public/app/plugins/app/testdata/plugin.json +++ b/public/app/plugins/app/testdata/plugin.json @@ -9,7 +9,7 @@ "name": "Grafana Project", "url": "http://grafana.org" }, - "version": "1.0.13", + "version": "1.0.14", "updated": "2016-09-26" }, diff --git a/public/app/plugins/datasource/cloudwatch/img/amazon-web-services.png b/public/app/plugins/datasource/cloudwatch/img/amazon-web-services.png index f11f4034751..7f9687e839c 100644 Binary files a/public/app/plugins/datasource/cloudwatch/img/amazon-web-services.png and b/public/app/plugins/datasource/cloudwatch/img/amazon-web-services.png differ diff --git a/public/app/plugins/datasource/elasticsearch/elastic_response.js b/public/app/plugins/datasource/elasticsearch/elastic_response.js index a099aa1a012..4e82a280024 100644 --- a/public/app/plugins/datasource/elasticsearch/elastic_response.js +++ b/public/app/plugins/datasource/elasticsearch/elastic_response.js @@ -171,6 +171,9 @@ function (_, queryDef) { } else { props["filter"] = nameIndex; } + if (bucket.key_as_string) { + props[aggDef.field] = bucket.key_as_string; + } this.processBuckets(bucket, target, seriesList, docs, props, depth+1); } } diff --git a/public/app/plugins/datasource/elasticsearch/img/logo_large.png b/public/app/plugins/datasource/elasticsearch/img/logo_large.png index b76d01e5d74..5ded1d8f438 100644 Binary files a/public/app/plugins/datasource/elasticsearch/img/logo_large.png and b/public/app/plugins/datasource/elasticsearch/img/logo_large.png differ diff --git a/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html b/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html index 36e914d06e0..3790d18857e 100644 --- a/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html +++ b/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html @@ -23,7 +23,7 @@ -
diff --git a/public/app/plugins/datasource/elasticsearch/query_def.js b/public/app/plugins/datasource/elasticsearch/query_def.js index 9a45b138b21..187e5c2f4fa 100644 --- a/public/app/plugins/datasource/elasticsearch/query_def.js +++ b/public/app/plugins/datasource/elasticsearch/query_def.js @@ -22,7 +22,7 @@ function (_) { bucketAggTypes: [ {text: "Terms", value: 'terms', requiresField: true}, {text: "Filters", value: 'filters' }, - {text: "Geo Hash Grid", value: 'geohash_grid', requiresField: true}, + {text: "Geo Hash Grid", value: 'geohash_grid', requiresField: true}, {text: "Date Histogram", value: 'date_histogram', requiresField: true}, ], diff --git a/public/app/plugins/datasource/graphite/datasource.ts b/public/app/plugins/datasource/graphite/datasource.ts index ac3c6581522..5d0b3de0630 100644 --- a/public/app/plugins/datasource/graphite/datasource.ts +++ b/public/app/plugins/datasource/graphite/datasource.ts @@ -126,6 +126,10 @@ export function GraphiteDatasource(instanceSettings, $q, backendSrv, templateSrv } }; + this.targetContainsTemplate = function(target) { + return templateSrv.variableExists(target.target); + }; + this.translateTime = function(date, roundUp) { if (_.isString(date)) { if (date === 'now') { diff --git a/public/app/plugins/datasource/graphite/img/graphite_logo.png b/public/app/plugins/datasource/graphite/img/graphite_logo.png index e70b40720c4..7b6b85d2eb5 100644 Binary files a/public/app/plugins/datasource/graphite/img/graphite_logo.png and b/public/app/plugins/datasource/graphite/img/graphite_logo.png differ diff --git a/public/app/plugins/datasource/graphite/query_ctrl.ts b/public/app/plugins/datasource/graphite/query_ctrl.ts index 93977dc143d..30f17554d2b 100644 --- a/public/app/plugins/datasource/graphite/query_ctrl.ts +++ b/public/app/plugins/datasource/graphite/query_ctrl.ts @@ -209,17 +209,40 @@ export class GraphiteQueryCtrl extends QueryCtrl { this.panelCtrl.refresh(); } + updateModelTarget() { + // render query + var metricPath = this.getSegmentPathUpTo(this.segments.length); + this.target.target = _.reduce(this.functions, this.wrapFunction, metricPath); + + // render nested query + var targetsByRefId = _.keyBy(this.panelCtrl.panel.targets, 'refId'); + var nestedSeriesRefRegex = /\#([A-Z])/g; + var targetWithNestedQueries = this.target.target.replace(nestedSeriesRefRegex, (match, g1) => { + var target = targetsByRefId[g1]; + if (!target) { + return match; + } + + return target.targetFull || target.target; + }); + + delete this.target.targetFull; + if (this.target.target !== targetWithNestedQueries) { + this.target.targetFull = targetWithNestedQueries; + } + } + targetChanged() { if (this.error) { return; } var oldTarget = this.target.target; - var target = this.getSegmentPathUpTo(this.segments.length); - this.target.target = _.reduce(this.functions, this.wrapFunction, target); + this.updateModelTarget(); if (this.target.target !== oldTarget) { - if (this.segments[this.segments.length - 1].value !== 'select metric') { + var lastSegment = this.segments.length > 0 ? this.segments[this.segments.length - 1] : {}; + if (lastSegment.value !== 'select metric') { this.panelCtrl.refresh(); } } diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts index 76a66d18e3c..8e7175b0cdf 100644 --- a/public/app/plugins/datasource/influxdb/datasource.ts +++ b/public/app/plugins/datasource/influxdb/datasource.ts @@ -139,6 +139,24 @@ export default class InfluxDatasource { }); }; + targetContainsTemplate(target) { + for (let group of target.groupBy) { + for (let param of group.params) { + if (this.templateSrv.variableExists(param)) { + return true; + } + } + } + + for (let i in target.tags) { + if (this.templateSrv.variableExists(target.tags[i].value)) { + return true; + } + } + + return false; + }; + metricFindQuery(query) { var interpolated = this.templateSrv.replace(query, null, 'regex'); diff --git a/public/app/plugins/datasource/influxdb/plugin.json b/public/app/plugins/datasource/influxdb/plugin.json index 605ce168831..635309d1610 100644 --- a/public/app/plugins/datasource/influxdb/plugin.json +++ b/public/app/plugins/datasource/influxdb/plugin.json @@ -6,6 +6,7 @@ "defaultMatchFormat": "regex values", "metrics": true, "annotations": true, + "alerting": true, "info": { "author": { diff --git a/public/app/plugins/datasource/opentsdb/datasource.js b/public/app/plugins/datasource/opentsdb/datasource.js index 54605a4f7e2..8620817c83e 100644 --- a/public/app/plugins/datasource/opentsdb/datasource.js +++ b/public/app/plugins/datasource/opentsdb/datasource.js @@ -332,7 +332,7 @@ function (angular, _, dateMath) { var tagData = []; if (!_.isEmpty(md.tags)) { - _.each(_.pairs(md.tags), function(tag) { + _.each(_.toPairs(md.tags), function(tag) { if (_.has(groupByTags, tag[0])) { tagData.push(tag[0] + "=" + tag[1]); } @@ -419,7 +419,7 @@ function (angular, _, dateMath) { return target.metric === metricData.metric; } else { return target.metric === metricData.metric && - _.all(target.tags, function(tagV, tagK) { + _.every(target.tags, function(tagV, tagK) { interpolatedTagValue = templateSrv.replace(tagV, options.scopedVars, 'pipe'); return metricData.tags[tagK] === interpolatedTagValue || interpolatedTagValue === "*"; }); diff --git a/public/app/plugins/datasource/opentsdb/img/opentsdb_logo.png b/public/app/plugins/datasource/opentsdb/img/opentsdb_logo.png index 519d56a476c..081459abe0c 100644 Binary files a/public/app/plugins/datasource/opentsdb/img/opentsdb_logo.png and b/public/app/plugins/datasource/opentsdb/img/opentsdb_logo.png differ diff --git a/public/app/plugins/datasource/prometheus/datasource.ts b/public/app/plugins/datasource/prometheus/datasource.ts index 941591791ef..972fa2c7c55 100644 --- a/public/app/plugins/datasource/prometheus/datasource.ts +++ b/public/app/plugins/datasource/prometheus/datasource.ts @@ -58,6 +58,10 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS return escapedValues.join('|'); }; + this.targetContainsTemplate = function(target) { + return templateSrv.variableExists(target.expr); + }; + // Called once per panel (graph) this.query = function(options) { var self = this; diff --git a/public/app/plugins/panel/graph/graph.ts b/public/app/plugins/panel/graph/graph.ts index a07701cef65..7e19d00251f 100755 --- a/public/app/plugins/panel/graph/graph.ts +++ b/public/app/plugins/panel/graph/graph.ts @@ -384,10 +384,32 @@ module.directive('grafanaGraph', function($rootScope, timeSrv) { if (!annotations || annotations.length === 0) { return; } + console.log(annotations); var types = {}; + types['$__alerting'] = { + color: 'rgba(237, 46, 24, 1)', + position: 'BOTTOM', + markerSize: 5, + }; + types['$__ok'] = { + color: 'rgba(11, 237, 50, 1)', + position: 'BOTTOM', + markerSize: 5, + }; + types['$__nodata'] = { + color: 'rgba(150, 150, 150, 1)', + position: 'BOTTOM', + markerSize: 5, + }; + for (var i = 0; i < annotations.length; i++) { var item = annotations[i]; + if (item.newState) { + console.log(item.newState); + item.eventType = '$__' + item.newState; + continue; + } if (!types[item.source.name]) { types[item.source.name] = { diff --git a/public/app/plugins/panel/graph/graph_tooltip.js b/public/app/plugins/panel/graph/graph_tooltip.js index cd3bddf41ef..da0080f0005 100644 --- a/public/app/plugins/panel/graph/graph_tooltip.js +++ b/public/app/plugins/panel/graph/graph_tooltip.js @@ -41,7 +41,7 @@ function ($, _) { }; this.getMultiSeriesPlotHoverInfo = function(seriesList, pos) { - var value, i, series, hoverIndex, hoverDistance, pointTime; + var value, i, series, hoverIndex, hoverDistance, pointTime, yaxis; var results = []; //now we know the current X (j) position for X and Y values @@ -51,12 +51,12 @@ function ($, _) { series = seriesList[i]; if (!series.data.length || (panel.legend.hideEmpty && series.allIsNull)) { - results.push({ hidden: true }); + results.push({ hidden: true, value: 0, yaxis: 0 }); continue; } if (!series.data.length || (panel.legend.hideZero && series.allIsZero)) { - results.push({ hidden: true }); + results.push({ hidden: true, value: 0, yaxis: 0 }); continue; } @@ -85,13 +85,20 @@ function ($, _) { hoverIndex = this.findHoverIndexFromDataPoints(pos.x, series, hoverIndex); } + yaxis = 0; + if (series.yaxis) { + yaxis = series.yaxis.n; + } + results.push({ value: value, hoverIndex: hoverIndex, color: series.color, label: series.label, time: pointTime, - distance: hoverDistance + distance: hoverDistance, + yaxis: yaxis, + index: i }); } @@ -145,7 +152,7 @@ function ($, _) { absoluteTime = dashboard.formatDate(seriesHoverInfo.time, tooltipFormat); // Dynamically reorder the hovercard for the current time point if the - // option is enabled. + // option is enabled, sort by yaxis by default. if (panel.tooltip.sort === 2) { seriesHoverInfo.sort(function(a, b) { return b.value - a.value; @@ -155,6 +162,11 @@ function ($, _) { return a.value - b.value; }); } + else { + seriesHoverInfo.sort(function(a, b) { + return a.yaxis - b.yaxis; + }); + } for (i = 0; i < seriesHoverInfo.length; i++) { hoverInfo = seriesHoverInfo[i]; @@ -168,14 +180,14 @@ function ($, _) { highlightClass = 'graph-tooltip-list-item--highlight'; } - series = seriesList[i]; + series = seriesList[hoverInfo.index]; value = series.formatValue(hoverInfo.value); seriesHtml += '
'; seriesHtml += ' ' + hoverInfo.label + ':
'; seriesHtml += '
' + value + '
'; - plot.highlight(i, hoverInfo.hoverIndex); + plot.highlight(hoverInfo.index, hoverInfo.hoverIndex); } self.showTooltip(absoluteTime, seriesHtml, pos); diff --git a/public/app/plugins/panel/graph/module.ts b/public/app/plugins/panel/graph/module.ts index 8d392c0d5c1..c4b1bd89044 100644 --- a/public/app/plugins/panel/graph/module.ts +++ b/public/app/plugins/panel/graph/module.ts @@ -93,7 +93,7 @@ class GraphCtrl extends MetricsPanelCtrl { steppedLine: false, // tooltip options tooltip : { - value_type: 'cumulative', + value_type: 'individual', shared: true, sort: 0, msResolution: false, @@ -133,10 +133,8 @@ class GraphCtrl extends MetricsPanelCtrl { this.addEditorTab('Axes', axesEditorComponent, 2); this.addEditorTab('Legend', 'public/app/plugins/panel/graph/tab_legend.html', 3); this.addEditorTab('Display', 'public/app/plugins/panel/graph/tab_display.html', 4); + this.addEditorTab('Alert', alertTab, 5); - if (config.alertingEnabled) { - this.addEditorTab('Alert', alertTab, 5); - } this.subTabIndex = 0; } diff --git a/public/app/plugins/panel/graph/tab_display.html b/public/app/plugins/panel/graph/tab_display.html index 14c8c4cf6fc..6845181b8b2 100644 --- a/public/app/plugins/panel/graph/tab_display.html +++ b/public/app/plugins/panel/graph/tab_display.html @@ -71,13 +71,9 @@
Stacking & Null value
- + - +
diff --git a/public/app/plugins/panel/text/module.ts b/public/app/plugins/panel/text/module.ts index 7228f220d46..c817c184380 100644 --- a/public/app/plugins/panel/text/module.ts +++ b/public/app/plugins/panel/text/module.ts @@ -13,14 +13,15 @@ export class TextPanelCtrl extends PanelCtrl { mode : "markdown", // 'html', 'markdown', 'text' content : "# title", }; - /** @ngInject */ + + /** @ngInject **/ constructor($scope, $injector, private templateSrv, private $sce) { super($scope, $injector); _.defaults(this.panel, this.panelDefaults); this.events.on('init-edit-mode', this.onInitEditMode.bind(this)); - this.events.on('refresh', this.onRender.bind(this)); + this.events.on('refresh', this.onRefresh.bind(this)); this.events.on('render', this.onRender.bind(this)); } @@ -29,6 +30,10 @@ export class TextPanelCtrl extends PanelCtrl { this.editorTabIndex = 1; } + onRefresh() { + this.render(); + } + onRender() { if (this.panel.mode === 'markdown') { this.renderMarkdown(this.panel.content); diff --git a/public/img/CopyQuery.png b/public/img/CopyQuery.png index b9829c23b2f..a923bf43603 100644 Binary files a/public/img/CopyQuery.png and b/public/img/CopyQuery.png differ diff --git a/public/img/alert_howto_new.png b/public/img/alert_howto_new.png index b7663588656..efbf87c3ce8 100644 Binary files a/public/img/alert_howto_new.png and b/public/img/alert_howto_new.png differ diff --git a/public/img/angle_gradient_light_rev.png b/public/img/angle_gradient_light_rev.png index cc4558b0cf2..973f52fbad8 100644 Binary files a/public/img/angle_gradient_light_rev.png and b/public/img/angle_gradient_light_rev.png differ diff --git a/public/img/angle_gradient_rev.png b/public/img/angle_gradient_rev.png index 6b45f4d1990..501ecfdf75a 100644 Binary files a/public/img/angle_gradient_rev.png and b/public/img/angle_gradient_rev.png differ diff --git a/public/img/check_radio_sheet.png b/public/img/check_radio_sheet.png index de6549fa2cc..e5c7eaaa071 100644 Binary files a/public/img/check_radio_sheet.png and b/public/img/check_radio_sheet.png differ diff --git a/public/img/checkbox.png b/public/img/checkbox.png index a1256ec8b95..52547547161 100644 Binary files a/public/img/checkbox.png and b/public/img/checkbox.png differ diff --git a/public/img/checkbox_white.png b/public/img/checkbox_white.png index dbff6d5ab64..fc2dc61d4ab 100644 Binary files a/public/img/checkbox_white.png and b/public/img/checkbox_white.png differ diff --git a/public/img/cubes.png b/public/img/cubes.png index 30712ea558d..dfdcc12894a 100644 Binary files a/public/img/cubes.png and b/public/img/cubes.png differ diff --git a/public/img/fav16.png b/public/img/fav16.png index 827cd972e4b..6f5f809d9cb 100644 Binary files a/public/img/fav16.png and b/public/img/fav16.png differ diff --git a/public/img/fav32.png b/public/img/fav32.png index 827cd972e4b..6f5f809d9cb 100644 Binary files a/public/img/fav32.png and b/public/img/fav32.png differ diff --git a/public/img/fav_dark_16.png b/public/img/fav_dark_16.png index 2f66c42db40..f22fb86de1f 100644 Binary files a/public/img/fav_dark_16.png and b/public/img/fav_dark_16.png differ diff --git a/public/img/fav_dark_32.png b/public/img/fav_dark_32.png index 9248832f671..a3b300ad683 100644 Binary files a/public/img/fav_dark_32.png and b/public/img/fav_dark_32.png differ diff --git a/public/img/glyphicons-halflings-white.png b/public/img/glyphicons-halflings-white.png index 3bf6484a29d..a779107ecec 100644 Binary files a/public/img/glyphicons-halflings-white.png and b/public/img/glyphicons-halflings-white.png differ diff --git a/public/img/glyphicons-halflings.png b/public/img/glyphicons-halflings.png index a9969993201..df8120a1a01 100644 Binary files a/public/img/glyphicons-halflings.png and b/public/img/glyphicons-halflings.png differ diff --git a/public/img/kibana.png b/public/img/kibana.png index 17b719eed07..85220e33226 100644 Binary files a/public/img/kibana.png and b/public/img/kibana.png differ diff --git a/public/img/light.png b/public/img/light.png index cc65dbaad99..eb2dd2b5af5 100644 Binary files a/public/img/light.png and b/public/img/light.png differ diff --git a/public/img/logo_transparent_200x.png b/public/img/logo_transparent_200x.png index 18a431e478e..d73ad2126a8 100644 Binary files a/public/img/logo_transparent_200x.png and b/public/img/logo_transparent_200x.png differ diff --git a/public/img/logo_transparent_200x75.png b/public/img/logo_transparent_200x75.png index 18a431e478e..d73ad2126a8 100644 Binary files a/public/img/logo_transparent_200x75.png and b/public/img/logo_transparent_200x75.png differ diff --git a/public/img/logo_transparent_400x.png b/public/img/logo_transparent_400x.png index 7f2bf357178..a1e36dcae40 100644 Binary files a/public/img/logo_transparent_400x.png and b/public/img/logo_transparent_400x.png differ diff --git a/public/img/page_header_line.png b/public/img/page_header_line.png index ec98becd093..5455a8eff36 100644 Binary files a/public/img/page_header_line.png and b/public/img/page_header_line.png differ diff --git a/public/img/small.png b/public/img/small.png index 8c5222bad41..e355b6efc7e 100644 Binary files a/public/img/small.png and b/public/img/small.png differ diff --git a/public/img/transparent.png b/public/img/transparent.png index e4e8dcaa3b3..b4256beb829 100644 Binary files a/public/img/transparent.png and b/public/img/transparent.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/buttonBg.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/buttonBg.png index f367b427e60..961cd73976a 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/buttonBg.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/buttonBg.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/buttonBgHover.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/buttonBgHover.png index cd37a0d52de..58a3b54c789 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/buttonBgHover.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/buttonBgHover.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/detach.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/detach.png index 0ddb9a1764a..a05767a255e 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/detach.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/detach.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/detachHover.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/detachHover.png index e419272912b..e075b43f7d9 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/detachHover.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/detachHover.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/disable.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/disable.png index c28bcdf24a8..516cb716c20 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/disable.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/disable.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/disableHover.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/disableHover.png index 26fe37542f8..42bbc13f612 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/disableHover.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/disableHover.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/down.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/down.png index acbbd30c065..d90fdc77537 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/down.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/down.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/downActive.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/downActive.png index f4312b2ffbc..62e4ac2228f 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/downActive.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/downActive.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/downHover.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/downHover.png index 8144e63787d..d8aab29be63 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/downHover.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/downHover.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/errorIcon-sm.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/errorIcon-sm.png index 0c377e307e5..d73fdde20b6 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/errorIcon-sm.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/errorIcon-sm.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/errorIcon.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/errorIcon.png index 2d75261bb67..345843067fc 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/errorIcon.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/errorIcon.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/firebug.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/firebug.png index e10affebb48..8651749f9de 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/firebug.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/firebug.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/infoIcon.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/infoIcon.png index da1e5334c19..00ba1e54b6c 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/infoIcon.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/infoIcon.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/min.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/min.png index 1034d66fb44..08b7a0f3e62 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/min.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/min.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/minHover.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/minHover.png index b0d1e1afdcc..55f9b8e850a 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/minHover.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/minHover.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/off.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/off.png index b70b1d24d88..9775dfe348a 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/off.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/off.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/offHover.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/offHover.png index f3670f19ff3..43c67d1d59b 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/offHover.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/offHover.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/search.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/search.png index fba33b8a57d..2ee9cbccab4 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/search.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/search.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/shadowAlpha.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/shadowAlpha.png index a2561df9717..f33985adf58 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/shadowAlpha.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/shadowAlpha.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/sprite.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/sprite.png index 33d2c4d4649..06ba3ca3172 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/sprite.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/sprite.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabHoverLeft.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabHoverLeft.png index 0fb24d0c855..da5aa00fc80 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabHoverLeft.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabHoverLeft.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabHoverMid.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabHoverMid.png index fbccab54d05..6db85faddfd 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabHoverMid.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabHoverMid.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabHoverRight.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabHoverRight.png index 3db0f361799..4e812f0f332 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabHoverRight.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabHoverRight.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabLeft.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabLeft.png index a6cc9e94a9b..7cddcbee832 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabLeft.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabLeft.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuCheckbox.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuCheckbox.png index 4726e62208e..c98d1129bed 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuCheckbox.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuCheckbox.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuPin.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuPin.png index eb4b11efe5e..4a0c65a1e61 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuPin.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuPin.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuRadio.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuRadio.png index 55b982d7c8e..290a7820597 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuRadio.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuRadio.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuTarget.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuTarget.png index 957bd9f2ada..437007a8127 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuTarget.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuTarget.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuTargetHover.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuTargetHover.png index 200a37083d6..f67477c9821 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuTargetHover.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMenuTargetHover.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMid.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMid.png index 68986c3b0bd..e747db52049 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMid.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabMid.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabRight.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabRight.png index 501130796a5..0d0f2cb74b7 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabRight.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/tabRight.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/textEditorBorders.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/textEditorBorders.png index 21682c3dcaf..a275c764e71 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/textEditorBorders.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/textEditorBorders.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/textEditorCorners.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/textEditorCorners.png index a0f839dc598..378a11d6f92 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/textEditorCorners.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/textEditorCorners.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/titlebarMid.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/titlebarMid.png index 10998ae7b37..fc8e837b1ab 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/titlebarMid.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/titlebarMid.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/toolbarMid.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/toolbarMid.png index aa21dee6a77..bed6218fa59 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/toolbarMid.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/toolbarMid.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/twistyClosed.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/twistyClosed.png index f80319b0a4e..ea662abcb4f 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/twistyClosed.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/twistyClosed.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/twistyOpen.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/twistyOpen.png index 86801243459..a48d4520ec1 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/twistyOpen.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/twistyOpen.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/up.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/up.png index 2174d03a9c9..0788f47baea 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/up.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/up.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/upActive.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/upActive.png index 236cf6768e3..497454631af 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/upActive.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/upActive.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/upHover.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/upHover.png index cd8131707e2..23769f8b671 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/upHover.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/upHover.png differ diff --git a/public/vendor/lodash/vendor/firebug-lite/skin/xp/warningIcon.png b/public/vendor/lodash/vendor/firebug-lite/skin/xp/warningIcon.png index de51084e848..3500987cc12 100644 Binary files a/public/vendor/lodash/vendor/firebug-lite/skin/xp/warningIcon.png and b/public/vendor/lodash/vendor/firebug-lite/skin/xp/warningIcon.png differ diff --git a/scripts/trigger_windows_build.sh b/scripts/trigger_windows_build.sh new file mode 100755 index 00000000000..521a365a299 --- /dev/null +++ b/scripts/trigger_windows_build.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +_token=$1 + +curl \ + -H "Content-Type: application/json" \ + -H "Authorization: Bearer ${_token}" \ + -X POST -d '{ "accountName": "Torkeldegaard", "projectSlug": "grafana","branch": "master","environmentVariables": {}}' \ + https://ci.appveyor.com/api/builds diff --git a/vendor/github.com/go-xorm/xorm/docs/images/cache_design.png b/vendor/github.com/go-xorm/xorm/docs/images/cache_design.png index 11ce817663c..78796b56833 100644 Binary files a/vendor/github.com/go-xorm/xorm/docs/images/cache_design.png and b/vendor/github.com/go-xorm/xorm/docs/images/cache_design.png differ diff --git a/vendor/gopkg.in/macaron.v1/macaronlogo.png b/vendor/gopkg.in/macaron.v1/macaronlogo.png index 399759769a8..a2ab537b6d8 100644 Binary files a/vendor/gopkg.in/macaron.v1/macaronlogo.png and b/vendor/gopkg.in/macaron.v1/macaronlogo.png differ