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
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
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
Torkel Ödegaard
dfaa6d8eb9
feat(plugins): a lot of work on #4298
2016-03-08 18:17:47 +01:00
Mitsuhiro Tanda
aff4bf8f6c
minor refactoring
2016-03-09 01:47:38 +09:00
Mitsuhiro Tanda
ba1e1532ac
change option name more clearly
2016-03-09 00:53:43 +09:00
Kaveh Nowroozi
945131ccab
add annotations for opentsdb
2016-03-08 10:47:36 -05:00
NickG123
f11b4cb481
Added a select box to templates that allows template values to be refreshed on refresh
2016-03-09 00:40:33 +09:00
utkarshcmu
92c6025390
Minor nav fix
2016-03-08 07:39:41 -08:00
Torkel Ödegaard
7b1d827460
Merge branch 'master' into dashboard-thing
...
Conflicts:
public/app/features/datasources/partials/edit.html
2016-03-08 15:48:01 +01:00
Torkel Ödegaard
74ebc2d3b0
Merge branch 'master' of github.com:grafana/grafana
2016-03-08 15:32:15 +01:00
Torkel Ödegaard
db98632078
feat(plugins): progress on plugins page
2016-03-08 12:31:37 +01:00
Torkel Ödegaard
3af4b1ff98
Merge pull request #4287 from grafana/raintank-issue4283
...
refactor how template vars are updated. fixes #4283
2016-03-08 11:33:37 +01:00
Torkel Ödegaard
f80c2406a8
feat(plugins): remove app bundled plugins from plugins list
2016-03-08 11:29:36 +01:00
bergquist
453eebbac8
style(graph): convert query options to gf-form
2016-03-08 11:08:43 +01:00
bergquist
252568c91b
fix(graph): type in html
2016-03-08 10:33:38 +01:00
bergquist
8e11f8dc21
feat(graph): add spacing above Series specific overrides
2016-03-08 10:30:38 +01:00
Torkel Ödegaard
2475ca8f9a
fix(templaing): refactoring PR #4283
2016-03-08 09:32:54 +01:00
woodsaj
dc4743a392
ensure current template variable is set.
...
- When distributing a dashboard it is often not practical to have
"current" template variable option set. This commit ensures that
for dashboards with no current, it is assigned when the dashboard
loads (assuming refresh on load is set.)
2016-03-08 15:41:24 +08:00
woodsaj
0cb57f52de
refactor how template vars are updated. fixes #4283
...
Use promises to order the updates of variable options so that
parents are always updated before children.
This ensures that we only need to query the datasource once per
variable as variables that depend on other variables will only be
processed once their parent has been.
This commit also ensures that variable options are refreshed if
"refresh_on_load" is true even when query params are used to
set the variable seltion.
2016-03-08 15:03:34 +08:00
Torkel Ödegaard
4cd4ce504d
feat(plugins): worked on markdown support for plugin page, #4275
2016-03-07 18:03:45 +01:00
Torkel Ödegaard
135679096b
feat(plugins): progress on plugin details page, # 4275
2016-03-07 14:31:17 +01:00
bergquist
e16f45e494
fix(playlist): fixes failed refactoring
2016-03-07 11:10:10 +01:00
bergquist
435d0f22f5
fix(dashlist): better handling of invalid dashboard ids
2016-03-07 11:04:02 +01:00
Torkel Ödegaard
00c70307ad
fix(panel): fixed to panel height for text panel and unknown panel
2016-03-06 19:23:22 +01:00
