Torkel Ödegaard
830491fa66
Merge branch 'time-offset-to-image' of https://github.com/ryu1-sakai/grafana into ryu1-sakai-time-offset-to-image
2017-01-31 06:28:54 +01:00
Pavlos Daoglou
3e741315b4
[3743] Adds support for user search based on login or email ( #7334 )
...
* [3743] Adds support for user search based on login or email
* Use query parameter instead
* Use macaron Query() instead
2017-01-31 06:25:55 +01:00
Stanislav Vetlovskiy
bd4eadf69c
#7383 Fix factory typo in telegram notifier ( #7406 )
2017-01-31 06:23:19 +01:00
Oleksandr Kushchenko
edba465a75
add DeliveryStreamName dimension to AWS/Firehose Cloudwatch namespace ( #7388 )
2017-01-28 08:30:57 +01:00
bergquist
46e4a54a6e
style: go fmt with simplify
2017-01-27 15:21:02 +01:00
Torkel Ödegaard
2f4da15264
fix(http api): throw validation error if missing property in call to /api/admin/users/123/permissions, #7365
2017-01-26 08:54:51 +01:00
Torkel Ödegaard
40d39f8a3e
refactor(): renaming alerting hide ui option, #7318
2017-01-25 13:32:26 +01:00
Torkel Ödegaard
fee4846429
Merge branch 'alerting_ui' of https://github.com/smalik03/grafana into smalik03-alerting_ui
2017-01-25 13:16:48 +01:00
smalik
9862c9ff40
feat(alerting): Show/hide alerting UI using configuration variable
...
Use configuration variable "show_alerting_ui" to show/hide alerting UI
2017-01-20 10:43:29 -05:00
bergquist
f5d8a75381
tech(webhook): remove redundant if statement
2017-01-19 09:29:40 +01:00
huydx
376d2d56bf
(feature) add LINE notify to notifier
2017-01-19 17:26:53 +09:00
bergquist
4ea4e0436a
feat(mailer): set localname to hostname
...
Some email providers does not accept localhost
in the HELO message. So we set it to hostname
instead. Our hope is that should be enough for
those providers who does not accept localhost.
closes #7223
2017-01-17 10:36:04 +01:00
bergquist
e78da57e4d
feat(alerting): shows when no_data triggered alerts
...
closes #7035
ref #7257
2017-01-17 09:49:25 +01:00
bergquist
06440ef57b
tech(dataproxy): moves cfg to [dataproxy]
2017-01-16 12:43:59 +01:00
bergquist
d4a96b9741
tech(dataproxy): make the code a little bit more defensive
2017-01-16 12:24:08 +01:00
bergquist
dd84fb563a
style(dataproxy): renames log functions
2017-01-16 12:23:49 +01:00
bergquist
51bca7d84b
tech(dataproxy): moves all parameters to Info call
2017-01-16 12:16:41 +01:00
bergquist
839eb97061
Merge branch 'feature/dataProxyAuditLog' of https://github.com/Ricky-N/grafana into Ricky-N-feature/dataProxyAuditLog
2017-01-16 12:02:43 +01:00
Ryuichi Sakai
1bc55a2d38
Enable image rendering to use browser time offset
2017-01-15 22:01:28 +09:00
Carl Bergquist
c43bb7fb99
Extractor should not modify dashboard json ( #7256 )
...
* test(dashboard): tests that he extractor does not modify original json
* feat(extractor): validate a cloned version of the dashboard json
2017-01-13 15:46:23 +01:00
Carl Bergquist
1efeaafdbf
Merge pull request #7249 from grafana/alerting_test_alertrule
...
Enable error and no_data overrides when testing alerting.
2017-01-13 15:18:02 +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
bergquist
0873d493c2
feat(alerting): moves getNewState to evalHandler
...
closes #7149
2017-01-13 11:02:24 +01:00
Ricky Niemi
0b48e48e3d
Small whitespace fix on setting file
2017-01-11 07:51:46 -08:00
Ricky Niemi
269d16301a
Rename to audit logging to data proxy logging
2017-01-11 07:40:06 -08:00
Ricky Niemi
0fee7c863a
Gate data proxy audit logging behind audit_logging server setting
2017-01-11 07:22:57 -08: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
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
Ricky Niemi
d9cbb994b8
Clean up audit log formatting and code
2017-01-10 11:42:03 -08:00
Ricky Niemi
d03977ac0e
Add initial audit logging to data proxy
2017-01-09 22:59:43 -08: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
Torkel Ödegaard
fad07f0d15
refactor(http): refactoring http server
2016-12-21 14:36:32 +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
Torkel Ödegaard
8bccbdafd2
feat(live): minor progress on stream manager
2016-12-21 09:16:29 +01:00
Torkel Ödegaard
b7827962dc
feat(live): just wanted to checkout how far I got on the websocket data source
2016-12-20 16:09:04 +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
bergquist
ca6a667555
feat(mqe): renames app tag into cluster
2016-12-14 16:49:16 +01:00
bergquist
f8871f9e4a
chore(mqe): remove comments
2016-12-14 16:16:42 +01:00
bergquist
6d57e42246
feat(mqe): restricts the executor to max 4 concurrent outgoing requests
2016-12-14 15:40:15 +01:00
Carl Bergquist
38d8ba8faa
Merge pull request #6952 from huydx/format-gofmt
...
(format) run go fmt in pkg
2016-12-14 09:26:38 +01:00
huydx
b97f4fd8b9
(typo) Exeuction -> Execution
2016-12-14 12:21:41 +09:00
huydx
adb441e5c8
(format) run go fmt in pkg
2016-12-14 12:17:38 +09:00
bergquist
e6c557bb91
Merge branch 'master' into alerting_mqe
2016-12-13 16:15:04 +01:00
bergquist
362162d6fa
feat(mqe): add token cache
2016-12-13 14:01:48 +01:00
bergquist
69d6316512
style(mqe): instance dependencies in ctor func
2016-12-13 12:47:57 +01:00
bergquist
549c3ab78b
tech(mqe): update todo
2016-12-13 11:42:06 +01:00
Utkarsh Bhatnagar
bd20dc6c4c
Fixed failing tests ( #6941 )
2016-12-13 10:00:33 +01:00
Utkarsh Bhatnagar
5777f65d05
Basic Auth now supports LDAP username and password ( #6940 )
2016-12-13 09:15:52 +01:00
bergquist
99e3db8208
Merge branch 'master' into alerting_mqe
2016-12-12 19:01:50 +01:00
Torkel Ödegaard
5ec7dea81a
Merge branch 'v4.0.x'
2016-12-12 14:39:53 +01:00
huydx
015fa82cf5
fix(alert): alert test should return error when it failed to dispatch
2016-12-12 18:22:58 +09:00
Seuf
12a82bc0d4
Auth Proxy improvements - adds the option to use ldap groups for authorization in combination with an auth proxy - adds an option to limit where auth proxy requests come from by configure a list of ip's - fixes a security issue, session could be reused
2016-12-12 09:53:02 +01:00
Seuf
ae27c17c68
Auth Proxy improvements
...
- adds the option to use ldap groups for authorization in combination with an auth proxy
- adds an option to limit where auth proxy requests come from by configure a list of ip's
- fixes a security issue, session could be reused
2016-12-12 09:43:17 +01:00
bergquist
96e8ecfa7b
feat(cli): adds command to reset admin password
...
closes #5479
2016-12-09 15:25:02 +01:00
bergquist
cd85e1f651
Merge branch 'master' into cli_db_commands
2016-12-09 12:36:05 +01:00
