1672 Commits

Author	SHA1	Message	Date
Torkel Ödegaard	e34bf9a1fa	Merge branch 'utkarshcmu-or_alerting'	2016-11-17 15:49:52 +01:00
Torkel Ödegaard	62e8a039a1	refactor(alerting): refactoring PR for OR conditions, #6579	2016-11-17 15:48:15 +01:00
Torkel Ödegaard	457ae74343	Merge branch 'or_alerting' of https://github.com/utkarshcmu/grafana into utkarshcmu-or_alerting	2016-11-17 14:43:24 +01:00
Torkel Ödegaard	98d1748e43	fix(templating): work on fixing exporting issues when using templating variables, like data source variables, and panel repeats, requires more work #6189	2016-11-17 12:32:11 +01:00
Torkel Ödegaard	9d5928ddd6	feat(templating): don't persist template variable options when variable has refresh enabled, closes #6586	2016-11-17 11:38:06 +01:00
Torkel Ödegaard	eafe0d6bfa	fix(templating): fixed issue when adding template variable, fixes #6622	2016-11-17 11:28:33 +01:00
Torkel Ödegaard	196fdbfd31	fix(dashboard): fixed issue when dragging new panel to drop zone	2016-11-17 10:31:37 +01:00
Torkel Ödegaard	a45fdfdd3f	fix(dashboard): minor fixes, and restored in-activity timer to 1min	2016-11-17 10:11:59 +01:00
ichekrygin	8f0d51171d	Resolve rebase w/ upstream conflicts. ... Remove: `Alert on Exec Error` (no longer needed) Add: `ruleUrl` to VictorOps message body.	2016-11-16 16:13:33 -08:00
ichekrygin	b46cbc5fbe	Add option to alert on ExecutionError	2016-11-16 14:02:34 -08:00
ichekrygin	4ca304b756	Change VictorOps fa from fa-exclamation-triangle -> fa-pagelines	2016-11-16 14:02:34 -08:00
ichekrygin	1e558e3936	Fix user-facing text	2016-11-16 14:02:34 -08:00
ichekrygin	b0620a9d4b	Add VictorOps alert notification capability	2016-11-16 14:02:34 -08:00
Torkel Ödegaard	4581bb4a7a	fix(singletat): Support repeated template variables in prefix/postfix, fixes #6595	2016-11-16 18:44:39 +01:00
Torkel Ödegaard	e6776f71d9	cleanup(sass): removed tight-form styles	2016-11-16 18:26:39 +01:00
Torkel Ödegaard	079b0ef44a	change(alerting): delete alert rule from panel model when duplicating panel	2016-11-16 18:03:00 +01:00
Torkel Ödegaard	9c7f8268dc	fix(build): fixed failing unit test	2016-11-16 14:39:17 +01:00
Torkel Ödegaard	171335bfef	fix(ux): fixed dropzone display issues, fixes #6598	2016-11-16 14:28:52 +01:00
Torkel Ödegaard	f91a833e6a	fix(panel): set initial transparency state at first link	2016-11-16 09:44:16 +01:00
utkarshcmu	b2db2b26dd	Added OR to alert_tab	2016-11-14 18:36:22 -08:00
bergquist	a87fd11f26	feat(stats): add alerts to global admin stats	2016-11-11 14:04:38 +01:00
Torkel Ödegaard	575828f1e9	Merge branch 'getting-started-panel' of github.com:grafana/grafana into getting-started-panel	2016-11-10 13:25:18 +01:00
Torkel Ödegaard	fb57bf77da	ux(getting started): progress on getting started panel and persited help flag states, #6466	2016-11-09 10:41:39 +01:00
bergquist	eb34855adb	feat(pagerduty): add support for auto resolve ... closes #6513	2016-11-08 20:38:38 +01:00
Torkel Ödegaard	fd09f17cd3	docs(): alerting docs, #6490	2016-11-08 14:53:28 +01:00
Utkarsh Bhatnagar	e642dce027	Fixed import dashboard bug (#6480)	2016-11-08 14:03:04 +01:00
Torkel Ödegaard	dea5fd385f	ux(alerting): minor wording change on alert tab	2016-11-08 09:34:52 +01:00
utkarshcmu	74632b5e98	Added last function for alerting conditions	2016-11-07 23:16:57 -08:00
bergquist	6dd076efc1	Merge branch 'alerting_pagerduty' of https://github.com/utkarshcmu/grafana into utkarshcmu-alerting_pagerduty	2016-11-08 07:48:20 +01:00
utkarshcmu	a7e67f3bdd	Removed invalid alerting state	2016-11-07 17:43:13 -08:00
utkarshcmu	f8d1eb11a9	Removed ExecError state	2016-11-07 07:12:43 -08:00
utkarshcmu	638d3bcb42	Removed NoData option	2016-11-07 07:08:51 -08:00
utkarshcmu	df8cd764b2	Added trigger options with Pagerduty	2016-11-07 07:08:51 -08:00
utkarshcmu	139bbecc10	Added Pagerduty basic alerting	2016-11-07 07:08:51 -08:00
bergquist	b2d8e83c7d	fix(alert_tab): better execution state description	2016-11-07 14:54:42 +01:00
bergquist	489f087fbd	feat(alerting): reduce states. Make exeuction result configurable. ... ref #6444	2016-11-07 12:42:39 +01:00
Torkel Ödegaard	907fb9c1be	ux(dashboard): fix for dropzone width when resizing another panel	2016-11-06 17:41:17 +01:00
Torkel Ödegaard	2d19af601a	fix(alerting): various alerting fixes	2016-11-06 15:40:02 +01:00
Torkel Ödegaard	8db40b25db	ux(dashboard): final tweaks to view mode and kiosk mode, better animation for view mode, and kiosk mode can be entered via kiosk url parameter, #6476	2016-11-06 10:15:36 +01:00
Torkel Ödegaard	bd996a4810	ux(viewmode): refining view mode #6476	2016-11-05 21:05:12 +01:00
utkarshcmu	2f60929d1e	Added slack mention functionality	2016-11-04 06:05:44 -07:00
Torkel Ödegaard	2da2d5df56	Merge branch 'master' of github.com:grafana/grafana	2016-11-04 12:15:08 +01:00
Torkel Ödegaard	2fa7100c3b	ux(dashboard): lots of tweaks and polish to row menu, added remove X to add panel and row option views, #6442	2016-11-04 11:43:49 +01:00
Ryan Bak	7165c866c2	Add blank default options for constant templates (#6460) ... Restores ability to change constant templates without going into templating menu	2016-11-04 11:41:39 +01:00
TerraTech	05d24020b1	settings.html: Fixup filename for custom.ini (#6463)	2016-11-04 11:41:12 +01:00
Matt	cf248a503b	Added panel name to individual add panel item to show full name when long	2016-11-03 17:49:54 -04:00
Torkel Ödegaard	abf1f6a163	ux(dashboard): added back hide controls toggle and shortcut, #6442	2016-11-03 22:39:59 +01:00
Torkel Ödegaard	d0513d3a54	ux(dashboard): changed name of delete row to remove row, #6442	2016-11-03 22:32:04 +01:00
Torkel Ödegaard	98be1734fa	ux(dashboard): refining new row slide out menu, #6442	2016-11-03 22:14:29 +01:00
Torkel Ödegaard	d917f69255	Merge branch 'v4ux' of github.com:grafana/grafana into v4ux	2016-11-03 20:32:45 +01:00