Commit Graph

5638 Commits

Author SHA1 Message Date
Mitsuhiro Tanda
ff8b25a50a fix, should fill null at end timestamp 2016-01-13 15:59:59 +09:00
Mitsuhiro Tanda
afa539368f fill null in Prometheus 2016-01-13 15:59:59 +09:00
Shaofeng Chen
dc427d5a2c add get org by name api 2016-01-12 13:50:56 -08:00
Torkel Ödegaard
a87b5f757d fix(datasources): minor fix to data sources after apps branch merge 2016-01-12 20:05:40 +01:00
bergquist
4db57cc0bb docs(playlists): add persisted playlists to changelog 2016-01-12 17:08:13 +01:00
Torkel Ödegaard
44f0242157 fix(build): fixed issue after merge 2016-01-12 15:45:55 +01:00
Torkel Ödegaard
e5b3f27a30 Merge branch 'apps' 2016-01-12 15:41:15 +01:00
Torkel Ödegaard
a15984b663 feat(apps): pages work 2016-01-12 15:39:29 +01:00
Carl Bergquist
f7fecdc6de Merge pull request #3655 from grafana/playlist
Persistable playlists

closes #515
closes #1137
2016-01-12 15:20:43 +01:00
bergquist
cabefa4fff fix(playlist): fix for timespan -> interval 2016-01-12 14:38:14 +01:00
bergquist
1ec97e5199 feat(playlist): shortens urls 2016-01-12 14:36:04 +01:00
bergquist
458d15063d fix(playlist): remove invalid logging 2016-01-12 14:28:19 +01:00
bergquist
e8786b0747 feat(playlist): renames timespan to interval 2016-01-12 13:56:47 +01:00
bergquist
d0bcd1d87c feat(playlist): move playlistSrv to playlist folder 2016-01-12 13:44:23 +01:00
bergquist
c8bd9fd6cc style(playlist): renames variable 2016-01-12 13:42:27 +01:00
Torkel Ödegaard
4c59e48cc2 feat(apps): worked on apps edit view styles 2016-01-12 12:25:07 +01:00
bergquist
85a463faab fix(playlist): remove only parameter to describe 2016-01-12 12:01:27 +01:00
bergquist
feca2871eb tests(playlist): adds ctrl test for playlist edit 2016-01-12 11:57:16 +01:00
Torkel Ödegaard
144c703c7b Merge pull request #3703 from mtanda/cloudwatch_seoul
(cloudwatch) add seoul region
2016-01-12 10:51:34 +01:00
Torkel Ödegaard
ae6cae0771 Merge branch 'master' of github.com:grafana/grafana 2016-01-12 10:32:49 +01:00
Torkel Ödegaard
2b99b64ec5 fix(table panel): fixed issue with table panel in optimized builds, closes #3702 2016-01-12 10:32:19 +01:00
Torkel Ödegaard
ffe1407217 feat(apps): minor progress 2016-01-12 10:20:04 +01:00
Mitsuhiro Tanda
7d8519f5f0 add seoul region 2016-01-12 18:15:29 +09:00
bergquist
b79f04493d style(playlist): abstract DTO creation 2016-01-12 08:36:25 +01:00
bergquist
7e7d9457ea Merge branch 'playlist_relation_table' into playlist 2016-01-12 08:18:03 +01:00
bergquist
07fdf6491c fix(playlist): new url for viewing playlist 2016-01-12 08:17:44 +01:00
bergquist
fb4bb7f53e fix(playlist): remove start button from edit page 2016-01-12 08:17:44 +01:00
bergquist
1da1849de6 fix(playlist): fixes broken search filter 2016-01-12 08:17:44 +01:00
bergquist
98dccb8641 feat(playlist): refactor FE to support playlistitems 2016-01-12 08:17:44 +01:00
bergquist
8a38991270 feat(playlist): changes to relation table
Also introduces an abstraction between playlist and dashboard.
This will make it possible to att search, and tag filtering to
playlists without any major refactoring
2016-01-12 08:17:44 +01:00
Torkel Ödegaard
2fe58461d5 feat(apps): minor fix for images 2016-01-11 22:51:40 +01:00
Torkel Ödegaard
16cd27282f Merge pull request #3686 from keis/phantomjs-dependency
Add missing peer dependency: phantomjs
2016-01-11 18:46:10 +01:00
Torkel Ödegaard
e081a5c5a0 feat(apps): worked on pinning apps 2016-01-11 18:03:08 +01:00
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