tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 16:55:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into ent-test-corr

Browse Source
This commit is contained in:
Ramon Novoa 2022-06-17 10:29:23 +02:00
commit d53c2f8ed4
7 changed files with 485 additions and 358 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pandora_console/godmode/modules/manage_network_components_form_wizard.php
View File

@ -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);
} }

782
pandora_console/godmode/snmpconsole/snmp_alert.php
View File

File diff suppressed because it is too large Load Diff

10
pandora_console/include/class/AgentWizard.class.php
View File

@ -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) {
@ -3572,7 +3573,12 @@ class AgentWizard extends HTML
if ($full_output === true) { if ($full_output === true) {
$output[] = $key.' = '.$oid_unit; $output[] = $key.' = '.$oid_unit;
} else { } else {
preg_match('/\.\d+$/', $key, $index); $index = [];
$index[] = preg_replace('/^'.$oid.'/', '', $key);
if (empty($index) === true) {
preg_match('/\.\d+$/', $key, $index);
}
$tmp = explode(': ', $oid_unit); $tmp = explode(': ', $oid_unit);
$output[$index[0]] = str_replace('"', '', ($tmp[1] ?? '')); $output[$index[0]] = str_replace('"', '', ($tmp[1] ?? ''));
} }

11
pandora_console/include/functions.php
View File

@ -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;
} }

7
pandora_console/include/styles/pandora.css
View File

@ -814,6 +814,13 @@ select:-internal-list-box {
.margin-left-2 { .margin-left-2 {
margin-left: 2em; margin-left: 2em;
} }
.margin-right-05 {
margin-right: 0.5em;
}
.margin-left-05 {
margin-left: 0.5em;
}
.no-border { .no-border {
border: none; border: none;
} }

17
pandora_server/lib/PandoraFMS/PluginTools.pm
View File

@ -609,15 +609,14 @@ sub print_module {
$data->{critical_instructions} = $conf->{critical_instructions} unless (defined($data->{critical_instructions}) || (!defined($conf->{critical_instructions}))); $data->{critical_instructions} = $conf->{critical_instructions} unless (defined($data->{critical_instructions}) || (!defined($conf->{critical_instructions})));
# Translation compatibility # Translation compatibility
$data->{'min_warning'} = $data->{'wmin'} if empty($data->{'min_warning'}); $data->{min_warning} = $data->{'wmin'} if empty($data->{min_warning});
$data->{'max_warning'} = $data->{'wmax'} if empty($data->{'max_warning'}); $data->{max_warning} = $data->{'wmax'} if empty($data->{max_warning});
$data->{'min_critical'} = $data->{'cmin'} if empty($data->{'min_critical'}); $data->{min_critical} = $data->{'cmin'} if empty($data->{min_critical});
$data->{'max_critical'} = $data->{'cmax'} if empty($data->{'max_critical'}); $data->{max_critical} = $data->{'cmax'} if empty($data->{max_critical});
$data->{'warning_inverse'} = $data->{'winv'} if empty($data->{'warning_inverse'}); $data->{warning_inverse} = $data->{'winv'} if empty($data->{warning_inverse});
$data->{'critical_inverse'} = $data->{'cinv'} if empty($data->{'critical_inverse'}); $data->{critical_inverse} = $data->{'cinv'} if empty($data->{critical_inverse});
$data->{'str_warning'} = $data->{'wstr'} if empty($data->{'str_warning'}); $data->{str_warning} = $data->{'wstr'} if empty($data->{str_warning});
$data->{'str_critical'} = $data->{'cstr'} if empty($data->{'str_critical'}); $data->{str_critical} = $data->{'cstr'} if empty($data->{str_critical});
$xml_module .= "<module>\n"; $xml_module .= "<module>\n";
$xml_module .= "\t<name><![CDATA[" . $data->{name} . "]]></name>\n"; $xml_module .= "\t<name><![CDATA[" . $data->{name} . "]]></name>\n";

15
pandora_server/lib/PandoraFMS/Recon/Base.pm
View File

@ -1628,9 +1628,14 @@ sub database_scan($$$) {
$self->{'summary'}->{'discovered'} += 1; $self->{'summary'}->{'discovered'} += 1;
$self->{'summary'}->{'alive'} += 1; $self->{'summary'}->{'alive'} += 1;
my $name = $type . ' connection';
if (defined $obj->{'prefix_module_name'} && $obj->{'prefix_module_name'} ne '') {
$name = $obj->{'prefix_module_name'} . $type . ' connection';
}
push @modules, push @modules,
{ {
name => $type . ' connection', name => $name,
type => 'generic_proc', type => 'generic_proc',
data => 1, data => 1,
description => $type . ' availability' description => $type . ' availability'
@ -1778,8 +1783,14 @@ sub app_scan($) {
# Update progress # Update progress
$self->call('update_progress', $global_percent + (90 / (scalar @targets))); $self->call('update_progress', $global_percent + (90 / (scalar @targets)));
$self->{'summary'}->{'not_alive'} += 1; $self->{'summary'}->{'not_alive'} += 1;
my $name = $type . ' connection';
if (defined $obj->{'prefix_module_name'} && $obj->{'prefix_module_name'} ne '') {
$name = $obj->{'prefix_module_name'} . $type . ' connection';
}
push @modules, { push @modules, {
name => $type . ' connection', name => $name,
type => 'generic_proc', type => 'generic_proc',
data => 0, data => 0,
description => $type . ' availability' description => $type . ' availability'