7444 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
bergquist	77ec575b46	tech(alerting): fixes broken unit-tests	2016-05-23 14:51:41 +02:00
bergquist	9d500df2bb	chore(alerting): remove redundant code	2016-05-23 14:36:24 +02:00
bergquist	9f8c67e352	feat(alerting): only start unfinnished jobs	2016-05-23 14:14:02 +02:00
Torkel Ödegaard	9e6056551d	docs(): updated download links	2016-05-23 14:13:30 +02:00
Torkel Ödegaard	bbea698af3	Update latest.json	2016-05-23 12:30:46 +02:00
bergquist	cb21bf41b0	tech(alerting): split code into different files	2016-05-23 12:15:36 +02:00
bergquist	b496b6a252	test(alerting): add test for alertjob selection	2016-05-23 12:04:34 +02:00
Torkel Ödegaard	9eec68985d	docs(): updated download links	2016-05-23 11:49:07 +02:00
bergquist	4fce82344e	feat(alerting): async exeuction on a shoestring	2016-05-23 11:47:41 +02:00
bergquist	f95fa51322	feat(alerting): make rule execution async	2016-05-23 11:17:07 +02:00
Torkel Ödegaard	cd82f579bd	docs(): updated changelog	2016-05-23 11:08:08 +02:00
Torkel Ödegaard	93665f49b1	Merge branch 'v3.0.x'	2016-05-23 11:06:53 +02:00
bergquist	a7fcb3a2cc	feat(alerting): add dummie executor	2016-05-23 10:59:28 +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
bergquist	f05cae23d2	feat(alerting): alert rule selector	2016-05-23 10:07:04 +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
bergquist	411178d384	tech(alerting): disable feature toggle ... this feature toggle caused migration tests to fail	2016-05-23 08:24:10 +02:00