Torkel Ödegaard
0d7eb18d7b
Merge branch 'master' of github.com:grafana/grafana
2016-03-16 10:32:24 +01:00
Torkel Ödegaard
81c11ebb53
fix(dashlist): fixed issue with viewing last viewed dashboards, when you had more than dashboards in last viewed than panel limit they did not show up in list
2016-03-16 10:32:11 +01:00
Mitsuhiro Tanda
381a48f21d
(cloudwatch) remove duplicative attribute
2016-03-16 15:41:52 +09: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
Torkel Ödegaard
82eb32a71e
ux(): initial pass at new card / list design, #4364
2016-03-15 09:15:24 +01:00
Sean Kenny
8f97e8d5ed
Fix minor typo in tooltip
2016-03-14 19:40:23 +00: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
4aba3bc62b
fix(opentsdb): fixed templating issue for OpenTSDB, fixes #4312 , fixes #4311
2016-03-14 10:18:43 +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
581ffb862c
feat(plugins): polish to plugin page, better handling for reading readme file contents
2016-03-13 19:21:44 +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
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
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
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
Mitsuhiro Tanda
0052e9d136
(cloudwatch) add ec2_instance_attribute() query
2016-03-11 16:48:29 +09:00
simnv
336c1b7b6e
Fix groupby selection
...
Default groupby selection for influxdb is escaped not like a regex, but as a glob. It works fine with one value in variable, but when you select multiple values, query is incorrect:
> SHOW TAG KEYS FROM "os.disk.fs.space_total" WHERE "host" =~ /{host-1,host-2}$/
2016-03-11 08:30:56 +05:00
Torkel Ödegaard
60adcedebe
feat(plugins): worked on plugin dashboard import handling
2016-03-10 19:57:48 +01:00
Torkel Ödegaard
78b9c3004a
feat(plugins): minor progress on dashboard imports
2016-03-10 14:28:31 +01:00
Torkel Ödegaard
1951f3856f
feat(plugins): refactored datasourceEditCtrl to typescript, #4298
2016-03-10 09:47:29 +01:00
Mitsuhiro Tanda
df2a23d1a7
fix to use variable.refresh flag
2016-03-10 13:19:07 +09:00
Torkel Ödegaard
d8b11adfd5
Merge branch 'master' into dashboard-thing
2016-03-09 13:11:48 +01:00
Torkel Ödegaard
4a5b753fd8
feat(templating): refactoring of the refresh values of #4281
2016-03-09 13:10:02 +01:00
Torkel Ödegaard
bb1e7f62a0
fix(build): updated moment.js to fix systemjs build issue, fixes #4306
2016-03-09 12:39:05 +01:00
bergquist
f0d1853a66
style(templating): tigth-form -> gf-form
2016-03-09 11:56:52 +01:00
bergquist
7224728ab8
Merge branch 'refresh_temp_value_by_time_range_changes' of https://github.com/mtanda/grafana into mtanda-refresh_temp_value_by_time_range_changes
2016-03-09 11:46:49 +01:00
Carl Bergquist
ac439d83fe
Merge pull request #4296 from knowroozi/opentsdb_annotations
...
add annotations for opentsdb
2016-03-09 11:31:05 +01:00
Torkel Ödegaard
c0b92eb5d0
fix(jshint): fixed jshint warning
2016-03-09 10:31:43 +01:00
Torkel Ödegaard
5599bdf1bc
Merge branch 'master' of github.com:grafana/grafana
2016-03-09 10:26:11 +01:00
Torkel Ödegaard
de41536046
fix(share): fixed checkboxes in share modal, fixes #4301
2016-03-09 10:26:00 +01:00
Torkel Ödegaard
30d321998c
Merge pull request #4295 from utkarshcmu/nav-fix
...
Minor nav fix
2016-03-09 09:27:38 +01:00
Torkel Ödegaard
3191678b14
feat(plugins): work on plugins that include dashboards
2016-03-08 20:46:25 +01:00
Torkel Ödegaard
091726b374
feat(plugins): commented out dashboard import list
2016-03-08 20:27:40 +01:00
