Matt
|
594207b6d3
|
Polish on icon placement, incorporated torkel's better idea for going slightly lighter, make sure error icon color was white now
|
2016-12-16 12:51:22 -05:00 |
|
Matt
|
0c85e845df
|
Softened the color a bit by mixing in the panel-bg, so it's not introducing any new variables. Was too start as pure body-bg
|
2016-12-16 12:11:29 -05:00 |
|
bergquist
|
86f148be48
|
docs(paths): updates relative path on /installation/ page
|
2016-12-16 17:42:40 +01:00 |
|
bergquist
|
30022b0d0b
|
docs(paths): adds aliase for rpm and debian install
got reports on twitter about broken links.
|
2016-12-16 17:36:01 +01:00 |
|
bergquist
|
686f598d44
|
docs(changelog): adds note about closing #6473
|
2016-12-16 17:11:33 +01:00 |
|
bergquist
|
4244551a87
|
fix(influxdb): removes quotes for field key queries
fixes #6473
|
2016-12-16 17:09:17 +01:00 |
|
Torkel Ödegaard
|
3a9680939e
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-12-16 16:09:59 +01:00 |
|
Torkel Ödegaard
|
a361d1f488
|
feat(panel): refinements for panel help text, made the inspector the home for the model version
|
2016-12-16 16:09:02 +01:00 |
|
bergquist
|
4ef95cfd31
|
style(api): reduce code complexity
|
2016-12-16 16:07:23 +01:00 |
|
bergquist
|
c45ad965d1
|
chore(github): typo
|
2016-12-16 15:50:29 +01:00 |
|
bergquist
|
1f8f3ed038
|
style(api): extracts filter logic for mass pause
|
2016-12-16 15:19:13 +01:00 |
|
bergquist
|
fb6aa0e026
|
feat(api): adds endpoint for mass pausing alerts
ref #6589
|
2016-12-16 15:00:58 +01:00 |
|
Torkel Ödegaard
|
2c05237d90
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-12-16 13:47:22 +01:00 |
|
Torkel Ödegaard
|
c04590784b
|
Merge branch 'utkarshcmu-help-text'
|
2016-12-16 13:43:51 +01:00 |
|
Torkel Ödegaard
|
af363ab478
|
fix(panel): build fixes
|
2016-12-16 13:43:43 +01:00 |
|
Torkel Ödegaard
|
62f3b16671
|
feat(panel): working on panel help text and unifying panel links, panel errors, and panel help into a single panel feature, #4079 , #6847
|
2016-12-16 13:06:04 +01:00 |
|
Torkel Ödegaard
|
ac9ae52cea
|
feat(panel): working on panel help text and unifying panel links, panel errors, and panel help into a single panel feature, #4079 , #6847
|
2016-12-16 12:46:29 +01:00 |
|
Torkel Ödegaard
|
b9043c915e
|
feat(panel): working on panel help text, #4079 , #6847
|
2016-12-16 11:48:32 +01:00 |
|
Mitsuhiro Tanda
|
bc8d27737f
|
fix cloudwatch docs (#6992)
|
2016-12-16 11:31:02 +01:00 |
|
Mitsuhiro Tanda
|
81394fcaa4
|
add cloudwatch internal metrics (#6990)
|
2016-12-16 10:48:05 +01:00 |
|
Mitsuhiro Tanda
|
f8d6902428
|
fix cloudwatch percentile (#6989)
|
2016-12-16 10:47:41 +01:00 |
|
Torkel Ödegaard
|
ca7bc25c83
|
feat(panel): working on panel help text, #4079 , #6847
|
2016-12-16 10:34:00 +01:00 |
|
bergquist
|
df3adbc0f8
|
refactor(mqe): reduce duplication
|
2016-12-16 08:01:58 +01:00 |
|
bergquist
|
830bf5a91c
|
docs(changelog): adds note about closing #6676
|
2016-12-15 16:31:30 +01:00 |
|
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 |
|