bergquist
402499c071
Merge branch 'master' into alerting_definitions
2016-05-19 08:47:34 +02:00
bergquist
617d18e587
feat(panel): active tab is now placed in querystring aswell
2016-05-19 08:42:21 +02:00
bergquist
a379b0057a
feat(alerting): link to dashboard goes directly to alerting tab
2016-05-19 08:13:20 +02:00
bergquist
ef4f5147be
Merge branch 'master' into alerting_definitions
2016-05-19 08:05:35 +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
bergquist
fa19e0d9c6
style(modal): use standard valid styles
2016-05-16 17:03:01 +02:00
bergquist
6435fa6b99
fix(modal): add undefined check
2016-05-16 16:48:28 +02:00
bergquist
2ce9d4571c
fix(alerting): fix spacing
2016-05-16 14:29:54 +02:00
Torkel Ödegaard
495404ef73
Merge branch 'master' into alerting_definitions
2016-05-16 14:12:56 +02:00
Torkel Ödegaard
09f11cf66e
updated
2016-05-16 14:11:55 +02:00
bergquist
80f7fe8646
feat(alerting): add confirm text dialog when deleting dashboards with alerts
2016-05-16 11:54:28 +02:00
Torkel Ödegaard
2be8658034
Merge remote-tracking branch 'origin/development'
2016-05-16 11:40:12 +02:00
bergquist
31698a1c55
Merge branch 'master' into alerting_definitions
2016-05-16 09:28:14 +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
bergquist
e69658128c
docs(alerting): change api url layout
2016-05-11 14:08:45 +02:00
Torkel Ödegaard
8a3bdb3685
fix(typo): corrected spelling in error message, fixes #4982
2016-05-11 13:21:25 +02:00
bergquist
c76c2f30a8
tech(alerting): add default values for alerts
2016-05-11 13:04:03 +02:00
bergquist
b58be91e71
feat(alerting): add delete button for removing alerts
2016-05-11 11:11:45 +02:00
Trent White
995f6be2c4
old grafana wordmark was still showing on login and sidebar ( #4972 )
2016-05-11 09:08:25 +02:00
Torkel Ödegaard
ae66c3f289
fix(influxdb): minor editor display fix
2016-05-10 14:38:11 +02:00
Carl Bergquist
c522341136
Merge pull request #4944 from Gueust/optional_tooltip_ordering
...
Add optional tooltip ordering (against the development branch)
2016-05-10 12:51:44 +02:00
bergquist
2cebe151f2
Merge branch 'master' into development
2016-05-10 12:40:17 +02:00
bergquist
b8421a478f
feat(alerting): move state filter to the right
2016-05-10 08:26:40 +02:00
bergquist
Torkel Ödegaard
Mitsuhiro Tanda
Utkarsh Bhatnagar
hijklmno
Lindsay Hill
Prajwal Rao
Trent White