 Torkel Ödegaard
|
0f6579801d
|
Merge branch 'master' into websocket
Conflicts:
public/app/core/core.ts
|
2016-03-16 15:19:32 +01:00 |
|
|
Torkel Ödegaard
|
fcaf2bfdba
|
fix(datasource): when addding data source withCredentials did not get set, fixes #4389
|
2016-03-16 15:16:28 +01:00 |
|
|
Torkel Ödegaard
|
4144f71e23
|
Merge branch 'datasource-lists-cards'
|
2016-03-16 15:05:46 +01:00 |
|
 bergquist
|
1a11f1e8c6
|
Merge branch 'master' into cli_colors
|
2016-03-16 14:17:35 +01:00 |
|
|
bergquist
|
a12f5376b5
|
feat(cli): adds some colors to ls command
|
2016-03-16 14:09:30 +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 |
|
|
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
|
2e1f26096f
|
feat(grafana_live): more work pushing data to websocket, #4355
|
2016-03-14 22:26:43 +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 |
|
|
Torkel Ödegaard
|
5b6754ce6c
|
Merge branch 'master' into websocket
|
2016-03-14 10:33:11 +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
|
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
|
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
|
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
|
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 |
|
|
bergquist
|
8da702c2e7
|
feat(cli): add grafana net url
|
2016-03-11 13:59:09 +01:00 |
|
|
Torkel Ödegaard
|
ece8a925a6
|
Merge branch 'master' of github.com:grafana/grafana
Conflicts:
examples/nginx-app/package.json
examples/nginx-app/plugin.json
|
2016-03-11 12:39:10 +01:00 |
|
|
Torkel Ödegaard
|
fc54c01f01
|
feat(plugins): more work on plugin dashboard install, #4298
|
2016-03-11 12:31:56 +01:00 |
|
|
Torkel Ödegaard
|
2de439bd1e
|
feat(plugins): progress on dashboard installs , #4298
|
2016-03-11 09:57:20 +01:00 |
|
|
bergquist
|
69013ef8ad
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-03-11 08:35:24 +01:00 |
|
 Mitsuhiro Tanda
|
2c5abed2f1
|
(cloudwatch) add metrics/dimensions of AWS/Events and AWS/Logs
|
2016-03-11 12:11:01 +09:00 |
|
|
Torkel Ödegaard
|
60adcedebe
|
feat(plugins): worked on plugin dashboard import handling
|
2016-03-10 19:57:48 +01:00 |
|
|
bergquist
|
95de5f6fe1
|
feat(cli): adds some amazing colors
|
2016-03-10 17:33:44 +01:00 |
|
|
bergquist
|
788aafff3c
|
feat(cli): disable dependecy downloads until needed
|
2016-03-10 17:16:01 +01:00 |
|
|
bergquist
|
c09d506245
|
feat(navigation): hide new and import for viewers
closes #4326
|
2016-03-10 16:38:16 +01:00 |
|
|
bergquist
|
fee0745e98
|
feat(cli): support for asking grafana net about plugins
|
2016-03-10 16:25:34 +01:00 |
|
|
bergquist
|
43073da7eb
|
feat(renderer): add timeout for the renderer api
closes #4325
|
2016-03-10 16:02:10 +01:00 |
|
 utkarshcmu
|
4fbff99186
|
Implemented GetDataSourceIdByName API
|
2016-03-10 01:31:10 -08:00 |
|
|
utkarshcmu
|
8afd56575c
|
Moved api in correct group
|
2016-03-10 00:48:38 -08:00 |
|
|
bergquist
|
6670e6cd29
|
feat(cli): allow redirect for plugin-repo.json
|
2016-03-09 16:10:46 +01:00 |
|
|
Torkel Ödegaard
|
dfaa6d8eb9
|
feat(plugins): a lot of work on #4298
|
2016-03-08 18:17:47 +01:00 |
|
|
Torkel Ödegaard
|
74ebc2d3b0
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-03-08 15:32:15 +01:00 |
|
|
bergquist
|
95f3e52064
|
feat(cli): use commandline object all the way
|
2016-03-08 14:54:18 +01:00 |
|