Commit Graph

14 Commits

Author SHA1 Message Date
Torkel Ödegaard
8a95c563bb Merge branch 'master' into websocket 2017-01-31 08:56:49 +01:00
Torkel Ödegaard
d354f3a8af fix(alerting): fixed evaluation for no_value condition, fixes #7244 (#7247)
* fix(alerting): fixed evaluation for no_value condition, fixes #7244

* feat(alerting): moving null library into grafana, fixing handling on no value / no series
2017-01-13 12:32:30 +01:00
Mitsuhiro Tanda
7e4c101d02 S3 IAM support (#7058)
* add s3 dependencly

* rewrite image uploader by aws-sdk-go

* improve backward compatibility of s3 image uploading

* set default for expires option

* remove acl and expires
2017-01-11 14:00:49 +01:00
Torkel Ödegaard
e81e4ad06f updated websocket lib 2016-12-20 11:36:11 +01:00
bergquist
362162d6fa feat(mqe): add token cache 2016-12-13 14:01:48 +01:00
Mitsuhiro Tanda
51f80affe3 (cloudwatch) update aws-sdk-go to v1.5.8 (#6658)
* (cloudwatch) upgrade aws-sdk-go v1.5.8

* (cloudwatch) remove non-required aws-sdk-go part

* add go-ini
2016-11-22 13:38:11 +01:00
bergquist
f77799837e feat(alerting): support for attached graphs in alert notifications
closes #6183
2016-10-21 09:06:03 +02:00
bergquist
bc634f20d5 Merge branch 'master' into go_routines 2016-09-28 13:58:14 +02:00
Torkel Ödegaard
15299c2ac0 fix(govendor): added new null package 2016-09-28 12:15:47 +02:00
bergquist
34b31aeef8 tech(goroutines): sync state between different go routines 2016-09-27 16:47:17 +02:00
bergquist
d711c0ed35 Merge branch 'master' into alert_prometheus 2016-09-22 19:27:24 +02:00
bergquist
43d8bd5a25 feat(prometheus): initial support for prometheus 2016-09-21 07:01:53 +02:00
bergquist
87be56a4f0 fix: add goconvey to vendor 2016-09-19 16:22:39 +02:00
bergquist
6253476c73 tech(build): move dependencies to vendor folder 2016-09-14 16:14:27 +02:00