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
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
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
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
Torkel Ödegaard
69d0e82453
Merge branch 'master' into apps
...
Conflicts:
pkg/services/sqlstore/migrations/migrations.go
2016-01-08 10:20:46 +01: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
Torkel Ödegaard
8a2af9b818
Merge branch 'v2.6.x'
2016-01-07 22:00:21 +01:00
Torkel Ödegaard
255901ca7c
fix(graph panel): fixed bug in typeahead when adding series style override, fixes #3554
2016-01-07 21:59:55 +01:00
Torkel Ödegaard
52644bb28a
fix(timepicker): fixed recent breaking of datetime picker when swithing from requirejs to systemjs
2016-01-07 20:52:48 +01:00
bergquist
bcdddfe4e8
style(tooltip): removed comment and extrated sort
2016-01-07 18:09:51 +01:00
bergquist
c4ca1444f9
Merge branch 'hover-order' of https://github.com/hcooper/grafana into hcooper-hover-order
2016-01-07 17:43:04 +01:00
Carl Bergquist
412e7bcdae
Merge pull request #3664 from utkarshcmu/recorded
...
Improvized dashboard sorting UI
2016-01-07 10:19:13 +01:00
utkarshcmu
6a9f451091
Better heading
2016-01-06 22:50:25 -08:00
utkarshcmu
a559d59d80
Improvized dashboard sorting
2016-01-06 22:13:22 -08:00
nikita-graf
3fabd2ea1b
basic playlist dashboards sort support
2016-01-06 02:05:23 +03:00
bergquist
5de69b288f
feat(singlestat): make sparkline height dynamic
...
closes #3553
2016-01-05 19:21:12 +01:00
bergquist
be1fb13162
feat(playlist): minor ux changes for playlists
2016-01-04 15:11:05 +01:00
bergquist
aa83dc15e2
feat(playlist): add search result count
2016-01-04 14:23:24 +01:00
bergquist
7c482064df
feat(playlist): improve header
2016-01-04 10:16:00 +01:00
bergquist
c93a3ce227
feat(playlist): make default timespan placeholder
2016-01-04 09:17:47 +01:00
Mitsuhiro Tanda
ebf0bd5fc9
fix end time of Prometheus link
2015-12-31 16:05:04 +09:00
Mitsuhiro Tanda
be48caf59f
fix Prometheus link, expand template variable in expression
2015-12-31 16:05:04 +09:00
Qtax
c0cf0cb802
Added an option to set a min-width for the graphs side table/area.
2015-12-29 14:42:52 +01:00
utkarshcmu
b68df56b03
Made Playlist UI user friendly
2015-12-28 04:24:38 -08:00
utkarshcmu
5877e5e11a
Merged with master, resolved conflicts
2015-12-24 02:24:59 -08:00
utkarshcmu
71febeb71f
Playlist can be run without saving too
2015-12-23 02:38:27 -08:00
utkarshcmu
a292aedd9c
Made playlist URL clickable
2015-12-23 02:15:28 -08:00
utkarshcmu
b58e605b99
Added play button
2015-12-23 02:02:48 -08:00
utkarshcmu
7776803890
Removed unused components
2015-12-23 01:46:23 -08:00
Torkel Ödegaard
aa32459bc2
feat(apps): mini update to apps config view
2015-12-22 17:00:21 +01:00
Torkel Ödegaard
41a0995db7
feat(apps): minor progress on app meta data
2015-12-22 16:32:17 +01:00
Torkel Ödegaard
d1145ed3fb
Merge branch 'master' into apps
2015-12-22 13:59:25 +01:00
Torkel Ödegaard
f074c1eaff
refactor(lodash): changed how lodash is referenced from typescript
2015-12-22 13:59:11 +01:00
Torkel Ödegaard
b8cb5e0367
feat(apps): WIP progress app views
2015-12-22 13:42:48 +01:00
Torkel Ödegaard
7a87c900ee
Merge branch 'master' into apps
2015-12-22 12:41:52 +01:00
Torkel Ödegaard
e95170e9fd
tech(angularjs): upgrade to angularjs 1.5
2015-12-22 12:24:36 +01:00
Torkel Ödegaard
d0dead0a08
feat(apps): rewrote appsCtrl to app_list_ctrl and to typescript
2015-12-22 12:13:55 +01:00
Torkel Ödegaard
71d718a6e2
fix(systemjs): systemjs config fix for plugins
2015-12-22 11:46:41 +01:00
Torkel Ödegaard
ad94f99d57
refactor(apps): more WIP work on apps
2015-12-22 11:37:44 +01:00
utkarshcmu
bcaaedf2ff
Resurrected nikita-graf's work and added playlistType for future use
2015-12-22 02:07:15 -08:00
bergquist
690a6e1a59
feat(graphs): zoom out on double click
2015-12-22 09:56:24 +01:00
woodsaj
0903d5541b
Merge branch 'master' of github.com:grafana/grafana into externalPlugin
...
Conflicts:
pkg/api/api.go
pkg/api/api_plugin.go
pkg/api/datasources.go
pkg/api/frontendsettings.go
pkg/api/index.go
pkg/plugins/models.go
pkg/plugins/plugins.go
2015-12-22 00:23:24 +08:00
Torkel Ödegaard
c19a2e5b45
fix(influxdb): systemjs fix
2015-12-21 16:48:12 +01:00
Torkel Ödegaard
0a9f705308
tech(systemjs): more fixes for optmized build
2015-12-21 16:34:18 +01:00
Torkel Ödegaard
dabd680d6b
tech(systemjs): merged sync with master, all tests are passing
2015-12-21 16:13:24 +01:00
Torkel Ödegaard
4522b02925
tech(systemjs): almost all tests are passing
2015-12-21 16:00:58 +01:00
Torkel Ödegaard
f7888886e9
tech(systemjs): working on getting tests to work
2015-12-21 11:10:16 +01:00
Torkel Ödegaard
dfd5413b10
tech(systemjs): worked on making optimized builds work with systemjs builder
2015-12-21 10:02:39 +01:00
carl bergquist
1b341f8000
fix(dashboard_settings): update css for last row
2015-12-20 21:13:44 +01:00
Carl Bergquist
af9b864b83
Merge pull request #3446 from utkarshcmu/new-columns
...
Displaying Last UpdatedBy as Metadata
2015-12-20 15:11:20 -05:00
Torkel Ödegaard
93e424de4c
tech(systemjs): work on systemjs builder
2015-12-18 15:59:27 +01:00
woodsaj
e7a0ab76c3
change plugin to app in breadcrumb
2015-12-18 22:09:33 +08:00
utkarshcmu
af371249f9
Successfully displayed userdId in UI
2015-12-18 01:52:05 -08:00
Torkel Ödegaard
0dd7fb7361
tech(systemjs): most things work
2015-12-18 10:28:00 +01:00
utkarshcmu
c433167950
Merged with master, resolved conflicts
2015-12-18 00:23:08 -08:00
utkarshcmu
e0ffcda32e
Added UI , DB settings
2015-12-18 00:20:23 -08:00
Torkel Ödegaard
d34ba416a6
tech(systemjs): more stuff is starting to work
2015-12-18 08:22:05 +01:00
woodsaj
3d15ee6d74
allow app menu items to be selectivly pinned to the left nav menu
2015-12-18 15:10:52 +08:00
woodsaj
48cf56b69a
more renaming. also moved apps and datasource menus
2015-12-18 13:46:40 +08:00
xiaoping378
488165ec73
fixes #3555 , path of table panel option error
2015-12-18 12:35:02 +08:00
Torkel Ödegaard
545c39356a
tech(systemjs): starting work on systemjs bundling
2015-12-17 19:18:30 +01:00
woodsaj
42db1378e0
rename app config directive to grafana-app-*
2015-12-17 23:59:01 +08:00
woodsaj
c35b51a268
refactor.
...
Rename externalPlugin to apiPlugin
Rename bundle to app
Move js, css, menuItem and staticRoot to be properties os App
Add "app" field to panel, datasource and api plugin models. If populated
then the plugin is only enabled if the specific app is enabled for the Org.
If app is "", then the plugin is enabled for all orgs and can't be disabled.
2015-12-17 23:53:58 +08:00
Torkel Ödegaard
df1e52e394
tech(systemjs): more stuff is starting to work
2015-12-17 16:30:53 +01:00
carl bergquist
24acea7261
refactoring(top_nav): move menu condition to controller
2015-12-17 14:41:10 +01:00
Carl Bergquist
08ca72399b
Merge pull request #3051 from utkarshcmu/viewer
...
Removed export/view permission from a dashboard viewer
2015-12-17 14:40:42 +01:00
Torkel Ödegaard
83ce40191c
tech(systemjs): ok, moving forward
2015-12-17 14:27:34 +01:00
Torkel Ödegaard
7c06b5cc22
tech(systemjs): minor change
2015-12-17 13:18:32 +01:00
Torkel Ödegaard
3b8e478a6a
tech(systemjs): finally starting to get systemjs and typescript and runtime loading to work together in a manner that I want it to.. took forever
2015-12-17 11:46:10 +01:00
utkarshcmu
9498c78576
Merged with master, resolved conflicts
2015-12-17 01:46:34 -08:00
utkarshcmu
746e203f7b
Admin can toggle editable checkbox
2015-12-17 01:44:05 -08:00
Torkel Ödegaard
a7d7f31e76
Merge branch 'master' of github.com:grafana/grafana
2015-12-17 10:13:40 +01:00
Torkel Ödegaard
16847fdb41
feat(elasticsearch): trim edges, minor refactoring of #3541
2015-12-17 10:13:23 +01:00
carl bergquist
80d757b371
feat(elasticsearch): move default query parameters to new table
2015-12-17 10:00:53 +01:00
carl bergquist
5bdf0cd136
Merge branch 'global_interval' of https://github.com/felixbarny/grafana into felixbarny-global_interval
...
Conflicts:
public/app/plugins/datasource/elasticsearch/partials/config.html
2015-12-17 09:53:02 +01:00
carl bergquist
e498503428
fix(elastic): fixed typo
2015-12-17 09:05:01 +01:00
carl bergquist
26f70a5fd7
fix(settings): make headline more informative
2015-12-17 09:04:05 +01:00
Carl Bergquist
ef46b23250
Merge pull request #3133 from tdyas/add_pencil_to_graphite_ds
...
add pencil icon back to graphite data source
2015-12-17 08:48:03 +01:00
carl bergquist
39ccf1526f
Merge branch 'addshore-graphiteSortByNameNatural'
2015-12-17 07:21:43 +01:00
carl bergquist
12889a9509
feat(graphite): make sortByName optional
...
fixes #3360
closes #3361
2015-12-17 07:17:39 +01:00
