7341 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	731c35540f	packaging(): default RESTART_ON_UPGRADE to true, closes #4993	2016-05-12 07:29:33 +02:00
Dan Cech	dac62ec560	fix rpm download link	2016-05-11 14:09:03 -04: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
Torkel Ödegaard	85e8cba7a1	Merge branch 'master' of github.com:grafana/grafana	2016-05-11 13:20:14 +02:00
Torkel Ödegaard	56bf9c5612	fix(): changed how package iteration/build is generated	2016-05-11 13:20:01 +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
bergquist	18bf2b2391	docs(alerting): add syles for optional params	2016-05-11 10:47:51 +02:00
Torkel Ödegaard	549eb15c32	Update latest.json	2016-05-11 10:37:21 +02:00
Torkel Ödegaard	03663c5b28	docs(): updated download links	2016-05-11 10:23:17 +02:00
Torkel Ödegaard	bbd52c0b71	changelog(): updated and updated version	2016-05-11 09:36:07 +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	959714a6ef	feat(docs): updated what's new article	2016-05-10 20:33:42 +02:00
Carl Bergquist	e4a24e1785	Merge pull request #4969 from peggyl/peggyl/fix-update-checker-typo ... Fix typo in error message from update checker	2016-05-10 18:17:09 +02:00
Peggy Li	9b0da20d90	Fix typo in error message from update checker	2016-05-10 16:06:51 +00:00
bergquist	dd47f7382a	docs(alerting): initial info	2016-05-10 16:40:46 +02:00
Torkel Ödegaard	c299b86983	docs(): updated readme	2016-05-10 16:33:05 +02:00
bergquist	33108df13f	docs(conf): add warning about alerting in conf file	2016-05-10 16:32:20 +02:00
Torkel Ödegaard	56e53d7da2	docs(): update readme dependency section	2016-05-10 16:07:59 +02:00
Torkel Ödegaard	d676840258	docs(): added homebrew info to mac install docs	2016-05-10 16:02:00 +02:00
bergquist	1fe2055743	tech(alerting): disable DEL for alert rules in the api	2016-05-10 15:02:11 +02:00
Torkel Ödegaard	ae66c3f289	fix(influxdb): minor editor display fix	2016-05-10 14:38:11 +02:00
bergquist	5ee1b6ca97	docs(changelog): add note about merged PR	2016-05-10 12:54:25 +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
Torkel Ödegaard	ecf5b61e86	Update ISSUE_TEMPLATE.md	2016-05-10 11:36:45 +02:00
Richard Hartmann	c01ab63744	ISSUE_TEMPLATE.md: different layout (#4960)	2016-05-10 11:33:33 +02:00
Torkel Ödegaard	72b324c95b	fix(go16): fixed hang with go 1.6 by updating sqlite3, fixes #4367	2016-05-10 11:22:06 +02:00
bergquist	1bb8bc58b8	feat(alerting): add parameteters for filtering alerts	2016-05-10 09:45:56 +02:00
minkikim89	0c5abc491d	Update index.md (#4956)	2016-05-10 08:44:18 +02:00
bergquist	b8421a478f	feat(alerting): move state filter to the right	2016-05-10 08:26:40 +02:00
bergquist	2ddffc8234	feat(alerting): add support for multiple state in ui	2016-05-09 16:32:35 +02:00
bergquist	b2cf2e877a	test(alerting): improve unit test	2016-05-09 15:19:11 +02:00
bergquist	9da2e6e907	feat(alerting): update path	2016-05-09 15:17:26 +02:00
bergquist	1be513fabd	feat(alerting): add support for alert page filter	2016-05-09 14:44:44 +02:00
LaszloHont	a5e2e59385	Clarify admin_password (#4948) ... Closes #4923	2016-05-09 13:44:11 +02:00
bergquist	3e462f2914	chore(alerting): style refactoring	2016-05-09 12:10:53 +02:00
bergquist	35c73902da	Merge branch 'master' into alerting_definitions	2016-05-09 11:34:56 +02:00
bergquist	47070f2d1f	chore(alerting): struct names and url refactoring	2016-05-09 11:25:21 +02:00
Torkel Ödegaard	040dd91d2e	fix(templating): fixed issue with current data source variable value, fixes #4934	2016-05-09 10:17:30 +02:00
Torkel Ödegaard	c6c07599c7	conf(): updated comments in config file, fixes #4933	2016-05-09 09:21:33 +02:00
Peggy Li	04ef25b6ff	Set custom type for templating variables (#4941)	2016-05-07 07:58:01 +02:00
bergquist	74d5410a38	feat(alerting): add inital doc page	2016-05-06 15:59:38 +02:00
Carl Bergquist	05ca7158d6	Merge pull request #4886 from Gueust/contribute_doc ... Add documentation on the build system for occasional contributors	2016-05-06 15:04:14 +02:00
bergquist	27274f37e8	feat(alerting): update paths for alert state	2016-05-06 14:37:41 +02:00
Torkel Ödegaard	c7e7a0cd16	fix(singlestat): rerender singlestat and reevaluate thresholds on render, fixes #4920	2016-05-05 10:29:14 +02:00
Utkarsh Bhatnagar	70f7177025	Fixed deleting row bug (#4919)	2016-05-05 09:57:21 +02:00