1338 Commits

Author	SHA1	Message	Date
Marcel Anacker	64c16eb912	Alerting: Fixing mobile notifications in Microsoft Teams	2018-04-04 16:28:12 +02:00
bergquist	d29563ff8e	alerting: bad default state for notifiers ... when we made image upload optional we didnt show the default value properly in the UI. Which caused confusing. This commit apply the default values to existing notifiers in the edit pages and reverts back to using uploadimage=true as the default value.	2018-03-28 12:52:39 +02:00
Leonard Gram	a40e209a91	Merge pull request #11379 from bergquist/provisioning_override_id ... provisioning: removes id from dashboard.json	2018-03-27 14:57:00 +02:00
bergquist	b61bc72e2a	provisioning: removes id from dashboard.json ... if dashboard json files contains `id` we will just remove it form the dashboard model before importing it into the database. closes #11138	2018-03-26 13:17:39 +02:00
Carl Bergquist	8d7fa644de	Merge pull request #11352 from digineo/golint ... Make golint happier	2018-03-23 13:35:11 +01:00
Carl Bergquist	8db09d7556	Merge pull request #11290 from Thib17/retry ... Alerting: Add retry mechanism	2018-03-23 13:17:24 +01:00
Carl Bergquist	f0d77804da	Merge pull request #11329 from alexanderzobnin/fix-11278 ... fix dashboard version cleanup on large datasets	2018-03-23 10:53:51 +01:00
Julian Kornberger	0a415c50d0	Make golint happier	2018-03-22 22:38:44 +01:00
Gerben Meijer	e722732021	Return actual user ID in UserProfileDTO ... This fixes calls to /api/user where ID is currently always 0	2018-03-22 16:30:04 +01:00
Alexander Zobnin	0ffcea08c7	dashboard version cleanup: more tests and refactor	2018-03-22 15:18:05 +03:00
Thibault Chataigner	38bdb8dfb3	Alerting: move getNewState to EvalContext ... This fix alert state update when several evaluation attempts are needed Signed-off-by: Thibault Chataigner <t.chataigner@criteo.com>	2018-03-21 20:59:39 +01:00
Alexander Zobnin	2ade0881b1	minor refactor of dashboard version cleanup	2018-03-21 22:48:17 +03:00
Alexander Zobnin	3f85fcce2d	refactor: dashboard version cleanup	2018-03-21 21:01:15 +03:00
Alexander Zobnin	f976b690ca	limit number of rows deleted by dashboard version cleanup	2018-03-21 20:26:27 +03:00
Alexander Zobnin	fc2d1d6ca9	fix dashboard version cleanup on large datasets	2018-03-21 17:23:05 +03:00
Thibault Chataigner	5d23e7710b	Alerting: Add retry mechanism and its unitests ... Signed-off-by: Thibault Chataigner <t.chataigner@criteo.com>	2018-03-20 21:01:56 +01:00
Daniel Lee	1cef373d16	Merge remote-tracking branch 'upstream/master' into update-xorm	2018-03-20 19:21:58 +01:00
Marcus Efraimsson	d26d8c713e	Merge branch 'master' into mssql_datasource	2018-03-16 15:19:19 +01:00
Daniel Lee	3ca1e06509	session: fork Macaron mysql session middleware ... This changes forks the mysql part of the Macaron session middleware. In the forked mysql file: - takes in a config setting for SetConnMaxLifetime (this solves wait_timeout problem if it is set to a shorter interval than wait_timeout) - removes the panic when an error is returned in the Exist function. - retries the exist query once - retries the GC query once	2018-03-16 01:19:28 +01:00
Daniel Lee	9cdd7cb04c	database: expose SetConnMaxLifetime as config setting ... For MySQL, setting this to be shorter than the wait_timeout MySQL setting solves the issue with connection errors after the session has timed out for the connection to the database via xorm.	2018-03-16 01:09:00 +01:00
Daniel Lee	5a3ba68a9c	database: fixes after xorm update	2018-03-16 00:09:29 +01:00
Daniel Lee	1c20126f87	database: update xorm to v0.6.4 and xorm core to v0.5.7	2018-03-16 00:02:50 +01:00
Corentin Chary	3d8f1a7439	alertmanager: /Creating/Sending/	2018-03-15 13:48:58 +01:00
Corentin Chary	c8da1a46c5	alertmanager: handle resolved alerts, nodata, and execution errors ... - Resolved alerts will be sent to the AM the first time they move from Alerting to OK - Errors are forwarded - NoData is not ignored anymore - The summary annotation is set (with the alertname) - The image annotation is set (when available)	2018-03-15 12:02:29 +01:00
Corentin Chary	d4d2b6d7da	notitfiers: avoid ShouldNotify duplication	2018-03-15 10:48:29 +01:00
Corentin Chary	777c1024c9	alertmanager: if there are no alerts to send, do nothing	2018-03-15 10:08:03 +01:00
Marcus Efraimsson	d2267643ed	Merge branch 'master' into mssql_datasource	2018-03-15 09:53:19 +01:00
Marcus Efraimsson	ef3588c1f8	docker: mssql and mssql tests blocks with common build context	2018-03-15 09:49:53 +01:00
Carl Bergquist	6d1e3613f7	Merge pull request #11246 from grafana/11227_import ... dashboard: fix import dashboard with alert rule(s)	2018-03-14 14:38:29 +01:00
Carl Bergquist	a8918047a2	Merge pull request #11238 from grafana/11155-mysql-issue ... middleware: recover and retry on session start	2018-03-14 14:29:47 +01:00
Marcus Efraimsson	87284d284e	dashboard: fix import dashboard with alert rule ... Importing a dashboard with alert rule(s) should be possible without receiving invalid alert data error. This fix reverts the import logic to how it worked before Grafana v5.0, that is import will allow dashboard with alert rule(s) but no alerts will be created. After an import the user will need to update the dashboard for the alerts to be created. Fixes #11227	2018-03-14 14:24:56 +01:00
Daniel Lee	5f511deefc	middleware: recover and retry on session start ... Partial fix for #11155 - the Macaron session middleware panics if mysql returns an error. This fix recovers from the panic and retries once	2018-03-14 12:26:59 +01:00
bergquist	be7ec310b1	alerting: supports extracting alerts from collapsed panels ... collapsed rows wrap the hidden rows within itself. This caused the extractor to miss the panel and therefore delete the alert accosiated with the graph. closes #11222	2018-03-14 11:23:16 +01:00
Marcus Efraimsson	57d46a706c	mssql datasource: additional data type tests	2018-03-13 19:54:29 +01:00
Marcus Efraimsson	d4beee2bb0	Merge branch 'master' into mssql_datasource	2018-03-13 16:03:02 +01:00
Leonard Gram	87bc60b9d7	alerting: adds back the link to grafana.	2018-03-13 13:29:57 +01:00
John Baublitz	aba6f627c5	Fix CI	2018-03-13 13:29:57 +01:00
John Baublitz	89557dd67b	Modify Grafana Pagerduty notifier to use Pagerduty API V2	2018-03-13 13:29:57 +01:00
bergquist	061a418f0f	style: dont expose func outside package	2018-03-13 11:24:10 +01:00
Carl Bergquist	5153d8e535	Merge pull request #11161 from DanCech/quota-refactor ... move quota to dedicated service	2018-03-08 15:21:16 +01:00
Carl Bergquist	87db2d1183	Merge pull request #11130 from DanCech/context-refactor ... move Context and session out of middleware	2018-03-08 10:21:34 +01:00
Dan Cech	bbd6adabbf	move quota to dedicated service	2018-03-07 17:19:35 -05:00
Carl Bergquist	e3b86637f9	Merge pull request #11146 from grafana/go1.10 ... Upgrade golang to 1.10	2018-03-07 18:00:37 +01:00
Carl Bergquist	d220516664	Merge pull request #11145 from grafana/alerting-invalid-data ... alerting: fixes validation error when saving alerts in dash	2018-03-07 17:06:19 +01:00
bergquist	ff6108051d	removes unused variables	2018-03-07 16:40:24 +01:00
Daniel Lee	d96fbb486f	alerting: fixes validation error when saving alerts in dash ... If a panelId in the dashboard json is set to zero then the validation silently fails. Instead of returning an error, it just ignores alerts and saves the dashboard.	2018-03-07 16:20:05 +01:00
Carl Bergquist	c39e68de24	Merge pull request #11046 from llamashoes/master ... Add metrics that triggered alert to description in OpsGenie.	2018-03-07 15:48:30 +01:00
Carl Bergquist	3f6e525755	Merge pull request #10942 from grafana/pausing_alerts_updates_timestamp ... Pausing/un alerts now updates new_state_date	2018-03-07 15:40:12 +01:00
Dan Cech	338655dd37	move Context and session out of middleware	2018-03-06 18:16:49 -05:00
Leonard Gram	891462b5d9	alerting: Limits telegram captions to 200 chars. ... The caption for inline images in Telegram is limited to 200 characters. Fixes #10975	2018-03-06 12:38:03 +01:00