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

2014-04-23 Vanessa Gil <vanessa.gil@artica.es> 

* godmode/agentes/agent_wizard.snmp_explorer.php: Changed
	'network_snmp_data' for 'network_snmp_data_inc' for module
	types: Bytes read and Bytes written.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9803 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
vgilc 2014-04-23 14:54:57 +00:00
parent 05b2283069
commit 49e02ce029
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2014-04-23 Vanessa Gil <vanessa.gil@artica.es>
* godmode/agentes/agent_wizard.snmp_explorer.php: Changed
'network_snmp_data' for 'network_snmp_data_inc' for module
types: Bytes read and Bytes written.
2014-04-23 Alejandro Gallardo <alejandro.gallardo@artica.es>
* godmode/setup/setup_netflow.php: Added a prompt dialog

24
pandora_console/godmode/agentes/agent_wizard.snmp_explorer.php
View File

@ -346,8 +346,12 @@ if ($create_modules) {
// Split module data to get type, name, etc
$device_exploded = explode($separator, $device);
$device_name = $device_exploded[0];
$device_type = $device_exploded[1];
$name_exploded = explode('-', $device_name);
$name = ltrim(html_entity_decode($name_exploded[1]));
$device_type = $device_exploded[1];
// Delete type from device id
unset($device_exploded[0]);
unset($device_exploded[1]);
@ -356,8 +360,12 @@ if ($create_modules) {
$device_id = implode($separator, $device_exploded);
$values['descripcion'] = $devices_prefix_descriptions[$device_type];
$values['id_tipo_modulo'] = modules_get_type_id('remote_snmp');
if (($name == 'Bytes read') || ($name == 'Bytes written')) {
$values['id_tipo_modulo'] = modules_get_type_id('remote_snmp_inc');
} else {
$values['id_tipo_modulo'] = modules_get_type_id('remote_snmp');
}
$values['snmp_oid'] = $devices_prefix_oids[$device_type] . $device_id;
@ -541,7 +549,7 @@ if ($create_modules) {
$success_message = '';
$error_message = '';
if (count($results[NOERR]) > 0) {
$success_message .= sprintf(__('%s modules created succesfully'), count($results[NOERR])) . '<br>';
}
@ -552,11 +560,13 @@ if ($create_modules) {
$error_message .= sprintf(__('%s modules already exist') . ': <br>&nbsp;&nbsp;* ' . implode('<br>&nbsp;&nbsp;* ', $results[ERR_EXIST]), count($results[ERR_EXIST])) . '<br>';
}
if (!empty($success_message)) {
ui_print_success_message($success_message);
}
if (!empty($error_message)) {
ui_print_error_message($error_message);
} else {
if (empty($success_message)) {
$success_message .= sprintf(__('Modules created succesfully')) . '<br>';
}
ui_print_success_message($success_message);
}
}
}