Torkel Ödegaard
598ac0e815
docs(http api): Clarified issue with admin http api docs, fixes #5834#
2016-09-22 09:09:12 +02:00
Torkel Ödegaard
2752dbd13a
feat(templating): minor fixes to recent refactorings
2016-09-22 09:00:15 +02:00
Torkel Ödegaard
6257ae094c
feat(sqlstore): added index for dashboard_id in dashboard_tag table, fixes #5868
2016-09-21 21:32:51 +02:00
Torkel Ödegaard
d65fbcbb42
fix(graphite): fixed minor graphite lexer issue when nodes begin with octal syntax and end with dash identifier, fixes #6049#
2016-09-21 20:04:09 +02:00
Dan Cech
248ed2672f
remove 'Github' from oauth login error messages
2016-09-21 09:42:06 -04:00
Dan Cech
b387c1291d
Merge branch 'master' into gnet-oauth
...
Conflicts:
pkg/api/login_oauth.go
2016-09-21 09:39:35 -04:00
Torkel Ödegaard
9e26a4cfcb
fix(templating): fixed unique filter after regex pass, fixes #6086
2016-09-21 15:30:11 +02:00
Torkel Ödegaard
b4111d78e1
fix(security): fixed login issue that was a potential for social engineering, fixes #6014
2016-09-21 15:03:14 +02:00
Torkel Ödegaard
4a1693196c
fix(mixed datasource): fixed issue when exporting dashboard using mixed data source, fixes #6032
2016-09-21 14:57:19 +02:00
Torkel Ödegaard
46ab09ed60
feat(links): fixed styling for dashboard links
2016-09-21 14:20:59 +02:00
bergquist
b856d7e193
fix(prometheus): remove timerange from context
2016-09-21 13:55:42 +02:00
bergquist
ae7345b04d
style(prometheus): remove commented test
2016-09-21 13:46:26 +02:00
bergquist
c084145cba
refactor(prometheus): add timerange to alert context
2016-09-21 13:46:10 +02:00
Torkel Ödegaard
dc3b614749
fix(submenu): fixed issue with submenu and annotation display, and annotation issue in table panel
2016-09-21 13:45:26 +02:00
bergquist
af551b8825
refactor(tsdb): remove toUnix from timerange
2016-09-21 13:41:25 +02:00
bergquist
9534a04d3d
fix(prometheus): only accept matrix result
2016-09-21 13:30:41 +02:00
bergquist
ee0f1a0f36
feat(prometheus): handle more errors
2016-09-21 13:17:36 +02:00
Torkel Ödegaard
d0b75cdb66
fix(templating): fixed issue with regex in query variable introduced by yesterdays big merged refactoring of template variable system
2016-09-21 11:38:59 +02:00
bergquist
3e73be8d2e
feat(prometheus): improve error handling
2016-09-21 11:31:56 +02:00
Torkel Ödegaard
8b90eedb35
feat(table): table options tab form layout changes
2016-09-21 11:23:39 +02:00
bergquist
4c88db3e43
feat(prometheus): add support for legend formatting
2016-09-21 11:17:29 +02:00
Torkel Ödegaard
7c10af012e
feat(singlestat): slight layout changes to options tab
2016-09-21 10:56:17 +02:00
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
