bergquist
|
faa3b5f4e8
|
feat(alertlist): adds sorting on state
closes #6676
|
2016-12-15 16:29:40 +01:00 |
|
bergquist
|
2264addd9d
|
docs(changelog): adds notes about closing #6905
|
2016-12-15 14:29:06 +01:00 |
|
bergquist
|
c467e48940
|
feat(notifications): removes html escaping subject
closes #6905
|
2016-12-15 14:27:33 +01:00 |
|
Torkel Ödegaard
|
597ebb1161
|
fix(config): fixed issue setting generic oauth name via ENV variable, fixes #6974
|
2016-12-15 14:08:39 +01:00 |
|
Torkel Ödegaard
|
0c94194a5b
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-12-15 13:57:05 +01:00 |
|
Torkel Ödegaard
|
b50490f080
|
docs(): changelog updated
|
2016-12-15 13:56:49 +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
|
0c8193a6af
|
docs(changelog): adds note about closing #6866
|
2016-12-15 11:15:06 +01:00 |
|
bergquist
|
ca7baca21d
|
feat(alerting): adds ok as no data option
closes #6866
|
2016-12-15 11:13:19 +01:00 |
|
bergquist
|
6a161216de
|
fix(influxdb): fixes bug with empty tagColumn for annotations
|
2016-12-15 10:54:22 +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 |
|
Torkel Ödegaard
|
19552450fa
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-12-14 22:31:11 +01:00 |
|
Torkel Ödegaard
|
435f474e8a
|
docs(): minor fix for docker docs
|
2016-12-14 22:30:20 +01:00 |
|
bergquist
|
dde6e73fed
|
feat(mqe): add basic support for functions list
|
2016-12-14 22:29:17 +01:00 |
|
Solar Olugebefola
|
1e6210dd41
|
update broken links (#6961)
|
2016-12-14 22:20:22 +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
|
9f69a4d34d
|
clean(): removed old docs file
|
2016-12-14 21:22:01 +01:00 |
|
Torkel Ödegaard
|
c59fd2e8f6
|
fix(docs): fixed support for old docs url, fixes #6960
|
2016-12-14 21:21:21 +01:00 |
|
Torkel Ödegaard
|
330c1b945e
|
refactor(datasource): refactoring datasource secure json fields handling, #6697, #6692
|
2016-12-14 21:06:10 +01:00 |
|
Torkel Ödegaard
|
b38e9b0cac
|
fix(cloudwatch): removed debugger statement
|
2016-12-14 20:40:02 +01:00 |
|
Torkel Ödegaard
|
c3920bfba1
|
fix(cloudwatch): fixed broken cloudwatch edit page, #6697
|
2016-12-14 20:38:35 +01:00 |
|
Torkel Ödegaard
|
467ddc19c3
|
feat(panel): worked on panel description tooltip, #6847
|
2016-12-14 17:22:19 +01:00 |
|
bergquist
|
ca6a667555
|
feat(mqe): renames app tag into cluster
|
2016-12-14 16:49:16 +01:00 |
|
Torkel Ödegaard
|
5f7ad9ddb6
|
Merge branch 'help-text' of https://github.com/utkarshcmu/grafana into utkarshcmu-help-text
|
2016-12-14 16:20:36 +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 |
|
Torkel Ödegaard
|
7425c63528
|
fix(dashboard): fixed unit test
|
2016-12-14 14:42:25 +01:00 |
|
Torkel Ödegaard
|
e72a60bbf5
|
feat(graph): shared graph tooltip is not a select option with 3 options, normal, shared crosshair & shared tooltip, CTRL+O or CMD+O cycles option, closes #6894
|
2016-12-14 14:33:33 +01:00 |
|
Torkel Ödegaard
|
baec2bbe8a
|
fix(firefox): fixed table options tab UX issues, fixes #6900
|
2016-12-14 13:16:54 +01:00 |
|
Torkel Ödegaard
|
488fe62f15
|
fix(singletat): fixed/polished layout in singlestat ui options tab
|
2016-12-14 12:58:20 +01:00 |
|
Torkel Ödegaard
|
faf6a5fd36
|
fixed issue in metric segment and option lookup, #6912
|
2016-12-14 10:50:48 +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 |
|
Carl Bergquist
|
9cd04768f7
|
Merge pull request #6953 from huydx/typo-execution
(typo) Exeuction -> Execution
|
2016-12-14 09:24:54 +01:00 |
|
bergquist
|
9510f21304
|
docs(changelog): fixes invalid ticket ref
|
2016-12-14 09:12:22 +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
|
63bf332023
|
Merge branch 'alerting_mqe'
|
2016-12-13 16:15:22 +01: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 |
|
bergquist
|
b620c7457d
|
test(query_editor): adds test for nesting queries in targetFull
|
2016-12-13 10:46:09 +01:00 |
|
Utkarsh Bhatnagar
|
bd20dc6c4c
|
Fixed failing tests (#6941)
|
2016-12-13 10:00:33 +01:00 |
|