mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into issue-3035

Browse Source
This commit is contained in:
Ultra2D
2016-03-04 09:13:15 +01:00
parent fb9224d507 e2d2c6aa38
commit 4c5701531f
251 changed files with 29156 additions and 13061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
includes/syslog.php
View File

@@ -52,38 +52,25 @@ function process_syslog($entry, $update) {
$os = get_cache($entry['host'], 'os');
if (in_array($os, array('ios', 'iosxe', 'catos'))) {
$matches = array();
// if (preg_match('#%(?P<program>.*):( ?)(?P<msg>.*)#', $entry['msg'], $matches)) {
// $entry['msg'] = $matches['msg'];
// $entry['program'] = $matches['program'];
// }
// unset($matches);
if (strstr($entry[msg], '%')) {
$entry['msg'] = preg_replace('/^%(.+?):\ /', '\\1||', $entry['msg']);
list(,$entry[msg]) = split(': %', $entry['msg']);
$entry['msg'] = '%'.$entry['msg'];
$entry['msg'] = preg_replace('/^%(.+?):\ /', '\\1||', $entry['msg']);
// multipart message
if(strpos($entry['msg'], ':') !== false) {
/* Split the following examples
* %CARD-SEVERITY-MSG:SLOT %FACILITY-SEVERITY-MNEMONIC: Message-text
* %FACILITY-SUBFACILITY-SEVERITY-MNEMONIC: Message-text
*/
$matches = array();
if(preg_match('/^(?<program>%?[A-Za-z\d\-_]+(:[A-Z]* %[A-Z\d\-_]+)?): ?(?<msg>.*)/', $entry['msg'], $matches)) {
$entry['program'] = $matches['program'];
$entry['msg'] = $matches['msg'];
}
unset($matches);
}
else {
$entry['msg'] = preg_replace('/^.*[0-9]:/', '', $entry['msg']);
$entry['msg'] = preg_replace('/^[0-9][0-9]\ [A-Z]{3}:/', '', $entry['msg']);
$entry['msg'] = preg_replace('/^(.+?):\ /', '\\1||', $entry['msg']);
}
$entry['msg'] = preg_replace('/^.+\.[0-9]{3}:/', '', $entry['msg']);
$entry['msg'] = preg_replace('/^.+-Traceback=/', 'Traceback||', $entry['msg']);
list($entry['program'], $entry['msg']) = explode('||', $entry['msg']);
$entry['msg'] = preg_replace('/^[0-9]+:/', '', $entry['msg']);
if (!$entry['program']) {
$entry['msg'] = preg_replace('/^([0-9A-Z\-]+?):\ /', '\\1||', $entry['msg']);
list($entry['program'], $entry['msg']) = explode('||', $entry['msg']);
}
if (!$entry['msg']) {
$entry['msg'] = $entry['program'];
unset($entry['program']);
// if this looks like a program (no groups of 2 or more lowercase letters), move it to program
if (!preg_match('/[(a-z)]{2,}/', $entry['msg'])) {
$entry['program'] = $entry['msg'];
unset($entry['msg']);
}
}
}
else if ($os == 'linux' and get_cache($entry['host'], 'version') == 'Point') {