638 Commits

Author	SHA1	Message	Date
Torkel Ödegaard	2b8177e3e5	fix(migration): fix for sqlstore migration, the execution of the migration and recording of the success of it was not done in same transaction, fixes #5315	2016-09-30 07:49:40 +02:00
Torkel Ödegaard	50d146e82c	fix(docs): fixed influxdb docs and mention of InfluxDB version, #6027	2016-09-29 14:53:50 +02:00
bergquist	1a062c52fa	fix(notifications): handle none configured image uploader ... ref #6152	2016-09-29 14:31:19 +02:00
Torkel Ödegaard	75311e0626	feat(alerting): removed old init package	2016-09-28 21:27:24 +02:00
Torkel Ödegaard	80eb82420e	fix(cleanup): check if images dir exists	2016-09-28 21:12:25 +02:00
Torkel Ödegaard	c28d004731	Merge branch 'go_routines'	2016-09-28 21:06:07 +02:00
Torkel Ödegaard	71e2c6f6ef	refactor(backend): refactoring management of go routines in backend	2016-09-28 21:06:00 +02:00
bergquist	bc634f20d5	Merge branch 'master' into go_routines	2016-09-28 13:58:14 +02:00
bergquist	991539e410	style(go_routines): improve variable naming	2016-09-28 13:35:24 +02:00
Torkel Ödegaard	5ccdbf01fd	merge with master	2016-09-28 13:02:15 +02:00
Torkel Ödegaard	8d5857661e	refactor(tsdb): changed tsdb time series model to use null.Float instead of pointers	2016-09-28 09:15:48 +02:00
Torkel Ödegaard	63caedb094	Merge branch 'master' of github.com:grafana/grafana	2016-09-28 08:09:51 +02:00
Torkel Ödegaard	3ecd96e682	feat(testdata): lots of work on new test data data source and scenarios	2016-09-27 18:17:39 +02:00
bergquist	34b31aeef8	tech(goroutines): sync state between different go routines	2016-09-27 16:47:17 +02:00
Torkel Ödegaard	34f15d92d0	feat(testdata): worked on testdata app	2016-09-27 14:39:51 +02:00
bergquist	262e7193a3	feat(alerting): keep proccessing results even if one response panics	2016-09-27 11:16:55 +02:00
bergquist	dbb7852f21	feat: purge old files and snapshots ... closes #4087 closes #2172	2016-09-26 14:33:40 +02:00
bergquist	1a32ab64b6	tech(renderer): improve renderOpts names	2016-09-26 11:07:36 +02:00
bergquist	effd2098ee	feat(alerting): fixes broken image renderer	2016-09-26 10:51:45 +02:00
bergquist	887e236bce	fix(rule): fixes rule reading bug	2016-09-26 10:01:33 +02:00
bergquist	8cd9225eb6	feat(alerting): increase timeout to 15s	2016-09-26 08:45:55 +02:00
Torkel Ödegaard	9a94072c1d	Merge branch 'master' of github.com:grafana/grafana	2016-09-23 12:30:20 +02:00
Torkel Ödegaard	175c651e65	fix(server side rendering): Fixed issues with server side rendering for alerting & for auth proxy scenarios, fixes #6115, fixes #5906	2016-09-23 12:29:53 +02:00
bergquist	e5c64732f1	fix(sql): Add boolstr to all dialects ... closes #6116	2016-09-23 09:36:15 +02:00
bergquist	d711c0ed35	Merge branch 'master' into alert_prometheus	2016-09-22 19:27:24 +02:00
bergquist	a49c21df3a	fix(png-renderer): increase timeouts	2016-09-22 19:24:18 +02:00
Torkel Ödegaard	e336fb3d60	fix(smtp mailer): added timeout of 10 seconds to smpt mailer, fixes #2989	2016-09-22 11:51:39 +02:00
Torkel Ödegaard	6257ae094c	feat(sqlstore): added index for dashboard_id in dashboard_tag table, fixes #5868	2016-09-21 21:32:51 +02:00
bergquist	b856d7e193	fix(prometheus): remove timerange from context	2016-09-21 13:55:42 +02:00
bergquist	c084145cba	refactor(prometheus): add timerange to alert context	2016-09-21 13:46:10 +02:00
bergquist	4c88db3e43	feat(prometheus): add support for legend formatting	2016-09-21 11:17:29 +02:00
bergquist	43d8bd5a25	feat(prometheus): initial support for prometheus	2016-09-21 07:01:53 +02:00
Dan Cech	630a8ed8aa	support setting default org role when adding user via grafana.net auth	2016-09-20 12:36:36 -04:00
bergquist	77783c02cd	fix(alerting): dont log null series ... closes #6025	2016-09-16 14:59:54 +02:00
bergquist	4e567b5f02	feat(alert): order alerts by name.. instead of nothing.	2016-09-14 14:51:31 +02:00
bergquist	a23b7f1371	fix(alerting): add missing evaldata field to set state command	2016-09-14 14:35:05 +02:00
bergquist	d0f9623037	feat(alertlistpanel): support state filter ... ref #5981	2016-09-14 10:49:05 +02:00
Torkel Ödegaard	f5809c0209	fix(build): trying to fix build	2016-09-13 20:14:18 +02:00
Torkel Ödegaard	8c30babdf1	feat(alerting): fixed build issues	2016-09-13 16:24:00 +02:00
Torkel Ödegaard	3af891d023	feat(alerting): restored alert history	2016-09-13 16:13:41 +02:00
Torkel Ödegaard	b0c7e61ef8	feat(alerting): removed severity	2016-09-13 15:09:55 +02:00
Torkel Ödegaard	6375418d8c	Merge branch 'alerting' into grafana-annotations	2016-09-13 09:38:12 +02:00
Rubycut	501f89e829	Increase datasource limit to 1000 #3910	2016-09-12 10:45:17 +02:00
Torkel Ödegaard	4a2f2fba73	feat(alerting): show panel specific alert annotations, #5694	2016-09-09 11:30:55 +02:00
bergquist	583790e650	fix(alering): the crocdile turned on me > < ... closes #5855	2016-09-09 07:42:07 +02:00
bergquist	7b9099ef93	fix(query): requires all that all series are empty to set NoDataFound	2016-09-08 14:33:10 +02:00
bergquist	9511f89a22	fix(alerting): fixes bug in query conditions	2016-09-08 13:28:41 +02:00
bergquist	bec099cd84	tech: remove unused files	2016-09-08 11:41:56 +02:00
Torkel Ödegaard	b8081b29fd	Merge branch 'master' into grafana-annotations	2016-09-08 11:26:55 +02:00
Torkel Ödegaard	d60bd77658	feat(annotations): added support to show grafana stored annotations in graphs, #5982	2016-09-08 11:25:45 +02:00