Neil Lathwood
							
						 
					 | 
					
						
						
							
						
						04bb652e06
					 | 
					
						
						
							
							Merge pull request #1817 from f0o/issue-1770
						
						
						
						
						
						
						
						Only process followups if there are any results 
						
						
					 | 
					
						2015-09-01 09:38:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								f0o
							
						 
					 | 
					
						
						
							
						
						a833d46d4d
					 | 
					
						
						
							
							Add placehoders to custom titles
						
						
						
						
						
						
					 | 
					
						2015-08-30 18:02:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								f0o
							
						 
					 | 
					
						
						
							
						
						9057d48273
					 | 
					
						
						
							
							Fix default template assignment
						
						
						
						
						
						
					 | 
					
						2015-08-30 17:07:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								f0o
							
						 
					 | 
					
						
						
							
						
						ac7d0c9420
					 | 
					
						
						
							
							Added user defined titles for alert templates
						
						
						
						
						
						
					 | 
					
						2015-08-30 16:53:34 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								f0o
							
						 
					 | 
					
						
						
							
						
						867c83e9ac
					 | 
					
						
						
							
							Fix Alert-Test Object.
						
						
						
						
						
						
					 | 
					
						2015-08-27 16:03:31 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								f0o
							
						 
					 | 
					
						
						
							
						
						f28103173b
					 | 
					
						
						
							
							Only process followups if there are any results
						
						
						
						
						
						
					 | 
					
						2015-08-27 14:05:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								f0o
							
						 
					 | 
					
						
						
							
						
						ec6dc0fb40
					 | 
					
						
						
							
							Reformated eventlog messages to represent the state of the trigger
						
						
						
						
						
						
					 | 
					
						2015-08-13 20:37:05 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Job Snijders
							
						 
					 | 
					
						
						
							
						
						d8693f05ae
					 | 
					
						
						
							
							Fix coding style part 2
						
						
						
						
						
						
					 | 
					
						2015-07-15 11:04:22 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Neil Lathwood
							
						 
					 | 
					
						
						
							
						
						8226e8b447
					 | 
					
						
						
							
							Merge pull request #1096 from laf/issue-1095-web
						
						
						
						
						
						
						
						Added support for interval for alerting for WebUI 
						
						
					 | 
					
						2015-06-20 01:56:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								laf
							
						 
					 | 
					
						
						
							
						
						1e34fb0753
					 | 
					
						
						
							
							Added f0os patch for using interval on alerts
						
						
						
						
						
						
					 | 
					
						2015-06-20 01:49:03 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								f0o
							
						 
					 | 
					
						
						
							
						
						b54dc288c3
					 | 
					
						
						
							
							Replace Alert-ID with Alert-Name/Rule in titles
						
						
						
						
						
						
					 | 
					
						2015-06-19 16:53:31 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								f0o
							
						 
					 | 
					
						
						
							
						
						b8666cb886
					 | 
					
						
						
							
							Log success or failure of an alert-transport
						
						
						
						
						
						
					 | 
					
						2015-06-15 18:14:12 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								laf
							
						 
					 | 
					
						
						
							
						
						6813c1face
					 | 
					
						
						
							
							updated alert template mapping to own table
						
						
						
						
						
						
					 | 
					
						2015-06-15 11:13:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								f0o
							
						 
					 | 
					
						
						
							
						
						2467b11290
					 | 
					
						
						
							
							Merge branch 'issue-laf-110-new' of git://github.com/laf/librenms into laf-issue-laf-110-new
						
						
						
						
						
						
						
						Conflicts:
	html/pages/health/mempool.inc.php
	includes/defaults.inc.php 
						
						
					 | 
					
						2015-06-07 10:44:39 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Campbell
							
						 
					 | 
					
						
						
							
						
						f56c8c4425
					 | 
					
						
						
							
							Fixed indentation
						
						
						
						
						
						
					 | 
					
						2015-06-04 22:15:22 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Campbell
							
						 
					 | 
					
						
						
							
						
						45d7ff0a73
					 | 
					
						
						
							
							Added log_event for issued alerts
						
						
						
						
						
						
					 | 
					
						2015-06-04 22:13:45 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Campbell
							
						 
					 | 
					
						
						
							
						
						719c2bc63e
					 | 
					
						
						
							
							Testing log_event for issued alerts
						
						
						
						
						
						
					 | 
					
						2015-06-04 21:55:26 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								laf
							
						 
					 | 
					
						
						
							
						
						5b57e75b2e
					 | 
					
						
						
							
							Final work getting alerts dynconfig done
						
						
						
						
						
						
					 | 
					
						2015-05-28 17:00:26 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								f0o
							
						 
					 | 
					
						
						
							
						
						e242924fd8
					 | 
					
						
						
							
							Introduce config-switch to regather contacts before dispatch
						
						
						
						
						
						
					 | 
					
						2015-05-22 10:26:38 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								f0o
							
						 
					 | 
					
						
						
							
						
						4c10cb625b
					 | 
					
						
						
							
							Honour 'Disable all alerting for this host'
						
						
						
						
						
						
						
						Fixes some redundancy in macros (parentesis) 
						
						
					 | 
					
						2015-05-18 10:23:55 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								f0o
							
						 
					 | 
					
						
						
							
						
						6624c17534
					 | 
					
						
						
							
							Allow a user-defined window to add tolerance to delay-values
						
						
						
						
						
						
						
						This is to counter cronjob irregularities as they arent always executed on *:00 dead 
						
						
					 | 
					
						2015-05-17 12:15:02 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								f0o
							
						 
					 | 
					
						
						
							
						
						5ab21f2b7b
					 | 
					
						
						
							
							Send a single ACK notification
						
						
						
						
						
						
					 | 
					
						2015-05-14 14:38:16 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								f0o
							
						 
					 | 
					
						
						
							
						
						740e85a1ba
					 | 
					
						
						
							
							Fix silly SQL bug
						
						
						
						
						
						
					 | 
					
						2015-05-07 19:56:05 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								f0o
							
						 
					 | 
					
						
						
							
						
						da624fa136
					 | 
					
						
						
							
							Added Macros in Alert-Rule syntax
						
						
						
						
						
						
					 | 
					
						2015-04-24 19:14:10 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								f0o
							
						 
					 | 
					
						
						
							
						
						ef25ed345d
					 | 
					
						
						
							
							Allow notification to resume count/delay cycles after maintenance
						
						
						
						
						
						
					 | 
					
						2015-04-21 07:06:14 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								f0o
							
						 
					 | 
					
						
						
							
						
						a2e4a0dcff
					 | 
					
						
						
							
							Honour new maintenance format (PR#835)
						
						
						
						
						
						
					 | 
					
						2015-04-20 17:55:41 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								f0o
							
						 
					 | 
					
						
						
							
						
						7b1e6655b4
					 | 
					
						
						
							
							Remove stale alerts if a map has been changed or the device does not match the group-criteria anymore
						
						
						
						
						
						
					 | 
					
						2015-04-04 17:13:22 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								f0o
							
						 
					 | 
					
						
						
							
						
						f7ba23ecf0
					 | 
					
						
						
							
							Check if alert-rule is disabled prior dispatch.
						
						
						
						
						
						
						
						Fixes #490 
						
						
					 | 
					
						2015-02-21 06:58:15 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								f0o
							
						 
					 | 
					
						
						
							
						
						632bf1231a
					 | 
					
						
						
							
							Fix #474
						
						
						
						
						
						
						
						Remove obsolete states for removed rules 
						
						
					 | 
					
						2015-02-17 20:52:50 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								f0o
							
						 
					 | 
					
						
						
							
						
						e15a16d689
					 | 
					
						
						
							
							Ignore queued alerts if device changed to 'ignore' or 'disabled' after alert entered queue.
						
						
						
						
						
						
					 | 
					
						2015-01-31 11:06:11 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								laf
							
						 
					 | 
					
						
						
							
						
						d0aec7d23a
					 | 
					
						
						
							
							Removed extra d from alert to match up with rest of ui
						
						
						
						
						
						
					 | 
					
						2015-01-31 11:06:11 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								f0o
							
						 
					 | 
					
						
						
							
						
						0ada4f129c
					 | 
					
						
						
							
							Fix variable declaration
						
						
						
						
						
						
					 | 
					
						2015-01-26 08:13:41 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								f0o
							
						 
					 | 
					
						
						
							
						
						fa86e9308d
					 | 
					
						
						
							
							Added:
						
						
						
						
						
						
						
						Follow-Up notifications when a situation betters/worsens
	Inverted Alerts
	Nested Control-tags
	Extended variable-scope for incidents 
						
						
					 | 
					
						2015-01-25 21:39:33 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								f0o
							
						 
					 | 
					
						
						
							
						
						d6d5282e84
					 | 
					
						
						
							
							Changed:
						
						
						
						
						
						
						
						Alerts cronjob to be every minute.
Added:
	Lockfile to Alerts cronjob 
						
						
					 | 
					
						2014-12-22 18:17:43 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								f0o
							
						 
					 | 
					
						
						
							
						
						aeccdbb942
					 | 
					
						
						
							
							Cleanup for Scrutinizer
						
						
						
						
						
						
					 | 
					
						2014-12-15 14:33:31 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								f0o
							
						 
					 | 
					
						
						
							
						
						c0e1d9cbc5
					 | 
					
						
						
							
							Added Alerting
						
						
						
						
						
						
					 | 
					
						2014-12-15 11:10:26 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								laf
							
						 
					 | 
					
						
						
							
						
						e535ec2e47
					 | 
					
						
						
							
							Resolved critical bugs from scrutinizer
						
						
						
						
						
						
					 | 
					
						2014-02-22 15:47:57 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tyler Christiansen
							
						 
					 | 
					
						
						
							
						
						63d428c0e1
					 | 
					
						
						
							
							Revert "update copyright notice" after discussion with Paul
						
						
						
						
						
						
						
						This reverts commit 774233327e. 
						
						
					 | 
					
						2013-10-28 12:01:36 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tyler Christiansen
							
						 
					 | 
					
						
						
							
						
						774233327e
					 | 
					
						
						
							
							update copyright notice
						
						
						
						
						
						
					 | 
					
						2013-10-28 01:46:59 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Adam Amstrong
							
						 
					 | 
					
						
						
							
						
						dbf212f652
					 | 
					
						
						
							
							phpDocumentator headers. retire static-config. IF YOU ARE READING THIS, REMOVE IT FROM THE BOTTOM YOUR CONFIG.PHP. YES. YOU.
						
						
						
						
						
						
						
						git-svn-id: http://www.observium.org/svn/observer/trunk@3150 61d68cd4-352d-0410-923a-c4978735b2b8 
						
						
					 | 
					
						2012-05-09 10:01:42 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Adam Amstrong
							
						 
					 | 
					
						
						
							
						
						bc0cdd2415
					 | 
					
						
						
							
							move poller.php (inc os/system) to db* (and others, but poller is biggest change)
						
						
						
						
						
						
						
						git-svn-id: http://www.observium.org/svn/observer/trunk@2298 61d68cd4-352d-0410-923a-c4978735b2b8 
						
						
					 | 
					
						2011-05-13 11:42:26 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Laermans
							
						 
					 | 
					
						
						
							
						
						f55a30f744
					 | 
					
						
						
							
							some formatting cleanups, introduce some more FIXMEs to look at, plus replace mysql_fetch_array by mysql_fetch_assoc, for great justice
						
						
						
						
						
						
						
						git-svn-id: http://www.observium.org/svn/observer/trunk@2029 61d68cd4-352d-0410-923a-c4978735b2b8 
						
						
					 | 
					
						2011-04-06 13:54:50 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Laermans
							
						 
					 | 
					
						
						
							
						
						de7ff537cc
					 | 
					
						
						
							
							revert r1957 patch
						
						
						
						
						
						
						
						git-svn-id: http://www.observium.org/svn/observer/trunk@1960 61d68cd4-352d-0410-923a-c4978735b2b8 
						
						
					 | 
					
						2011-03-23 09:54:56 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Geert Hauwaerts
							
						 
					 | 
					
						
						
							
						
						6501cd29b5
					 | 
					
						
						
							
							- Code cleanup by Bastian Widmer.
						
						
						
						
						
						
						
						git-svn-id: http://www.observium.org/svn/observer/trunk@1957 61d68cd4-352d-0410-923a-c4978735b2b8 
						
						
					 | 
					
						2011-03-22 20:27:39 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Laermans
							
						 
					 | 
					
						
						
							
						
						39dc6e9053
					 | 
					
						
						
							
							update changelog, clean up files
						
						
						
						
						
						
						
						git-svn-id: http://www.observium.org/svn/observer/trunk@1893 61d68cd4-352d-0410-923a-c4978735b2b8 
						
						
					 | 
					
						2011-03-16 22:04:29 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Adam Amstrong
							
						 
					 | 
					
						
						
							
						
						cd76567edb
					 | 
					
						
						
							
							ginger patch
						
						
						
						
						
						
						
						git-svn-id: http://www.observium.org/svn/observer/trunk@1699 61d68cd4-352d-0410-923a-c4978735b2b8 
						
						
					 | 
					
						2010-09-03 18:26:59 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Adam Amstrong
							
						 
					 | 
					
						
						
							
						
						802f08a54f
					 | 
					
						
						
							
							test commit
						
						
						
						
						
						
						
						git-svn-id: http://www.observium.org/svn/observer/trunk@1176 61d68cd4-352d-0410-923a-c4978735b2b8 
						
						
					 | 
					
						2010-06-14 19:16:05 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tom Laermans
							
						 
					 | 
					
						
						
							
						
						fca6fafb60
					 | 
					
						
						
							
							include defaults.php before config.php, not FROM config.php
						
						
						
						
						
						
						
						git-svn-id: http://www.observium.org/svn/observer/trunk@966 61d68cd4-352d-0410-923a-c4978735b2b8 
						
						
					 | 
					
						2010-02-27 14:44:38 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Adam Amstrong
							
						 
					 | 
					
						
						
							
						
						bc6ad69724
					 | 
					
						
						
							
							a million fixes. half way to 0.6.0! :D
						
						
						
						
						
						
						
						git-svn-id: http://www.observium.org/svn/observer/trunk@407 61d68cd4-352d-0410-923a-c4978735b2b8 
						
						
					 | 
					
						2009-04-23 21:13:56 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Adam Amstrong
							
						 
					 | 
					
						
						
							
						
						89b6a9bf1a
					 | 
					
						
						
							
							git-svn-id: http://www.observium.org/svn/observer/trunk@118 61d68cd4-352d-0410-923a-c4978735b2b8
						
						
						
						
						
						
					 | 
					
						2007-11-23 11:37:28 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |