Torkel Ödegaard
7b7ba46f12
fix(styleguide): fixed theme switching in style guide
2016-09-21 09:10:25 +02:00
Torkel Ödegaard
4f892ab9bf
Merge branch 'master' of github.com:grafana/grafana
2016-09-21 09:03:57 +02:00
Torkel Ödegaard
a01836e86d
feat(adhoc filters): basic implementation for ad hoc filters for elasticsearch, #6038
2016-09-21 08:48:49 +02:00
Alexander Zobnin
392976981c
fix(table panel): update Table Panel options tab styles. ( #6087 )
2016-09-21 07:40:12 +02:00
bergquist
43d8bd5a25
feat(prometheus): initial support for prometheus
2016-09-21 07:01:53 +02:00
Dan Cech
630a8ed8aa
support setting default org role when adding user via grafana.net auth
2016-09-20 12:36:36 -04:00
Torkel Ödegaard
1b02632de8
fix(jslint): fixed lint issue
2016-09-20 17:36:20 +02:00
Dan Cech
da95a23080
remove 'Github' from oauth login error messages
2016-09-20 11:36:13 -04:00
Torkel Ödegaard
0906312046
Merge branch 'adhoc-filters'
2016-09-20 17:34:57 +02:00
Torkel Ödegaard
15423e6e51
feat(adhoc filters): initial base mvp for adhoc filters are donecloses #6038
2016-09-20 17:34:38 +02:00
Torkel Ödegaard
dfe0f91105
feat(adhoc): adhoc filters progress
2016-09-20 16:29:48 +02:00
Dan Cech
dcd96c90e2
add grafana.net auth section to defaults.ini, normalize section heading line lengths
2016-09-20 10:09:20 -04:00
Alexander Zobnin
159a8bf734
fix(singlestat): update singlestat options tab styles. ( #6084 )
2016-09-20 15:29:10 +02:00
Torkel Ödegaard
6e429b8575
feat(adhoc filters): good progress on ad hoc filters and sync from to url, #6038
2016-09-20 11:57:43 +02:00
Alexander Zobnin
20f7eee8cc
fix(graph): increase Y min and max range when series values are the same, ( #6082 )
...
fixes #6070 , #6050 .
2016-09-20 11:38:18 +02:00
Alexander Zobnin
e926b01185
Bug fixes for flexible Y-Min and Y-Max settings ( #6066 )
...
* fix(flexible_y-min/max): fixed negative values support and added tests for this.
* fix(flexible_y-min/max): fixed issue with Y-Min and Y-Max values stored as numbers.
Issue: panels with configured Y-Min and Y-Max don't display anything
after upgrade.
2016-09-20 11:23:31 +02:00
bergquist
d2fb660557
fix(cli): remove unused logging
2016-09-20 10:10:27 +02:00
Carl Bergquist
630adfaf2b
Merge pull request #6068 from fg2it/cross
...
Cross build support
2016-09-20 10:03:06 +02:00
bergquist
ec452dd704
docs(conf): remove internal options since its not working atm
2016-09-20 08:18:15 +02:00
bergquist
21fcb2c643
Merge branch 'mtanda-cloudwatch_expand_template'
2016-09-20 08:14:01 +02:00
bergquist
46866add7e
docs(changelog): add note about closing #5003
2016-09-20 08:13:53 +02:00
Mitsuhiro Tanda
71b5007ec7
refactor
2016-09-20 11:04:23 +09:00
Mitsuhiro Tanda
07cce5f6bd
refactor
2016-09-20 11:04:23 +09:00
Mitsuhiro Tanda
481cc01242
(cloudwatch) add test for expand templater variables
2016-09-20 11:04:23 +09:00
Mitsuhiro Tanda
540436e9d5
inject templateSrv
2016-09-20 11:04:23 +09:00
Mitsuhiro Tanda
490141da82
(cloudwatch) expand multi select template variable
2016-09-20 11:03:35 +09:00
Dan Cech
f5e2d61aef
Merge branch 'master' into gnet-oauth
2016-09-19 16:48:40 -04:00
Dan Cech
fc17ed351c
support logging in with grafana.net credentials
2016-09-19 16:48:07 -04:00
Torkel Ödegaard
cb522d58cd
feat(templating): back to be able to continue work on ad hoc filters, #6048
2016-09-19 18:41:42 +02:00
Torkel Ödegaard
7a6fb70026
feat(templating): progress on variable system refactoring, #6048
2016-09-19 18:32:09 +02:00
Torkel Ödegaard
9d6ecc6361
feat(templating): progress on variable system refactoring, #6048
2016-09-19 18:06:36 +02:00
Steven Arnott
6e4ed4debd
Altered DB for Prefix ( #6062 )
2016-09-19 17:12:43 +02:00
Torkel Ödegaard
945b5ee3cf
feat(templating): progress on variable system refactoring, #6048
2016-09-19 17:03:36 +02:00
bergquist
87be56a4f0
fix: add goconvey to vendor
2016-09-19 16:22:39 +02:00
bergquist
3f00834f25
tech: remove unused dependencies
2016-09-19 15:21:53 +02:00
Torkel Ödegaard
8a796c5b4b
feat(templating): progress on variable system refactoring, #6048
2016-09-19 15:15:15 +02:00
Torkel Ödegaard
5ded88fa4d
feat(templating): progress on variable system refactoring, #6048
2016-09-19 11:34:08 +02:00
bergquist
1cb45c3416
fix(alertlist): better description
2016-09-19 10:11:33 +02:00
Torkel Ödegaard
524f505664
tech(templating): refactoring, updated dashboardSrv to typescript
2016-09-19 10:08:05 +02:00
bergquist
0bde2ae689
fix(alertlist): remove timerange checkbox option
2016-09-19 10:07:53 +02:00
fg2it
0984edd8b2
avoid copy of go dep. from vendor/ for release
2016-09-19 08:03:35 +02:00
fg2it
699c515369
enforce unconditional copy
2016-09-18 11:45:46 +00:00
fg2it
c669de1169
add options to support cross build
2016-09-18 10:07:12 +00:00
fg2it
62a2f80f10
add option for grunt release
2016-09-18 09:13:00 +00:00
fg2it
174ea11b1c
avoid copy of go dep. from vendor/ for release
2016-09-18 09:03:47 +00:00
Torkel Ödegaard
5ce3e40cc9
feat(templating): more work on new variable handling code, #6048
2016-09-17 15:27:53 +02:00
Torkel Ödegaard
4188c46f83
feat(templating): more work on new variable handling code, #6048
2016-09-17 11:28:45 +02:00
Torkel Ödegaard
46ebae7304
feat(templating): progress on template system rewrite #6048
2016-09-16 16:50:30 +02:00
bergquist
05d43999dc
feat(alertlist): add support for time range lockdown
...
closes #5981
2016-09-16 15:55:38 +02:00
bergquist
77783c02cd
fix(alerting): dont log null series
...
closes #6025
2016-09-16 14:59:54 +02:00
