1345 Commits

Author	SHA1	Message	Date
Torkel Ödegaard	73fc659011	fix(graph): fixed issue with old threshold to new threshold model migration, fixes #6236	2016-10-11 13:22:46 +02:00
bergquist	446bde2421	Merge branch 'pause_alert_rules' ... closes #6135	2016-10-11 10:54:58 +02:00
bergquist	c6cf7647ff	feat(alerting): pausing alerts requires alert id	2016-10-11 10:53:24 +02:00
Torkel Ödegaard	7b70e0ff3a	fix(UI): fixed 3 UI bugs, fixes #6225	2016-10-11 09:51:43 +02:00
bergquist	8b0c29b104	Merge branch 'master' into pause_alert_rules	2016-10-11 09:46:48 +02:00
bergquist	4bbc2108f9	feat(alerting): add pause button to alert list	2016-10-11 09:45:38 +02:00
bergquist	804797245d	feat(alerting): make it possible to pause from alert tab	2016-10-11 08:40:38 +02:00
Torkel Ödegaard	d4fd1c82e3	fix(alerting): added step any to alert threshold input fields, fixes #6205	2016-10-10 19:47:16 +02:00
bergquist	f3825263d4	feat(alerting): add pause button in alert list	2016-10-10 15:17:14 +02:00
Torkel Ödegaard	913f17ee8a	fix(plugin dashboards): fixed issue with plugin dashboard list, fixes #6215	2016-10-07 16:04:58 +02:00
Torkel Ödegaard	4ec2377e09	fix(notifications): added form validation and restored Send Test button which was always hidden, #6159	2016-10-01 17:14:45 +02:00
bergquist	91b180168e	tech(notifications): remove unused filter markup	2016-10-01 15:51:08 +02:00
Torkel Ödegaard	7c339f0794	feat(alerting): show alertin state in panel header, closes #6136	2016-09-30 17:37:47 +02:00
Torkel Ödegaard	fe4a0a98c1	fix(alerting): added confirm modal in UI, when deleting alert	2016-09-30 13:00:16 +02:00
Torkel Ödegaard	5a1a80bcdd	feat(templating): adding missing label property to query variable defaults, fixes #6150	2016-09-29 14:46:59 +02:00
Torkel Ödegaard	599fe49944	fix(templating): fix to datasource variable, was not updated on dashboard load, added unit test for case as well	2016-09-28 12:12:38 +02:00
Torkel Ödegaard	22e8885690	feat(testdata): progress on test data stuff	2016-09-27 18:36:00 +02:00
Torkel Ödegaard	34f15d92d0	feat(testdata): worked on testdata app	2016-09-27 14:39:51 +02:00
Torkel Ödegaard	3bbc940b88	Merge branch 'master' into graph-panel-non-timeseries	2016-09-23 14:22:44 +02:00
Torkel Ödegaard	bb77caa369	Merge branch 'master' of github.com:grafana/grafana	2016-09-22 21:49:57 +02:00
Torkel Ödegaard	e36cdac594	fix(templating): fixed issue with templating when initalizing variables without any existing value	2016-09-22 21:49:41 +02:00
bergquist	d711c0ed35	Merge branch 'master' into alert_prometheus	2016-09-22 19:27:24 +02:00
Torkel Ödegaard	f3d4a97f49	Merge branch 'master' into graph-panel-non-timeseries	2016-09-22 14:03:06 +02:00
Torkel Ödegaard	3ed7ab93c5	added small info text to plugins list page, #5176	2016-09-22 11:32:27 +02:00
Torkel Ödegaard	d8df421b43	fix(build): fixed issues with optimized build, fixes #6096	2016-09-22 10:22:16 +02:00
Torkel Ödegaard	39af588a94	fix(playlist): fixed sorting issue with playlist playback, fixes #5467	2016-09-22 10:06:03 +02:00
Torkel Ödegaard	2752dbd13a	feat(templating): minor fixes to recent refactorings	2016-09-22 09:00:15 +02:00
Torkel Ödegaard	d65fbcbb42	fix(graphite): fixed minor graphite lexer issue when nodes begin with octal syntax and end with dash identifier, fixes #6049#	2016-09-21 20:04:09 +02:00
Torkel Ödegaard	9e26a4cfcb	fix(templating): fixed unique filter after regex pass, fixes #6086	2016-09-21 15:30:11 +02:00
Torkel Ödegaard	4a1693196c	fix(mixed datasource): fixed issue when exporting dashboard using mixed data source, fixes #6032	2016-09-21 14:57:19 +02:00
Torkel Ödegaard	46ab09ed60	feat(links): fixed styling for dashboard links	2016-09-21 14:20:59 +02:00
Torkel Ödegaard	dc3b614749	fix(submenu): fixed issue with submenu and annotation display, and annotation issue in table panel	2016-09-21 13:45:26 +02:00
Torkel Ödegaard	d0b75cdb66	fix(templating): fixed issue with regex in query variable introduced by yesterdays big merged refactoring of template variable system	2016-09-21 11:38:59 +02:00
Torkel Ödegaard	7b7ba46f12	fix(styleguide): fixed theme switching in style guide	2016-09-21 09:10:25 +02:00
Torkel Ödegaard	a01836e86d	feat(adhoc filters): basic implementation for ad hoc filters for elasticsearch, #6038	2016-09-21 08:48:49 +02:00
bergquist	43d8bd5a25	feat(prometheus): initial support for prometheus	2016-09-21 07:01:53 +02:00
Torkel Ödegaard	1b02632de8	fix(jslint): fixed lint issue	2016-09-20 17:36:20 +02:00
Torkel Ödegaard	0906312046	Merge branch 'adhoc-filters'	2016-09-20 17:34:57 +02:00
Torkel Ödegaard	15423e6e51	feat(adhoc filters): initial base mvp for adhoc filters are donecloses #6038	2016-09-20 17:34:38 +02:00
Torkel Ödegaard	dfe0f91105	feat(adhoc): adhoc filters progress	2016-09-20 16:29:48 +02:00
Torkel Ödegaard	6e429b8575	feat(adhoc filters): good progress on ad hoc filters and sync from to url, #6038	2016-09-20 11:57:43 +02:00
Torkel Ödegaard	cb522d58cd	feat(templating): back to be able to continue work on ad hoc filters, #6048	2016-09-19 18:41:42 +02:00
Torkel Ödegaard	7a6fb70026	feat(templating): progress on variable system refactoring, #6048	2016-09-19 18:32:09 +02:00
Torkel Ödegaard	9d6ecc6361	feat(templating): progress on variable system refactoring, #6048	2016-09-19 18:06:36 +02:00
Torkel Ödegaard	945b5ee3cf	feat(templating): progress on variable system refactoring, #6048	2016-09-19 17:03:36 +02:00
Torkel Ödegaard	8a796c5b4b	feat(templating): progress on variable system refactoring, #6048	2016-09-19 15:15:15 +02:00
Torkel Ödegaard	5ded88fa4d	feat(templating): progress on variable system refactoring, #6048	2016-09-19 11:34:08 +02:00
Torkel Ödegaard	524f505664	tech(templating): refactoring, updated dashboardSrv to typescript	2016-09-19 10:08:05 +02:00
Torkel Ödegaard	5ce3e40cc9	feat(templating): more work on new variable handling code, #6048	2016-09-17 15:27:53 +02:00
Torkel Ödegaard	4188c46f83	feat(templating): more work on new variable handling code, #6048	2016-09-17 11:28:45 +02:00