From 34639ac5c46522e18408f57ee7517ac84a4ecee0 Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Fri, 20 Jul 2018 10:41:16 +0200 Subject: [PATCH 01/21] Do not update tagente_estado when processing out-of-order data. Ref pandora_enterprise#6120. --- pandora_server/lib/PandoraFMS/Core.pm | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index 19caec0169..71adb4cf36 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -1623,16 +1623,19 @@ sub pandora_process_module ($$$$$$$$$;$) { my $save = ($module->{'history_data'} == 1 && ($agent_status->{'datos'} ne $processed_data || $last_try < ($utimestamp - 86400))) ? 1 : 0; - db_do ($dbh, 'UPDATE tagente_estado - SET datos = ?, estado = ?, known_status = ?, last_status = ?, last_known_status = ?, - status_changes = ?, utimestamp = ?, timestamp = ?, - id_agente = ?, current_interval = ?, running_by = ?, - last_execution_try = ?, last_try = ?, last_error = ?, - ff_start_utimestamp = ? - WHERE id_agente_modulo = ?', $processed_data, $status, $status, $new_status, $new_status, $status_changes, - $current_utimestamp, $timestamp, $module->{'id_agente'}, $current_interval, $server_id, - $utimestamp, ($save == 1) ? $timestamp : $agent_status->{'last_try'}, $last_error, $ff_start_utimestamp, $module->{'id_agente_modulo'}); - + # Never update tagente_estado when processing out-of-order data. + if ($utimestamp >= $last_try) { + db_do ($dbh, 'UPDATE tagente_estado + SET datos = ?, estado = ?, known_status = ?, last_status = ?, last_known_status = ?, + status_changes = ?, utimestamp = ?, timestamp = ?, + id_agente = ?, current_interval = ?, running_by = ?, + last_execution_try = ?, last_try = ?, last_error = ?, + ff_start_utimestamp = ? + WHERE id_agente_modulo = ?', $processed_data, $status, $status, $new_status, $new_status, $status_changes, + $current_utimestamp, $timestamp, $module->{'id_agente'}, $current_interval, $server_id, + $utimestamp, ($save == 1) ? $timestamp : $agent_status->{'last_try'}, $last_error, $ff_start_utimestamp, $module->{'id_agente_modulo'}); + } + # Save module data. Async and log4x modules are not compressed. if ($module_type =~ m/(async)|(log4x)/ || $save == 1) { save_module_data ($data_object, $module, $module_type, $utimestamp, $dbh); From e54e91cdf108397d83e65b6901ee6e394661f52c Mon Sep 17 00:00:00 2001 From: fermin831 Date: Fri, 17 Aug 2018 13:27:55 +0200 Subject: [PATCH 02/21] Revert "Improved metaconsole sync (added centralized management)" This reverts commit 3c99242508cc573674c8f31e53c2408596e58380. --- pandora_console/include/functions_config.php | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index 7fcee364f3..3bc48f519a 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -2294,19 +2294,4 @@ function config_prepare_session() { ini_set("post_max_size", $config["max_file_size"]); ini_set("upload_max_filesize", $config["max_file_size"]); } - -function config_update_value_in_db ($token, $value) { - $inserted_value = db_get_value('value', 'tconfig', '`token`', $token); - if ($inserted_value === false) { - return db_process_sql_insert( - 'tconfig', - array('value' => $value, 'token' => $token) - ) !== false; - } - else { - return db_process_sql_update( - 'tconfig', array('value' => $value), array('token' => $token) - ) !== false; - } -} ?> From 52da57121293f2ee766872e922b334bed7d10a0f Mon Sep 17 00:00:00 2001 From: samucarc Date: Fri, 17 Aug 2018 14:42:17 +0200 Subject: [PATCH 03/21] Fixed visual error --- pandora_console/include/languages/en_GB.po | 2 +- pandora_console/include/languages/es.po | 2 +- pandora_console/include/languages/ja.po | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pandora_console/include/languages/en_GB.po b/pandora_console/include/languages/en_GB.po index 246b244fe4..2b962c9e81 100644 --- a/pandora_console/include/languages/en_GB.po +++ b/pandora_console/include/languages/en_GB.po @@ -33958,7 +33958,7 @@ msgid "Cluster type" msgstr "" #: ../../enterprise/godmode/reporting/cluster_builder.main.php:258 -msgid "Ative - Active" +msgid "Active - Active" msgstr "" #: ../../enterprise/godmode/reporting/cluster_builder.main.php:259 diff --git a/pandora_console/include/languages/es.po b/pandora_console/include/languages/es.po index 682d2019cb..b935806431 100644 --- a/pandora_console/include/languages/es.po +++ b/pandora_console/include/languages/es.po @@ -34245,7 +34245,7 @@ msgid "Cluster type" msgstr "" #: ../../enterprise/godmode/reporting/cluster_builder.main.php:258 -msgid "Ative - Active" +msgid "Active - Active" msgstr "" #: ../../enterprise/godmode/reporting/cluster_builder.main.php:259 diff --git a/pandora_console/include/languages/ja.po b/pandora_console/include/languages/ja.po index ef9f55463a..685f4d7c32 100644 --- a/pandora_console/include/languages/ja.po +++ b/pandora_console/include/languages/ja.po @@ -33343,7 +33343,7 @@ msgid "Cluster type" msgstr "クラスタタイプ" #: ../../enterprise/godmode/reporting/cluster_builder.main.php:258 -msgid "Ative - Active" +msgid "Active - Active" msgstr "アクティブ - アクティブ" #: ../../enterprise/godmode/reporting/cluster_builder.main.php:259 From 168d081268a414a18ac54584ea97ab6b6dbf59e3 Mon Sep 17 00:00:00 2001 From: fermin831 Date: Mon, 20 Aug 2018 11:38:01 +0200 Subject: [PATCH 04/21] [Secondary groups] Added to manage agents view --- .../godmode/agentes/modificar_agente.php | 137 +++++------------- 1 file changed, 39 insertions(+), 98 deletions(-) diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php index 670009bf2f..5b97384cb4 100644 --- a/pandora_console/godmode/agentes/modificar_agente.php +++ b/pandora_console/godmode/agentes/modificar_agente.php @@ -343,6 +343,7 @@ if($os != 0){ $search_sql .= " AND id_os = " . $os; } +$user_groups_to_sql = ""; // Show only selected groups if ($ag_group > 0) { $ag_groups = array(); @@ -350,100 +351,38 @@ if ($ag_group > 0) { if ($recursion) { $ag_groups = groups_get_id_recursive($ag_group, true); } - - switch ($config["dbtype"]) { - case "mysql": - $sql = sprintf ('SELECT * - FROM tagente - WHERE id_grupo IN (%s) - %s - ORDER BY %s %s, %s %s - LIMIT %d, %d', - implode (",", $ag_groups), $search_sql, $order['field'],$order['order'], $order['field2'], $order['order'], $offset, $config["block_size"]); - break; - case "postgresql": - $sql = sprintf ('SELECT * - FROM tagente - WHERE id_grupo IN (%s) - %s - ORDER BY %s %s, %s %s - LIMIT %d OFFSET %d', - implode (",", $ag_groups), $search_sql, $order['field'],$order['order'], $order['field2'], $order['order'], $config["block_size"], $offset); - break; - case "oracle": - $set = array (); - $set['limit'] = $config["block_size"]; - $set['offset'] = $offset; - $sql = sprintf ('SELECT * - FROM tagente - WHERE id_grupo IN (%s) - %s - ORDER BY %s %s, %s %s', - implode (",", $ag_groups), $search_sql, $order['field'],$order['order'], $order['field2'], $order['order']); - $sql = oracle_recode_query ($sql, $set); - break; - } - - $sql_total = sprintf ('SELECT COUNT(*) - FROM tagente - WHERE id_grupo IN (%s) - %s', - implode (",", $ag_groups), $search_sql); - $total_agents = db_get_sql ($sql_total); -} -else { + $user_groups_to_sql = implode (",", $ag_groups); +} else { // Concatenate AW and AD permisions to get all the possible groups where the user can manage $user_groupsAW = users_get_groups ($config['id_user'], 'AW'); $user_groupsAD = users_get_groups ($config['id_user'], 'AD'); - + $user_groups = $user_groupsAW + $user_groupsAD; - - $sql = sprintf ('SELECT COUNT(*) - FROM tagente - WHERE id_grupo IN (%s) - %s', - implode (',', array_keys ($user_groups)), - $search_sql); - - $total_agents = db_get_sql ($sql); - - switch ($config["dbtype"]) { - case "mysql": - $sql = sprintf ('SELECT * - FROM tagente - WHERE id_grupo IN (%s) - %s - ORDER BY %s %s, %s %s - LIMIT %d, %d', - implode (',', array_keys ($user_groups)), - $search_sql, $order['field'],$order['order'], $order['field2'], $order['order'], $offset, $config["block_size"]); - break; - case "postgresql": - $sql = sprintf ('SELECT * - FROM tagente - WHERE id_grupo IN (%s) - %s - ORDER BY %s %s, %s %s - LIMIT %d OFFSET %d', - implode (',', array_keys ($user_groups)), - $search_sql, $order['field'],$order['order'], $order['field2'], $order['order'], $config["block_size"], $offset); - break; - case "oracle": - $set = array (); - $set['limit'] = $config["block_size"]; - $set['offset'] = $offset; - $sql = sprintf ('SELECT * - FROM tagente - WHERE id_grupo IN (%s) - %s - ORDER BY %s %s, %s %s', - implode (',', array_keys ($user_groups)), - $search_sql, $order['field'],$order['order'], $order['field2'], $order['order']); - $sql = oracle_recode_query ($sql, $set); - break; - } + $user_groups_to_sql = implode (',', array_keys ($user_groups)); } +$sql = sprintf ('SELECT COUNT(*) + FROM tagente LEFT JOIN tagent_secondary_group tasg + ON tagente.id_agente = tasg.id_agent + WHERE (tagente.id_grupo IN (%s) OR tasg.id_group IN (%s)) + %s', + $user_groups_to_sql, $user_groups_to_sql, + $search_sql); + +$total_agents = db_get_sql ($sql); + +$sql = sprintf ('SELECT * + FROM tagente LEFT JOIN tagent_secondary_group tasg + ON tagente.id_agente = tasg.id_agent + WHERE (tagente.id_grupo IN (%s) OR tasg.id_group IN (%s)) + %s + ORDER BY %s %s, %s %s + LIMIT %d, %d', + $user_groups_to_sql, $user_groups_to_sql, + $search_sql, + $order['field'], $order['order'], $order['field2'], $order['order'], + $offset, $config["block_size"]); + $agents = db_get_all_rows_sql ($sql); // Delete rnum row generated by oracle_recode_query() function @@ -494,13 +433,15 @@ if ($agents !== false) { } /* End Update tagente.remote 0/1 with remote agent function return */ - - $id_grupo = $agent["id_grupo"]; - + + $all_groups = agents_get_all_groups_agent($agent["id_agente"], $agent["id_grupo"]); + $check_aw = check_acl_one_of_groups ($config["id_user"], $all_groups, "AW"); + $check_ad = check_acl_one_of_groups ($config["id_user"], $all_groups, "AD"); + $cluster = db_get_row_sql('select id from tcluster where id_agent = '.$agent['id_agente']); - - if (! check_acl ($config["id_user"], $id_grupo, "AW", $agent['id_agente']) && ! check_acl ($config["id_user"], $id_grupo, "AD", $agent['id_agente'])) - continue; + + // Do not show the agent if there is not enough permissions + if (!$check_aw && !$check_ad) continue; if ($color == 1) { $tdcolor = "datos"; @@ -526,7 +467,7 @@ if ($agents !== false) { echo ''; echo ""; - if (check_acl ($config["id_user"], $agent["id_grupo"], "AW")) { + if ($check_aw) { $main_tab = 'main'; } else { @@ -574,7 +515,7 @@ if ($agents !== false) { } echo ''; if ($id_agente) { + echo '
'; html_print_submit_button (__('Update'), 'updbutton', false, 'class="sub upd"'); html_print_input_hidden ('update_agent', 1); From 8e2f4b0eaad8680fca1faac2e5b0a17a421c48ee Mon Sep 17 00:00:00 2001 From: alejandro-campos Date: Thu, 23 Aug 2018 13:57:41 +0200 Subject: [PATCH 09/21] Implemented license validation for mobile console --- pandora_console/index.php | 4 ++-- pandora_console/mobile/index.php | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/pandora_console/index.php b/pandora_console/index.php index 84f53d6e95..015ab613f9 100755 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -202,9 +202,9 @@ $process_login = false; // Update user password $change_pass = get_parameter_post('renew_password', 0); - -if ($change_pass == 1) { +if ($change_pass == 1) { + $password_old = (string) get_parameter_post ('old_password', ''); $password_new = (string) get_parameter_post ('new_password', ''); $password_confirm = (string) get_parameter_post ('confirm_new_password', ''); diff --git a/pandora_console/mobile/index.php b/pandora_console/mobile/index.php index 6623965f1a..04fc1ff92e 100644 --- a/pandora_console/mobile/index.php +++ b/pandora_console/mobile/index.php @@ -42,6 +42,8 @@ $enterpriseHook = enterprise_include('mobile/include/enterprise.class.php'); $enterpriseHook = enterprise_include('mobile/operation/dashboard.php'); $enterpriseHook = enterprise_include('mobile/operation/home.php'); +$is_mobile=true; + if (!empty ($config["https"]) && empty ($_SERVER['HTTPS'])) { $query = ''; if (sizeof ($_REQUEST)) @@ -116,6 +118,13 @@ if ($action != "ajax") { } } +if ($user->isLogged()) { + + if (file_exists ("../enterprise/load_enterprise.php")) { + include_once ("../enterprise/load_enterprise.php"); + } +} + switch ($action) { case 'ajax': $parameter1 = $system->getRequest('parameter1', false); @@ -169,6 +178,11 @@ switch ($action) { break; case 'login': if ($user->login() && $user->isLogged()) { + + if (file_exists ("../enterprise/load_enterprise.php")) { + include_once ("../enterprise/load_enterprise.php"); + } + if ($user->isWaitingDoubleAuth()) { if ($user->validateDoubleAuthCode()) { // Logged. Refresh the page @@ -192,6 +206,12 @@ switch ($action) { break; case 'double_auth': if ($user->isLogged()) { + + if (file_exists ("../enterprise/load_enterprise.php")) { + include_once ("../enterprise/load_enterprise.php"); + } + + if ($user->validateDoubleAuthCode()) { $user_language = get_user_language ($system->getConfig('id_user')); if (file_exists ('../include/languages/'.$user_language.'.mo')) { @@ -358,4 +378,8 @@ switch ($action) { } break; } + + + + ?> From a9ac4462a5b87f2833488839f5b4304a0bf4d4cd Mon Sep 17 00:00:00 2001 From: alejandro-campos Date: Fri, 24 Aug 2018 09:15:10 +0200 Subject: [PATCH 10/21] added help dialog in visual console editor --- .../include/functions_visual_map_editor.php | 2 +- .../help/en/help_macros_visual_maps.php | 19 +++++++++++++++++++ .../help/es/help_macros_visual_maps.php | 19 +++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 pandora_console/include/help/en/help_macros_visual_maps.php create mode 100644 pandora_console/include/help/es/help_macros_visual_maps.php diff --git a/pandora_console/include/functions_visual_map_editor.php b/pandora_console/include/functions_visual_map_editor.php index ff07b6bcb4..83c394ab44 100755 --- a/pandora_console/include/functions_visual_map_editor.php +++ b/pandora_console/include/functions_visual_map_editor.php @@ -166,7 +166,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) { 'bars_graph', 'clock'); $form_items['label_row']['html'] = - '' . __('Label') . ' + '' . __('Label') . ui_print_help_icon ('macros_visual_maps', true) . '
Label position diff --git a/pandora_console/include/help/en/help_macros_visual_maps.php b/pandora_console/include/help/en/help_macros_visual_maps.php new file mode 100644 index 0000000000..95b88968d8 --- /dev/null +++ b/pandora_console/include/help/en/help_macros_visual_maps.php @@ -0,0 +1,19 @@ + +

Macros

+ +It is possible to enter a macro in the text box when editing an element of the visual console. +

+List of visual maps' macros: +
    +
  • _date_: Displays the date using the local PHP format.
    • +
  • _time_: Displays the time using the local PHP format.
    • +
  • _agent_: Displays the alias of the selected agent.
    • +
  • _module_: Displays the name of the selected module.
    • +
  • _agentdescription_: Displays the description of the selected agent.
    • +
  • _address_: Displays the ip address of the selected agent.
    • +
  • _description_moduledescription_: Displays the description of the selected module.
    • +
\ No newline at end of file diff --git a/pandora_console/include/help/es/help_macros_visual_maps.php b/pandora_console/include/help/es/help_macros_visual_maps.php new file mode 100644 index 0000000000..290007c555 --- /dev/null +++ b/pandora_console/include/help/es/help_macros_visual_maps.php @@ -0,0 +1,19 @@ + +

Macros

+ +Es posible introducir una macro en el cuadro de texto al editar un elemento de la consola visual. +

+Lista de macros de mapas visuales: +
    +
  • _date_ : Muestra la fecha usando el formato local del PHP.
    • +
  • _time_ : Muestra la hora usando el formato local del PHP.
    • +
  • _agent_ : Muestra el alias del agente seleccionado.
    • +
  • _module_ : Muestra el nombre del módulo seleccionado.
    • +
  • _agentdescription_ : Muestra la descripción del agente seleccionado.
    • +
  • _address_ : Muestra la dirección ip del agente seleccionado.
    • +
  • _moduledescription_ : Muestra la descripción del módulo seleccionado.
    • +
\ No newline at end of file From 5f593df22a4304d1917eae48aaee1fb11f4006cc Mon Sep 17 00:00:00 2001 From: alejandro-campos Date: Fri, 24 Aug 2018 09:19:48 +0200 Subject: [PATCH 11/21] minor fix in visual maps macros help text --- pandora_console/include/help/en/help_macros_visual_maps.php | 4 ++-- pandora_console/include/help/es/help_macros_visual_maps.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pandora_console/include/help/en/help_macros_visual_maps.php b/pandora_console/include/help/en/help_macros_visual_maps.php index 95b88968d8..4ff573b19a 100644 --- a/pandora_console/include/help/en/help_macros_visual_maps.php +++ b/pandora_console/include/help/en/help_macros_visual_maps.php @@ -1,9 +1,9 @@ -

Macros

+

Visual maps' macros

It is possible to enter a macro in the text box when editing an element of the visual console.

diff --git a/pandora_console/include/help/es/help_macros_visual_maps.php b/pandora_console/include/help/es/help_macros_visual_maps.php index 290007c555..592752874e 100644 --- a/pandora_console/include/help/es/help_macros_visual_maps.php +++ b/pandora_console/include/help/es/help_macros_visual_maps.php @@ -3,7 +3,7 @@ * @package Include/help/es */ ?> -

Macros

+

Macros de mapas visuales

Es posible introducir una macro en el cuadro de texto al editar un elemento de la consola visual.

From 9915518b8efaaaf03557099c96fa33e288045bb3 Mon Sep 17 00:00:00 2001 From: samucarc Date: Mon, 27 Aug 2018 18:00:44 +0200 Subject: [PATCH 12/21] Fixed alert report date --- pandora_console/include/functions_reporting.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index 9c0a8d2a8c..6d0a57fe8b 100755 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -2869,7 +2869,7 @@ function reporting_alert_get_fired($id_agent_module, $id_alert_template_module, if (empty($firedTimes)) { $firedTimes = array(); - $firedTimes[0]['timestamp'] = '----------------------------'; + $firedTimes[0]['timestamp'] = null; } foreach ($firedTimes as $fireTime) { @@ -3010,7 +3010,10 @@ function reporting_alert_report_group($report, $content) { (int) $report["datetime"]); $module_actions["actions"] = $data_action; + if ($module_actions["template_fired"][0] !== null) $data_row['alerts'][$ntemplates] = $module_actions; + else + $data_row = null; $ntemplates++; } @@ -3127,7 +3130,10 @@ function reporting_alert_report_agent($report, $content) { (int) $report["datetime"]); $module_actions["actions"] = $data_action; + if ($module_actions["template_fired"][0] !== null) $data_row['alerts'][$ntemplates] = $module_actions; + else + $data_row = null; $ntemplates++; } @@ -3248,7 +3254,10 @@ function reporting_alert_report_module($report, $content) { (int) $report["datetime"]); $module_actions["actions"] = $data_action; + if ($module_actions["template_fired"][0] !== null) $data_row['alerts'][$ntemplates] = $module_actions; + else + $data_row = null; $ntemplates++; } From 7c37a7d2ee2e1eb3274c220c249418ffccfd18fc Mon Sep 17 00:00:00 2001 From: artica Date: Tue, 28 Aug 2018 00:01:27 +0200 Subject: [PATCH 13/21] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index d5791dcc76..1aeea95537 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.726-180827 +Version: 7.0NG.726-180828 Architecture: all Priority: optional Section: admin diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh index 9a55654585..3765a9ab0a 100644 --- a/pandora_agents/unix/DEBIAN/make_deb_package.sh +++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0NG.726-180827" +pandora_version="7.0NG.726-180828" echo "Test if you has the tools for to make the packages." whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index 6b57ec6f3b..96dcae78bb 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -42,7 +42,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.726'; -use constant AGENT_BUILD => '180827'; +use constant AGENT_BUILD => '180828'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 008a191ebd..33638b3364 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.726 -%define release 180827 +%define release 180828 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index 014dfae1ec..a9a560916c 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.726 -%define release 180827 +%define release 180828 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index ec0aa622c6..d70da6e68f 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.726" -PI_BUILD="180827" +PI_BUILD="180828" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 1282a16065..ccfdd2491e 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{180827} +{180828} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 7d9168dd91..c5d0d26222 100644 --- a/pandora_agents/win32/pandora.cc +++ b/pandora_agents/win32/pandora.cc @@ -30,7 +30,7 @@ using namespace Pandora; using namespace Pandora_Strutils; #define PATH_SIZE _MAX_PATH+1 -#define PANDORA_VERSION ("7.0NG.726(Build 180827)") +#define PANDORA_VERSION ("7.0NG.726(Build 180828)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 9314b885e0..0683893185 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Artica ST" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.726(Build 180827))" + VALUE "ProductVersion", "(7.0NG.726(Build 180828))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 7d885222b8..0ab4985c89 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.726-180827 +Version: 7.0NG.726-180828 Architecture: all Priority: optional Section: admin diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh index a3116668b9..2aec499426 100644 --- a/pandora_console/DEBIAN/make_deb_package.sh +++ b/pandora_console/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0NG.726-180827" +pandora_version="7.0NG.726-180828" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 4bb649d571..62c14f9290 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC180827'; +$build_version = 'PC180828'; $pandora_version = 'v7.0NG.726'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 9e9e24ac9c..86ea97aa5f 100755 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 44dee36d06..3d0f1ec38a 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.726 -%define release 180827 +%define release 180828 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 7ffb5014d8..48379a2e3e 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.726 -%define release 180827 +%define release 180828 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 6cac72fcae..eb167303d0 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.726" -PI_BUILD="180827" +PI_BUILD="180828" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 6e41d9f237..2989207841 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -34,7 +34,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.726 PS180827"; +my $version = "7.0NG.726 PS180828"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 51e76ded68..d5313b7667 100644 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.726 PS180827"; +my $version = "7.0NG.726 PS180828"; # save program name for logging my $progname = basename($0); From e59f123d1980d193d517ecaf8ca60b3b19b352d6 Mon Sep 17 00:00:00 2001 From: "manuel.montes" Date: Tue, 28 Aug 2018 10:23:25 +0200 Subject: [PATCH 14/21] Fixed bug in agent-manager --- pandora_console/godmode/agentes/agent_manager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php index 8224d4f7a1..0196fb9393 100644 --- a/pandora_console/godmode/agentes/agent_manager.php +++ b/pandora_console/godmode/agentes/agent_manager.php @@ -603,7 +603,7 @@ else { } echo clippy_context_help("modules_not_learning_mode"); echo ""; -echo '
'; + if ($id_agente) { echo '
'; From 3b7b54cb68329f3269877fd261f619ef72f68f2c Mon Sep 17 00:00:00 2001 From: alejandro-campos Date: Tue, 28 Aug 2018 10:31:24 +0200 Subject: [PATCH 15/21] fixed text errors in visual console macros' help text --- pandora_console/include/help/en/help_macros_visual_maps.php | 6 +++--- pandora_console/include/help/es/help_macros_visual_maps.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pandora_console/include/help/en/help_macros_visual_maps.php b/pandora_console/include/help/en/help_macros_visual_maps.php index 4ff573b19a..af01634f94 100644 --- a/pandora_console/include/help/en/help_macros_visual_maps.php +++ b/pandora_console/include/help/en/help_macros_visual_maps.php @@ -3,11 +3,11 @@ * @package Include/help/en */ ?> -

Visual maps' macros

+

Visual console's macros

It is possible to enter a macro in the text box when editing an element of the visual console.

-List of visual maps' macros: +List of visual console's macros:
  • _date_: Displays the date using the local PHP format.
  • _time_: Displays the time using the local PHP format.
    • @@ -15,5 +15,5 @@ List of visual maps' macros:
  • _module_: Displays the name of the selected module.
  • _agentdescription_: Displays the description of the selected agent.
  • _address_: Displays the ip address of the selected agent.
    • -
  • _description_moduledescription_: Displays the description of the selected module.
    • +
  • _moduledescription_: Displays the description of the selected module.
\ No newline at end of file diff --git a/pandora_console/include/help/es/help_macros_visual_maps.php b/pandora_console/include/help/es/help_macros_visual_maps.php index 592752874e..e373d7417b 100644 --- a/pandora_console/include/help/es/help_macros_visual_maps.php +++ b/pandora_console/include/help/es/help_macros_visual_maps.php @@ -3,11 +3,11 @@ * @package Include/help/es */ ?> -

Macros de mapas visuales

+

Macros de consolas visuales

Es posible introducir una macro en el cuadro de texto al editar un elemento de la consola visual.

-Lista de macros de mapas visuales: +Lista de macros de consolas visuales:
  • _date_ : Muestra la fecha usando el formato local del PHP.
  • _time_ : Muestra la hora usando el formato local del PHP.
    • From dae0021db975da36b7330900116d7621b26d5ffa Mon Sep 17 00:00:00 2001 From: samucarc Date: Tue, 28 Aug 2018 11:02:27 +0200 Subject: [PATCH 16/21] Changed soft graphs hint --- pandora_console/godmode/setup/setup_visuals.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php index bdca26e56d..88b2392e14 100755 --- a/pandora_console/godmode/setup/setup_visuals.php +++ b/pandora_console/godmode/setup/setup_visuals.php @@ -686,8 +686,8 @@ $table_chars->data[$row][1] = html_print_select($options_full_escale, 'full_scal $row++; -$table_chars->data[$row][0] = __('Soft graphs:'); -$table_chars->data[$row][0] .= ui_print_help_tip(__('This option may cause performance issues'), true); +$table_chars->data[$row][0] = __('Show only average'); +$table_chars->data[$row][0] .= ui_print_help_tip(__('If enabled, the module graphs will only show the average value, otherwise it will show three sets of data showing maximums, averages and minimums.'), true); $options_soft_graphs = array(); $options_soft_graphs[0] = __('Standard mode'); From 5f4d76f3a7c07c861cd455256b7412a86e979c95 Mon Sep 17 00:00:00 2001 From: alejandro-campos Date: Tue, 28 Aug 2018 16:38:32 +0200 Subject: [PATCH 17/21] fixed recursion option in custom report's item editor --- pandora_console/extras/mr/20.sql | 1 + .../pandoradb_migrate_6.0_to_7.0.mysql.sql | 1 + .../reporting_builder.item_editor.php | 18 +++++++++++++++++- .../godmode/reporting/reporting_builder.php | 9 ++++++++- pandora_console/pandoradb.sql | 1 + 5 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 pandora_console/extras/mr/20.sql diff --git a/pandora_console/extras/mr/20.sql b/pandora_console/extras/mr/20.sql new file mode 100644 index 0000000000..a78963b813 --- /dev/null +++ b/pandora_console/extras/mr/20.sql @@ -0,0 +1 @@ +ALTER TABLE treport_content ADD COLUMN `recursion` TINYINT(1) default NULL; \ No newline at end of file diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql index 2e6457c3f0..a472b8b6dd 100644 --- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql @@ -1337,6 +1337,7 @@ ALTER TABLE treport_content ADD COLUMN `lapse_calc` tinyint(1) default '0'; ALTER TABLE treport_content ADD COLUMN `lapse` int(11) default '300'; ALTER TABLE treport_content ADD COLUMN `visual_format` tinyint(1) default '0'; ALTER TABLE treport_content ADD COLUMN `hide_no_data` tinyint(1) default '0'; +ALTER TABLE treport_content ADD COLUMN `recursion` tinyint(1) default NULL; -- --------------------------------------------------------------------- -- Table `tmodule_relationship` diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php index c2ebad004d..9a2f5f3018 100755 --- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php +++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php @@ -426,9 +426,12 @@ switch ($action) { $description = $item['description']; $period = $item['period']; $group = $item['id_group']; + $recursion = $item['recursion']; break; case 'event_report_agent': case 'event_report_group': + $recursion = $item['recursion']; + break; case 'event_report_module': $description = $item['description']; $period = $item['period']; @@ -477,12 +480,14 @@ switch ($action) { case 'group_report': $description = $item['description']; $group = $item['id_group']; + $recursion = $item['recursion']; break; case 'network_interfaces_report': $description = $item['description']; $group = $item['id_group']; $period = $item['period']; $fullscale = isset($style['fullscale']) ? (bool) $style['fullscale'] : 0; + $recursion = $item['recursion']; break; case 'top_n': $description = $item['description']; @@ -521,6 +526,7 @@ switch ($action) { $es = json_decode($item['external_source'], true); $id_agents = $es['id_agents']; $selection_a_m = get_parameter('selection'); + $recursion = $item['recursion']; if ((count($es['module']) == 1) && ($es['module'][0] == 0)) { $module = ""; @@ -538,6 +544,7 @@ switch ($action) { $date = $es['date']; $inventory_modules = $es['inventory_modules']; $id_agents = $es['id_agents']; + $recursion = $item['recursion']; $idAgent = $es['id_agents']; $idAgentModule = $inventory_modules; @@ -549,6 +556,7 @@ switch ($action) { $es = json_decode($item['external_source'], true); $inventory_modules = $es['inventory_modules']; $id_agents = $es['id_agents']; + $recursion = $item['recursion']; break; case 'agent_configuration': @@ -557,6 +565,7 @@ switch ($action) { case 'group_configuration': $group = $item['id_group']; + $recursion = $item['recursion']; break; case 'netflow_area': @@ -609,6 +618,7 @@ switch ($action) { break; } + $urlForm = $config['homeurl'] . 'index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=item_editor&action=' . $actionParameter . '&id_report=' . $idReport; @@ -914,7 +924,7 @@ You can of course remove the warnings, that's why we include the source and do n html_print_select_groups($config['id_user'], "RM", true, 'combo_group', $group, ''); - echo "   ".__('Recursion').html_print_checkbox('recursion', 1, 0, true); + echo "   ".__('Recursion').html_print_checkbox('recursion', 1, $recursion, true); ?> @@ -1760,6 +1770,9 @@ function print_SLA_list($width, $action, $idItem = null) { $itemsSLA = db_get_all_rows_filter( 'treport_content_sla_combined', array('id_report_content' => $idItem)); + + + if ($itemsSLA === false) { $itemsSLA = array(); } @@ -1971,6 +1984,9 @@ function print_General_list($width, $action, $idItem = null, $type = 'general') $itemsGeneral = db_get_all_rows_filter( 'treport_content_item', array('id_report_content' => $idItem)); + + + if ($itemsGeneral === false) { $itemsGeneral = array(); } diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index a9e955a04e..067b756908 100755 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -940,17 +940,22 @@ switch ($action) { $report = db_get_row_filter('treport', array('id_report' => $idReport)); + + + $reportName = $report['name']; $idGroupReport = $report['id_group']; $description = $report['description']; $good_format = false; switch ($action) { case 'update': + $values = array(); - $values['id_report'] = $idReport; + $values['id_report'] = $idReport; //--------------------------------------------------- //$values['name'] = (string) get_parameter('name'); $values['description'] = get_parameter('description'); $values['type'] = get_parameter('type', null); + $values['recursion'] = get_parameter('recursion', null); $label = get_parameter('label', ''); //Add macros name @@ -1290,6 +1295,7 @@ switch ($action) { } break; case 'save': + $values = array(); $values['id_report'] = $idReport; $values['type'] = get_parameter('type', null); @@ -1303,6 +1309,7 @@ switch ($action) { $items_label['id_agent'] = get_parameter('id_agent'); $items_label['id_agent_module'] = get_parameter('id_agent_module'); $name_it = (string) get_parameter('name'); + $values['recursion'] = get_parameter('recursion', null); $values['name'] = reporting_label_macro($items_label, $name_it); // Support for projection graph, prediction date and SLA reports diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 1940c2cc45..3255136a7b 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -1289,6 +1289,7 @@ CREATE TABLE IF NOT EXISTS `treport_content` ( `lapse` int(11) UNSIGNED NOT NULL default '300', `visual_format` tinyint(1) UNSIGNED NOT NULL default '0', `hide_no_data` tinyint(1) default 0, + `recursion` tinyint(1) default NULL, PRIMARY KEY(`id_rc`), FOREIGN KEY (`id_report`) REFERENCES treport(`id_report`) ON UPDATE CASCADE ON DELETE CASCADE From 91bdb0094abc58d565f736296ea99969ab267180 Mon Sep 17 00:00:00 2001 From: artica Date: Wed, 29 Aug 2018 00:01:26 +0200 Subject: [PATCH 18/21] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 1aeea95537..aad8e5f1a9 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.726-180828 +Version: 7.0NG.726-180829 Architecture: all Priority: optional Section: admin diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh index 3765a9ab0a..c075feec44 100644 --- a/pandora_agents/unix/DEBIAN/make_deb_package.sh +++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0NG.726-180828" +pandora_version="7.0NG.726-180829" echo "Test if you has the tools for to make the packages." whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index 96dcae78bb..b6a1d3de19 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -42,7 +42,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.726'; -use constant AGENT_BUILD => '180828'; +use constant AGENT_BUILD => '180829'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 33638b3364..b71fdb7c0f 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.726 -%define release 180828 +%define release 180829 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index a9a560916c..7df210eb21 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.726 -%define release 180828 +%define release 180829 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index d70da6e68f..9c18c59912 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.726" -PI_BUILD="180828" +PI_BUILD="180829" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index ccfdd2491e..71cef9dcd0 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{180828} +{180829} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index c5d0d26222..33fe6fb0b6 100644 --- a/pandora_agents/win32/pandora.cc +++ b/pandora_agents/win32/pandora.cc @@ -30,7 +30,7 @@ using namespace Pandora; using namespace Pandora_Strutils; #define PATH_SIZE _MAX_PATH+1 -#define PANDORA_VERSION ("7.0NG.726(Build 180828)") +#define PANDORA_VERSION ("7.0NG.726(Build 180829)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 0683893185..a259ecc3b7 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Artica ST" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.726(Build 180828))" + VALUE "ProductVersion", "(7.0NG.726(Build 180829))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 0ab4985c89..d8b96ab690 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.726-180828 +Version: 7.0NG.726-180829 Architecture: all Priority: optional Section: admin diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh index 2aec499426..1dbd1c899c 100644 --- a/pandora_console/DEBIAN/make_deb_package.sh +++ b/pandora_console/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0NG.726-180828" +pandora_version="7.0NG.726-180829" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 62c14f9290..4c0436b42c 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC180828'; +$build_version = 'PC180829'; $pandora_version = 'v7.0NG.726'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 86ea97aa5f..8d7a963b67 100755 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
    [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 3d0f1ec38a..83707fda98 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.726 -%define release 180828 +%define release 180829 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 48379a2e3e..488d110662 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.726 -%define release 180828 +%define release 180829 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index eb167303d0..3eb1a34837 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.726" -PI_BUILD="180828" +PI_BUILD="180829" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 2989207841..a0bced6993 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -34,7 +34,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.726 PS180828"; +my $version = "7.0NG.726 PS180829"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index d5313b7667..5bc7301eef 100644 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.726 PS180828"; +my $version = "7.0NG.726 PS180829"; # save program name for logging my $progname = basename($0); From 9d35a66ad32bd083cfab3149edb10565ac783214 Mon Sep 17 00:00:00 2001 From: artica Date: Thu, 30 Aug 2018 00:01:25 +0200 Subject: [PATCH 19/21] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index aad8e5f1a9..c5c5f6460a 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.726-180829 +Version: 7.0NG.726-180830 Architecture: all Priority: optional Section: admin diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh index c075feec44..35e1738095 100644 --- a/pandora_agents/unix/DEBIAN/make_deb_package.sh +++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0NG.726-180829" +pandora_version="7.0NG.726-180830" echo "Test if you has the tools for to make the packages." whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index b6a1d3de19..801e79e290 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -42,7 +42,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.726'; -use constant AGENT_BUILD => '180829'; +use constant AGENT_BUILD => '180830'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index b71fdb7c0f..8fb2d5251a 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.726 -%define release 180829 +%define release 180830 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index 7df210eb21..630c71fb7a 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.726 -%define release 180829 +%define release 180830 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index 9c18c59912..d1845bea11 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.726" -PI_BUILD="180829" +PI_BUILD="180830" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 71cef9dcd0..f65af70cd5 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{180829} +{180830} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 33fe6fb0b6..40fa17f985 100644 --- a/pandora_agents/win32/pandora.cc +++ b/pandora_agents/win32/pandora.cc @@ -30,7 +30,7 @@ using namespace Pandora; using namespace Pandora_Strutils; #define PATH_SIZE _MAX_PATH+1 -#define PANDORA_VERSION ("7.0NG.726(Build 180829)") +#define PANDORA_VERSION ("7.0NG.726(Build 180830)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index a259ecc3b7..2ceab1f9a1 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Artica ST" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.726(Build 180829))" + VALUE "ProductVersion", "(7.0NG.726(Build 180830))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index d8b96ab690..4b8b84952d 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.726-180829 +Version: 7.0NG.726-180830 Architecture: all Priority: optional Section: admin diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh index 1dbd1c899c..0f76524484 100644 --- a/pandora_console/DEBIAN/make_deb_package.sh +++ b/pandora_console/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0NG.726-180829" +pandora_version="7.0NG.726-180830" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 4c0436b42c..755f33fff5 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC180829'; +$build_version = 'PC180830'; $pandora_version = 'v7.0NG.726'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 8d7a963b67..9eb590129d 100755 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
    [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 83707fda98..952c93ff81 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.726 -%define release 180829 +%define release 180830 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 488d110662..142134fde5 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.726 -%define release 180829 +%define release 180830 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 3eb1a34837..0f9d9d442e 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.726" -PI_BUILD="180829" +PI_BUILD="180830" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index a0bced6993..b12ac10de8 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -34,7 +34,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.726 PS180829"; +my $version = "7.0NG.726 PS180830"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 5bc7301eef..110405b4e8 100644 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.726 PS180829"; +my $version = "7.0NG.726 PS180830"; # save program name for logging my $progname = basename($0); From 34c553f5b4c7be717641d8fda20e1af05f6fb4dd Mon Sep 17 00:00:00 2001 From: Junichi Satoh Date: Thu, 30 Aug 2018 13:30:22 +0900 Subject: [PATCH 20/21] Fixed plugin timeout. --- pandora_server/lib/PandoraFMS/PluginServer.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_server/lib/PandoraFMS/PluginServer.pm b/pandora_server/lib/PandoraFMS/PluginServer.pm index b94de25598..d57ed6407d 100644 --- a/pandora_server/lib/PandoraFMS/PluginServer.pm +++ b/pandora_server/lib/PandoraFMS/PluginServer.pm @@ -153,7 +153,7 @@ sub data_consumer ($$) { return unless defined $agent; # Use the smallest timeout - my $timeout = (($plugin->{'max_timeout'} < $pa_config->{'plugin_timeout'}) && $pa_config->{'max_timeout'}) ? + my $timeout = (($plugin->{'max_timeout'} < $pa_config->{'plugin_timeout'}) && $plugin->{'max_timeout'}) ? $plugin->{'max_timeout'} : $pa_config->{'plugin_timeout'}; # Setting default timeout if is invalid From 43a7d4973b434e9b7f37fa4f842f9e2141623391 Mon Sep 17 00:00:00 2001 From: artica Date: Fri, 31 Aug 2018 00:01:28 +0200 Subject: [PATCH 21/21] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index c5c5f6460a..7de9be88d6 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.726-180830 +Version: 7.0NG.726-180831 Architecture: all Priority: optional Section: admin diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh index 35e1738095..83f8a6f5e1 100644 --- a/pandora_agents/unix/DEBIAN/make_deb_package.sh +++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0NG.726-180830" +pandora_version="7.0NG.726-180831" echo "Test if you has the tools for to make the packages." whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index 801e79e290..abae10cdaa 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -42,7 +42,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.726'; -use constant AGENT_BUILD => '180830'; +use constant AGENT_BUILD => '180831'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 8fb2d5251a..5b37969691 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.726 -%define release 180830 +%define release 180831 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index 630c71fb7a..032dab76a8 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0NG.726 -%define release 180830 +%define release 180831 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index d1845bea11..e9c54cb52e 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.726" -PI_BUILD="180830" +PI_BUILD="180831" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index f65af70cd5..51eb30ec2e 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{180830} +{180831} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 40fa17f985..438d4cb8ff 100644 --- a/pandora_agents/win32/pandora.cc +++ b/pandora_agents/win32/pandora.cc @@ -30,7 +30,7 @@ using namespace Pandora; using namespace Pandora_Strutils; #define PATH_SIZE _MAX_PATH+1 -#define PANDORA_VERSION ("7.0NG.726(Build 180830)") +#define PANDORA_VERSION ("7.0NG.726(Build 180831)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 2ceab1f9a1..c3b78aff8b 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Artica ST" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.726(Build 180830))" + VALUE "ProductVersion", "(7.0NG.726(Build 180831))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 4b8b84952d..7f6d5aa908 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.726-180830 +Version: 7.0NG.726-180831 Architecture: all Priority: optional Section: admin diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh index 0f76524484..66cd91ba7a 100644 --- a/pandora_console/DEBIAN/make_deb_package.sh +++ b/pandora_console/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0NG.726-180830" +pandora_version="7.0NG.726-180831" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 755f33fff5..cc796ceccc 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC180830'; +$build_version = 'PC180831'; $pandora_version = 'v7.0NG.726'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 9eb590129d..e394c37b2d 100755 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
    [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 952c93ff81..87f122a9ef 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.726 -%define release 180830 +%define release 180831 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 142134fde5..ee908e38b5 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -3,7 +3,7 @@ # %define name pandorafms_server %define version 7.0NG.726 -%define release 180830 +%define release 180831 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 0f9d9d442e..0a18124871 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.726" -PI_BUILD="180830" +PI_BUILD="180831" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index b12ac10de8..7d2a59712a 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -34,7 +34,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.726 PS180830"; +my $version = "7.0NG.726 PS180831"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 110405b4e8..4ffc0b252c 100644 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.726 PS180830"; +my $version = "7.0NG.726 PS180831"; # save program name for logging my $progname = basename($0);