Carl Bergquist
|
0ea01f24a8
|
Merge pull request #3690 from utkarshcmu/recorded3
Update playlist.md
|
2016-01-11 16:56:13 +01:00 |
|
Torkel Ödegaard
|
882980ada7
|
changelog: updated with info about #3635
|
2016-01-11 16:39:22 +01:00 |
|
Torkel Ödegaard
|
66f7a2be15
|
Merge branch 'snapshot_annotation' of https://github.com/mtanda/grafana into mtanda-snapshot_annotation
|
2016-01-11 16:35:45 +01:00 |
|
Torkel Ödegaard
|
908b2d151f
|
Merge pull request #3681 from byronmwong/master
Fix elasticsearch hourly indexes
|
2016-01-11 16:29:46 +01:00 |
|
Mitsuhiro Tanda
|
d3bc52278d
|
annotation snapshot fix
|
2016-01-11 19:26:48 +09:00 |
|
Mitsuhiro Tanda
|
012d1378d4
|
snapshot annotation
|
2016-01-11 19:26:48 +09:00 |
|
Torkel Ödegaard
|
4da31291d2
|
feat(apps): minor progress to apps list
|
2016-01-11 10:44:04 +01:00 |
|
Torkel Ödegaard
|
c1e94e61d0
|
feat(apps): lots of more work on apps, changed app_plugin to app_settings in order to to confuse the app plugin model (definition) and app org settings
|
2016-01-10 21:37:11 +01:00 |
|
Torkel Ödegaard
|
ab79348af5
|
feat(plugins): minor fix for external plugins with staticRoot
|
2016-01-09 23:56:39 +01:00 |
|
Torkel Ödegaard
|
d83e24572a
|
feat(plugins): more refactoring
|
2016-01-09 23:52:13 +01:00 |
|
Torkel Ödegaard
|
1ffcea1952
|
feat(plugins): major improvement in plugins golang code
|
2016-01-09 23:34:20 +01:00 |
|
Torkel Ödegaard
|
35f40b7312
|
feat(plugins): upgraded opentsdb
|
2016-01-09 21:54:03 +01:00 |
|
Torkel Ödegaard
|
b76449d151
|
feat(plugins): upgraded influxdb to new data source plugin model
|
2016-01-09 21:42:26 +01:00 |
|
Torkel Ödegaard
|
15546dd84e
|
feat(plugins): added better error message when trying to load data source plugin module that is missing datasource constructor
|
2016-01-09 19:14:59 +01:00 |
|
Torkel Ödegaard
|
ca3405afc5
|
feat(plugins): moved http settings to directive instad of just ng-include partial
|
2016-01-09 19:03:03 +01:00 |
|
Torkel Ödegaard
|
36ebfc747a
|
feat(plugins): more upgrading work
|
2016-01-09 18:44:13 +01:00 |
|
Torkel Ödegaard
|
bc328cbed7
|
feat(plugins): upgraded Cloudwatch to new plugin schema
|
2016-01-09 18:36:25 +01:00 |
|
Torkel Ödegaard
|
7ae81a2195
|
feat(plugins): annotations view work again for elasticsearch
|
2016-01-09 18:20:43 +01:00 |
|
Torkel Ödegaard
|
cf98a16db0
|
feat(plugins): made data source custom edit view into a directive instead of html path config in plugin.json
|
2016-01-09 18:07:42 +01:00 |
|
Torkel Ödegaard
|
f813b4c58f
|
feat(plugins): converted graphite plugin to new format
|
2016-01-09 13:30:02 +01:00 |
|
Torkel Ödegaard
|
c5635f9c89
|
feat(plugins): changed what datasources should return, they should now return the datasource constructor
|
2016-01-09 13:21:16 +01:00 |
|
Torkel Ödegaard
|
d932653c7f
|
feat(apps): minor progress on apps edit view
|
2016-01-09 11:07:34 +01:00 |
|
Utkarsh Bhatnagar
|
39aca0f038
|
Update playlist.md
|
2016-01-08 23:52:51 -08:00 |
|
Torkel Ödegaard
|
9943b9a226
|
feat(plugin): more work on plugin schema
|
2016-01-09 08:12:27 +01:00 |
|
Torkel Ödegaard
|
3bb20dbf2e
|
feat(plugins): changed plugin schema, pluginType -> type, type -> id
|
2016-01-08 23:15:44 +01:00 |
|
Torkel Ödegaard
|
7a8b3c419b
|
feat(apps): lots of progress
|
2016-01-08 20:57:58 +01:00 |
|
Torkel Ödegaard
|
60e7c6d150
|
Merge branch 'master' into apps
Conflicts:
public/app/partials/sidemenu.html
|
2016-01-08 18:10:53 +01:00 |
|
Torkel Ödegaard
|
a9aaa5ad73
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-01-08 18:01:20 +01:00 |
|
Torkel Ödegaard
|
6c1fee736b
|
feat(sidemenu): improved user dropdown and sidemenu, will be improved further, #3687
|
2016-01-08 17:58:46 +01:00 |
|
Torkel Ödegaard
|
f81d2595f9
|
Merge branch 'sidebar-consolidation' of github.com:nchristus/grafana into sidebar-consolidation
|
2016-01-08 16:29:10 +01:00 |
|
David Keijser
|
1896bd0920
|
Add missing peer dependency: phantomjs
|
2016-01-08 16:27:43 +01:00 |
|
Torkel Ödegaard
|
183f32390c
|
Merge pull request #3683 from mtanda/cloudwatch_reuse_credentials
(cloudwatch) reuse credentials
|
2016-01-08 16:25:27 +01:00 |
|
bergquist
|
455948ad14
|
fix(playlist): fix broken build. unused vars
|
2016-01-08 16:24:35 +01:00 |
|
bergquist
|
0918063c55
|
fix(playlist): move dashboard uri cration to Backend
|
2016-01-08 16:13:49 +01:00 |
|
bergquist
|
22c001c8a6
|
fix(playlist): implement api according to new standard
|
2016-01-08 14:21:30 +01:00 |
|
bergquist
|
d15b0bf4c4
|
fix(playlist): move backend code to ctrl
data loading should be done in the ctrl
|
2016-01-08 13:57:00 +01:00 |
|
bergquist
|
01a910fedc
|
style(playlists): use backendsrv direct
There is no point resolving the playlists in the routes file.
Loading playlists is what the controller is suppose to do
|
2016-01-08 13:33:24 +01:00 |
|
bergquist
|
8c05067f88
|
style(playlist): rename files to match new format
|
2016-01-08 13:25:30 +01:00 |
|
Torkel Ödegaard
|
f67563e9ee
|
feat(apps): moving things around
|
2016-01-08 12:45:12 +01:00 |
|
bergquist
|
d0841919ea
|
docs(plugins): fixes typo
|
2016-01-08 10:55:22 +01:00 |
|
bergquist
|
a23e60ab69
|
docs(plugins): adds plugin page
|
2016-01-08 10:53:39 +01:00 |
|
Carl Bergquist
|
ab30297d02
|
Merge pull request #3679 from volter/colored-bolt
Color the annotation bolt (#3590)
closes #3590
|
2016-01-08 10:51:29 +01:00 |
|
Torkel Ödegaard
|
3362d6bc56
|
Merge branch 'docs-2.6'
|
2016-01-08 10:25:20 +01:00 |
|
Torkel Ödegaard
|
e5f391ab53
|
docs: minor change to docs make file
|
2016-01-08 10:24:58 +01:00 |
|
Torkel Ödegaard
|
19a5e425cf
|
docs: fixed building from source go dependency verison
|
2016-01-08 10:22:57 +01:00 |
|
Torkel Ödegaard
|
69d0e82453
|
Merge branch 'master' into apps
Conflicts:
pkg/services/sqlstore/migrations/migrations.go
|
2016-01-08 10:20:46 +01:00 |
|
Mitsuhiro Tanda
|
f84737d7d4
|
(cloudwatch) reuse credentials
|
2016-01-08 18:13:36 +09:00 |
|
Nick Christus
|
0ee0ea554d
|
sidebar-consolidation: added new org menu to sidebar
|
2016-01-07 22:49:14 -06:00 |
|
Byron
|
40845578c6
|
Fix elasticsearch hourly indexes
|
2016-01-07 14:39:20 -08:00 |
|
Volker Fröhlich
|
f4e22e49b6
|
Color the annotation bolt (#3590)
Makes it easier to distinguish between annotations while
editing and using them; Uses the icon color.
|
2016-01-07 22:28:03 +01:00 |
|