28d93b574d
(feat) support max connection setting for database configuration
2017-02-10 15:30:01 +01:00
73d441450b
Merge pull request #7516 from grafana/oauth-login-redirect
...
redirect user to requested url after login via oauth
2017-02-10 08:27:41 +01:00
5dd961c0f5
settings: remove commented code
2017-02-10 07:39:26 +01:00
b22881c717
redirect user to requested url after login via oauth
2017-02-09 14:01:53 -05:00
c7febca447
mqe: fixes broken test for indexalias
2017-02-09 16:43:57 +01:00
aa7292fac6
mqe: adds support for wildcard and index aliases
2017-02-09 16:25:03 +01: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
00549f393c
style(hipchat): improves code style
2017-02-08 11:24:49 +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
53942f7987
Adding HipChat Notifier
2017-02-07 10:50:49 -06:00
7d205ae2b8
Merge pull request #7466 from hagen1778/prometheus-basicauth-query
...
allow setting basic auth headers for prometheus datasource
2017-02-07 11:18:17 +01:00
689f5cb686
feat(alerting): Text formatting for Threema alert messages
2017-02-07 11:14:57 +01:00
d1a5d9c15c
feat(alerting): Add Threema Gateway integration
...
This commit adds alerting support for Threema Gateway. It supports all
Simple IDs (managed by the Gateway server).
More information can be found on https://gateway.threema.ch/
2017-02-07 11:14:57 +01:00
9ece10ef24
style(dataproxy): simplify expression
2017-02-07 11:03:57 +01:00
b386920abb
Merge branch 'prometheus_secure' of https://github.com/mtanda/grafana into mtanda-prometheus_secure
2017-02-07 11:01:02 +01:00
a1e835884b
use configured Transport instead of defaultHttpTransport
2017-02-07 11:56:59 +02:00
25be602dce
go fmt
2017-02-06 17:17:16 +02:00
57d36b3d42
feat(alerting): transform labels into tags for prometheus tsdb
2017-02-06 15:25:15 +01:00
80b92335bb
allow setting basic auth headers for prometheus datasource
2017-02-06 16:22:09 +02:00
69566a23fc
improve security of Prometheus datasource
2017-02-06 23:10:10 +09:00
3827c0a69c
tech(alerting): adds tags to alerting data model
2017-02-06 14:59:29 +01:00
c05bc0cb17
chore(vet): fixes invalid fmt.Sprintf format
2017-02-05 21:19:39 +01:00
032ecad3b7
Fix typo
2017-02-03 12:10:22 +01: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
4f5dc6104f
Merge pull request #7417 from Erliz/patch-1
...
Add image url to telegram alert notifier
2017-01-31 15:13:21 +01:00
0c46def1a0
Add an idiomatic plugin path for FreeBSD ( #7410 )
2017-01-31 14:54:53 +01:00
0e892e9f86
Add image url to telegram alert notifier
...
If public image url of alert is exist add it to the telegram message
2017-01-31 16:47:14 +03:00
fce2e341d2
mergefix(): fixed issue with master merge
2017-01-31 09:00:36 +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
bd4eadf69c
#7383 Fix factory typo in telegram notifier ( #7406 )
2017-01-31 06:23:19 +01:00
edba465a75
add DeliveryStreamName dimension to AWS/Firehose Cloudwatch namespace ( #7388 )
2017-01-28 08:30:57 +01:00
46e4a54a6e
style: go fmt with simplify
2017-01-27 15:21:02 +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
f5d8a75381
tech(webhook): remove redundant if statement
2017-01-19 09:29:40 +01:00
376d2d56bf
(feature) add LINE notify to notifier
2017-01-19 17:26:53 +09:00
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
e78da57e4d
feat(alerting): shows when no_data triggered alerts
...
closes #7035
ref #7257
2017-01-17 09:49:25 +01:00
06440ef57b
tech(dataproxy): moves cfg to [dataproxy]
2017-01-16 12:43:59 +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
huydx
Carl Bergquist
Dan Cech
Daniel Lee
James Regovich
Danilo Bargen
hagen1778
r.khavronenko
Mitsuhiro Tanda
lucapette
Alexander Menzhinsky
Torkel Ödegaard
Kevin Bowling
Stanislav Vetlovskiy
Pavlos Daoglou
Oleksandr Kushchenko
smalik