From 9c291fe82bff5bdf4bb14b7629bcd521998075e4 Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Wed, 2 Nov 2016 13:10:32 +0100 Subject: [PATCH 1/5] Never set the status of script recon tasks outside the script. (cherry picked from commit 9b79307668d51021eeed17f78ae728b1f8518abf) --- pandora_server/lib/PandoraFMS/ReconServer.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_server/lib/PandoraFMS/ReconServer.pm b/pandora_server/lib/PandoraFMS/ReconServer.pm index a2453a8dd1..ac113579fd 100644 --- a/pandora_server/lib/PandoraFMS/ReconServer.pm +++ b/pandora_server/lib/PandoraFMS/ReconServer.pm @@ -517,8 +517,8 @@ sub exec_recon_script ($$$) { logger ($pa_config, "Cannot execute recon task command $command."); } - # Notify this recon task is ended - update_recon_task ($dbh, $task->{'id_rt'}, -1); + # Only update the timestamp in case something went wrong. The script should set the status. + db_do ($dbh, 'UPDATE trecon_task SET utimestamp = ? WHERE id_rt = ?', time (), $task->{'id_rt'}); logger($pa_config, 'Done executing recon script ' . safe_output($script->{'name'}), 10); return 0; From 6a98ac828814f208be1b954698c775476402f02b Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Thu, 27 Oct 2016 15:31:51 +0200 Subject: [PATCH 2/5] Reset recon task progress at startup. (cherry picked from commit a5c9da2a569dc4c8645e82f1c7e07325eb09cb9c) --- pandora_server/lib/PandoraFMS/ReconServer.pm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pandora_server/lib/PandoraFMS/ReconServer.pm b/pandora_server/lib/PandoraFMS/ReconServer.pm index ac113579fd..a4e20dc083 100644 --- a/pandora_server/lib/PandoraFMS/ReconServer.pm +++ b/pandora_server/lib/PandoraFMS/ReconServer.pm @@ -70,6 +70,9 @@ sub new ($$$$$$) { $Sem = Thread::Semaphore->new; $TaskSem = Thread::Semaphore->new (0); + db_do ($dbh, 'UPDATE trecon_task SET utimestamp = 0 WHERE id_recon_server = ? AND status <> -1', + get_server_id ($dbh, $config->{'servername'}, RECONSERVER)); + # Call the constructor of the parent class my $self = $class->SUPER::new($config, RECONSERVER, \&PandoraFMS::ReconServer::data_producer, \&PandoraFMS::ReconServer::data_consumer, $dbh); From ddfeafa1f0597a70ef9fe42576ee6917bf628017 Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Thu, 27 Oct 2016 15:31:19 +0200 Subject: [PATCH 3/5] Kill child processes when the server exits. (cherry picked from commit c3b9f9bdbb78c9570ae97732a91daa39ea35183a) --- pandora_server/bin/pandora_server | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pandora_server/bin/pandora_server b/pandora_server/bin/pandora_server index eead79c04e..afd8afe70a 100755 --- a/pandora_server/bin/pandora_server +++ b/pandora_server/bin/pandora_server @@ -694,3 +694,11 @@ else { win32_service_run(); } +################################################################################ +# Kill any scripts started by the Pandora FMS Server that are still running. +################################################################################ +END {{ + local $SIG{HUP} = "IGNORE"; + kill("HUP", -$$); +}} + From f0d23eb7127f354a319342e9f327441a0f29a505 Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Date: Mon, 7 Nov 2016 13:19:58 +0100 Subject: [PATCH 4/5] Added change in spanish translations --- pandora_console/include/languages/es.mo | Bin 481819 -> 481818 bytes pandora_console/include/languages/es.po | 50 ++---------------------- 2 files changed, 3 insertions(+), 47 deletions(-) diff --git a/pandora_console/include/languages/es.mo b/pandora_console/include/languages/es.mo index 8a6a476a3b321244b7ec4cc6fb1c88c7490ff56e..9195840d3457574411da8014d4128ffb81eb4a70 100644 GIT binary patch delta 39516 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 delta 39517 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 diff --git a/pandora_console/include/languages/es.po b/pandora_console/include/languages/es.po index ae4415856d..467c3be94e 100644 --- a/pandora_console/include/languages/es.po +++ b/pandora_console/include/languages/es.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: pandora-fms\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2016-11-03 10:13+0100\n" -"PO-Revision-Date: 2016-11-03 10:53+0000\n" +"PO-Revision-Date: 2016-11-07 12:05+0000\n" "Last-Translator: artu30 \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-11-03 11:04+0000\n" +"X-Launchpad-Export-Date: 2016-11-07 12:11+0000\n" "X-Generator: Launchpad (build 18246)\n" #: ../../general/links_menu.php:20 ../../godmode/menu.php:284 @@ -10976,7 +10976,7 @@ msgstr "Siguiente IP disponible" #: ../../enterprise/extensions/csv_import_group.php:27 msgid "CSV import group" -msgstr "Importar el grupo a CSV" +msgstr "Importar grupos de CSV" #: ../../enterprise/extensions/resource_exportation/functions.php:19 #: ../../extensions/resource_exportation.php:350 @@ -33565,47 +33565,3 @@ msgstr "Nodo principal" #~ msgid "Agent max" #~ msgstr "Máximo agente" - -#~ msgid "Show percentil 95º" -#~ msgstr "Mostrar porcentaje 95º" - -#~ msgid "Combined%20Sample%20Graph" -#~ msgstr "Gráfico de Muestra Combinado" - -#~ msgid "Update manager » Messages" -#~ msgstr "Administrador de actualizaciones » Mensajes" - -#~ msgid "Update manager » Online" -#~ msgstr "Administrador de actualizaciones » Conectado" - -#~ msgid "Update manager » Offline" -#~ msgstr "Administrador de actualizaciones » Sin conexión" - -#~ msgid "Update manager » Setup" -#~ msgstr "Administrador de actualizaciones » Configuración" - -#, php-format -#~ msgid "Percentile %dº" -#~ msgstr "Porcentaje %dº" - -#~ msgid "" -#~ "This happen when you have just created a module and it's not executed at " -#~ "first time. Usually in a few seconds should be initialized and you will be " -#~ "able to see in main view. If you keep non-init modules for more than 24hr " -#~ "(due a problem in it's execution or configuration) they will be " -#~ "automatically deleted by the system. Non-init are not visible in the “main " -#~ "view”, you can see/edit them in the module administration section, in the " -#~ "agent administrator." -#~ msgstr "" -#~ "Esto pasa cuando se acaba de crear un método y no se ejecuta la primera vez. " -#~ "Habitualmente en unos segundos debería estar iniciado para que lo pueda ver " -#~ "en la vista principal. Si se mantiene en la lista de módulos no iniciados " -#~ "más tiempo de 24hrs (debido a un problema en su ejecución o configuración) " -#~ "serán borrados automáticamente por el sistema." - -#~ msgid "Create group if doesn’t exist in destination" -#~ msgstr "Crear grupo si no existe en el destino" - -#, php-format -#~ msgid "® Ártica soluciones Pandora FMS %s - Build %s" -#~ msgstr "® Ártica soluciones Pandora FMS %s - Versión %s" From ad9037a7e0e0415f3b00daabd2e52ad9815f46e0 Mon Sep 17 00:00:00 2001 From: enriquecd Date: Mon, 7 Nov 2016 13:49:33 +0100 Subject: [PATCH 5/5] Fix icon bug and async string data without data:image string, Pandora UX #90 (cherry picked from commit 367c88fc9e6643cb707b000dc572e784adafe34c) --- pandora_console/include/ajax/module.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php index 5fd667c2e0..640ef1acd5 100755 --- a/pandora_console/include/ajax/module.php +++ b/pandora_console/include/ajax/module.php @@ -251,7 +251,7 @@ if ($get_module_detail) { foreach ($columns as $col => $attr) { if ($attr[1] != "modules_format_data") { - $data[] = date('d F Y - h:i:s A', $row['utimestamp']); + $data[] = date('d F Y h:i:s A', $row['utimestamp']); } elseif (($config['command_snapshot']) && (preg_match ("/[\n]+/i", $row[$attr[0]]))) { @@ -294,7 +294,17 @@ if ($get_module_detail) { $data[] = 'No data'; } else { + + if(is_snapshot_data($row[$attr[0]])){ $data[] = ""; + } + else{ + $data[] = $row[$attr[0]]; + } + + + + } } }