Torkel Ödegaard
93665f49b1
Merge branch 'v3.0.x'
2016-05-23 11:06:53 +02:00
Torkel Ödegaard
dc77d555f9
fix(elasticsearch): fixed templating issue with elasticsearch, fixes #5135
2016-05-23 10:58:31 +02:00
Torkel Ödegaard
dfe3806d01
fix(elasticsearch): fixed query editor issue with elasticsearch
2016-05-23 10:14:40 +02:00
Torkel Ödegaard
cfc7710205
docs(): changelog updated
2016-05-23 09:31:52 +02:00
Torkel Ödegaard
c60d737928
Merge branch 'v3.0.x'
...
Conflicts:
package.json
2016-05-23 09:29:14 +02:00
Torkel Ödegaard
1da149d9e1
feat(annotations): annotations can now use a template variable as data source, closes #5054
2016-05-23 09:28:14 +02:00
Torkel Ödegaard
43ba563a1c
fix(logging): change log level to trace for plugin proxy logging call, fixes #5126
2016-05-23 07:55:55 +02:00
Mitsuhiro Tanda
1d27a7f93d
(cloudwatch) fix wrong cache key of credentials ( #5124 )
2016-05-21 09:02:04 +02:00
Torkel Ödegaard
fb4dc77f36
docs(): updated changelog with 3.0.3 fixes
2016-05-20 15:26:19 +02:00
Torkel Ödegaard
9eb7b192b8
Merge branch 'master' of github.com:grafana/grafana
2016-05-20 15:16:05 +02:00
Torkel Ödegaard
06d63dda6e
Merge branch 'v3.0.x'
2016-05-20 15:15:30 +02:00
Torkel Ödegaard
e6f251011f
fix(panel span): fixed issue setting panel span while in fullscren and also an issue when changing repeat variable while in fullscreen view, fixes #4957
2016-05-20 15:15:02 +02:00
David J. Felix
441682b598
Fix linking for /dashboard-solo/ proxy prefix ( #5116 )
...
Fixes #5109
2016-05-20 14:01:12 +02:00
Mitsuhiro Tanda
9c672f6ec1
(prometheus) support new legend format (with backward compatibility) ( #5096 )
...
* (prometheus) support new legend format (with backward compatibility)
* (prometheus) use regex replace for legend format
* (prometheus) allow white space
2016-05-20 12:29:10 +02:00
Torkel Ödegaard
35c05463e7
Merge branch 'v3.0.x'
2016-05-20 12:23:50 +02:00
Torkel Ödegaard
f00cbc0aeb
fix(panel height): fixed issue with singlestat height, fixes #4679 , fixes #4894 , fixes #5113
2016-05-20 12:23:26 +02:00
Torkel Ödegaard
ee86d24797
fix(elasticsearch): minor editor layout fix
2016-05-20 10:31:22 +02:00
Torkel Ödegaard
58a9324db0
Merge branch 'v3.0.x'
2016-05-20 10:24:54 +02:00
Torkel Ödegaard
e0e8fd6637
fix(templating): fixed handling of numeric values in tempalting query results, fixes #5097
2016-05-20 10:24:24 +02:00
Torkel Ödegaard
2416ee04c8
fix(templating): fixed detection of nested template variables, fixes #5103
2016-05-20 09:58:07 +02:00
Torkel Ödegaard
91c6ebb06c
Merge branch 'v3.0.x'
2016-05-20 09:06:39 +02:00
Torkel Ödegaard
df0ddc0b50
fix(prometheus): fixed bug in prometheus query editor, fixes #5107
2016-05-20 09:03:52 +02:00
Torkel Ödegaard
2e02abffc0
fix(render): fixed issue with image renderer caused by disabling angular debug info
2016-05-20 08:34:35 +02:00
Torkel Ödegaard
e47957ce6d
Merge branch 'master' of github.com:grafana/grafana
2016-05-20 08:32:40 +02:00
Torkel Ödegaard
c54e688272
Merge branch 'v3.0.x'
2016-05-20 08:31:51 +02:00
Torkel Ödegaard
37821e6d63
fix(share modal): fixed link in share modal when sub app url is /dashboard/, fixes #5109
2016-05-20 08:31:27 +02:00
Richard Hartmann
78360ece8a
ISSUE_TEMPLATE.md: Improve wording and fix typos ( #5101 )
2016-05-19 10:59:38 +02:00
Richard Hartmann
7c46423727
ISSUE_TEMPLATE.md: Fix typo ( #5099 )
2016-05-19 10:34:12 +02:00
bergquist
617d18e587
feat(panel): active tab is now placed in querystring aswell
2016-05-19 08:42:21 +02:00
bergquist
2b06ceda71
feat(panels): adds queryparameter for choose active tab in edit mode
2016-05-19 08:00:48 +02:00
Torkel Ödegaard
1bb4ca22e7
fix(test): fixed failing unsaved changes test
2016-05-19 07:58:44 +02:00
Tim Bielawa
24a410ae8f
docs(preferences): Document user and org preferences ( #5087 )
...
closes #5069
2016-05-18 18:31:59 +02:00
Torkel Ödegaard
10339090b8
fix(annotations): fixed annotation error handling, fixes #5077
2016-05-18 15:22:40 +02:00
Torkel Ödegaard
b6dcf6bd02
Merge branch 'v3.0.x'
2016-05-18 14:23:59 +02:00
Torkel Ödegaard
280e7bb04d
Merge branch 'master' of github.com:grafana/grafana
2016-05-18 14:23:41 +02:00
Torkel Ödegaard
03551a5961
Merge remote-tracking branch 'origin/development'
2016-05-18 14:23:21 +02:00
Torkel Ödegaard
d474eba53a
fix(logging): fixed reading config level from config file, fixes #5079
2016-05-18 14:18:08 +02:00
Mitsuhiro Tanda
392cb2a714
(cloudwatch) update changelog ( #5080 )
...
* update cloudwatch.md
* update changelog
2016-05-18 13:27:19 +02:00
bergquist
92ac370415
tech(docker): rename fake data writers
2016-05-18 12:29:37 +02:00
Torkel Ödegaard
c41e3dcb91
updated changelog
2016-05-18 12:04:37 +02:00
Torkel Ödegaard
602d1a5fbc
Merge branch 'v3.0.x'
2016-05-18 12:02:53 +02:00
Torkel Ödegaard
cd80884b76
fix(dashboard timepicker): fixed issue with time picker and UTC when reading time from url, fixes #5078
2016-05-18 12:01:11 +02:00
Torkel Ödegaard
bfadc932d7
Merge branch 'master' of github.com:grafana/grafana
2016-05-18 11:50:56 +02:00
Torkel Ödegaard
0cd2e150d5
feat(snapshots): performance improvements to deep clone, makes snapshot's a lot quicker for big dashboards with a lot of panels and data
2016-05-18 11:50:40 +02:00
Carl Bergquist
5aaaeb05a0
Merge pull request #5075 from mtanda/prometheus_templating_fix
...
(prometheus) fix metric find query
2016-05-18 11:40:33 +02:00
Mitsuhiro Tanda
a86d218891
(prometheus) fix metric find query
2016-05-18 16:36:57 +09:00
Mitsuhiro Tanda
66bcae353c
(prometheus) pass dashboard time range to template query ( #5007 )
...
* (prometheus) pass dashboard time range to template query
* (prometheus) add passing time test of templating
2016-05-18 07:56:23 +02:00
Mitsuhiro Tanda
07d355851e
(cloudwatch) assume role support ( #5065 )
...
* (cloudwatch) assume role support
* save godep
* (cloudwatch) add assumeRoleArn field
* (cloudwatch) set cred provider for sts
* (cloudwatch) fix test
2016-05-18 07:54:24 +02:00
Mitsuhiro Tanda
8d2f350ad1
(prometheus) fix prometheus link
2016-05-18 07:50:30 +02:00
Mitsuhiro Tanda
fc1891320e
(prometheus) fix prometheus link ( #5074 )
2016-05-18 07:49:32 +02:00
