14780 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
bergquist	171a38df99	alerting: fixes broken table rename	2018-06-05 14:29:48 +02:00
bergquist	ab70ead5e4	alerting: renames journal table to alert_notification_journal	2018-06-05 13:10:38 +02:00
bergquist	bcbae7aa62	alerting: move queries from evalcontext to notifier base	2018-06-05 12:07:02 +02:00
Carl Bergquist	05245e9b3d	Merge pull request #12161 from bergquist/alerting_reminder_invert ... alerting: invert sendOnce to sendReminder	2018-06-05 11:03:37 +02:00
bergquist	7333d7b8d4	alerting: invert sendOnce to sendReminder	2018-06-05 10:44:17 +02:00
bergquist	0c6d8398a1	alerting: remove zero units from duration	2018-06-05 08:42:39 +02:00
bergquist	93124f38fa	alerting: only check frequency when not send once	2018-06-04 22:19:27 +02:00
bergquist	0e647db485	Merge branch 'master' into alerting_reminder ... * master: (30 commits) changelog: add notes about closing #11882 renamed variable in tests added comment, variableChange -> variableValueChange added a test added if to check if new variable has been added Gravatar fallback does not respect 'AppSubUrl'-setting (#12149) change admin password after first login changelog: adds note about closing #11958 revert: reverted singlestat panel position change PR #12004 Revert "provisioning: turn relative symlinked path into absolut paths" provisioning: turn relative symlinked path into absolut paths changelog: adds note about closing #11670 elasticsearch: sort bucket keys to fix issue wth response parser tests docs: what's new in v5.2 changelog: add notes about closing #11167 docs: docker secrets support. (#12141) alerting: show alerts for user with Viewer role datasource: added option no-direct-access to ds-http-settings diretive, closes #12138 provisioning: adds fallback if evalsymlink/abs fails tests: uses different paths depending on os ...	2018-06-04 17:44:18 +02:00
bergquist	86e65f84f9	alerting: fixes invalid error handling	2018-06-04 17:30:57 +02:00
David	95aef8241c	Merge pull request #12146 from grafana/12144-new-variable-save ... added if to check if new variable has been added	2018-06-04 17:26:48 +02:00
Marcus Efraimsson	09a0a49c52	changelog: add notes about closing #11882 ... [skip ci]	2018-06-04 16:32:42 +02:00
Patrick O'Carroll	89238b4a04	renamed variable in tests	2018-06-04 16:23:36 +02:00
Patrick O'Carroll	b122f53085	added comment, variableChange -> variableValueChange	2018-06-04 16:23:36 +02:00
Patrick O'Carroll	609b0fa498	added a test	2018-06-04 16:23:36 +02:00
Patrick O'Carroll	5e484e8393	added if to check if new variable has been added	2018-06-04 16:23:36 +02:00
Marcus Efraimsson	6281910591	Merge pull request #12037 from grafana/login-change-password ... change admin password after first login	2018-06-04 16:21:45 +02:00
pari-	9680a3d44d	Gravatar fallback does not respect 'AppSubUrl'-setting (#12149) ... Closes #12148	2018-06-04 16:03:59 +02:00
David	b5c53aae97	Merge pull request #12108 from grafana/davkal/12001-explore-permissions ... Restrict Explore UI to Editor and Admin roles	2018-06-04 16:01:39 +02:00
Patrick O'Carroll	cb6c6c8172	change admin password after first login	2018-06-04 16:01:09 +02:00
bergquist	574e92e1d8	changelog: adds note about closing #11958 ... [skip ci]	2018-06-04 16:00:44 +02:00
Carl Bergquist	7214ee9024	Merge pull request #12007 from bergquist/provisioning_symlinked_folders ... Add support for symlinked folders in dashboard provisioning	2018-06-04 16:00:32 +02:00
Torkel Ödegaard	829af9425f	revert: reverted singlestat panel position change PR #12004	2018-06-04 15:45:29 +02:00
bergquist	cd4026da6b	Revert "provisioning: turn relative symlinked path into absolut paths" ... This reverts commit d089b5e05d.	2018-06-04 15:38:37 +02:00
bergquist	d089b5e05d	provisioning: turn relative symlinked path into absolut paths	2018-06-04 15:20:26 +02:00
Marcus Efraimsson	33ee1fba30	Merge pull request #12150 from grafana/12120_whats_new ... Draft: What's new in v5.2	2018-06-04 15:17:31 +02:00
bergquist	c138ff2c90	changelog: adds note about closing #11670	2018-06-04 15:16:34 +02:00
Marcus Efraimsson	38906acda9	elasticsearch: sort bucket keys to fix issue wth response parser tests	2018-06-04 15:15:47 +02:00
Carl Bergquist	49d9235433	Merge pull request #12122 from grafana/provisioning_ha ... Support provisioning in HA setup where modtime differs	2018-06-04 15:12:46 +02:00
Marcus Efraimsson	0d5579b4c0	docs: what's new in v5.2	2018-06-04 14:31:43 +02:00
John Baublitz	bdf433594a	Implement code review changes	2018-06-04 13:19:14 +02:00
John Baublitz	5c5951bc42	Bug fix for repeated alerting even on OK state and add notification_journal cleanup when alert resolves	2018-06-04 13:19:14 +02:00
John Baublitz	c0a9e5cf1d	Fix tests	2018-06-04 13:19:14 +02:00
John Baublitz	fca97535d1	Fix multiple bugs	2018-06-04 13:19:14 +02:00
John Baublitz	3cb0e27e1c	Revert changes post code review and move them to notification page	2018-06-04 13:19:14 +02:00
John Baublitz	e068be4c26	Feature for repeated alerting in grafana	2018-06-04 13:19:13 +02:00
Marcus Efraimsson	7453df2662	changelog: add notes about closing #11167 ... [skip ci]	2018-06-04 11:57:13 +02:00
Marcus Efraimsson	e258f30704	Merge pull request #12129 from alexanderzobnin/fix-11167 ... alert list panel: show alerts for user with viewer role	2018-06-04 11:54:51 +02:00
Leonard Gram	e562ae753b	docs: docker secrets support. (#12141) ... Closes #12132	2018-06-04 11:49:12 +02:00
Alexander Zobnin	13c6f37ea5	alerting: show alerts for user with Viewer role ... changelog: add notes about closing #11167 remove changelog note reformat alert_test.go	2018-06-04 12:34:30 +03:00
Torkel Ödegaard	feb5e20779	datasource: added option no-direct-access to ds-http-settings diretive, closes #12138	2018-06-04 11:17:50 +02:00
bergquist	f606654c50	provisioning: adds fallback if evalsymlink/abs fails	2018-06-04 09:04:33 +02:00
bergquist	3f5078339c	tests: uses different paths depending on os	2018-06-04 08:27:03 +02:00
bergquist	75ee1e9208	renames intervalSeconds to updateIntervalSeconds	2018-06-04 08:13:20 +02:00
Marcus Efraimsson	f5cf926364	changelog: add notes about closing #5893 ... [skip ci]	2018-06-01 15:23:26 +02:00
Marcus Efraimsson	b6afe5f2e8	Merge pull request #11380 from WPH95/feature/add_es_alerting ... elasticsearch: alerting support	2018-06-01 15:17:28 +02:00
Marcus Efraimsson	b67872bc35	changelog: add notes about closing #11500, #8168, #6541 ... [skip ci]	2018-06-01 14:49:14 +02:00
Patrick O'Carroll	0c269d64d0	Alert panel filters (#11712) ... alert list panel: filter alerts by name, dashboard, folder, tags	2018-06-01 14:36:40 +02:00
Marcus Efraimsson	ce75afa413	docs: update alerting docs with alerting support for elasticsearch	2018-06-01 12:26:20 +02:00
David	13a9701581	Update CHANGELOG.md ... - added Prometheus query date alignment	2018-06-01 10:13:48 +02:00
bergquist	333af6fd9b	provisioning: makes the interval for polling for changes configurable	2018-05-31 21:07:34 +02:00