nfsen suffix support by falz, + fix poll-reachability, reported by JumpingM

git-svn-id: http://www.observium.org/svn/observer/trunk@2058 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2011-04-11 14:37:05 +00:00
parent c3d1ac1609
commit ff2991fd70
4 changed files with 12 additions and 4 deletions

View File

@@ -9,10 +9,14 @@ foreach ( $config['nfsen_rrds'] as $nfsenrrds )
if ($configs[strlen($nfsenrrds)-1] != '/') { $nfsenrrds .= '/'; }
# convert dots in filename to underscores
$nfsensuffix = "";
if ($config['nfsen_suffix']) { $nfsensuffix = $config['nfsen_suffix']; }
$basefilename_underscored = preg_replace('/\./', $config['nfsen_split_char'], $device['hostname']);
if (is_file($nfsenrrds . $basefilename_underscored . ".rrd"))
$nfsen_filename = (strstr($basefilename_underscored, $nfsensuffix, true));
if (is_file($nfsenrrds . $nfsen_filename . ".rrd"))
{
$rrd_filename = $nfsenrrds . $basefilename_underscored . ".rrd";
$rrd_filename = $nfsenrrds . $nfsen_filename . ".rrd";
$flowtypes = array('tcp', 'udp', 'icmp', 'other');