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 |
|
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 |
|
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 |
|
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
|
d2b0bad1cf
|
fix(): fixed changed partials paths
|
2016-03-11 13:02:21 +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
|
3fd420c901
|
Merge pull request #4335 from mtanda/cloudwatch_tag_query
(cloudwatch) support tag query
|
2016-03-11 11:21:12 +01:00 |
|
Mitsuhiro Tanda
|
01788e86e5
|
(cloudwatch) add document for new query
|
2016-03-11 18:18:14 +09:00 |
|
bergquist
|
4f52bc138f
|
docs(examples): move app example into new repo
|
2016-03-11 10:06:44 +01:00 |
|
Torkel Ödegaard
|
2de439bd1e
|
feat(plugins): progress on dashboard installs , #4298
|
2016-03-11 09:57:20 +01:00 |
|
Mitsuhiro Tanda
|
b989e2ce37
|
minor fix
|
2016-03-11 17:04:42 +09:00 |
|
Mitsuhiro Tanda
|
25f08ddd39
|
(cloudwatch) change parameter form of ec2_instance_attribute()
|
2016-03-11 16:59:06 +09:00 |
|
bergquist
|
a16c799da9
|
fix(examples): update link in readme
|
2016-03-11 08:52:14 +01:00 |
|
Mitsuhiro Tanda
|
0052e9d136
|
(cloudwatch) add ec2_instance_attribute() query
|
2016-03-11 16:48:29 +09:00 |
|
bergquist
|
b72cf90ed4
|
example(panel): rename to match new convetion
|
2016-03-11 08:39:05 +01:00 |
|
bergquist
|
69013ef8ad
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-03-11 08:35:24 +01:00 |
|
Carl Bergquist
|
16132e86a3
|
Merge pull request #4331 from mtanda/cloudwatch_add_metrics_dimensions
(cloudwatch) add metrics/dimensions of AWS/Events and AWS/Logs
|
2016-03-11 08:28:00 +01:00 |
|
Carl Bergquist
|
047191abf0
|
Merge pull request #4330 from tdyas/fix_nginx_app_example
remove extra comma in nginx-app's package.json
|
2016-03-11 08:02:48 +01:00 |
|