83b3208540
Use functions defined in authentication-modules to obtain contact-list
2015-04-05 12:50:38 +00:00
50b806ee50
Merge pull request #733 from laf/docs-syslog
...
Added new doc showing syslog setup
2015-04-05 11:10:09 +00:00
80582fed75
Updated syslog with client examples
2015-04-05 12:08:42 +01:00
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
3a1f492267
Merge pull request #731 from laf/unifi
...
Re-added unifi support + improved it
2015-04-05 05:27:05 +00:00
f57cf36f4e
Added new doc showing syslog setup
2015-04-05 02:01:06 +01:00
4cbef8863e
Added code guidelines to try and explain the file structure more
2015-04-05 01:15:52 +01:00
e4040c0ace
Basic detection of unifi kit
2015-04-05 00:27:02 +01:00
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
361bb3cada
Merge remote-tracking branch 'upstream/master' into ubquitiap-delete
2015-04-04 22:31:56 +01:00
06f95595cd
Remove ubiquitiap os type from discovery and polling sub dirs
2015-04-04 22:06:31 +01:00
fdb9507800
Merge pull request #722 from f0o/issue-616-dynamic
...
Device-Groups + Alerting + Management
2015-04-04 19:36:26 +01:00
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
1ac5c92280
Fixed SQL bug
2015-04-04 13:33:19 +00:00
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
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
6c38556d74
Merge pull request #723 from laf/credits
...
Added credits for ubnt code base
2015-04-04 05:03:12 +00:00
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
cf0ab45351
Updated alert-log table to use new header, also fixed sorting on time logged column
2015-04-04 00:54:50 +01:00
746dc32a9d
Fixed ORIG_PATH_INFO being logged in error_log
2015-04-04 00:27:01 +01:00
7bfe5f75e0
Added credits for ubnt code base
2015-04-03 23:55:11 +01:00
76c20925f7
Merge pull request #721 from laf/ubnt
...
Added support for AirOS and AirFibre from UBNT
2015-04-03 19:38:47 +00:00
97039768a6
Updated to fix scrut issues
2015-04-03 20:10:42 +01:00
00954ff4d6
Force device_id of 0 for new alert-rules to use the maps.
2015-04-03 18:31:32 +00:00
ba99eb25a2
Device-Groups Draft
2015-04-03 18:22:29 +00:00
ac4eba78e4
Added support for AirOS and AirFibre from UBNT
2015-04-03 18:59:58 +01:00
dc6c166804
Merge pull request #720 from f0o/ack-hotfix
...
Hotfixes Alert-Acks for Worse/Better situations.
2015-04-03 14:20:40 +00:00
373243a19e
Hotfixes Alert-Acks for Worse/Better situations.
2015-04-03 13:14:01 +00:00
7f4c988391
Merge pull request #709 from Rosiak/master
...
FortiGate Minor Change
2015-04-02 21:36:24 +01:00
eff1c34d8f
Update fortigate.inc.php
...
-Another correction.
2015-04-02 22:17:53 +02:00
11a107ea63
Merge pull request #717 from laf/css-fix
...
Fix for bad alignment in input boxes.
2015-04-02 20:09:11 +00:00
fcd01254a1
Merge pull request #716 from laf/bootgrid-inventory
...
Updated inventory table to use bootgrid
2015-04-02 20:08:53 +00:00
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
0b95062c88
Updated search box to fit in with design
2015-04-02 19:28:39 +01:00
7b7165b876
Fixed scrut issues
2015-04-02 18:34:52 +01:00
ca6c436cb7
Updated inventory table to use bootgrid
2015-04-02 18:05:24 +01:00
1a8c76268c
Merge pull request #713 from laf/apc-mib
...
Updated APC powernet mib
2015-04-02 16:47:39 +00:00
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
469f5aa629
Updated the way the rule loop works
2015-04-02 16:19:30 +01:00
9889ae5759
Updated APC powernet mib
2015-04-02 15:24:40 +01:00
49babf77b8
Merge pull request #707 from Ultra2D/master
...
Add support for LDAP directories using member ...
2015-04-02 12:24:37 +01:00
b0494dca9a
Merge pull request #710 from Ultra2D/patch1
...
I agree to the conditions of the Contributor Agreement
2015-04-01 21:25:42 +02:00
33f0290439
I agree to the conditions of the Contributor Agreement
...
contained in doc/General/Contributing.md.
2015-04-01 21:03:41 +02:00
a60eb07608
Update fortigate.inc.php
...
- Re-add the some of the old code to ensure backwards compatibility
2015-04-01 20:38:53 +02:00
b689f7952d
FortiGate Minor Change
...
- Add serial and hardware recognition
- Clean up code
2015-04-01 19:17:24 +02:00
e2fe20b07a
Merge pull request #708 from Rosiak/master
...
Detect Cisco ASA HW and OS Ver
2015-04-01 17:27:47 +01:00
cda227bd51
Detect Cisco ASA HW and OS Ver
...
- Now detects Cisco ASA HW and OS Ver, somehow this went missing
- Code used from ciscowlc.inc.php, Copyright information included
- Tested against various 5505 and 5515 OS Versions.
2015-04-01 18:06:42 +02:00
0ab454fefc
Add support for LDAP directories using member in stead of memberUid and dn in stead of username for group members.
...
Used the same variables as Observium, see http://www.observium.org/wiki/Authentication_modules#OpenLDAP
2015-04-01 16:10:50 +02:00
74badf86de
Merge pull request #706 from laf/bootgrid-alert-log
...
Updated alertlog to use bootgrid
2015-04-01 10:24:54 +02:00
272b8fc4ba
Updated alertlog to use bootgrid
2015-04-01 00:21:56 +01:00
