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

2011-04-19 Ramon Novoa <rnovoa@artica.es> 

* lib/PandoraFMS/DB.pm,
	  lib/PandoraFMS/Core.pm,
	  lib/PandoraFMS/DataServer.pm: Fixed module data processing
	  for PostgreSQL and Oracle.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4253 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Ramon Novoa 2011-04-19 15:32:11 +00:00
parent 34fbb5c40a
commit 454ea4f1ba
4 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_server/ChangeLog
View File

@ -1,3 +1,10 @@
2011-04-19 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/DB.pm,
lib/PandoraFMS/Core.pm,
lib/PandoraFMS/DataServer.pm: Fixed module data processing
for PostgreSQL and Oracle.
2011-04-18 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/SNMPServer.pm,

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

@ -440,7 +440,7 @@ sub pandora_evaluate_compound_alert ($$$$) {
# Get all the alerts associated with this compound alert
my @compound_alerts = get_db_rows ($dbh, 'SELECT id_alert_template_module, operation FROM talert_compound_elements
WHERE id_alert_compound = ? ORDER BY `order`', $id);
WHERE id_alert_compound = ? ORDER BY ' . db_reserved_word ('order'), $id);
foreach my $compound_alert (@compound_alerts) {
@ -1080,7 +1080,7 @@ sub pandora_create_incident ($$$$$$$$;$) {
# Initialize default parameters
$owner = '' unless defined ($owner);
db_do($dbh, 'INSERT INTO tincidencia (`inicio`, `titulo`, `descripcion`, `origen`, `estado`, `prioridad`, `id_grupo`, `id_usuario`)
db_do($dbh, 'INSERT INTO tincidencia (inicio, titulo, descripcion, origen, estado, prioridad, id_grupo, id_usuario)
VALUES (NOW(), ?, ?, ?, ?, ?, ?, ?)', $title, $text, $origin, $status, $priority, $id_group, $owner);
}
@ -1162,7 +1162,7 @@ sub pandora_create_module_from_hash ($$$) {
my $module_id = db_process_insert($dbh, 'id_agente_modulo', 'tagente_modulo', $parameters);
db_do ($dbh, 'INSERT INTO tagente_estado (`id_agente_modulo`, `id_agente`, `last_try`) VALUES (?, ?, \'1970-01-01 00:00:00\')', $module_id, $parameters->{'id_agente'});
db_do ($dbh, 'INSERT INTO tagente_estado (id_agente_modulo, id_agente, last_try) VALUES (?, ?, \'1970-01-01 00:00:00\')', $module_id, $parameters->{'id_agente'});
return $module_id;
}
@ -1573,7 +1573,7 @@ sub process_inc_data ($$$$) {
# No previous data
if (! defined ($data_inc)) {
db_do ($dbh, 'INSERT INTO tagente_datos_inc
(`id_agente_modulo`, `datos`, `utimestamp`)
(id_agente_modulo, datos, utimestamp)
VALUES (?, ?, ?)', $module->{'id_agente_modulo'}, $data, $utimestamp);
return undef;
}
@ -1582,7 +1582,7 @@ sub process_inc_data ($$$$) {
if ($data < $data_inc->{'datos'}) {
db_do ($dbh, 'DELETE FROM tagente_datos_inc WHERE id_agente_modulo = ?', $module->{'id_agente_modulo'});
db_do ($dbh, 'INSERT INTO tagente_datos_inc
(`id_agente_modulo`, `datos`, `utimestamp`)
(id_agente_modulo, datos, utimestamp)
VALUES (?, ?, ?)', $module->{'id_agente_modulo'}, $data, $utimestamp);
return undef;
}
@ -1758,7 +1758,7 @@ sub save_module_data ($$$$$) {
} else {
my $data = $data_object->{'data'};
my $table = ($module_type =~ m/_string/) ? 'tagente_datos_string' : 'tagente_datos';
db_do($dbh, 'INSERT INTO ' . $table . ' (id_agente_modulo, datos, utimestamp)
VALUES (?, ?, ?)', $module->{'id_agente_modulo'}, $data, $utimestamp);
}
@ -1778,7 +1778,7 @@ sub export_module_data ($$$$$$$) {
logger($pa_config, "Exporting data for module '" . $module->{'nombre'} . "' agent '" . $agent->{'nombre'} . "'.", 10);
db_do($dbh, 'INSERT INTO tserver_export_data
(`id_export_server`, `agent_name` , `module_name`, `module_type`, `data`, `timestamp`) VALUES
(id_export_server, agent_name , module_name, module_type, data, timestamp) VALUES
(?, ?, ?, ?, ?, ?)', $module->{'id_export'}, $agent->{'nombre'}, $module->{'nombre'}, $module_type, $data, $timestamp);
}
@ -1888,8 +1888,8 @@ sub archive_agent_position($$$$$$$$$$) {
logger($pa_config, "Saving new agent position: start_timestamp=$start_timestamp longitude=$longitude latitude=$latitude altitude=$altitude", 10);
db_do($dbh, 'INSERT INTO tgis_data_history (`longitude`, `latitude`, `altitude`, `tagente_id_agente`, `start_timestamp`,
`end_timestamp`, `description`, `number_of_packages`) VALUES (?, ?, ?, ?, ?, ?, ?, ?)',
db_do($dbh, 'INSERT INTO tgis_data_history (longitude, latitude, altitude, tagente_id_agente, start_timestamp,
end_timestamp, description, number_of_packages) VALUES (?, ?, ?, ?, ?, ?, ?, ?)',
$longitude, $latitude, $altitude, $agent_id, $start_timestamp, $end_timestamp, $description, $number_packages);
}
@ -2116,7 +2116,7 @@ my $queued_modules = get_db_value ($dbh, "SELECT SUM(queued_modules) FROM tserve
$queued_modules = 0;
}
my $dbmaintance = get_db_value ($dbh, "SELECT COUNT(*) FROM tconfig WHERE token = 'db_maintance' AND `value` > UNIX_TIMESTAMP() - 86400");
my $dbmaintance = get_db_value ($dbh, "SELECT COUNT(*) FROM tconfig WHERE token = 'db_maintance' AND value > UNIX_TIMESTAMP() - 86400");
$xml_output .=" <module>";
$xml_output .=" <name>Database Maintenance</name>";

15
pandora_server/lib/PandoraFMS/DB.pm
View File

@ -98,7 +98,7 @@ sub db_connect ($$$$$$) {
# Set date format
$dbh->do("ALTER SESSION SET NLS_TIMESTAMP_FORMAT='YYYY-MM-DD HH24:MI:SS'");
$dbh->do("ALTER SESSION SET NLS_NUMERIC_CHARACTERS='.,'");
return $dbh;
}
@ -292,20 +292,21 @@ sub get_group_name ($$) {
##########################################################################
sub get_db_value ($$;@) {
my ($dbh, $query, @values) = @_;
my @rows;
# Cache statements
my $sth = $dbh->prepare_cached($query);
$sth->execute(@values);
# No results
if ($sth->rows == 0) {
# Save returned rows
while (my $row = $sth->fetchrow_arrayref()) {
$sth->finish();
return undef;
return defined ($row->[0]) ? $row->[0] : undef;
}
my $row = $sth->fetchrow_arrayref();
$sth->finish();
return $row->[0];
return undef;
}
##########################################################################

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

@ -315,7 +315,7 @@ sub process_xml_data ($$$$$) {
# Get OS, group and description
my $os = pandora_get_os ($data->{'os_name'});
my $group_id = undef;
$group_id = get_db_value ($dbh, 'SELECT id_grupo FROM tgrupo WHERE nombre = ?', $data->{'group'}) if (defined ($data->{'group'}));
$group_id = get_db_value ($dbh, 'SELECT id_grupo FROM tgrupo WHERE ' . db_text ('nombre') . ' = ?', $data->{'group'}) if (defined ($data->{'group'}));
$group_id = $pa_config->{'autocreate_group'} unless defined ($group_id);
my $description = '';
$description = $data->{'description'} if (defined ($data->{'description'}));
@ -463,7 +463,7 @@ sub process_module_data ($$$$$$$$$) {
# Get module data or create it if it does not exist
$ModuleSem->down ();
my $module = get_db_single_row ($dbh, 'SELECT * FROM tagente_modulo WHERE id_agente = ? AND nombre = ?', $agent->{'id_agente'}, safe_input($module_name));
my $module = get_db_single_row ($dbh, 'SELECT * FROM tagente_modulo WHERE id_agente = ? AND ' . db_text ('nombre') . ' = ?', $agent->{'id_agente'}, safe_input($module_name));
if (! defined ($module)) {
# Do not auto create modules
if ($pa_config->{'autocreate'} ne '1') {
@ -498,7 +498,7 @@ sub process_module_data ($$$$$$$$$) {
pandora_create_module ($pa_config, $agent->{'id_agente'}, $module_id, $module_name,
$module_conf->{'max'}, $module_conf->{'min'}, $module_conf->{'post_process'},
$module_conf->{'descripcion'}, $module_conf->{'module_interval'}, $dbh);
$module = get_db_single_row ($dbh, 'SELECT * FROM tagente_modulo WHERE id_agente = ? AND nombre = ?', $agent->{'id_agente'}, safe_input($module_name));
$module = get_db_single_row ($dbh, 'SELECT * FROM tagente_modulo WHERE id_agente = ? AND ' . db_text('nombre') . ' = ?', $agent->{'id_agente'}, safe_input($module_name));
if (! defined ($module)) {
logger($pa_config, "Could not create module '$module_name' for agent '$agent_name'.", 3);
$ModuleSem->up ();
@ -506,6 +506,9 @@ sub process_module_data ($$$$$$$$$) {
}
} else {
# Control NULL columns
$module->{'descripcion'} = '' unless defined ($module->{'descripcion'});
# Set default values
$module_conf->{'max'} = $module->{'max'} unless defined ($module_conf->{'max'});
$module_conf->{'min'} = $module->{'min'} unless defined ($module_conf->{'min'});