Changed snmpwalk parameters for wizard
This commit is contained in:
parent
f0637438f3
commit
dfc4786ef1
|
@ -178,6 +178,7 @@ switch ($type) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$query_filter = [];
|
||||||
if (empty($query_filter) === false) {
|
if (empty($query_filter) === false) {
|
||||||
$query_filter = json_decode($query_filter, true);
|
$query_filter = json_decode($query_filter, true);
|
||||||
}
|
}
|
||||||
|
|
|
@ -3559,7 +3559,8 @@ class AgentWizard extends HTML
|
||||||
$this->targetPort,
|
$this->targetPort,
|
||||||
$this->server,
|
$this->server,
|
||||||
$this->extraArguments,
|
$this->extraArguments,
|
||||||
(($full_output === false) ? '-Oa -On' : '-Oa')
|
(($full_output === false) ? '-On' : '-Oa'),
|
||||||
|
''
|
||||||
);
|
);
|
||||||
|
|
||||||
if ($pure === true) {
|
if ($pure === true) {
|
||||||
|
|
|
@ -1993,7 +1993,8 @@ function get_snmpwalk(
|
||||||
$snmp_port='',
|
$snmp_port='',
|
||||||
$server_to_exec=0,
|
$server_to_exec=0,
|
||||||
$extra_arguments='',
|
$extra_arguments='',
|
||||||
$format='-Oa'
|
$format='-Oa',
|
||||||
|
$load_mibs='-m ALL'
|
||||||
) {
|
) {
|
||||||
global $config;
|
global $config;
|
||||||
|
|
||||||
|
@ -2057,15 +2058,15 @@ function get_snmpwalk(
|
||||||
case '3':
|
case '3':
|
||||||
switch ($snmp3_security_level) {
|
switch ($snmp3_security_level) {
|
||||||
case 'authNoPriv':
|
case 'authNoPriv':
|
||||||
$command_str = $snmpwalk_bin.' -m ALL '.$format.' '.$extra_arguments.' -v 3'.' -u '.escapeshellarg($snmp3_auth_user).' -A '.escapeshellarg($snmp3_auth_pass).' -l '.escapeshellarg($snmp3_security_level).' -a '.escapeshellarg($snmp3_auth_method).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir;
|
$command_str = $snmpwalk_bin.' '.$load_mibs.' '.$format.' '.$extra_arguments.' -v 3'.' -u '.escapeshellarg($snmp3_auth_user).' -A '.escapeshellarg($snmp3_auth_pass).' -l '.escapeshellarg($snmp3_security_level).' -a '.escapeshellarg($snmp3_auth_method).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'noAuthNoPriv':
|
case 'noAuthNoPriv':
|
||||||
$command_str = $snmpwalk_bin.' -m ALL '.$format.' '.$extra_arguments.' -v 3'.' -u '.escapeshellarg($snmp3_auth_user).' -l '.escapeshellarg($snmp3_security_level).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir;
|
$command_str = $snmpwalk_bin.' '.$load_mibs.' '.$format.' '.$extra_arguments.' -v 3'.' -u '.escapeshellarg($snmp3_auth_user).' -l '.escapeshellarg($snmp3_security_level).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
$command_str = $snmpwalk_bin.' -m ALL '.$format.' '.$extra_arguments.' -v 3'.' -u '.escapeshellarg($snmp3_auth_user).' -A '.escapeshellarg($snmp3_auth_pass).' -l '.escapeshellarg($snmp3_security_level).' -a '.escapeshellarg($snmp3_auth_method).' -x '.escapeshellarg($snmp3_privacy_method).' -X '.escapeshellarg($snmp3_privacy_pass).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir;
|
$command_str = $snmpwalk_bin.' '.$load_mibs.' '.$format.' '.$extra_arguments.' -v 3'.' -u '.escapeshellarg($snmp3_auth_user).' -A '.escapeshellarg($snmp3_auth_pass).' -l '.escapeshellarg($snmp3_security_level).' -a '.escapeshellarg($snmp3_auth_method).' -x '.escapeshellarg($snmp3_privacy_method).' -X '.escapeshellarg($snmp3_privacy_pass).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -2074,7 +2075,7 @@ function get_snmpwalk(
|
||||||
case '2c':
|
case '2c':
|
||||||
case '1':
|
case '1':
|
||||||
default:
|
default:
|
||||||
$command_str = $snmpwalk_bin.' -m ALL '.$extra_arguments.' '.$format.' -v '.escapeshellarg($snmp_version).' -c '.escapeshellarg(io_safe_output($snmp_community)).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir;
|
$command_str = $snmpwalk_bin.' '.$load_mibs.' '.$extra_arguments.' '.$format.' -v '.escapeshellarg($snmp_version).' -c '.escapeshellarg(io_safe_output($snmp_community)).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue