IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-16 18:34:52 -06:00
Code Issues Packages Projects Releases Wiki Activity
9,512 Commits 5,454 Branches 554 Tags 1.9 GiB
7e4c101d02
Commit Graph

2004 Commits

Author SHA1 Message Date
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
Lee Briggs
2e796da441 Add support for sensu notifications (#7207) 2017-01-11 13:57:07 +01:00
Torkel Ödegaard
149dd78298 Merge branch 'built_in_template_variables' 2017-01-11 12:10:33 +01:00
Torkel Ödegaard
b475f91387 feat(templating): completed work on built in template variables and , closes #7190, refactors #7170 2017-01-11 12:10:26 +01:00
Mark Theisen
afda9cbb2d Fix webhook username mismatch 
Fixing variable name mismatch so that the Authorization HTTP header is added to webhook notifications.
 2017-01-09 17:18:53 +01:00
Torkel Ödegaard
31bd725559 Merge branch 'notifier-refactor' 2017-01-06 12:17:34 +01:00
Mitsuhiro Tanda
dfaefe34a4 add cloudwatch region (#7161) 2017-01-06 12:05:27 +01:00
Torkel Ödegaard
b8f559aecb feat(plugins): made notifiers more pluggable and easier to support many of them, new ones can now be added without modifying any existing file, #7162 2017-01-06 12:04:25 +01:00
Torkel Ödegaard
d6a2431767 Merge branch 'notifier-telegram-messenger' of https://github.com/leonoff/grafana into leonoff-notifier-telegram-messenger 2017-01-06 10:27:20 +01:00
Utkarsh Bhatnagar
65057212e7 Org update should throw error if not found (#7066) 
* Org update should give error if not found

* Used affected rows
 2017-01-03 09:21:18 +01:00
bergquist
9a3e51894b tech(alerting): remove unused property 2017-01-03 08:11:17 +01:00
bergquist
2e7d222f6e Revert "tech: remove unused code" 
This reverts commit d9131be0a5.
 2017-01-02 13:22:37 +01:00
bergquist
d9131be0a5 tech: remove unused code 2017-01-02 13:11:09 +01:00
Mitsuhiro Tanda
9855ea8c6c handle sts error (#7088) 2016-12-30 16:59:06 +01:00
Mikhail Leonov
e32a653cb6 Added Telegram Messenger notification destination 2016-12-30 15:57:12 +03:00
Kerim Satirli
48b57afe84 Adds London and Canada AWS Regions 2016-12-27 14:25:12 +01:00
bergquist
4e306590f8 Merge branch 'v4.0.x' 2016-12-21 10:02:28 +01:00
bergquist
8cef4cc74e fix(influxdb): handles time(auto) like time($interval) 
closes #6997
 2016-12-21 10:01:20 +01:00
Utkarsh Bhatnagar
13c4ce68ee Added name and id in response of create/update (#7016) 2016-12-20 13:02:26 +01:00
bergquist
80d438ca49 chore(alerting): removes double logging 2016-12-20 08:34:44 +01:00
bergquist
a230ff65a9 fix(alerting): typo 2016-12-19 16:44:59 +01:00
Carl Bergquist
9135abf3ae Merge pull request #6996 from bergquist/pause_all_alerts 
Pause all alerts
 2016-12-19 16:38:44 +01:00
bergquist
6c2c3c7e24 Revert "fix(alerting): pause dto can only pause one" 
This reverts commit b2c5a6a037.
 2016-12-19 16:07:55 +01:00
bergquist
b2c5a6a037 fix(alerting): pause dto can only pause one 2016-12-19 16:05:24 +01:00
bergquist
71f406558e tech(alerting): remove comments 2016-12-19 15:40:09 +01:00
bergquist
a2257ec3d0 tech(alerting): renames pause all method 2016-12-19 15:17:49 +01:00
bergquist
ecf44d4d9c tech(): go fmt code 2016-12-19 13:26:42 +01:00
bergquist
ecdf1888c4 feat(alerting): removes pause per datasource 2016-12-19 13:24:45 +01:00
bergquist
6b9db0c0c5 style(alerting): simplify support for pausing multiple alerts 2016-12-19 08:18:42 +01:00
bergquist
4ef95cfd31 style(api): reduce code complexity 2016-12-16 16:07:23 +01:00
bergquist
1f8f3ed038 style(api): extracts filter logic for mass pause 2016-12-16 15:19:13 +01:00
bergquist
fb6aa0e026 feat(api): adds endpoint for mass pausing alerts 
ref #6589
 2016-12-16 15:00:58 +01:00
Mitsuhiro Tanda
81394fcaa4 add cloudwatch internal metrics (#6990) 2016-12-16 10:48:05 +01:00
Mitsuhiro Tanda
f8d6902428 fix cloudwatch percentile (#6989) 2016-12-16 10:47:41 +01:00
bergquist
df3adbc0f8 refactor(mqe): reduce duplication 2016-12-16 08:01:58 +01:00
bergquist
c467e48940 feat(notifications): removes html escaping subject 
closes #6905
 2016-12-15 14:27:33 +01:00
Torkel Ödegaard
0c94194a5b Merge branch 'master' of github.com:grafana/grafana 2016-12-15 13:57:05 +01:00
Torkel Ödegaard
35b970347a Merge branch 'v4.0.x' 2016-12-15 13:55:26 +01:00
Torkel Ödegaard
497a1fcefc Merge branch 'v4.0.x' of github.com:grafana/grafana into v4.0.x 2016-12-15 13:54:58 +01:00
Torkel Ödegaard
94962b4193 fix(logging): fixed default log level filter option not taking effect, fixex #6978 2016-12-15 13:54:47 +01:00
bergquist
ca7baca21d feat(alerting): adds ok as no data option 
closes #6866
 2016-12-15 11:13:19 +01:00
bergquist
51c4385c92 fix(mqe): only parse none empty functions 2016-12-15 08:52:43 +01:00
bergquist
f907330c9e tech(mailer): improves error when grafana cannot read open cert/key file 
ref #6949
 2016-12-15 08:27:21 +01:00
bergquist
e3b53fe599 test(mqe): adds test for double function usage 2016-12-15 07:36:06 +01:00
bergquist
7dece3ff0c test(mqe): solves brittle unit test 2016-12-15 07:36:06 +01:00
bergquist
dde6e73fed feat(mqe): add basic support for functions list 2016-12-14 22:29:17 +01:00
Torkel Ödegaard
8fc6e4cfb0 fix(auth proxy, ldap): fixed so users cannot change password when ldap or auth proxy is enabled, fixes #2495, do not allow user to change email or username depending on what property auth proxy is using, fixes #6903 2016-12-14 22:19:25 +01:00
Torkel Ödegaard
df562e23cf feat(ldap): better ldap logging, closes #6918 2016-12-14 22:01:02 +01:00
Torkel Ödegaard
6e27db148c Merge branch 'authproxy_ldap' of https://github.com/seuf/grafana into seuf-authproxy_ldap 2016-12-14 21:45:15 +01:00
Torkel Ödegaard
330c1b945e refactor(datasource): refactoring datasource secure json fields handling, #6697, #6692 2016-12-14 21:06:10 +01:00