bergquist
072c1559ba
middlware: prevent orgredirect to open body stream
...
the org redirecter opened the body stream by misstake. Causing
downstream code to start reading from an empty stream and raise errors.
2017-02-20 11:38:29 +01:00
bergquist
6115941df0
middleware: rename org-id -> orgId
2017-02-17 15:18:40 +01:00
bergquist
5174d050f2
middlware: change org when url contains orgid
...
closes #6948
ref #1613
2017-02-17 15:02:14 +01:00
bergquist
12f1ea71fd
chore: delete empty test
2017-02-17 12:07:46 +01:00
bergquist
cf871b1284
http: close http server gracefully.
2017-02-17 10:33:47 +01:00
bergquist
52566376b2
tech(server): remove unused code
2017-02-17 10:18:11 +01:00
Roman Vynar
4fcd5eab29
Add advanced TLS settings to harden setup. ( #7347 )
...
* Hardcoded the most secured TLS options.
2017-02-15 14:29:20 +01:00
Torkel Ödegaard
902cf5f889
fix(): google analytics fix
2017-02-15 14:26:57 +01:00
bergquist
bd010289b2
alerting: images in alert notifications is now optional
...
its now possible to turn of image uploading in alert notifications
for those who operate on very sensitive data.
closes #7419
2017-02-15 14:17:36 +01:00
bergquist
f14e25612e
annotations: go vet fixes
2017-02-15 14:15:42 +01:00
Daniel Lee
6dfdcd7ca5
email: change default from name to Grafana
...
Changes default from name in smtp settings
from Grafana Admin to Grafana.
Fix for integration test (which is skipped but that
did not work)
2017-02-15 11:02:46 +01:00
Daniel Lee
5fca4c7304
Merge pull request #7569 from jacobbednarz/add-sender-name-to-email
...
Updates mailer to include `from_name` value
2017-02-15 10:32:06 +01:00
Jan Garaj
79cd48f64c
Cloudwatch AWS/SES metrics ( #7568 )
2017-02-15 08:12:24 +01:00
Jacob Bednarz
796957c8c6
Update mailer tests to include FromName
2017-02-15 08:04:21 +11:00
Jacob Bednarz
66445faeb5
Format mailer From field to include name
...
Updates the messafe `From` field to include the name and email of the
sender.
2017-02-15 07:51:41 +11:00
Jacob Bednarz
90cbfacacf
Add FromName to SmtpSettings struct
...
Updates the `SmtpSettings` struct to include a value for setting the
name of the email sender.
2017-02-15 07:45:28 +11:00
Jacob Bednarz
7dc6b69c8b
s/smpt/SMTP
2017-02-15 07:43:59 +11:00
Jacob Bednarz
c9d4654592
s/from_adress/from_address
2017-02-15 07:43:16 +11:00
Daniel Lee
193d468ed3
admin: adds paging to global user list
...
Currently there is a limit of 1000 users in the global
user list. This change introduces paging so that an
admin can see all users and not just the first 1000.
Adds a new route to the api - /api/users/search that
returns a list of users and a total count. It takes
two parameters perpage and page that enable paging.
Fixes #7469
2017-02-13 12:59:36 +01:00
Carl Bergquist
7f4f38e773
Merge pull request #7519 from huydx/master
...
(feat) support datasource delete by name api
2017-02-10 15:53:34 +01:00
huydx
143cbe921f
(feat) support datasource delete by name api
2017-02-10 23:30:14 +09:00
huydx
28d93b574d
(feat) support max connection setting for database configuration
2017-02-10 15:30:01 +01:00
Carl Bergquist
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
bergquist
5dd961c0f5
settings: remove commented code
2017-02-10 07:39:26 +01:00
Dan Cech
b22881c717
redirect user to requested url after login via oauth
2017-02-09 14:01:53 -05:00
bergquist
c7febca447
mqe: fixes broken test for indexalias
2017-02-09 16:43:57 +01:00
bergquist
aa7292fac6
mqe: adds support for wildcard and index aliases
2017-02-09 16:25:03 +01:00
Daniel Lee
2b2368b189
Merge pull request #7491 from grafana/sorting-datasources
...
Sorting datasources with case insensitive order
2017-02-08 12:01:31 +01:00
Daniel Lee
fbc3c3dd32
api: removes import alias + some unused fields
2017-02-08 11:57:05 +01:00
bergquist
00549f393c
style(hipchat): improves code style
2017-02-08 11:24:49 +01:00
Daniel Lee
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
James Regovich
53942f7987
Adding HipChat Notifier
2017-02-07 10:50:49 -06:00
Carl Bergquist
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
bergquist
9ece10ef24
style(dataproxy): simplify expression
2017-02-07 11:03:57 +01:00
bergquist
b386920abb
Merge branch 'prometheus_secure' of https://github.com/mtanda/grafana into mtanda-prometheus_secure
2017-02-07 11:01:02 +01:00
hagen1778
a1e835884b
use configured Transport instead of defaultHttpTransport
2017-02-07 11:56:59 +02:00
r.khavronenko
25be602dce
go fmt
2017-02-06 17:17:16 +02:00
bergquist
57d36b3d42
feat(alerting): transform labels into tags for prometheus tsdb
2017-02-06 15:25:15 +01:00
r.khavronenko
80b92335bb
allow setting basic auth headers for prometheus datasource
2017-02-06 16:22:09 +02:00
Mitsuhiro Tanda
69566a23fc
improve security of Prometheus datasource
2017-02-06 23:10:10 +09:00
bergquist
3827c0a69c
tech(alerting): adds tags to alerting data model
2017-02-06 14:59:29 +01:00
bergquist
c05bc0cb17
chore(vet): fixes invalid fmt.Sprintf format
2017-02-05 21:19:39 +01:00
lucapette
032ecad3b7
Fix typo
2017-02-03 12:10:22 +01:00
Carl Bergquist
4f5dc6104f
Merge pull request #7417 from Erliz/patch-1
...
Add image url to telegram alert notifier
2017-01-31 15:13:21 +01:00
Kevin Bowling
0c46def1a0
Add an idiomatic plugin path for FreeBSD ( #7410 )
2017-01-31 14:54:53 +01:00
Stanislav Vetlovskiy
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
Torkel Ödegaard
fce2e341d2
mergefix(): fixed issue with master merge
2017-01-31 09:00:36 +01:00
Torkel Ödegaard
8a95c563bb
Merge branch 'master' into websocket
2017-01-31 08:56:49 +01:00
Torkel Ödegaard
c400b5cf63
Merge branch 'master' of github.com:grafana/grafana
2017-01-31 07:48:44 +01:00
Torkel Ödegaard
1a9aaa4138
feat(server side png rendering): added timezone parameter for server side rendering, refactoring PR #7264
2017-01-31 07:48:10 +01:00
