10353 Commits

Author SHA1 Message Date
6b583c447c fix maps 2016-03-05 15:32:59 +01:00
beb4091b66 Merge pull request #3170 from ekoyle/snmp_trap_doc
Add doc stub for SNMP trap handling
2016-03-05 11:34:20 +00:00
29066cfcbc Merge pull request #3173 from Ultra2D/syslog-linux-openvpn
Syslog Linux OpenVPN pattern does not match example, remove it
2016-03-05 11:34:04 +00:00
ab67f7870c Merge pull request #3171 from Ultra2D/syslog-trim
Syslog trim whitespace
2016-03-05 11:26:09 +00:00
fe17aa8604 Merge pull request #3172 from Ultra2D/issue-3041
Issue 3041
2016-03-05 11:24:35 +00:00
d74c37ab0e Syslog Linux OpenVPN pattern does not match example, remove it 2016-03-05 12:23:43 +01:00
f97f9c824b Added syslog Procurve unit testing 2016-03-05 11:59:49 +01:00
fb34fb7ab5 Syslog trim whitespace 2016-03-05 11:06:29 +01:00
621d3be05c Merge branch 'master' into issue-3041 2016-03-05 10:05:46 +01:00
4aa9d30cba Merge pull request #3167 from ekoyle/rsyslog_docs 2016-03-05 01:47:57 +00:00
laf
f0fb602046 Added support for os in oxidized groups 2016-03-05 00:48:51 +00:00
86330d051e Add doc stub for SNMP trap handling 2016-03-04 17:13:03 -07:00
c803e24fb1 Minor formatting tweaks 2016-03-04 16:35:05 -07:00
7ea7bd4c92 Merge pull request #3036 from Ultra2D/issue-3035
Linux syslog processing cleanup
2016-03-04 23:34:00 +00:00
8d8d689e2a Merge pull request #3018 from jmacul2/mapgroups
Initial adds for map group functionality.
2016-03-04 23:30:54 +00:00
a549902aca Basic outline for using rsyslog instead of syslog-ng 2016-03-04 16:29:02 -07:00
555fdb5bfc Clean up avtech by making a helper function so it is easier to add devices.
Add support for RoomAlert 4E
fixes #3166
2016-03-04 17:28:54 -06:00
25e88f743c Remove dovecot match because of invalid pattern 2016-03-04 17:43:05 +01:00
46bee4021f Changed else if to elseif 2016-03-04 16:25:51 +00:00
f969317863 Human readable program, and append event ID to message 2016-03-04 16:14:47 +01:00
488f7f44c4 array_walk does not work like that, apparently input is trimmed later on 2016-03-04 15:51:49 +01:00
29eea12b08 Scrut fixes 2016-03-04 14:36:47 +00:00
99cd9f96cf Proper tags and facilities; additional example 2016-03-04 15:18:24 +01:00
2b6439d502 Missing trailing delimiter in original code 2016-03-04 13:45:48 +01:00
24d7926ea6 Fix build failure 2016-03-04 13:10:07 +01:00
ec857ebfa5 Merge pull request #3162 from Ultra2D/whitespace
Tabs to spaces
2016-03-04 11:32:18 +00:00
70ad24157f PHPunit tests for Linux syslog parsing 2016-03-04 12:32:06 +01:00
891f11665c Merge pull request #3158 from jmacul2/master
Update AUTHORS.md
2016-03-04 11:29:26 +00:00
9812c402ce Merge pull request #3160 from Rosiak/ironware-state
Basic Ironware State Support
2016-03-04 11:28:59 +00:00
a91475dfde Merge pull request #3163 from Andreser/patch-1
Update RRDTune.md
2016-03-04 11:26:15 +00:00
e34a80a047 Update RRDTune.md
It seems script folder changed to "scripts" so I'm also changing it in the docs.
2016-03-04 08:24:59 -03:00
9773b3bade Tabs to spaces 2016-03-04 11:30:11 +01:00
4c5701531f Merge branch 'master' into issue-3035 2016-03-04 09:13:15 +01:00
5a4334daa5 Small fix 2016-03-04 06:49:04 +01:00
0818c6ae99 whitespace fix 2016-03-03 16:51:40 -07:00
a77c9d234c Menu UI for map groups. 2016-03-03 16:43:13 -07:00
d053b5a6b2 Clean up centos install docs
Reorganize install order (can't access web interface without getting to a point where httpd starts!), minor tweaks for clarity
2016-03-03 18:11:33 -05:00
e2d2c6aa38 Merge pull request #3154 from laf/syslog-test
Updated syslogTest to work with php 5.3
2016-03-03 15:55:46 -06:00
laf
f395cbdefe Updated to work with php 5.3 2016-03-03 21:21:28 +00:00
laf
d85a9f688f Removed innodb check from daily and updated validate to warn 2016-03-03 20:52:23 +00:00
da2ca8ed25 Merge pull request #3152 from laf/travis-fix
Fixed .travis.yml
2016-03-03 20:22:06 +00:00
24003e5681 Merge pull request #3150 from laf/test-fix
Couple of small fixes
2016-03-03 20:08:22 +00:00
695baede4e Merge pull request #3121 from Rosiak/juniper-state
Juniper State Support
2016-03-03 20:07:34 +00:00
laf
8cd767f22f Fixed .travis.yml 2016-03-03 20:04:09 +00:00
laf
89f0952bc3 Couple of small fixes 2016-03-03 19:56:18 +00:00
fa23fc4b6d Merge pull request #3099 from murrant/syslog-cisco
Simplify and fix Cisco ios,iosxe,catos syslog processing
2016-03-03 19:55:13 +00:00
833b169431 Merge pull request #3149 from khobbits/patch-notes
Stop double escaping the notes post variable.
2016-03-03 19:46:42 +00:00
7e851ad999 add space 2016-03-03 19:45:51 +01:00
add8f9503a if descr empty, then fill in 2016-03-03 19:42:11 +01:00
c321d4e4b2 Stop double escaping the notes post variable 2016-03-03 18:38:24 +00:00