Torkel Ödegaard
|
63caedb094
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-09-28 08:09:51 +02:00 |
|
Torkel Ödegaard
|
460160cfa4
|
feat(testdata): added test case for ms resolution data
|
2016-09-28 08:08:46 +02:00 |
|
Torkel Ödegaard
|
22e8885690
|
feat(testdata): progress on test data stuff
|
2016-09-27 18:36:00 +02:00 |
|
Torkel Ödegaard
|
3ecd96e682
|
feat(testdata): lots of work on new test data data source and scenarios
|
2016-09-27 18:17:39 +02:00 |
|
Torkel Ödegaard
|
ade8aa5b92
|
feat(graph): refactorings
|
2016-09-27 14:47:04 +02:00 |
|
Torkel Ödegaard
|
34f15d92d0
|
feat(testdata): worked on testdata app
|
2016-09-27 14:39:51 +02:00 |
|
bergquist
|
262e7193a3
|
feat(alerting): keep proccessing results even if one response panics
|
2016-09-27 11:16:55 +02:00 |
|
bergquist
|
071f2205e1
|
tech(tsdb): ops <o>
|
2016-09-27 11:13:13 +02:00 |
|
bergquist
|
46d4f817e3
|
tech(graphite): return error if statuscode is not ok
|
2016-09-27 10:09:56 +02:00 |
|
Torkel Ödegaard
|
81cb4a740b
|
refactor(graph): progress on graph panel work
|
2016-09-26 17:25:29 +02:00 |
|
bergquist
|
6a699d13c4
|
docs(configuration): add note about snapshot configuration
|
2016-09-26 14:46:03 +02:00 |
|
bergquist
|
7585e9a930
|
docs(changelog): add note about closing #4087 and #2172
|
2016-09-26 14:41:13 +02:00 |
|
bergquist
|
dbb7852f21
|
feat: purge old files and snapshots
closes #4087
closes #2172
|
2016-09-26 14:33:40 +02:00 |
|
Torkel Ödegaard
|
40e6317b7b
|
feat(graph): refactoring
|
2016-09-26 14:04:13 +02:00 |
|
Torkel Ödegaard
|
acfde82c0a
|
refactor(graph): js -> typescript refactoring
|
2016-09-26 13:55:42 +02:00 |
|
bergquist
|
1a32ab64b6
|
tech(renderer): improve renderOpts names
|
2016-09-26 11:07:36 +02:00 |
|
bergquist
|
effd2098ee
|
feat(alerting): fixes broken image renderer
|
2016-09-26 10:51:45 +02:00 |
|
bergquist
|
887e236bce
|
fix(rule): fixes rule reading bug
|
2016-09-26 10:01:33 +02:00 |
|
bergquist
|
8cd9225eb6
|
feat(alerting): increase timeout to 15s
|
2016-09-26 08:45:55 +02:00 |
|
Torkel Ödegaard
|
5682520603
|
feat(graph): more work on graph panel and support for non time series
|
2016-09-24 13:08:58 +02:00 |
|
Torkel Ödegaard
|
cd270f14a2
|
feat(graph): more work on graph panel and support for non time series
|
2016-09-23 17:12:10 +02:00 |
|
Dan Cech
|
501e67a657
|
use semver when comparing grafana and plugin versions (#6108)
|
2016-09-23 14:38:59 +02:00 |
|
Torkel Ödegaard
|
3bbc940b88
|
Merge branch 'master' into graph-panel-non-timeseries
|
2016-09-23 14:22:44 +02:00 |
|
Torkel Ödegaard
|
9a94072c1d
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-09-23 12:30:20 +02:00 |
|
Torkel Ödegaard
|
175c651e65
|
fix(server side rendering): Fixed issues with server side rendering for alerting & for auth proxy scenarios, fixes #6115, fixes #5906
|
2016-09-23 12:29:53 +02:00 |
|
bergquist
|
99c77e7df8
|
tech(plugins): increase timeout
|
2016-09-23 09:56:42 +02:00 |
|
bergquist
|
e5c64732f1
|
fix(sql): Add boolstr to all dialects
closes #6116
|
2016-09-23 09:36:15 +02:00 |
|
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 |
|