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
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
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
Torkel Ödegaard
10339090b8
fix(annotations): fixed annotation error handling, fixes #5077
2016-05-18 15:22:40 +02:00
Torkel Ödegaard
03551a5961
Merge remote-tracking branch 'origin/development'
2016-05-18 14:23:21 +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
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
Utkarsh Bhatnagar
8a9455d901
Fixed singlestat mapping typo ( #5070 )
2016-05-18 07:44:01 +02:00
Torkel Ödegaard
46b6ab7db7
Merge branch 'master' of github.com:grafana/grafana
2016-05-17 21:51:31 +02:00
Torkel Ödegaard
83f5080274
feat(angular): disable debug in production for angular compiler
2016-05-17 15:00:48 +02:00
hijklmno
f1b5a265ab
fix trailing whitespace in kbn.js
2016-05-16 15:35:42 -07:00
hijklmno
451e917e7d
Add dBm as an option in energy units
2016-05-16 15:24:31 -07:00
Torkel Ödegaard
d443079cf6
fix(): fixed sass issue
2016-05-16 18:48:13 +02:00
Torkel Ödegaard
09f11cf66e
updated
2016-05-16 14:11:55 +02:00
Torkel Ödegaard
2be8658034
Merge remote-tracking branch 'origin/development'
2016-05-16 11:40:12 +02:00
Lindsay Hill
85758a2dd2
Fixed minor typo s/seperate/separate/
...
Fixed small typo in help text
2016-05-14 17:51:08 +12:00
Utkarsh Bhatnagar
7bc15ec6c1
[Bug Fix] Opentsdb Alias issue ( #4910 )
...
* Fixed Opentsdb Alias issue
* Fixed Opentsdb query editor
2016-05-13 22:22:56 +02:00
bergquist
579b36754a
Merge branch 'master' into development
2016-05-13 14:30:47 +02:00
bergquist
6849bfae16
fix(graph): fixes broken hide xaxis option
...
closes #5024
2016-05-13 13:52:57 +02:00
bergquist
c3f1d1a647
fix(influxdb): fixes extra semi colon due to hidden series
...
closes #5005
2016-05-13 13:36:57 +02:00
bergquist
d5899aacfb
fix(graph-panel): fixes broken PNG rendering
...
When refactoring y-axies for graph panel these
was forgotten and which caused the graphite datasource
to send invalid data.
closes #5025
2016-05-13 12:20:39 +02:00
Prajwal Rao
3feb6492e6
fixed datasources icon ( #5015 )
2016-05-12 21:49:58 +02:00
bergquist
88b2f48493
Merge branch 'master' into development
2016-05-12 16:22:18 +02:00
Torkel Ödegaard
35f55cabf0
fix(templating): improved detection of nested template variables, fixes #4986 , fixes #4987
2016-05-12 10:41:15 +02:00
Torkel Ödegaard
0201ac24e7
fix(templating): fixed issue with mixing repeated row and repeated panel, fixes #4988
2016-05-12 10:31:36 +02:00
Torkel Ödegaard
8a3bdb3685
fix(typo): corrected spelling in error message, fixes #4982
2016-05-11 13:21:25 +02:00
Trent White
995f6be2c4
old grafana wordmark was still showing on login and sidebar ( #4972 )
2016-05-11 09:08:25 +02:00
