From d9b95a32f5d11a8215630c924ff19464531563d3 Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Wed, 22 Jul 2015 10:35:09 +0200 Subject: [PATCH 1/4] Made the database engine dynamic in pandora_db. --- pandora_server/util/pandora_db.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 3dcd083c6b..c7276537c8 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -639,7 +639,7 @@ sub pandora_load_config ($) { $conf->{'claim_back_snmp_modules'} = '1' unless defined ($conf->{'claim_back_snmp_modules'}); # Read additional tokens from the DB - my $dbh = db_connect ('mysql', $conf->{'dbname'}, $conf->{'dbhost'}, $conf->{'dbport'}, $conf->{'dbuser'}, $conf->{'dbpass'}); + my $dbh = db_connect ($conf->{'dbengine'}, $conf->{'dbname'}, $conf->{'dbhost'}, $conf->{'dbport'}, $conf->{'dbuser'}, $conf->{'dbpass'}); $conf->{'_event_purge'} = get_db_value ($dbh, "SELECT value FROM tconfig WHERE token = 'event_purge'"); $conf->{'_trap_purge'} = get_db_value ($dbh, "SELECT value FROM tconfig WHERE token = 'trap_purge'"); From 6592e0f5b907d130c2d5020d32926519803ec2f4 Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Wed, 22 Jul 2015 10:37:23 +0200 Subject: [PATCH 2/4] Return from the data server consumer if the XML file was not found. --- pandora_server/lib/PandoraFMS/DataServer.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pandora_server/lib/PandoraFMS/DataServer.pm b/pandora_server/lib/PandoraFMS/DataServer.pm index 72c048d21e..f34c59a59d 100644 --- a/pandora_server/lib/PandoraFMS/DataServer.pm +++ b/pandora_server/lib/PandoraFMS/DataServer.pm @@ -162,6 +162,7 @@ sub data_consumer ($$) { $AgentSem->down (); delete ($Agents{$agent_name}); $AgentSem->up (); + return; } # Try to parse the XML 2 times, with a delay between tries of 2 seconds @@ -192,6 +193,7 @@ sub data_consumer ($$) { $AgentSem->down (); delete ($Agents{$agent_name}); $AgentSem->up (); + return; } unlink ($file_name); From cbc27d103d100ad468739016558ac7438347011c Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Diaz Date: Wed, 22 Jul 2015 10:42:47 +0200 Subject: [PATCH 3/4] Now the value 'db_scheme_version' show the correct bd version (only mysql). Ticket#2430 --- pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql index ca5325b41a..60c4782f7c 100755 --- a/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql @@ -63,6 +63,8 @@ UPDATE `talert_commands` SET `fields_descriptions` = '[\"Destination addres -- Table `tconfig` -- --------------------------------------------------------------------- INSERT INTO `tconfig` (`token`, `value`) VALUES ('post_process_custom_values', '{"0.00000038580247":"Seconds to months","0.00000165343915":"Seconds to weeks","0.00001157407407":"Seconds to days","0.01666666666667":"Seconds to minutes","0.00000000093132":"Bytes to Gigabytes","0.00000095367432":"Bytes to Megabytes","0.0009765625":"Bytes to Kilobytes","0.00000001653439":"Timeticks to weeks","0.00000011574074":"Timeticks to days"}'); +UPDATE tconfig SET value = 'v6.0dev' WHERE token = 'db_scheme_version'; + -- --------------------------------------------------------------------- -- Table `tnetwork_map` From a1d1cc5eb995df59c81746b15772732798af9af1 Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Diaz Date: Wed, 22 Jul 2015 11:24:50 +0200 Subject: [PATCH 4/4] Now diagnostic info have a new data, 'db_scheme_first_version' and show the first pandora db scheme version. --- pandora_console/extras/pandora_diag.php | 5 ++++- pandora_console/pandoradb_data.sql | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pandora_console/extras/pandora_diag.php b/pandora_console/extras/pandora_diag.php index 6f634c6250..540cf27f0f 100644 --- a/pandora_console/extras/pandora_diag.php +++ b/pandora_console/extras/pandora_diag.php @@ -123,7 +123,10 @@ switch ($config["dbtype"]) { case "mysql": render_info_data ("SELECT `value` FROM tconfig - WHERE `token` = 'db_scheme_version'", "DB Schema Version"); + WHERE `token` = 'db_scheme_first_version'", "DB Schema Version (first installed)"); + render_info_data ("SELECT `value` + FROM tconfig + WHERE `token` = 'db_scheme_version'", "DB Schema Version (actual)"); render_info_data ("SELECT `value` FROM tconfig WHERE `token` = 'db_scheme_build'", "DB Schema Build"); diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index f55f93e26d..a163ee30d1 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -37,6 +37,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('days_compact','0'), ('graph_res','5'), ('step_compact','1'), +('db_scheme_first_version', '6.0dev'), ('db_scheme_version','6.0dev'), ('db_scheme_build','PD150722'), ('show_unknown','0'),