8180 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Trent White	35b90afdd0	initial styling	2016-08-24 17:41:29 -04:00
Carl Bergquist	5b9366a9c3	tech(docker): update prometheus config	2016-08-23 11:50:17 +02:00
bergquist	d0ca4ca3cd	chore(alerting): remove unused files	2016-08-22 17:01:23 +02:00
bergquist	0cbedb4473	chore(api): remove commented endpoints	2016-08-22 16:56:28 +02:00
bergquist	b8ccb82382	Merge branch 'alerting'	2016-08-22 16:10:36 +02:00
bergquist	7095a9d7e1	Merge branch 'master' into alerting	2016-08-22 15:31:33 +02:00
bergquist	3b8bba3e9f	feat(alerting): add more fields to webhook	2016-08-22 15:11:27 +02:00
bergquist	1ff21b3ee8	docs(example): remove old properties	2016-08-22 14:55:16 +02:00
bergquist	f3d6035c59	feat(alerting): add alerts for notification edits	2016-08-22 14:49:40 +02:00
Carl Bergquist	90388710af	Merge pull request #5874 from mtanda/cw_api_gateway ... (cloudwatch) add api gateway metrics/dimensions	2016-08-22 14:36:40 +02:00
Carl Bergquist	1c25d22f9e	Merge pull request #5875 from mtanda/prometheus_time ... (prometheus) refactor time calculation	2016-08-22 14:25:52 +02:00
bergquist	457eb91c2f	docs(alerting): example dashboards	2016-08-22 13:30:57 +02:00
bergquist	77f9c24050	feat(alerting): add support for count reducer	2016-08-22 13:25:31 +02:00
bergquist	26c6437846	Merge branch 'master' into alerting	2016-08-22 12:27:08 +02:00
bergquist	69de3bcfc7	chore(example): remove example file and add links	2016-08-22 12:26:26 +02:00
bergquist	5a33679470	fix(alerting): remove has no value condition	2016-08-22 12:20:07 +02:00
Mitsuhiro Tanda	d9fe41cc8d	(prometheus) refactor time calculation	2016-08-20 22:51:33 +09:00
Mitsuhiro Tanda	6bd2bb04a7	(cloudwatch) add api gateway metrics/dimensions	2016-08-20 21:57:20 +09:00
bergquist	3077f992bb	docs(changelog): add note about closing #5613	2016-08-19 15:19:08 +02:00
Carl Bergquist	9fdda0e269	Merge pull request #5613 from ctrochalakis/group_by_nodes ... feat(graphite): added groupByNodes func def, closes #5612	2016-08-19 15:16:40 +02:00
bergquist	8d49b66dae	Merge branch 'Scalingo-database_url'	2016-08-19 14:53:38 +02:00
bergquist	aeb1b99648	docs(changelog): add note about closing #5456	2016-08-19 14:51:09 +02:00
bergquist	92a52ccdf7	docs(conf): add more info about using database.url	2016-08-19 14:48:40 +02:00
bergquist	c663e32ea8	Merge branch 'database_url' of https://github.com/Scalingo/grafana into Scalingo-database_url	2016-08-19 13:15:44 +02:00
bergquist	e415412691	feat(alerting): add image for howto popup ... closes #5784	2016-08-18 18:36:58 +02:00
bergquist	d3421c671c	fix(alerting): make sure xorm can reset execution_error	2016-08-18 17:25:32 +02:00
bergquist	28ac05b1d1	docs(changelog): add filter for org switcher ... closes #2609	2016-08-18 15:52:14 +02:00
bergquist	6d60d125d3	Merge branch 'Othyus-filter_orgs'	2016-08-18 15:48:47 +02:00
bergquist	e3bbf96b37	Merge branch 'filter_orgs' of https://github.com/Othyus/grafana into Othyus-filter_orgs	2016-08-18 15:48:01 +02:00
bergquist	def4632f08	test(alerting): add falsification test	2016-08-18 14:13:39 +02:00
bergquist	cbe7f8b697	feat(config): add ascii dragon to sample.ini	2016-08-18 14:13:02 +02:00
bergquist	d28df71c3b	feat(alerting): add support for "no_value" evaluator	2016-08-18 11:44:25 +02:00
Torkel Ödegaard	09cdf3e9e1	feat(alerting): show execution errors in alert list	2016-08-18 11:37:35 +02:00
Torkel Ödegaard	5cf9711862	feat(alerting): added eval match to test results	2016-08-18 11:22:24 +02:00
Torkel Ödegaard	2f953d75a6	Merge branch 'alerting' of github.com:grafana/grafana into alerting	2016-08-18 10:07:45 +02:00
Torkel Ödegaard	9028d4899f	feat(alerting): alert list fixes	2016-08-18 10:07:31 +02:00
bergquist	631acc2bf9	feat(alerting): only show available queries in alert query	2016-08-18 10:02:17 +02:00
Torkel Ödegaard	9b5a7b5ef6	feat(alerting): added alert howto text, closes #5784	2016-08-18 09:58:20 +02:00
Torkel Ödegaard	902314d3a1	Merge branch 'alerting' of github.com:grafana/grafana into alerting	2016-08-18 09:04:00 +02:00
Torkel Ödegaard	75a6c2b612	feat(alerting): added validation that checks valid data source and checks for template variables in graphite query, #5841	2016-08-18 09:03:46 +02:00
beejeebus	998ed097d3	Update aws-sdk from v1.0.0 to v1.4.1, fixes #5763. (#5813)	2016-08-18 08:19:53 +02:00
Roman Vynar	d086f5d398	Align step with interval passed to Prometheus query using rate() (#5839)	2016-08-18 08:19:32 +02:00
bergquist	6d080904fa	tech(alerting): empty string does not update database	2016-08-17 22:13:27 +02:00
bergquist	4154a4066f	feat(alerting): handle all results, even due they have errors ... DON'T SWALLOW THE ERR CARL	2016-08-17 22:12:08 +02:00
bergquist	158ce06167	fix(alerting): cleanup alerting example dashboard	2016-08-17 17:21:57 +02:00
Torkel Ödegaard	eabba50bbf	Merge branch 'alerting' of github.com:grafana/grafana into alerting	2016-08-17 15:49:18 +02:00
Torkel Ödegaard	2e7cb04490	feat(alerting): some final changes to alert list #5784	2016-08-17 15:48:58 +02:00
Torkel Ödegaard	63a283b4bc	feat(alerting): working on alert state filters for alert list	2016-08-17 11:00:00 +02:00
bergquist	7d1e5b6374	tech(alerting): remove old crit/warn properties from dashboard	2016-08-17 10:53:24 +02:00
bergquist	d8cfe22318	tech(alerting): add example dashboard with many alerts	2016-08-17 10:35:48 +02:00