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

device: Fix for syslog-messages from zywall (USG series) (#6838)

Browse Source 
* Fix for syslog-messages from zywall (USG series)

* Adding a test
This commit is contained in:
Olen
2017-06-20 19:27:37 +02:00
committed by Tony Murray
parent 52fabcb770
commit b8452862af
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
includes/syslog.php
View File

@@ -126,6 +126,18 @@ function process_syslog($entry, $update)
$entry['program'] = $matches['program']; $entry['program'] = $matches['program'];
} }
unset($matches); unset($matches);
} elseif ($os == 'zywall') {
// Zwwall sends messages without all the fields, so the offset is wrong
$msg = preg_replace("/\" /", '";', stripslashes($entry['program'].':'.$entry['msg']));
$msg = str_getcsv($msg, ';');
$entry['program'] = null;
foreach ($msg as $param) {
list($var, $val) = explode("=", $param);
if ($var == 'cat') {
$entry['program'] = str_replace('"', '', $val);
}
}
$entry['msg'] = join(" ", $msg);
}//end if }//end if
if (!isset($entry['program'])) { if (!isset($entry['program'])) {

14
tests/SyslogTest.php
View File

@@ -234,4 +234,18 @@ class SyslogTest extends \PHPUnit_Framework_TestCase
array('device_id'=>1, 'program'=>'SNTP', 'msg'=>'updated time by -4 seconds') array('device_id'=>1, 'program'=>'SNTP', 'msg'=>'updated time by -4 seconds')
); );
} }
public function testZywallSyslog()
{
// populate fake $dev_cache and $config
global $config, $dev_cache;
$dev_cache['1.1.1.1'] = array('device_id' => 1, 'os' => 'zywall', 'version' => 1);
$config = array();
$config['syslog_filter'] = array();
// ---- USG60W ----
$this->checkSyslog(
"1.1.1.1||local1||info||info||8e||2017-06-14 17:51:25||0\" dst=\"0.0.0.0:0\" msg=\"DHCP server assigned 195.159.132.109 to Chromecast(6C:AD:F8:B1:10:1D)\" note=\"DHCP ACK\" user=\"unknown\" devID=\"a0e4cb7d7f52\" cat=\"DHCP\"||src=\"0.0.0.0",
array('device_id'=>1, 'program'=>'DHCP', 'msg'=>'src="0.0.0.0:0" dst="0.0.0.0:0" msg="DHCP server assigned 195.159.132.109 to Chromecast(6C:AD:F8:B1:10:1D)" note="DHCP ACK" user="unknown" devID="a0e4cb7d7f52" cat="DHCP"')
);
}
} }