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
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
Torkel Ödegaard
11372ac9ff
Merge pull request #4332 from simnv/influxdb-tags-multiple
...
InfluxDB: Fix groupby selection
2016-03-11 07:14:48 +01: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
Mitsuhiro Tanda
2c5abed2f1
(cloudwatch) add metrics/dimensions of AWS/Events and AWS/Logs
2016-03-11 12:11:01 +09:00
Tom Dyas
8c6890c95f
remove extra comma in nginx-app's package.json
...
otherwise grunt fails due to a syntax error in package.json
2016-03-10 17:48:17 -05:00
Torkel Ödegaard
60adcedebe
feat(plugins): worked on plugin dashboard import handling
2016-03-10 19:57:48 +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
18c5e90076
Merge branch 'cli_compose_download_url'
2016-03-10 16:29:37 +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
bergquist
0b6fee138a
docs(configuration): add redis as session storage
2016-03-10 14:49:37 +01:00
Torkel Ödegaard
78b9c3004a
feat(plugins): minor progress on dashboard imports
2016-03-10 14:28:31 +01:00
Carl Bergquist
c99aa74140
Merge pull request #4322 from utkarshcmu/add-api
...
#4258 Implemented GetDataSourceIdByName API
2016-03-10 11:46:32 +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
Torkel Ödegaard
1951f3856f
feat(plugins): refactored datasourceEditCtrl to typescript, #4298
2016-03-10 09:47:29 +01:00
Torkel Ödegaard
8357cdf591
Merge pull request #4313 from PaulMest/patch-1
...
Update ldap.md
2016-03-10 07:29:41 +01:00
Torkel Ödegaard
499bad5f53
Merge pull request #4320 from mtanda/templating_fix_on_time_range_change
...
fix to use variable.refresh flag
2016-03-10 07:26:24 +01:00
Mitsuhiro Tanda
df2a23d1a7
fix to use variable.refresh flag
2016-03-10 13:19:07 +09:00
Paul Mestemaker
d6ecf74db4
Update ldap.md
...
Added clearer language on which versions offer LDAP support.
2016-03-09 11:25:42 -08:00
bergquist
6670e6cd29
feat(cli): allow redirect for plugin-repo.json
2016-03-09 16:10:46 +01: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
d9231eb805
github(pr_template): minor guide for PRs
2016-03-09 12:42:36 +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
e5ffb2bfd2
github(issue_template): minor improvement
2016-03-09 12:08:09 +01:00
bergquist
6fff0b3e2a
Merge branch 'mtanda-refresh_temp_value_by_time_range_changes'
2016-03-09 12:02: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
bergquist
ca7c3cc27d
docs(changelog): add opentsdb annotations to changelog
2016-03-09 11:34:59 +01:00
