bergquist
|
521b5cf014
|
tech(build): make sure build.go setup works fine
ref #6113
|
2016-09-23 06:51:37 +02:00 |
|
Carl Bergquist
|
696a5f6a80
|
Merge pull request #6113 from replay/fix_context_dependency
Fix context dependency
|
2016-09-23 06:43:32 +02:00 |
|
Carl Bergquist
|
66fe886755
|
Merge pull request #6112 from replay/fix_typo
fix typo
|
2016-09-23 06:42:59 +02:00 |
|
Mauro Stettler
|
f7dfcb4401
|
Merge branch 'master' of github.com:grafana/grafana into fix_context_dependency
|
2016-09-22 21:13:53 +01:00 |
|
Mauro Stettler
|
cb0f19f8d4
|
fix context dependency
|
2016-09-22 21:13:08 +01:00 |
|
Carl Bergquist
|
7bfef0ced8
|
Merge pull request #6111 from grafana/pluginreadme
allow non-admin users to view plugin readme
|
2016-09-22 21:12:44 +01:00 |
|
Torkel Ödegaard
|
bb77caa369
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-09-22 21:49:57 +02:00 |
|
Torkel Ödegaard
|
e36cdac594
|
fix(templating): fixed issue with templating when initalizing variables without any existing value
|
2016-09-22 21:49:41 +02:00 |
|
Mauro Stettler
|
b063cf0a6e
|
fix typo
|
2016-09-22 20:44:57 +01:00 |
|
Carl Bergquist
|
d6a0ec85c4
|
Merge pull request #6111 from grafana/pluginreadme
allow non-admin users to view plugin readme
|
2016-09-22 19:51:47 +02:00 |
|
Dan Cech
|
2c3dd84ebb
|
allow non-admin users to view plugin readme
|
2016-09-22 13:46:11 -04:00 |
|
bergquist
|
5817948341
|
Merge branch 'alert_prometheus'
|
2016-09-22 19:27:35 +02:00 |
|
bergquist
|
d711c0ed35
|
Merge branch 'master' into alert_prometheus
|
2016-09-22 19:27:24 +02:00 |
|
bergquist
|
a49c21df3a
|
fix(png-renderer): increase timeouts
|
2016-09-22 19:24:18 +02:00 |
|
Torkel Ödegaard
|
f2f3115749
|
feat(graph panel): more progress on graph panel and non time series data support
|
2016-09-22 16:47:37 +02:00 |
|
Torkel Ödegaard
|
6cd4db12c7
|
feat(graph panel): refactoring axes tab options into it's own component
|
2016-09-22 16:19:44 +02:00 |
|
bergquist
|
76b8cff445
|
fix(gnet): remove trailing ,
|
2016-09-22 16:17:22 +02:00 |
|
Torkel Ödegaard
|
23246605b0
|
feat(graph panel): working on adding non time series support to graph panel
|
2016-09-22 16:05:20 +02:00 |
|
Torkel Ödegaard
|
f3d4a97f49
|
Merge branch 'master' into graph-panel-non-timeseries
|
2016-09-22 14:03:06 +02:00 |
|
Torkel Ödegaard
|
0fc7405b95
|
fix(elasticsearch): for query template variable when looking up terms without query, no longer relies on elasticsearch default field, fixes #3887
|
2016-09-22 12:05:03 +02:00 |
|
Torkel Ödegaard
|
f79600b352
|
fix(internal metrics): removed local dev code
|
2016-09-22 11:54:47 +02:00 |
|
Torkel Ödegaard
|
e336fb3d60
|
fix(smtp mailer): added timeout of 10 seconds to smpt mailer, fixes #2989
|
2016-09-22 11:51:39 +02:00 |
|
Torkel Ödegaard
|
936146768f
|
fix(snapshots): fixed issue with viewing embedded/solo/png panel from snapshot without login, fixes #3769
|
2016-09-22 11:46:58 +02:00 |
|
Torkel Ödegaard
|
3ed7ab93c5
|
added small info text to plugins list page, #5176
|
2016-09-22 11:32:27 +02:00 |
|
Torkel Ödegaard
|
6574dfacfb
|
feat(internal metrics): added some total stats to metrics reporting, closes #5865
|
2016-09-22 11:16:19 +02:00 |
|
Torkel Ödegaard
|
8c05a125dc
|
fix(build): updated build.go setup
|
2016-09-22 10:33:43 +02:00 |
|
Torkel Ödegaard
|
d8df421b43
|
fix(build): fixed issues with optimized build, fixes #6096
|
2016-09-22 10:22:16 +02:00 |
|
Torkel Ödegaard
|
39af588a94
|
fix(playlist): fixed sorting issue with playlist playback, fixes #5467
|
2016-09-22 10:06:03 +02:00 |
|
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 |
|