b22881c717
redirect user to requested url after login via oauth
2017-02-09 14:01:53 -05:00
2b2368b189
Merge pull request #7491 from grafana/sorting-datasources
...
Sorting datasources with case insensitive order
2017-02-08 12:01:31 +01:00
fbc3c3dd32
api: removes import alias + some unused fields
2017-02-08 11:57:05 +01:00
cbd1455c42
fix(api): case insensitive sort for datasources
...
The data source list is case sensitive when sorted. This changes the
sort to be case insensitive. The test only tests the handler, not the
routing or database query.
2017-02-07 22:15:52 +01:00
9ece10ef24
style(dataproxy): simplify expression
2017-02-07 11:03:57 +01:00
69566a23fc
improve security of Prometheus datasource
2017-02-06 23:10:10 +09:00
30c334a2b8
Add common type for oauth authorization errors
2017-02-01 16:42:59 +03:00
01f1c1b8dc
feat(): began refactoring PR #5364
2017-01-31 17:10:27 +01:00
8a95c563bb
Merge branch 'master' into websocket
2017-01-31 08:56:49 +01:00
c400b5cf63
Merge branch 'master' of github.com:grafana/grafana
2017-01-31 07:48:44 +01:00
1a9aaa4138
feat(server side png rendering): added timezone parameter for server side rendering, refactoring PR #7264
2017-01-31 07:48:10 +01:00
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
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
edba465a75
add DeliveryStreamName dimension to AWS/Firehose Cloudwatch namespace ( #7388 )
2017-01-28 08:30:57 +01:00
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
40d39f8a3e
refactor(): renaming alerting hide ui option, #7318
2017-01-25 13:32:26 +01:00
fee4846429
Merge branch 'alerting_ui' of https://github.com/smalik03/grafana into smalik03-alerting_ui
2017-01-25 13:16:48 +01:00
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
e78da57e4d
feat(alerting): shows when no_data triggered alerts
...
closes #7035
ref #7257
2017-01-17 09:49:25 +01:00
d4a96b9741
tech(dataproxy): make the code a little bit more defensive
2017-01-16 12:24:08 +01:00
dd84fb563a
style(dataproxy): renames log functions
2017-01-16 12:23:49 +01:00
51bca7d84b
tech(dataproxy): moves all parameters to Info call
2017-01-16 12:16:41 +01:00
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
1bc55a2d38
Enable image rendering to use browser time offset
2017-01-15 22:01:28 +09:00
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
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
0873d493c2
feat(alerting): moves getNewState to evalHandler
...
closes #7149
2017-01-13 11:02:24 +01:00
269d16301a
Rename to audit logging to data proxy logging
2017-01-11 07:40:06 -08:00
0fee7c863a
Gate data proxy audit logging behind audit_logging server setting
2017-01-11 07:22:57 -08:00
d9cbb994b8
Clean up audit log formatting and code
2017-01-10 11:42:03 -08:00
d03977ac0e
Add initial audit logging to data proxy
2017-01-09 22:59:43 -08:00
31bd725559
Merge branch 'notifier-refactor'
2017-01-06 12:17:34 +01:00
dfaefe34a4
add cloudwatch region ( #7161 )
2017-01-06 12:05:27 +01:00
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
9a3e51894b
tech(alerting): remove unused property
2017-01-03 08:11:17 +01:00
9855ea8c6c
handle sts error ( #7088 )
2016-12-30 16:59:06 +01:00
48b57afe84
Adds London and Canada AWS Regions
2016-12-27 14:25:12 +01:00
fad07f0d15
refactor(http): refactoring http server
2016-12-21 14:36:32 +01:00
8bccbdafd2
feat(live): minor progress on stream manager
2016-12-21 09:16:29 +01:00
b7827962dc
feat(live): just wanted to checkout how far I got on the websocket data source
2016-12-20 16:09:04 +01:00
13c4ce68ee
Added name and id in response of create/update ( #7016 )
2016-12-20 13:02:26 +01:00
a230ff65a9
fix(alerting): typo
2016-12-19 16:44:59 +01:00
9135abf3ae
Merge pull request #6996 from bergquist/pause_all_alerts
...
Pause all alerts
2016-12-19 16:38:44 +01:00
6c2c3c7e24
Revert "fix(alerting): pause dto can only pause one"
...
This reverts commit b2c5a6a037
2016-12-19 16:07:55 +01:00
b2c5a6a037
fix(alerting): pause dto can only pause one
2016-12-19 16:05:24 +01:00
a2257ec3d0
tech(alerting): renames pause all method
2016-12-19 15:17:49 +01:00
ecdf1888c4
feat(alerting): removes pause per datasource
2016-12-19 13:24:45 +01:00
4ef95cfd31
style(api): reduce code complexity
2016-12-16 16:07:23 +01:00
1f8f3ed038
style(api): extracts filter logic for mass pause
2016-12-16 15:19:13 +01:00
fb6aa0e026
feat(api): adds endpoint for mass pausing alerts
...
ref #6589
2016-12-16 15:00:58 +01:00
Dan Cech
Daniel Lee
bergquist
Mitsuhiro Tanda
Alexander Menzhinsky
Torkel Ödegaard
Pavlos Daoglou
Oleksandr Kushchenko
smalik
Ryuichi Sakai
Ricky Niemi
Kerim Satirli
Utkarsh Bhatnagar