Neil Lathwood 
							
						 
					 
					
						
						
							
						
						cbaf3cacec 
					 
					
						
						
							
							Merge pull request  #375  from laf/issue-laf-98  
						
						 
						
						... 
						
						
						
						Updated ability to acknowledge alerts 
						
						
					 
					
						2014-12-23 16:57:16 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Neil Lathwood 
							
						 
					 
					
						
						
							
						
						ff833a508d 
					 
					
						
						
							
							Merge pull request  #373  from laf/issue-laf-97  
						
						 
						
						... 
						
						
						
						Added ability to create default global alert rules 
						
						
					 
					
						2014-12-23 16:36:18 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								laf 
							
						 
					 
					
						
						
							
						
						9d1fd5adb4 
					 
					
						
						
							
							Updated location of API docs  
						
						 
						
						
						
						
					 
					
						2014-12-23 16:35:09 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Neil Lathwood 
							
						 
					 
					
						
						
							
						
						078d63b3f3 
					 
					
						
						
							
							Update print-alert-rules.php  
						
						 
						
						
						
						
					 
					
						2014-12-23 15:56:39 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Neil Lathwood 
							
						 
					 
					
						
						
							
						
						3669a6e824 
					 
					
						
						
							
							Update print-alert-rules.php  
						
						 
						
						
						
						
					 
					
						2014-12-23 15:56:17 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								laf 
							
						 
					 
					
						
						
							
						
						b476514b7d 
					 
					
						
						
							
							Updated ability to acknowledge alerts  
						
						 
						
						
						
						
					 
					
						2014-12-22 20:31:52 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								laf 
							
						 
					 
					
						
						
							
						
						1d217df791 
					 
					
						
						
							
							Set device_id to -1  
						
						 
						
						
						
						
					 
					
						2014-12-22 19:38:45 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								laf 
							
						 
					 
					
						
						
							
						
						84eb81c23a 
					 
					
						
						
							
							Setting default delay to 300 seconds so alerts are every 5 minutes  
						
						 
						
						
						
						
					 
					
						2014-12-22 19:01:23 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								laf 
							
						 
					 
					
						
						
							
						
						a3c180868b 
					 
					
						
						
							
							Updated default rules  
						
						 
						
						
						
						
					 
					
						2014-12-22 17:41:05 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								laf 
							
						 
					 
					
						
						
							
						
						6f0b9478a8 
					 
					
						
						
							
							Added ability to create default global alert rules  
						
						 
						
						
						
						
					 
					
						2014-12-22 16:58:58 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Neil Lathwood 
							
						 
					 
					
						
						
							
						
						51616844bc 
					 
					
						
						
							
							Added ability to name alert rules  
						
						 
						
						
						
						
					 
					
						2014-12-21 15:44:50 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul Gear 
							
						 
					 
					
						
						
							
						
						56aa518608 
					 
					
						
						
							
							Merge pull request  #369  from laf/alert-api  
						
						 
						
						... 
						
						
						
						API for alerting 
						
						
					 
					
						2014-12-21 12:54:36 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Neil Lathwood 
							
						 
					 
					
						
						
							
						
						51db1af74d 
					 
					
						
						
							
							Clear out rule entries now when modal form closes  
						
						 
						
						
						
						
					 
					
						2014-12-19 21:32:05 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Neil Lathwood 
							
						 
					 
					
						
						
							
						
						7cd8cf7ecf 
					 
					
						
						
							
							Update to enabled calculations to be put into entity  
						
						 
						
						
						
						
					 
					
						2014-12-19 20:30:51 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Neil Lathwood 
							
						 
					 
					
						
						
							
						
						1df57b7254 
					 
					
						
						
							
							Added a fix for matching table names  
						
						 
						
						
						
						
					 
					
						2014-12-19 17:37:15 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Neil Lathwood 
							
						 
					 
					
						
						
							
						
						45e3323f38 
					 
					
						
						
							
							Fix variable assignment issue  
						
						 
						
						
						
						
					 
					
						2014-12-18 21:50:26 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Neil Lathwood 
							
						 
					 
					
						
						
							
						
						ef28a9fe03 
					 
					
						
						
							
							Scrutinizer issues fixed  
						
						 
						
						
						
						
					 
					
						2014-12-16 21:10:11 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Neil Lathwood 
							
						 
					 
					
						
						
							
						
						613391ca8f 
					 
					
						
						
							
							Scrutinizer issues fixed  
						
						 
						
						
						
						
					 
					
						2014-12-16 20:58:31 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Neil Lathwood 
							
						 
					 
					
						
						
							
						
						1140768bd2 
					 
					
						
						
							
							Scrutinizer issues fixed  
						
						 
						
						
						
						
					 
					
						2014-12-16 20:49:55 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Neil Lathwood 
							
						 
					 
					
						
						
							
						
						b6d935e608 
					 
					
						
						
							
							API for alerting  
						
						 
						
						
						
						
					 
					
						2014-12-16 20:39:58 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								laf 
							
						 
					 
					
						
						
							
						
						807fc9a3ba 
					 
					
						
						
							
							Alerts gui commit  
						
						 
						
						
						
						
					 
					
						2014-12-16 20:03:19 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								laf 
							
						 
					 
					
						
						
							
						
						a152f3566e 
					 
					
						
						
							
							Fixed API route order to resolve get_port_graphs working  
						
						 
						
						
						
						
					 
					
						2014-12-12 19:35:49 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul Gear 
							
						 
					 
					
						
						
							
						
						d9e35ff2c2 
					 
					
						
						
							
							Merge pull request  #360  from laf/issue-358  
						
						 
						
						... 
						
						
						
						Added new API route for billing information 
						
						
					 
					
						2014-12-06 18:54:05 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								laf 
							
						 
					 
					
						
						
							
						
						1bcc078853 
					 
					
						
						
							
							Fixed formatting update  
						
						 
						
						
						
						
					 
					
						2014-12-02 23:44:23 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								laf 
							
						 
					 
					
						
						
							
						
						1108ef7939 
					 
					
						
						
							
							Added new api route for billing  
						
						 
						
						
						
						
					 
					
						2014-12-02 23:43:11 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								laf 
							
						 
					 
					
						
						
							
						
						d9a5d11782 
					 
					
						
						
							
							More fixes to CDR and Quota values  
						
						 
						
						
						
						
					 
					
						2014-12-02 21:38:32 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								laf 
							
						 
					 
					
						
						
							
						
						13712b1aed 
					 
					
						
						
							
							Fixed bill display issues when calculating CDR  
						
						 
						
						
						
						
					 
					
						2014-12-02 21:16:08 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul Gear 
							
						 
					 
					
						
						
							
						
						9b609c5869 
					 
					
						
						
							
							Merge pull request  #357  from laf/issue-laf-91  
						
						 
						
						... 
						
						
						
						Fixed global search box bootstrap code 
						
						
					 
					
						2014-12-01 20:35:41 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul Gear 
							
						 
					 
					
						
						
							
						
						05d998c1f8 
					 
					
						
						
							
							Merge remote-tracking branch 'laf/issue-laf-90'  
						
						 
						
						... 
						
						
						
						Conflicts:
	html/api_v0.php
	html/includes/api_functions.inc.php 
						
						
					 
					
						2014-12-01 20:27:50 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								laf 
							
						 
					 
					
						
						
							
						
						e4e2cfe3cf 
					 
					
						
						
							
							Fixed global search box bootstrap code  
						
						 
						
						
						
						
					 
					
						2014-11-30 17:49:52 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								laf 
							
						 
					 
					
						
						
							
						
						0a7a1a0ef6 
					 
					
						
						
							
							Added docs for the route  
						
						 
						
						
						
						
					 
					
						2014-11-30 17:11:08 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								laf 
							
						 
					 
					
						
						
							
						
						1a3f5504d0 
					 
					
						
						
							
							Added new API route to obtain available ports for a device  
						
						 
						
						
						
						
					 
					
						2014-11-30 15:45:10 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								laf 
							
						 
					 
					
						
						
							
						
						4d7b4ef432 
					 
					
						
						
							
							Added new route for retrieving available device graphs  
						
						 
						
						
						
						
					 
					
						2014-11-29 15:43:19 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Neil Lathwood 
							
						 
					 
					
						
						
							
						
						744f3d81c9 
					 
					
						
						
							
							Removed check for image/png content-type  
						
						 
						
						... 
						
						
						
						14:08 <lafwood> blahdeblah: Quick question about the portgroups api route, you added a check for image/png
14:09 <lafwood> I'm not sure that's what that function is meant for. Event sending -H "Accept: image/png" on a curl request fails. I think this is for checking if you send an image to the api rather than what's to be output
14:27 <lafwood> Sending -H "Content-type: image/png" works but this for defining what content-type the request will send.
14:29 <lafwood> I think the curl request needs to send an Accept and then the API check for this, I'll put a PR through to remove the current code until it can be looked at in more detail. 
						
						
					 
					
						2014-11-29 14:29:58 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul Gear 
							
						 
					 
					
						
						
							
						
						9930670119 
					 
					
						
						
							
							Tidy API entry points & doc; error if something other than image/png is asked for from portgroup graphs  
						
						 
						
						
						
						
					 
					
						2014-11-25 21:45:15 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul Gear 
							
						 
					 
					
						
						
							
						
						935e51d3c8 
					 
					
						
						
							
							Merge remote-tracking branch 'laf/issue-laf-85' into issue-laf-85  
						
						 
						
						
						
						
					 
					
						2014-11-23 19:19:58 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul Gear 
							
						 
					 
					
						
						
							
						
						06780f1003 
					 
					
						
						
							
							Testing EdgeOS support  
						
						 
						
						
						
						
					 
					
						2014-11-22 20:23:02 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul Gear 
							
						 
					 
					
						
						
							
						
						f254bc465f 
					 
					
						
						
							
							Resize VyOS image  
						
						 
						
						
						
						
					 
					
						2014-11-22 17:52:23 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul Gear 
							
						 
					 
					
						
						
							
						
						198cf9ac08 
					 
					
						
						
							
							Testing VyOS support  
						
						 
						
						
						
						
					 
					
						2014-11-22 17:47:32 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								laf 
							
						 
					 
					
						
						
							
						
						213ba09f9f 
					 
					
						
						
							
							Fixed some scrutinizer issues  
						
						 
						
						
						
						
					 
					
						2014-11-12 23:19:57 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								laf 
							
						 
					 
					
						
						
							
						
						3522f66f69 
					 
					
						
						
							
							Added new route to display graphs for peering,transit and core  
						
						 
						
						
						
						
					 
					
						2014-11-12 23:05:47 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul Gear 
							
						 
					 
					
						
						
							
						
						62532e652f 
					 
					
						
						
							
							Add pagination at top  
						
						 
						
						
						
						
					 
					
						2014-11-12 20:56:14 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul Gear 
							
						 
					 
					
						
						
							
						
						a8341c7608 
					 
					
						
						
							
							Stylistic fixes  
						
						 
						
						
						
						
					 
					
						2014-11-12 20:55:49 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul Gear 
							
						 
					 
					
						
						
							
						
						b705233a0c 
					 
					
						
						
							
							Merge PR#336: Updated eventlog page to use paged results  
						
						 
						
						
						
						
					 
					
						2014-11-12 20:54:59 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul Gear 
							
						 
					 
					
						
						
							
						
						3460031135 
					 
					
						
						
							
							Stylistic fixes  
						
						 
						
						
						
						
					 
					
						2014-11-12 19:42:44 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul Gear 
							
						 
					 
					
						
						
							
						
						d39956454c 
					 
					
						
						
							
							Merge Neil's changes for 'Updated edit snmp device section to show relevant v1,v2c or v3 options  #317 '  
						
						 
						
						
						
						
					 
					
						2014-11-12 19:31:30 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul Gear 
							
						 
					 
					
						
						
							
						
						de52585796 
					 
					
						
						
							
							Merge pull request  #335  from laf/issue-laf-74  
						
						 
						
						... 
						
						
						
						Added bgp peers route to display all bgp peers 
						
						
					 
					
						2014-11-12 19:13:12 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul Gear 
							
						 
					 
					
						
						
							
						
						3f29197f4b 
					 
					
						
						
							
							Merge pull request  #334  from laf/issue-laf-73  
						
						 
						
						... 
						
						
						
						Fixed BGP session count to exclude sessions that no longer have a device associated 
						
						
					 
					
						2014-11-12 19:10:16 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								laf 
							
						 
					 
					
						
						
							
						
						fca7252a74 
					 
					
						
						
							
							updated sql queries  
						
						 
						
						
						
						
					 
					
						2014-11-02 20:31:26 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								laf 
							
						 
					 
					
						
						
							
						
						f2a66b1ea8 
					 
					
						
						
							
							updated incorrectly named variable reference  
						
						 
						
						
						
						
					 
					
						2014-11-02 20:28:43 +00:00