From d016fc1da13e0c0af887c545d4803a77ecb029d5 Mon Sep 17 00:00:00 2001 From: bergquist Date: Tue, 18 Oct 2016 10:54:17 +0200 Subject: [PATCH 1/7] tech(build): create sha files for windows build --- appveyor.yml | 1 + build.go | 3 +++ 2 files changed, 4 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 2cf92ebcbcb..48d3e7f314e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -25,6 +25,7 @@ install: build_script: - go run build.go build - grunt release + - go run build.go sha1-dist - cp dist/* . artifacts: diff --git a/build.go b/build.go index a457a49a2c8..de828d3ef91 100644 --- a/build.go +++ b/build.go @@ -98,6 +98,9 @@ func main() { createDebPackages() sha1FilesInDist() + case "sha1-dist": + sha1FilesInDist() + case "latest": makeLatestDistCopies() sha1FilesInDist() From 2b55cf609c97735620c5cc9ebd40e420f9b6b75d Mon Sep 17 00:00:00 2001 From: bergquist Date: Tue, 18 Oct 2016 11:42:25 +0200 Subject: [PATCH 2/7] tech(build): include sha1 as artifact --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 48d3e7f314e..756dbf8fba5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,7 +29,7 @@ build_script: - cp dist/* . artifacts: - - path: grafana-*windows-*.zip + - path: grafana-*windows-*.* name: binzip deploy: From 9429434cb5422226bb061ae0cc6947aae2e2d724 Mon Sep 17 00:00:00 2001 From: bergquist Date: Tue, 18 Oct 2016 15:12:01 +0200 Subject: [PATCH 3/7] feat(influxdb): use database auth if provided closes #6310 --- docker/blocks/influxdb/config.toml | 75 ----------------------- docker/blocks/influxdb/fig | 3 +- docker/blocks/influxdb/influxdb.conf | 92 ++++++++++++++++++++++++++++ pkg/tsdb/influxdb/influxdb.go | 5 ++ 4 files changed, 99 insertions(+), 76 deletions(-) delete mode 100644 docker/blocks/influxdb/config.toml create mode 100644 docker/blocks/influxdb/influxdb.conf diff --git a/docker/blocks/influxdb/config.toml b/docker/blocks/influxdb/config.toml deleted file mode 100644 index 23834b22e3d..00000000000 --- a/docker/blocks/influxdb/config.toml +++ /dev/null @@ -1,75 +0,0 @@ -bind-address = "0.0.0.0" - -[logging] -level = "debug" -file = "/opt/influxdb/shared/data/influxdb.log" # stdout to log to standard out - -[admin] -port = 8083 # binding is disabled if the port isn't set -assets = "/opt/influxdb/current/admin" - -[api] -port = 8086 # binding is disabled if the port isn't set - -read-timeout = "5s" - -[input_plugins] - - [input_plugins.graphite] - enabled = true - port = 2004 - database = "graphite" # store graphite data in this database - - -[raft] -port = 8090 -dir = "/opt/influxdb/shared/data/raft" - -[storage] -dir = "/opt/influxdb/shared/data/db" -# How many requests to potentially buffer in memory. If the buffer gets filled then writes -# will still be logged and once the local storage has caught up (or compacted) the writes -# will be replayed from the WAL -write-buffer-size = 10000 -default-engine = "rocksdb" -max-open-shards = 0 -point-batch-size = 100 -write-batch-size = 5000000 -retention-sweep-period = "10m" - -[storage.engines.rocksdb] -max-open-files = 1000 -lru-cache-size = "200m" - -[storage.engines.leveldb] -max-open-files = 1000 -lru-cache-size = "200m" - -[cluster] -protobuf_port = 8099 -protobuf_timeout = "2s" # the write timeout on the protobuf conn any duration parseable by time.ParseDuration -protobuf_heartbeat = "200ms" # the heartbeat interval between the servers. must be parseable by time.ParseDuration -protobuf_min_backoff = "1s" # the minimum backoff after a failed heartbeat attempt -protobuf_max_backoff = "10s" # the maxmimum backoff after a failed heartbeat attempt -write-buffer-size = 10000 -ax-response-buffer-size = 100000 -oncurrent-shard-query-limit = 10 - -[sharding] - replication-factor = 1 - - [sharding.short-term] - duration = "7d" - split = 1 - - [sharding.long-term] - duration = "30d" - split = 1 - # split-random = "/^Hf.*/" - -[wal] -dir = "/opt/influxdb/shared/data/wal" -flush-after = 1000 # the number of writes after which wal will be flushed, 0 for flushing on every write -bookmark-after = 1000 # the number of writes after which a bookmark will be created -index-after = 1000 -requests-per-logfile = 10000 diff --git a/docker/blocks/influxdb/fig b/docker/blocks/influxdb/fig index 7b83bb2bab4..8821c010a98 100644 --- a/docker/blocks/influxdb/fig +++ b/docker/blocks/influxdb/fig @@ -1,11 +1,12 @@ influxdb: - #image: influxdb/influxdb:1.0-alpine image: influxdb:latest container_name: influxdb ports: - "2004:2004" - "8083:8083" - "8086:8086" + volumes: + - ./blocks/influxdb/influxdb.conf:/etc/influxdb/influxdb.conf fake-influxdb-data: image: grafana/fake-data-gen diff --git a/docker/blocks/influxdb/influxdb.conf b/docker/blocks/influxdb/influxdb.conf new file mode 100644 index 00000000000..c0331ce7449 --- /dev/null +++ b/docker/blocks/influxdb/influxdb.conf @@ -0,0 +1,92 @@ +reporting-disabled = false + +[meta] + # Where the metadata/raft database is stored + dir = "/var/lib/influxdb/meta" + + retention-autocreate = true + + # If log messages are printed for the meta service + logging-enabled = true + pprof-enabled = false + + # The default duration for leases. + lease-duration = "1m0s" + +[data] + # Controls if this node holds time series data shards in the cluster + enabled = true + + dir = "/var/lib/influxdb/data" + + # These are the WAL settings for the storage engine >= 0.9.3 + wal-dir = "/var/lib/influxdb/wal" + wal-logging-enabled = true + + +[coordinator] + write-timeout = "10s" + max-concurrent-queries = 0 + query-timeout = "0" + log-queries-after = "0" + max-select-point = 0 + max-select-series = 0 + max-select-buckets = 0 + +[retention] + enabled = true + check-interval = "30m" + +[shard-precreation] + enabled = true + check-interval = "10m" + advance-period = "30m" + +[monitor] + store-enabled = true # Whether to record statistics internally. + store-database = "_internal" # The destination database for recorded statistics + store-interval = "10s" # The interval at which to record statistics + +[admin] + enabled = true + bind-address = ":8083" + https-enabled = false + https-certificate = "/etc/ssl/influxdb.pem" + +[http] + enabled = true + bind-address = ":8086" + auth-enabled = true + log-enabled = true + write-tracing = false + pprof-enabled = false + https-enabled = false + https-certificate = "/etc/ssl/influxdb.pem" + ### Use a separate private key location. + # https-private-key = "" + max-row-limit = 10000 + realm = "InfluxDB" + + unix-socket-enabled = false # enable http service over unix domain socket + # bind-socket = "/var/run/influxdb.sock" + +[subscriber] + enabled = true + +[[graphite]] + enabled = false + +[[collectd]] + enabled = false + +[[opentsdb]] + enabled = false + +[[udp]] + enabled = false + +[continuous_queries] + log-enabled = true + enabled = true + # run-interval = "1s" # interval for how often continuous queries will be checked if they need to run + diff --git a/pkg/tsdb/influxdb/influxdb.go b/pkg/tsdb/influxdb/influxdb.go index 22f6230ed6d..b546a6ee3a9 100644 --- a/pkg/tsdb/influxdb/influxdb.go +++ b/pkg/tsdb/influxdb/influxdb.go @@ -124,10 +124,15 @@ func (e *InfluxDBExecutor) createRequest(query string) (*http.Request, error) { req.URL.RawQuery = params.Encode() req.Header.Set("User-Agent", "Grafana") + if e.BasicAuth { req.SetBasicAuth(e.BasicAuthUser, e.BasicAuthPassword) } + if e.User != "" { + req.SetBasicAuth(e.User, e.Password) + } + glog.Debug("Influxdb request", "url", req.URL.String()) return req, nil } From d1eceedf55b0f6d1e88cffdeeb07b5502ad78743 Mon Sep 17 00:00:00 2001 From: bergquist Date: Tue, 18 Oct 2016 16:18:16 +0200 Subject: [PATCH 4/7] feat(webhook): add httpmethod to webhook closes #6255 --- pkg/models/notifications.go | 18 ++++++++------- pkg/services/alerting/notifiers/webhook.go | 19 ++++++++------- pkg/services/notifications/notifications.go | 18 ++++++++------- pkg/services/notifications/webhook.go | 17 +++++++++----- .../alerting/notification_edit_ctrl.ts | 2 +- .../alerting/partials/notification_edit.html | 23 +++++++++++-------- 6 files changed, 57 insertions(+), 40 deletions(-) diff --git a/pkg/models/notifications.go b/pkg/models/notifications.go index 759efe41a02..abbc6ec7e27 100644 --- a/pkg/models/notifications.go +++ b/pkg/models/notifications.go @@ -17,17 +17,19 @@ type SendEmailCommandSync struct { } type SendWebhook struct { - Url string - User string - Password string - Body string + Url string + User string + Password string + Body string + HttpMethod string } type SendWebhookSync struct { - Url string - User string - Password string - Body string + Url string + User string + Password string + Body string + HttpMethod string } type SendResetPasswordEmailCommand struct { diff --git a/pkg/services/alerting/notifiers/webhook.go b/pkg/services/alerting/notifiers/webhook.go index 979ce2e8a98..fb236c91c13 100644 --- a/pkg/services/alerting/notifiers/webhook.go +++ b/pkg/services/alerting/notifiers/webhook.go @@ -24,16 +24,18 @@ func NewWebHookNotifier(model *m.AlertNotification) (alerting.Notifier, error) { Url: url, User: model.Settings.Get("user").MustString(), Password: model.Settings.Get("password").MustString(), + HttpMethod: model.Settings.Get("httpMethod").MustString("POST"), log: log.New("alerting.notifier.webhook"), }, nil } type WebhookNotifier struct { NotifierBase - Url string - User string - Password string - log log.Logger + Url string + User string + Password string + HttpMethod string + log log.Logger } func (this *WebhookNotifier) Notify(evalContext *alerting.EvalContext) error { @@ -59,10 +61,11 @@ func (this *WebhookNotifier) Notify(evalContext *alerting.EvalContext) error { body, _ := bodyJSON.MarshalJSON() cmd := &m.SendWebhookSync{ - Url: this.Url, - User: this.User, - Password: this.Password, - Body: string(body), + Url: this.Url, + User: this.User, + Password: this.Password, + Body: string(body), + HttpMethod: this.HttpMethod, } if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil { diff --git a/pkg/services/notifications/notifications.go b/pkg/services/notifications/notifications.go index f7762e2d3d0..9aa30b94edd 100644 --- a/pkg/services/notifications/notifications.go +++ b/pkg/services/notifications/notifications.go @@ -61,19 +61,21 @@ func Init() error { func SendWebhookSync(ctx context.Context, cmd *m.SendWebhookSync) error { return sendWebRequestSync(ctx, &Webhook{ - Url: cmd.Url, - User: cmd.User, - Password: cmd.Password, - Body: cmd.Body, + Url: cmd.Url, + User: cmd.User, + Password: cmd.Password, + Body: cmd.Body, + HttpMethod: cmd.HttpMethod, }) } func sendWebhook(cmd *m.SendWebhook) error { addToWebhookQueue(&Webhook{ - Url: cmd.Url, - User: cmd.User, - Password: cmd.Password, - Body: cmd.Body, + Url: cmd.Url, + User: cmd.User, + Password: cmd.Password, + Body: cmd.Body, + HttpMethod: cmd.HttpMethod, }) return nil diff --git a/pkg/services/notifications/webhook.go b/pkg/services/notifications/webhook.go index d5b8a718d52..de1303d8131 100644 --- a/pkg/services/notifications/webhook.go +++ b/pkg/services/notifications/webhook.go @@ -15,10 +15,11 @@ import ( ) type Webhook struct { - Url string - User string - Password string - Body string + Url string + User string + Password string + Body string + HttpMethod string } var webhookQueue chan *Webhook @@ -44,13 +45,17 @@ func processWebhookQueue() { } func sendWebRequestSync(ctx context.Context, webhook *Webhook) error { - webhookLog.Debug("Sending webhook", "url", webhook.Url) + webhookLog.Debug("Sending webhook", "url", webhook.Url, "http method", webhook.HttpMethod) client := &http.Client{ Timeout: time.Duration(10 * time.Second), } - request, err := http.NewRequest(http.MethodPost, webhook.Url, bytes.NewReader([]byte(webhook.Body))) + if webhook.HttpMethod == "" { + webhook.HttpMethod = http.MethodPost + } + + request, err := http.NewRequest(webhook.HttpMethod, webhook.Url, bytes.NewReader([]byte(webhook.Body))) if webhook.User != "" && webhook.Password != "" { request.Header.Add("Authorization", util.GetBasicAuthHeader(webhook.User, webhook.Password)) } diff --git a/public/app/features/alerting/notification_edit_ctrl.ts b/public/app/features/alerting/notification_edit_ctrl.ts index 19b804f4697..c5f24650845 100644 --- a/public/app/features/alerting/notification_edit_ctrl.ts +++ b/public/app/features/alerting/notification_edit_ctrl.ts @@ -18,7 +18,7 @@ export class AlertNotificationEditCtrl { this.model = { type: 'email', settings: { - severityFilter: 'none' + httpMethod: 'POST' }, isDefault: false }; diff --git a/public/app/features/alerting/partials/notification_edit.html b/public/app/features/alerting/partials/notification_edit.html index 817035d21a3..c6c422b3598 100644 --- a/public/app/features/alerting/partials/notification_edit.html +++ b/public/app/features/alerting/partials/notification_edit.html @@ -32,19 +32,24 @@

Webhook settings

- Url + Url
-
-
- Username - -
-
- Password - +
+ Http Method +
+
+
+ Username + +
+
+ Password + +
From 9468ddeed5c93a4de9ab245ddcabfff043d1c2b1 Mon Sep 17 00:00:00 2001 From: Eric Uldall Date: Tue, 18 Oct 2016 22:43:32 -0700 Subject: [PATCH 5/7] Issues/6317 empty google login (#6318) * added Login property to google_oauth model * fixed spacing * fixed google_oauth syntax error, missing comma before newline * set noexpandtab for commit --- pkg/social/google_oauth.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/social/google_oauth.go b/pkg/social/google_oauth.go index a2687d58f81..21543902a86 100644 --- a/pkg/social/google_oauth.go +++ b/pkg/social/google_oauth.go @@ -46,5 +46,6 @@ func (s *SocialGoogle) UserInfo(client *http.Client) (*BasicUserInfo, error) { return &BasicUserInfo{ Name: data.Name, Email: data.Email, + Login: data.Email, }, nil } From b2d5b920f58d1ac1bb5ba3e310a9c689c45e39fc Mon Sep 17 00:00:00 2001 From: bergquist Date: Wed, 19 Oct 2016 08:01:14 +0200 Subject: [PATCH 6/7] feat(alerting): allow editor to modify notifications closes #6314 --- pkg/api/api.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/api/api.go b/pkg/api/api.go index 211b5b05e4d..ed73f2dc76d 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -252,7 +252,7 @@ func Register(r *macaron.Macaron) { r.Group("/alerts", func() { r.Post("/test", bind(dtos.AlertTestCommand{}), wrap(AlertTest)) - r.Post("/:alertId/pause", bind(dtos.PauseAlertCommand{}), wrap(PauseAlert)) + r.Post("/:alertId/pause", bind(dtos.PauseAlertCommand{}), wrap(PauseAlert), reqEditorRole) r.Get("/:alertId", ValidateOrgAlert, wrap(GetAlert)) r.Get("/", wrap(GetAlerts)) r.Get("/states-for-dashboard", wrap(GetAlertStatesForDashboard)) @@ -266,7 +266,7 @@ func Register(r *macaron.Macaron) { r.Put("/:notificationId", bind(m.UpdateAlertNotificationCommand{}), wrap(UpdateAlertNotification)) r.Get("/:notificationId", wrap(GetAlertNotificationById)) r.Delete("/:notificationId", wrap(DeleteAlertNotification)) - }, reqOrgAdmin) + }, reqEditorRole) r.Get("/annotations", wrap(GetAnnotations)) r.Post("/annotations/mass-delete", reqOrgAdmin, bind(dtos.DeleteAnnotationsCmd{}), wrap(DeleteAnnotations)) From 20bfe443fe10f4ce4d8a674fa3f4a9b510d0a439 Mon Sep 17 00:00:00 2001 From: bergquist Date: Wed, 19 Oct 2016 08:57:58 +0200 Subject: [PATCH 7/7] feat(prometheus): trim labelname lookup key closes #6300 --- pkg/tsdb/prometheus/prometheus.go | 6 ++++-- pkg/tsdb/prometheus/prometheus_test.go | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkg/tsdb/prometheus/prometheus.go b/pkg/tsdb/prometheus/prometheus.go index 85f6b621c1c..6dc4146ad0e 100644 --- a/pkg/tsdb/prometheus/prometheus.go +++ b/pkg/tsdb/prometheus/prometheus.go @@ -84,8 +84,10 @@ func formatLegend(metric pmodel.Metric, query *PrometheusQuery) string { reg, _ := regexp.Compile(`\{\{\s*(.+?)\s*\}\}`) result := reg.ReplaceAllFunc([]byte(query.LegendFormat), func(in []byte) []byte { - ind := strings.Replace(strings.Replace(string(in), "{{", "", 1), "}}", "", 1) - if val, exists := metric[pmodel.LabelName(ind)]; exists { + labelName := strings.Replace(string(in), "{{", "", 1) + labelName = strings.Replace(labelName, "}}", "", 1) + labelName = strings.TrimSpace(labelName) + if val, exists := metric[pmodel.LabelName(labelName)]; exists { return []byte(val) } diff --git a/pkg/tsdb/prometheus/prometheus_test.go b/pkg/tsdb/prometheus/prometheus_test.go index f7489ae9afc..a4c38cae582 100644 --- a/pkg/tsdb/prometheus/prometheus_test.go +++ b/pkg/tsdb/prometheus/prometheus_test.go @@ -17,7 +17,7 @@ func TestPrometheus(t *testing.T) { } query := &PrometheusQuery{ - LegendFormat: "legend {{app}} {{device}} {{broken}}", + LegendFormat: "legend {{app}} {{ device }} {{broken}}", } So(formatLegend(metric, query), ShouldEqual, "legend backend mobile {{broken}}")