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
bergquist
ba7a990f86
tech: bump version in server cli
2016-12-09 12:30:36 +01:00
Torkel Ödegaard
22bf6420f1
Merge branch 'master' of github.com:grafana/grafana
2016-12-08 10:25:26 +01:00
Torkel Ödegaard
05772b30d7
feat(ux): completed work on getting started panel, #6466
2016-12-08 10:25:05 +01:00
Torkel Ödegaard
dee6b7d150
Merge branch 'master' into getting-started-panel
2016-12-08 08:51:40 +01:00
bergquist
8ee85626f2
fix(api): return correct json info after updating datasource
...
closes #6869
2016-12-07 18:09:17 +01:00
bergquist
dd3060fdc3
feat(alerting): calculate avg of valid points
2016-12-07 15:55:37 +01:00
bergquist
2bdd2a59cb
test(alerting): improve naming for test scenario
2016-12-07 15:19:58 +01:00
Carl Bergquist
0294446af9
Merge pull request #6856 from kylemcc/opsgenie-alerting
...
alerting: add support for OpsGenie
2016-12-07 11:23:54 +01:00
Carl Bergquist
2c7adccf12
Use cache for http.client in tsdb package. ( #6833 )
...
* datasource: move caching closer to datasource struct
* tsdb: use cached version of datasource http transport
closes #6825
2016-12-07 11:10:42 +01:00
Kyle McCullough
4ef940482c
alerting: add support for OpsGenie
2016-12-06 14:48:13 -06:00
bergquist
8f1ed07275
metrics: 64bit fields should come first in structs
...
https://golang.org/pkg/sync/atomic/#pkg-note-BUG
2016-12-06 09:08:51 +01:00
bergquist
c17064fb44
fix(webdav): adds missing auth headers
...
closes #6779
2016-12-06 09:02:14 +01:00
jifwin
e73b82d54f
Disable web-security for phantomjs rendering ( #6469 )
2016-12-06 08:37:36 +01:00
Mitsuhiro Tanda
be26c017f6
(cloudwatch) percentile support ( #6634 )
...
* support extended statistics
* handle different response format for extended statistics
2016-12-06 08:12:30 +01:00
Torkel Ödegaard
88e1d56bc2
fix(logging): added extra logging when default config file is not found (ie homepath is not correct), fixes #6829
2016-12-06 07:36:10 +01:00
Torkel Ödegaard
1f50c6d76f
Merge branch 'v4.0.x'
2016-12-05 11:20:14 +01:00
