tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Discovery RDS 

Former-commit-id: e03d600b06fec25fb5808b9425cc94832d9d1268
This commit is contained in:
fbsanchez 2019-04-11 15:05:03 +02:00
parent 2af9cbb711
commit e998c8dd70
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pandora_console/include/functions_snmp_browser.php
View File

@ -55,7 +55,9 @@ function snmp_browser_print_tree(
$last_array=[], $last_array=[],
$sufix=false, $sufix=false,
$checked=[], $checked=[],
$return=false $return=false,
$descriptive_ids=false,
$previous_id=''
) { ) {
static $url = false; static $url = false;
@ -138,7 +140,13 @@ function snmp_browser_print_tree(
} }
$checkbox_name_sufix = ($sufix === true) ? '_'.$level : ''; $checkbox_name_sufix = ($sufix === true) ? '_'.$level : '';
$checkbox_name = 'create_'.$sub_id.$checkbox_name_sufix; if ($descriptive_ids === true) {
$checkbox_name = 'create_'.$sub_id.$previous_id.$checkbox_name_sufix;
} else {
$checkbox_name = 'create_'.$sub_id.$checkbox_name_sufix;
}
$previous_id = $checkbox_name_sufix;
$status = (!empty($checked) && isset($checked[$level])); $status = (!empty($checked) && isset($checked[$level]));
$output .= html_print_checkbox($checkbox_name, 0, $status, true, false, '').'&nbsp;<span>'.$level.'</span>'; $output .= html_print_checkbox($checkbox_name, 0, $status, true, false, '').'&nbsp;<span>'.$level.'</span>';
if (isset($sub_level['__VALUE__'])) { if (isset($sub_level['__VALUE__'])) {
@ -156,7 +164,9 @@ function snmp_browser_print_tree(
$last_array, $last_array,
$sufix, $sufix,
$checked, $checked,
$return $return,
$descriptive_ids,
$previous_id
); );
$count++; $count++;

4
pandora_server/lib/PandoraFMS/DiscoveryServer.pm
View File

@ -205,13 +205,13 @@ sub data_consumer ($$) {
$cnf_extra{'cred_file'} = $pa_config->{'temporal'} . '/tmp_discovery.' . md5($task->{'id_rt'} . $task->{'name'} . time()); $cnf_extra{'cred_file'} = $pa_config->{'temporal'} . '/tmp_discovery.' . md5($task->{'id_rt'} . $task->{'name'} . time());
eval { eval {
open(my $__file_cfg, '> '. $cnf_extra{'cred_file'}) or die($!); open(my $__file_cfg, '> '. $cnf_extra{'cred_file'}) or die($!);
print $__file_cfg $cnf_extra{'aws_access_key_id'} . "\n";
print $__file_cfg $cnf_extra{'aws_secret_access_key'} . "\n"; print $__file_cfg $cnf_extra{'aws_secret_access_key'} . "\n";
print $__file_cfg $cnf_extra{'cloud_util_path'};
close($__file_cfg); close($__file_cfg);
set_file_permissions( set_file_permissions(
$pa_config, $pa_config,
$cnf_extra{'cred_file'}, $cnf_extra{'cred_file'},
0600 "0600"
); );
}; };
if ($@) { if ($@) {