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

fix syslog a little.

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2406 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-09-02 09:01:32 +00:00
parent 232b330f3d
commit bb95ed4dc3
4 changed files with 44 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
includes/dbFacile.php
View File

@@ -82,7 +82,7 @@ function dbInsert($data, $table) {
#$id = false;
}
logfile($fullSql);
#logfile($fullSql);
$time_end = microtime(true);
$db_stats['insert_sec'] += number_format($time_end - $time_start, 8);

3
includes/defaults.inc.php
View File

@@ -280,10 +280,11 @@ $config['ignore_mount_network'] = 1; # Ignore network mounted storage
### Syslog Settings
$config['syslog_age'] = "1 month"; ## Entries older than this will be removed
$config['syslog_filter'][] = "last message repeated";
$config['syslog_filter'][] = "Connection from UDP: [";
$config['syslog_filter'][] = "ipSystemStatsTable node ipSystemStatsOutFragOKs not implemented";
$config['syslog_filter'][] = "diskio.c: don't know how to handle"; ## Ignore some crappy stuff from SNMP daemon
$config['syslog_filter'][] = "diskio.c"; ## Ignore some crappy stuff from SNMP daemon
### Virtualization

98
includes/syslog.php
View File

@@ -36,56 +36,6 @@ function process_syslog ($entry, $update) {
global $config;
global $dev_cache;
foreach($config['syslog_filter'] as $bi)
if(strpos($entry['msg'], $bi) !== FALSE){
print_r($entry);
echo('D-'.$bi);
return $entry;
}
$entry['device_id'] = get_cache($entry['host'], 'device_id');
if($entry['device_id']) {
dbInsert(
array(
'device_id' => $entry['device_id'],
'host' => $entry['host'],
'program' => $entry['program'],
'facility' => $entry['facility'],
'priority' => $entry['priority'],
'level' => $entry['level'],
'tag' => $entry['tag'],
'msg' => $entry['msg'],
'datetime' => $entry['timestamp']
),
'logs'
);
dbInsert(
array(
'device_id' => $entry['device_id'],
'program' => $entry['program'],
'facility' => $entry['facility'],
'priority' => $entry['priority'],
'level' => $entry['level'],
'tag' => $entry['tag'],
'msg' => $entry['msg'],
'timestamp' => $entry['timestamp']
),
'syslog'
);
}
return $entry;
}
function process_syslog_old ($entry, $update) {
global $config;
global $dev_cache;
foreach($config['syslog_filter'] as $bi)
if(strpos($entry['msg'], $bi) !== FALSE){
print_r($entry);
@@ -99,11 +49,40 @@ function process_syslog_old ($entry, $update) {
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'];
# 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']);
}
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']); }
} elseif($os == 'linux' and get_cache($entry['host'], 'version') == 'Point'){
//Cisco WAP200 and similar
@@ -131,12 +110,15 @@ function process_syslog_old ($entry, $update) {
$entry['msg'] = $matches['msg'];
$entry['program'] = $matches['program'];
}
//SYSLOG CONNECTION BROKEN; FD='6', SERVER='AF_INET(123.213.132.231:514)', time_reopen='60'
//pam_krb5: authentication failure; logname=root uid=0 euid=0 tty=ssh ruser= rhost=123.213.132.231
elseif($pos = strpos($entry['msg'], ';') or $pos = strpos($entry['msg'], ':')){
$entry['program'] = substr($entry['msg'], 0, $pos);
$entry['msg'] = substr($entry['msg'], $pos+1);
}
## Disabled because broke this:
//diskio.c: don't know how to handle 10 request
#elseif($pos = strpos($entry['msg'], ';') or $pos = strpos($entry['msg'], ':')){
# $entry['program'] = substr($entry['msg'], 0, $pos);
# $entry['msg'] = substr($entry['msg'], $pos+1);
#}
//fallback, better than nothing...
elseif(empty($entry['program']) and !empty($entry['facility'])){
$entry['program'] = $entry['facility'];

2
syslog.php
View File

@@ -13,7 +13,7 @@ $i = "1";
$s = fopen('php://stdin','r');
while ($line = fgets($s))
{
logfile($line);
#logfile($line);
list($entry['host'],$entry['facility'],$entry['priority'], $entry['level'], $entry['tag'], $entry['timestamp'], $entry['msg'], $entry['program']) = explode("||", trim($line));
process_syslog($entry, 1);
unset($entry); unset($line);