Commit Graph

1060 Commits

Author SHA1 Message Date
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
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
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
1108ef7939 Added new api route for billing 2014-12-02 23:43:11 +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
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
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
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
b4b160ead4 Updates from scrutinizer recommendations 2014-10-29 21:30:35 +00:00
laf
a792d10a76 Fixed BGP session count to exclude sessions that no longer have a device associated 2014-10-29 19:52:50 +00:00
laf
9eafe9af2a Added function to generate pagination for mysql results 2014-10-29 18:30:42 +00:00
Paul Gear
8ab0bcb324 Remove unused jqplot functions (was PR#306) 2014-10-28 08:39:19 +10:00
laf
3e4a494047 Added bgp peers route to display all bgp peers 2014-10-26 15:48:51 +00:00
Paul Gear
208ac0b104 Merge remote-tracking branch 'laf/issue-laf-47' 2014-10-25 08:49:28 +10:00
Paul Gear
69c3d926ff Merge pull request #315 from laf/issue-laf-58
Added the ability to call the api for a list of endpoints
2014-10-22 21:46:34 +10:00
Paul Gear
15392ecf40 Merge pull request #313 from laf/issue-laf-61
Added a response code when things are ok - oops
2014-10-22 21:37:39 +10:00
Paul Gear
9bf617b586 Merge pull request #310 from laf/issue-laf-54
Updated authToken response code to be 401
2014-10-22 21:34:21 +10:00
Paul Gear
b400ff839d Merge pull request #307 from laf/issue-laf-53
Updated adduser to check for existing user and use password hashing
2014-10-11 16:16:41 +10:00
Neil Lathwood
24ee2541ee Defining output array as per scrutinizer 2014-10-09 16:47:11 +00:00
Neil Lathwood
0be049fde9 Added the ability to call the api for a list of endpoints 2014-10-09 16:20:04 +00:00
Neil Lathwood
b6db82d8af Added a response code when things are ok - oops 2014-10-09 16:14:06 +00:00
Neil Lathwood
cd8b2299df Updated authToken response code to be 401 2014-10-07 23:53:26 +00:00
Paul Gear
5887009b63 Merge pull request #300 from laf/issue-laf-44
Added a route to the API that will get vlans for a given device
2014-10-07 19:56:01 +10:00
Paul Gear
d665a101ac Merge pull request #297 from laf/issue-laf-42
Fixed the placement of overlib popup images
2014-10-07 19:32:41 +10:00
Paul Gear
b4cc92475d Merge pull request #295 from laf/issue-laf-37
Adding ping and poller graphs for devices
2014-10-07 19:31:21 +10:00
laf
7f95922160 Updated adduser to check for existing user and use password hashing 2014-10-06 18:39:48 +01:00
laf
2be63b2041 Added an option to rediscover a device from the web page 2014-10-02 20:17:45 +01:00
laf
c55c1a71ba missed out the response code and header 2014-10-01 21:12:21 +01:00