bergquist
422234d03a
feat(alerting): abstract graphite from executor
2016-05-27 12:06:41 +02:00
bergquist
3d66ec816d
chore(alerting): minor refactoring
2016-05-27 10:34:44 +02:00
Torkel Ödegaard
bf90fbc678
fix(templating): fixed failing templating unit test
2016-05-27 09:23:08 +02:00
Tim Bielawa
2b9d260686
docs(rebuild): Include new http api preferences docs in menus ( #5194 )
...
This updates the mkdocs.yml source file such that the HTTP Preferences
API is included in the website navigation bar and in the HTTP API
overview page.
This commit also refreshes the docs/README.md file with more verbose
instructions for building and viewing the documentation locally.
* Original issue: #5069 Document org & user preferences HTTP docs
* Original PR: #5087
Closes #5193
2016-05-27 08:58:42 +02:00
Mat Schaffer
18f704533f
Add enhanced elasticbeanstalk metrics
2016-05-27 11:47:53 +09:00
Mat Schaffer
aedba5411c
Add basic metrics for AWS/ElasticBeanstalk
2016-05-27 11:30:16 +09:00
Torkel Ödegaard
696fad702f
Merge branch 'v3.0.x'
...
Conflicts:
public/app/features/templating/templateValuesSrv.js
2016-05-26 14:21:17 +02:00
Torkel Ödegaard
724a511995
fix(templating): fixed issue with value being shown instead of it's text representation, fixes #5172
2016-05-26 13:18:02 +02:00
Torkel Ödegaard
90c9c70416
fix(): another fix for panel image rendering
2016-05-26 08:49:55 +02:00
Torkel Ödegaard
f8a4661d05
Merge branch 'master' of github.com:grafana/grafana
2016-05-26 08:37:19 +02:00
Torkel Ödegaard
dd494e648a
fix(rendering): fixed issue with phantomjs panel rendering
2016-05-26 07:45:53 +02:00
bergquist
8ac635b631
style(alerting): change const names
2016-05-26 07:41:23 +02:00
Jared Wiltshire
c9d6321f38
Allow for proxying Authorization header and automatically convert ( #4832 )
...
Authorization header to X-DS-Authorization in backend_srv.js
2016-05-26 07:13:29 +02:00
Mukesh
4038b4d17e
Set active org through admin api ( #5179 )
2016-05-26 06:51:23 +02:00
nfnty
46551e9d65
package.json: Upgrade grunt-contrib-compress, Fixes #5071
2016-05-26 01:03:22 +02:00
bergquist
957cb407c5
feat(alerting): naiv graphite executor
2016-05-25 17:21:20 +02:00
Torkel Ödegaard
1060eeb197
feat(dashboard): include org id query parameter in dashboard url, #1613
2016-05-25 17:06:41 +02:00
bergquist
b2a4d8083e
feat(alerting): add datasource ref to alert rule
2016-05-25 12:57:49 +02:00
Torkel Ödegaard
f923edc424
Merge branch 'v3.0.x'
2016-05-25 12:29:35 +02:00
Torkel Ödegaard
2712d9ae8b
Update latest.json
2016-05-25 12:23:32 +02:00
Torkel Ödegaard
3312a042dd
docs(): updated download links
2016-05-25 11:50:00 +02:00
Torkel Ödegaard
5040570ea9
docs(): updated changelog
2016-05-25 11:07:29 +02:00
Torkel Ödegaard
f5c5d1b1da
Merge branch 'master' of github.com:grafana/grafana
2016-05-25 11:04:27 +02:00
Torkel Ödegaard
2cd6c2e7e0
Merge branch 'v3.0.x'
2016-05-25 11:04:12 +02:00
Torkel Ödegaard
0daadc954c
fix(templating): fixed issue with detecting data source variable in other template variable definition, fixes #5165
2016-05-25 10:46:55 +02:00
bergquist
ec98b7d672
docs(changelog): add note about fix for 5167
2016-05-25 10:01:49 +02:00
bergquist
8c2b6b532d
fix(preferences): fixes broken default home dashboard
...
closes #5167
2016-05-25 09:56:45 +02:00
Torkel Ödegaard
71d62012e1
fix(panel): fixed issue with fullscreen panel view and switching to another dashboard, fixes #5163
2016-05-25 09:46:15 +02:00
Torkel Ödegaard
41deea90ee
feat(dashboard): template variable changes updates url, closes #5002
2016-05-24 16:34:17 +02:00
Torkel Ödegaard
a81806d3d0
feat(dashboard): sync time range with url, closes #458
2016-05-24 16:32:28 +02:00
bergquist
0f58f8a679
feat(alerting): add timeout handler for check execution
2016-05-24 10:30:39 +02:00
Torkel Ödegaard
5607a114f9
updated changelog
2016-05-24 09:53:28 +02:00
Torkel Ödegaard
e81614b9e9
Merge branch 'v3.0.x'
2016-05-24 09:50:41 +02:00
Torkel Ödegaard
6f094ef215
fix(templating): fixed issue with nested template variables and multi select, the child variable selection state is now updated like single select variables, so if none matches the first option is selected, fixes #4861
2016-05-24 09:50:23 +02:00
Torkel Ödegaard
366baea099
docs(): updated changelog
2016-05-24 08:14:40 +02:00
Torkel Ödegaard
dc9dcd045d
Merge branch 'master' of github.com:grafana/grafana
2016-05-24 08:11:52 +02:00
Torkel Ödegaard
10c47ee27c
feat(footer): some minor changes to footer to make it look good in light theme, closes #4889
2016-05-24 08:11:28 +02:00
Torkel Ödegaard
8f0240a295
Merge branch 'footer'
2016-05-24 07:53:13 +02:00
Torkel Ödegaard
fd08c821f9
Merge branch 'v3.0.x'
...
Conflicts:
package.json
2016-05-24 07:52:27 +02:00
Torkel Ödegaard
c41c771e9a
fix(home dashboard): fixed handling error when default dashboard is not found, fixes #5141
2016-05-24 07:39:58 +02:00
bergquist
448ee5812c
feat(alerting): make sure the map contains the responding alert
2016-05-24 07:24:45 +02:00
Zdenek Styblik
fff5aa3020
Add missing option Read-Only Editor to auto_assign_org_role description ( #5139 )
...
Commit adds missing option `Read-Only Editor` to `auto_assign_org_role` description.
2016-05-23 21:24:23 +02:00
Torkel Ödegaard
f1ec270e3e
bumped version to 3.0.4
2016-05-23 21:24:02 +02:00
Torkel Ödegaard
a3f2f574c6
fix(singlestat): fixed Gauge positioning issue, fixes #5143
2016-05-23 21:23:31 +02:00
Utkarsh Bhatnagar
ec19a97156
[Bug Fix] #5136 ( #5142 )
2016-05-23 21:00:06 +02:00
Torkel Ödegaard
9a7817a271
Merge branch 'master' into footer
...
Conflicts:
pkg/api/frontendsettings.go
2016-05-23 20:59:23 +02:00
Utkarsh Bhatnagar
8a0d5aa38d
[Bug Fix] #5136 ( #5142 )
2016-05-23 20:58:21 +02:00
Trent White
a52869507e
hide footer on non-dashboard pages
2016-05-23 12:46:13 -04:00
Trent White
76d18e7156
remove height: 100% on .main-view
2016-05-23 11:45:54 -04:00
bergquist
7229fb7a76
tech(alerting): change from array to map
2016-05-23 17:04:57 +02:00
