Commit Graph

6781 Commits

Author SHA1 Message Date
Torkel Ödegaard
51bde36dee Merge pull request #4354 from utkarshcmu/preferences
Ability to save Preferences
2016-03-15 22:04:10 +01:00
Torkel Ödegaard
e4c0c39fbf ux(): began work on updating data source list to cards view 2016-03-15 20:29:35 +01:00
Torkel Ödegaard
1abdd170d3 ux(): fixes to cards and sorting plugin list, #4364 2016-03-15 15:52:29 +01:00
Torkel Ödegaard
dddd155afa Merge branch 'master' of github.com:grafana/grafana 2016-03-15 15:28:55 +01:00
Torkel Ödegaard
c411714546 ux(): added card layout selector and list view mode, #4364 2016-03-15 15:28:37 +01:00
Trent White
cba7c1726f add graphite logo to datasource card 2016-03-15 10:08:23 -04:00
simnv
be8ec24106 Slash escape regex
Slash symbol "/" wasn't escaped when we chose variable from template dropdown, so we couldn't choose interface names like Gi9/10 when querying from influxdb.
2016-03-15 16:05:32 +05:00
Carl Bergquist
0b3ccaff27 Merge pull request #4361 from bergquist/remove_staticRoot
plugin.json: remove staticRoot field
2016-03-15 10:07:08 +01:00
Torkel Ödegaard
b273cd1339 Merge branch 'master' into websocket 2016-03-15 09:52:36 +01:00
Torkel Ödegaard
82eb32a71e ux(): initial pass at new card / list design, #4364 2016-03-15 09:15:24 +01:00
bergquist
e905c2c6b5 feat(plugin.json): remove staticRoot field 2016-03-15 09:00:55 +01:00
Torkel Ödegaard
13376d89cc Merge pull request #4363 from cookiefission/fix/trim-edges-typo
Fix minor typo in tooltip
2016-03-14 22:29:14 +01:00
Torkel Ödegaard
2e1f26096f feat(grafana_live): more work pushing data to websocket, #4355 2016-03-14 22:26:43 +01:00
Sean Kenny
8f97e8d5ed Fix minor typo in tooltip 2016-03-14 19:40:23 +00:00
Torkel Ödegaard
92f20b9b7d feat(websocket): reconnection and resubscription handling, #4355 2016-03-14 19:21:32 +01:00
Torkel Ödegaard
3d5251d9a5 feat(websocket): more work websocket ds, # 4355 2016-03-14 17:32:48 +01:00
Torkel Ödegaard
195be2742c feat(live): wip work 2016-03-14 16:18:07 +01:00
Torkel Ödegaard
2adc4d12be feat(live): work on websocket data source, #3455 2016-03-14 13:20:55 +01:00
Torkel Ödegaard
8d7b7009c3 Merge branch 'master' into websocket 2016-03-14 12:01:43 +01:00
Torkel Ödegaard
ca5a34ad1e fix(datasource): filter out built in data sources from data source type dropdown 2016-03-14 12:00:56 +01:00
Torkel Ödegaard
fbd94fc6ce feat(websockets): inital work on websockets, #4355 2016-03-14 11:59:51 +01:00
bergquist
953a07252a Revert "fix(datasource): fixes testdatasource bug"
This reverts commit f77bd59e1d.
2016-03-14 11:43:35 +01:00
bergquist
f77bd59e1d fix(datasource): fixes testdatasource bug 2016-03-14 11:33:38 +01:00
utkarshcmu
e371e03696 Able to save preference version, created, updated fields 2016-03-14 03:12:52 -07:00
Torkel Ödegaard
5b6754ce6c Merge branch 'master' into websocket 2016-03-14 10:33:11 +01:00
Torkel Ödegaard
4aba3bc62b fix(opentsdb): fixed templating issue for OpenTSDB, fixes #4312, fixes #4311 2016-03-14 10:18:43 +01:00
Torkel Ödegaard
fc6ad2059a docs(): updated doc version 2016-03-14 10:03:18 +01:00
Torkel Ödegaard
69c8bb1eb3 feat(plugins): added filter (type) tabs po plugin list view 2016-03-14 09:10:32 +01:00
utkarshcmu
0bf721a74c Able to save home dashboard 2016-03-13 23:57:38 -07:00
Torkel Ödegaard
c504abb84d feat(plugins): added dashboards tab to plugin edit page, #4275 2016-03-13 20:18:45 +01:00
Torkel Ödegaard
2527289e3e Merge branch 'master' of github.com:grafana/grafana 2016-03-13 19:21:56 +01:00
Torkel Ödegaard
581ffb862c feat(plugins): polish to plugin page, better handling for reading readme file contents 2016-03-13 19:21:44 +01:00
bergquist
8e70e9c1c3 feat(cli): improve error message for missing permission 2016-03-13 11:29:43 +01:00
Torkel Ödegaard
4a3c19c666 plugins(): dashboards, changed wording installed to imported when showing imported version in dashboard list 2016-03-12 10:49:30 +01:00
Torkel Ödegaard
d575a5ce12 feat(plugins): added prometheus dashboard to prometheus data source, #4298 2016-03-12 10:40:55 +01:00
Torkel Ödegaard
53dc145ce7 Merge branch 'dashboard-install' 2016-03-12 10:13:59 +01:00
Torkel Ödegaard
0398face05 feat(plugins): dashboard import for data sources is working! #4298 2016-03-12 10:13:49 +01:00
Torkel Ödegaard
ef7d8ab90b Merge branch 'master' of github.com:grafana/grafana 2016-03-12 00:16:21 +01:00
Torkel Ödegaard
28f4f3a8c8 fix(datasource edit): Editing datasources broken earlier today, fixes #4343 2016-03-12 00:16:08 +01:00
Torkel Ödegaard
3fb0b71822 refactor(): refactoring json usage 2016-03-12 00:13:06 +01:00
Torkel Ödegaard
40b2f00dc5 fix(): fixed from db -> json 2016-03-11 23:39:42 +01:00
Torkel Ödegaard
749da42ffc updated lib 2016-03-11 23:29:45 +01:00
Torkel Ödegaard
1f9f439acb lib(): added simplejson lib 2016-03-11 23:28:33 +01:00
Torkel Ödegaard
c5a817194a more work on dashboard importing and templating 2016-03-11 17:31:57 +01:00
bergquist
c1e4d0590c fix(plugins): fixes broken plugin link 2016-03-11 17:13:35 +01:00
bergquist
85466c7ee1 fix(plugins): fixes broken link 2016-03-11 17:04:26 +01:00
utkarshcmu
43b474143c Preferences model updated 2016-03-11 06:30:05 -08:00
bergquist
740478344b Merge branch 'master' into cli_colors 2016-03-11 14:43:12 +01:00
bergquist
5094c1db2a feat(cli): improves error message for 401 requests 2016-03-11 14:34:48 +01:00
bergquist
f5bb2b11e5 feat(cli): improve error handling for missing plugin dir 2016-03-11 14:11:25 +01:00