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 pull request #4535 from murrant/snmp-debug-output

Browse Source 
feature: improved readability for snmp debug output
This commit is contained in:
Neil Lathwood
2016-09-22 08:38:51 +01:00
committed by GitHub
parent 44fe868e43 7371c6e1b8
commit fee15f5e53
4 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
includes/common.php
View File

@@ -70,21 +70,26 @@ function format_number_short($number, $sf)
function external_exec($command)
{
global $debug,$vdebug;
if ($debug && !$vdebug) {
$debug_command = preg_replace('/-c [\S]+/', '-c COMMUNITY', $command);
$debug_command = preg_replace('/(udp|udp6|tcp|tcp6):(.*):([\d]+)/', '\1:HOSTNAME:\3', $debug_command);
d_echo($debug_command);
} elseif ($vdebug) {
d_echo($command."\n");
if ($debug) {
if ($vdebug) {
c_echo('SNMP[%c'.$command."%n]\n");
} else {
$debug_command = preg_replace('/-c [\S]+/', '-c COMMUNITY', $command);
$debug_command = preg_replace('/(udp|udp6|tcp|tcp6):([^:]+):([\d]+)/', '\1:HOSTNAME:\3', $debug_command);
c_echo('SNMP[%c'.$debug_command."%n]\n");
}
}
$output = shell_exec($command);
if ($debug && !$vdebug) {
$debug_output = preg_replace('/(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/', '*', $output);
d_echo("$debug_output\n");
} elseif ($vdebug) {
d_echo($output."\n");
if ($debug) {
if ($vdebug) {
d_echo($output.PHP_EOL);
} else {
$ip_regex = '/(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)/';
$debug_output = preg_replace($ip_regex, '*', $output);
d_echo($debug_output.PHP_EOL);
}
}
return $output;

2
includes/dbFacile.mysql.php
View File

@@ -32,7 +32,7 @@ function dbQuery($sql, $parameters = array())
if (preg_match('/(INSERT INTO `alert_log`).*(details)/i', $fullSql)) {
echo "\nINSERT INTO `alert_log` entry masked due to binary data\n";
} else {
c_echo("\nSQL[%y".$fullSql.'%n] ');
c_echo('SQL[%y'.$fullSql."%n] \n");
}
} else {
$sql_debug[] = $fullSql;

2
includes/dbFacile.mysqli.php
View File

@@ -32,7 +32,7 @@ function dbQuery($sql, $parameters = array())
if (preg_match('/(INSERT INTO `alert_log`).*(details)/i', $fullSql)) {
echo "\nINSERT INTO `alert_log` entry masked due to binary data\n";
} else {
c_echo("\nSQL[%y".$fullSql.'%n] ');
c_echo('SQL[%y'.$fullSql."%n] \n");
}
} else {
$sql_debug[] = $fullSql;

4
includes/snmp.inc.php
View File

@@ -554,10 +554,6 @@ function snmp_gen_auth(&$device)
}
}//end if
if ($vdebug) {
print "DEBUG: SNMP Auth options = $cmd\n";
}
return $cmd;
}//end snmp_gen_auth()