Commit Graph

4610 Commits

Author SHA1 Message Date
Daniel Preussker
4e2ed5aa27 Merge pull request #744 from SaaldjorMike/ciscosb-5
Added missing CPU id for Cisco SB
2015-04-07 12:43:54 +00:00
Mike Rostermund
e5fcdeab9c Added missing CPU id for Cisco SB 2015-04-07 04:54:55 -07:00
Daniel Preussker
7feb02707c Merge pull request #738 from laf/cambium
Very basic Cambium (canopy) detection for a few PMP models
2015-04-07 10:08:12 +00:00
laf
1a075dc5f3 Updated logo to use http://findicons.com/icon/552644/wireless_signal_icon 2015-04-07 10:51:52 +01:00
laf
b3f368da07 More work for initial Cambium support 2015-04-06 23:05:13 +01:00
laf
8b7f8310f0 Added initial canopy files 2015-04-06 23:05:13 +01:00
Daniel Preussker
de4a78f830 Merge pull request #737 from f0o/issue-736
JS typo
2015-04-06 17:05:09 +00:00
f0o
3abc93eba2 JS typo 2015-04-06 17:04:26 +00:00
Daniel Preussker
5b4ad29ca2 Merge pull request #735 from laf/changelog
Updated changelog 05/04/2015
2015-04-06 08:46:51 +00:00
laf
3966356229 Updated device groups line 2015-04-06 09:24:22 +01:00
laf
51ff0028c3 Updated changelog 05/04/2015 2015-04-05 21:20:54 +01:00
Neil Lathwood
55cdfd115b Merge pull request #734 from f0o/issue-714
Use functions defined in authentication-modules to obtain contact-list
2015-04-05 21:05:56 +01:00
f0o
83b3208540 Use functions defined in authentication-modules to obtain contact-list 2015-04-05 12:50:38 +00:00
Daniel Preussker
50b806ee50 Merge pull request #733 from laf/docs-syslog
Added new doc showing syslog setup
2015-04-05 11:10:09 +00:00
laf
80582fed75 Updated syslog with client examples 2015-04-05 12:08:42 +01:00
Daniel Preussker
515ae9bb80 Merge pull request #732 from laf/docs
Added code guidelines to try and explain the file structure more
2015-04-05 05:29:06 +00:00
Daniel Preussker
3a1f492267 Merge pull request #731 from laf/unifi
Re-added unifi support + improved it
2015-04-05 05:27:05 +00:00
laf
f57cf36f4e Added new doc showing syslog setup 2015-04-05 02:01:06 +01:00
laf
4cbef8863e Added code guidelines to try and explain the file structure more 2015-04-05 01:15:52 +01:00
laf
e4040c0ace Basic detection of unifi kit 2015-04-05 00:27:02 +01:00
Neil Lathwood
bf920d69c5 Merge pull request #730 from maegibbons/ubquitiap-delete
Remove ubiquitiap os type from discovery and polling sub dirs
2015-04-04 23:25:38 +01:00
Mark Gibbons
361bb3cada Merge remote-tracking branch 'upstream/master' into ubquitiap-delete 2015-04-04 22:31:56 +01:00
Mark Gibbons
06f95595cd Remove ubiquitiap os type from discovery and polling sub dirs 2015-04-04 22:06:31 +01:00
Neil Lathwood
fdb9507800 Merge pull request #722 from f0o/issue-616-dynamic
Device-Groups + Alerting + Management
2015-04-04 19:36:26 +01: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
1ac5c92280 Fixed SQL bug 2015-04-04 13:33:19 +00:00
f0o
441c27a7d4 Assign invalid device_id if a rule is created with a mapping.
Update rule to invalidate `device_id` if a map has been assigned afterwards.
Update rule to restore `device_id` if no more maps are assigned to it.
Remove all maps (if any) if a rule is deleted.
Fixed SQL-schema
2015-04-04 11:37:07 +00:00
Daniel Preussker
a462b56261 Merge pull request #728 from laf/bootgrid-alert-log
Updated alert-log table to use new header, also fixed sorting on time logged column
2015-04-04 10:54:52 +00:00
Daniel Preussker
6c38556d74 Merge pull request #723 from laf/credits
Added credits for ubnt code base
2015-04-04 05:03:12 +00:00
Daniel Preussker
84b44d07af Merge pull request #727 from laf/issue-726
Fixed ORIG_PATH_INFO being logged in error_log
2015-04-04 05:02:35 +00:00
laf
cf0ab45351 Updated alert-log table to use new header, also fixed sorting on time logged column 2015-04-04 00:54:50 +01:00
laf
746dc32a9d Fixed ORIG_PATH_INFO being logged in error_log 2015-04-04 00:27:01 +01:00
laf
7bfe5f75e0 Added credits for ubnt code base 2015-04-03 23:55:11 +01:00
Daniel Preussker
76c20925f7 Merge pull request #721 from laf/ubnt
Added support for AirOS and AirFibre from UBNT
2015-04-03 19:38:47 +00:00
laf
97039768a6 Updated to fix scrut issues 2015-04-03 20:10:42 +01:00
f0o
00954ff4d6 Force device_id of 0 for new alert-rules to use the maps. 2015-04-03 18:31:32 +00:00
f0o
ba99eb25a2 Device-Groups Draft 2015-04-03 18:22:29 +00:00
laf
ac4eba78e4 Added support for AirOS and AirFibre from UBNT 2015-04-03 18:59:58 +01:00
Daniel Preussker
dc6c166804 Merge pull request #720 from f0o/ack-hotfix
Hotfixes Alert-Acks for Worse/Better situations.
2015-04-03 14:20:40 +00:00
f0o
373243a19e Hotfixes Alert-Acks for Worse/Better situations. 2015-04-03 13:14:01 +00:00
Neil Lathwood
7f4c988391 Merge pull request #709 from Rosiak/master
FortiGate Minor Change
2015-04-02 21:36:24 +01:00
Søren Rosiak
eff1c34d8f Update fortigate.inc.php
-Another correction.
2015-04-02 22:17:53 +02:00
Daniel Preussker
11a107ea63 Merge pull request #717 from laf/css-fix
Fix for bad alignment in input boxes.
2015-04-02 20:09:11 +00:00
Daniel Preussker
fcd01254a1 Merge pull request #716 from laf/bootgrid-inventory
Updated inventory table to use bootgrid
2015-04-02 20:08:53 +00:00
laf
94d1c03ca9 Fix for bad alignment in input boxes. This is a hangup from an the old stylesheet. Not needed with bootstrap 2015-04-02 21:01:45 +01:00
laf
0b95062c88 Updated search box to fit in with design 2015-04-02 19:28:39 +01:00
laf
7b7165b876 Fixed scrut issues 2015-04-02 18:34:52 +01:00
laf
ca6c436cb7 Updated inventory table to use bootgrid 2015-04-02 18:05:24 +01:00
Daniel Preussker
1a8c76268c Merge pull request #713 from laf/apc-mib
Updated APC powernet mib
2015-04-02 16:47:39 +00:00
Daniel Preussker
9d457a5293 Merge pull request #715 from laf/alert-rule-fix
Updated the way the rule loop works
2015-04-02 16:47:21 +00:00