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

feature: improved readability for snmp debug output

Browse Source 
It now matches RRD and SQL output format, the color is cyan
Slightly better ip removal from debug output, only removes valid IPs now.
This commit is contained in:
Tony Murray
2016-09-21 17:15:28 -05:00
parent 72e07c860b
commit 7371c6e1b8
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;