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

2013-02-13 Sergio Martin <sergio.martin@artica.es> 

* lib/PandoraFMS/Core.pm
	lib/PandoraFMS/DataServer.pm: Fixed a problem with the status
	field of the modules (forced status) in the dataserver creation
	of the module because using create_module_from_hash. 
	Order some code of the same part of the Dataserver



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7644 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-02-13 12:36:08 +00:00
parent 9af80162bf
commit c242d90a23
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_server/ChangeLog
View File

@ -1,3 +1,11 @@
2013-02-13 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/Core.pm
lib/PandoraFMS/DataServer.pm: Fixed a problem with the status
field of the modules (forced status) in the dataserver creation
of the module because using create_module_from_hash.
Order some code of the same part of the Dataserver
2013-02-12 Miguel de Dios <miguel.dedios@artica.es>
* lib/PandoraFMS/Core.pm: fixed the planned downtime.

5
pandora_server/lib/PandoraFMS/Core.pm
View File

@ -2224,6 +2224,11 @@ sub pandora_create_module_from_hash ($$$) {
logger($pa_config, "Creating module '$parameters->{'nombre'}' for agent ID $parameters->{'id_agente'}.", 10);
# Delete tags that will not be stored in tagente_modulo
delete $parameters->{'data'};
delete $parameters->{'type'};
delete $parameters->{'datalist'};
my $module_id = db_process_insert($dbh, 'id_agente_modulo', 'tagente_modulo', $parameters);
my $status = 4;

7
pandora_server/lib/PandoraFMS/DataServer.pm
View File

@ -530,7 +530,7 @@ sub process_module_data ($$$$$$$$$) {
my $tags = {'name' => 0, 'data' => 0, 'type' => 0, 'description' => 0, 'max' => 0,
'min' => 0, 'descripcion' => 0, 'post_process' => 0, 'module_interval' => 0, 'min_critical' => 0,
'max_critical' => 0, 'min_warning' => 0, 'max_warning' => 0, 'disabled' => 0, 'min_ff_event' => 0,
'datalist' => 0, 'status' => 0, 'unit' => 0, 'timestamp' => 0, 'module_group' => 0, 'custom_id' => '',
'datalist' => 0, 'unit' => 0, 'timestamp' => 0, 'module_group' => 0, 'custom_id' => '',
'str_warning' => '', 'str_critical' => '', 'critical_instructions' => '', 'warning_instructions' => '',
'unknown_instructions' => '', 'tags' => '', 'critical_inverse' => 0, 'warning_inverse' => 0, 'quiet' => 0,
'module_ff_interval' => 0};
@ -546,11 +546,6 @@ sub process_module_data ($$$$$$$$$) {
$module_conf->{'extended_info'} .= "$tag: " . get_tag_value ($data, $tag, '') . '<br/>';
}
}
# Delete tags that will not be stored in tagente_modulo
delete $module_conf->{'data'};
delete $module_conf->{'type'};
delete $module_conf->{'datalist'};
# Description XML tag and column name don't match
$module_conf->{'descripcion'} = $module_conf->{'description'};