From 36f7c9dedcce2d7a9c79e2228a56b1e1d5d60a62 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Wed, 11 Apr 2018 17:19:03 +0200 Subject: [PATCH 01/28] Added dynamic_snmp to std Pandora versioning --- extras/pandora_update_version.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/extras/pandora_update_version.sh b/extras/pandora_update_version.sh index c63b988988..f7df061a7f 100755 --- a/extras/pandora_update_version.sh +++ b/extras/pandora_update_version.sh @@ -66,6 +66,7 @@ $PANDHOME_ENT/pandora_plugins/Informix/informix.pl \ $PANDHOME_ENT/pandora_plugins/Ruckus/ruckus.pl \ $PANDHOME_ENT/pandora_plugins/UX/pandora_ux.pl \ $PANDHOME_ENT/pandora_plugins/JMX/pandora_plugin_jmx.pl \ +$PANDHOME_ENT/pandora_plugins/SNMP/dynamic_snmp.pl \ $PANDHOME_ENT/pandora_server/util/plugin/vmware-plugin.pl " PLUGIN_LIB_FILE="$CODEHOME/pandora_server/lib/PandoraFMS/PluginTools.pm" From 5429ebb8de615545df169ab8d5af9ff8f3d4e94f Mon Sep 17 00:00:00 2001 From: fermin831 Date: Wed, 25 Apr 2018 19:04:52 +0200 Subject: [PATCH 02/28] Removed unreachable host from events responses --- pandora_console/include/javascript/pandora_events.js | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pandora_console/include/javascript/pandora_events.js b/pandora_console/include/javascript/pandora_events.js index bd9b6cfcb6..16d2ad4e0c 100644 --- a/pandora_console/include/javascript/pandora_events.js +++ b/pandora_console/include/javascript/pandora_events.js @@ -361,13 +361,8 @@ function perform_response(target, response_id) { timeout: 10000, dataType: 'html', success: function (data) { - if (data == '') { - $('#response_out').html('Unreachable host'); - } - else { - var out = data.replace(/[\n|\r]/g, "
"); - $('#response_out').html(out); - } + var out = data.replace(/[\n|\r]/g, "
"); + $('#response_out').html(out); $('#response_loading_command').hide(); $('#re_exec_command').show(); } From 9c640269904f51395e04865b8f2ae6c958357894 Mon Sep 17 00:00:00 2001 From: Alejandro Gallardo Escobar Date: Fri, 4 May 2018 13:38:04 +0200 Subject: [PATCH 03/28] Improvements and fixes into the internal audit view --- pandora_console/godmode/admin_access_logs.php | 324 ++++++++---------- pandora_console/godmode/audit_log_csv.php | 121 +++---- pandora_console/include/functions_io.php | 2 +- 3 files changed, 175 insertions(+), 272 deletions(-) diff --git a/pandora_console/godmode/admin_access_logs.php b/pandora_console/godmode/admin_access_logs.php index c3a8c9d0b0..abdb916b80 100644 --- a/pandora_console/godmode/admin_access_logs.php +++ b/pandora_console/godmode/admin_access_logs.php @@ -17,171 +17,170 @@ global $config; -require_once ($config["homedir"] . '/include/functions_graph.php'); +require_once($config["homedir"] . '/include/functions_graph.php'); -check_login (); +check_login(); $enterprise_include = enterprise_include_once('godmode/admin_access_logs.php'); -if (! check_acl ($config['id_user'], 0, "PM")) { - db_pandora_audit( "ACL Violation", - "Trying to access event viewer"); - require ("general/noaccess.php"); +if (! check_acl($config['id_user'], 0, "PM")) { + db_pandora_audit("ACL Violation", "Trying to access audit view"); + require("general/noaccess.php"); exit; } -ui_print_page_header (__('Pandora audit')." » ".__('Review Logs'), "images/gm_log.png", false, "", true ); +ui_print_page_header(__('Pandora audit') . " » " . __('Review Logs'), "images/gm_log.png", false, "", true); -$offset = get_parameter ("offset", 0); -$tipo_log = get_parameter ("tipo_log", 'all'); -$user_filter = get_parameter('user_filter', 'all'); -$filter_text = get_parameter('filter_text', ''); -$filter_hours_old = get_parameter('filter_hours_old', 24); -$filter_ip = get_parameter('filter_ip', ''); +$offset = (int) get_parameter("offset"); +$filter_type = (string) get_parameter("filter_type"); +$filter_user = (string) get_parameter("filter_user"); +$filter_text = (string) get_parameter("filter_text"); +$filter_period = get_parameter("filter_period", null); +$filter_period = ($filter_period !== null) ? (int) $filter_period : 24; +$filter_ip = (string) get_parameter("filter_ip"); -echo ""; -echo '
'; -echo '
'; -echo ''.__('Filter').'

'; +$filter_query = "&filter_type=" . $filter_type + . "&filter_user=" . $filter_user + . "&filter_text=" . $filter_text + . "&filter_period=" . $filter_period + . "&filter_ip=" . $filter_ip; -$rows = db_get_all_rows_sql ("SELECT DISTINCT(accion) - FROM tsesion"); -if (empty ($rows)) { - $rows = array (); -} -$actions = array (); - -foreach ($rows as $row) { - $actions[$row["accion"]] = $row["accion"]; -} -echo '
'; -$table = null; -$table->width = '100%'; +$table = new stdClass(); +$table->class = "databox filters"; +$table->cellstyle = array(); +$table->cellstyle[0] = array(); +$table->cellstyle[1] = array(); +$table->cellstyle[0][0] = "text-align: right;"; +$table->cellstyle[0][1] = "text-align: left;"; +$table->cellstyle[0][2] = "text-align: right;"; +$table->cellstyle[0][3] = "text-align: left;"; +$table->cellstyle[0][4] = "text-align: right;"; +$table->cellstyle[0][5] = "text-align: left;"; +$table->cellstyle[1][0] = "text-align: right;"; +$table->cellstyle[1][1] = "text-align: left;"; +$table->cellstyle[1][2] = "text-align: right;"; +$table->cellstyle[1][3] = "text-align: left;"; +$table->cellstyle[1][5] = "text-align: right;"; $table->data = array(); -$table->data[0][0] = __('Action'); -$table->data[0][1] = html_print_select ($actions, 'tipo_log', $tipo_log, '', __('All'), 'all', true); -$table->data[1][0] = __('User'); -$table->data[1][1] = html_print_select_from_sql('SELECT id_user, id_user AS text FROM tusuario', 'user_filter', $user_filter, '', __('All'), 'all', true); -$table->data[2][0] = __('Free text for search (*)'); -$table->data[2][1] = html_print_input_text('filter_text', $filter_text, __('Free text for search (*)'), 20, 40, true); -$table->data[3][0] = __('Max. hours old'); -$table->data[3][1] = html_print_input_text('filter_hours_old', $filter_hours_old, __('Max. hours old'), 3, 6, true); -$table->data[4][0] = __('IP'); -$table->data[4][1] = html_print_input_text('filter_ip', $filter_ip, __('IP'), 15, 15, true); -$table->data[5][0] = ''; -$table->data[5][1] = html_print_submit_button(__('Filter'), 'filter', false, 'class="sub search" style="float: right;"', true); -html_print_table($table); -echo '
'; -echo '
'; -echo '
'; -echo graphic_user_activity(300, 140); +$data = array(); -echo '
'; -echo '
 
'; -echo '
'; +$data[0] = "" . __('Search') . ""; +$data[1] = html_print_input_text("filter_text", $filter_text, __("Free text for search (*)"), 20, 40, true); +$data[2] = "" . __("Max. hours old") . ""; +$data[3] = html_print_input_text("filter_period", $filter_period, __("Max. hours old"), 3, 6, true); +$data[4] = "" . __("IP") . ""; +$data[5] = html_print_input_text("filter_ip", $filter_ip, __("IP"), 15, 15, true); -$filter = 'WHERE 1 = 1'; +$table->data[0] = $data; +$data = array(); -if ($tipo_log != 'all') { - $filter .= sprintf (" AND accion = '%s'", $tipo_log); -} -switch ($config['dbtype']) { - case "mysql": - if ($user_filter != 'all') { - $filter .= sprintf(' AND id_usuario = "%s"', $user_filter); - } - - $filter .= ' AND (accion LIKE "%' . $filter_text . '%" OR descripcion LIKE "%' . $filter_text . '%")'; - - if ($filter_ip != '') { - $filter .= sprintf(' AND ip_origen LIKE "%s"', $filter_ip); - } - break; - case "postgresql": - case "oracle": - if ($user_filter != 'all') { - $filter .= sprintf(' AND id_usuario = \'%s\'', $user_filter); - } - - $filter .= ' AND (accion LIKE \'%' . $filter_text . '%\' OR descripcion LIKE \'%' . $filter_text . '%\')'; - - if ($filter_ip != '') { - $filter .= sprintf(' AND ip_origen LIKE \'%s\'', $filter_ip); - } - break; +$actions_sql = "SELECT DISTINCT(accion), accion AS text FROM tsesion"; +$data[0] = "" . __("Action") . ""; +$data[1] = html_print_select_from_sql($actions_sql, "filter_type", $filter_type, "", __("All"), "", true); + +$users_sql = "SELECT id_user, id_user AS text FROM tusuario"; +$data[2] = "" . __("User") . ""; +$data[3] = html_print_select_from_sql($users_sql, "filter_user", $filter_user, "", __("All"), "", true); + +$data[4] = ""; +$data[5] = html_print_submit_button(__("Filter"), "filter", false, 'class="sub search"', true); + +$table->data[1] = $data; + +$form = '
'; +$form .= html_print_table($table, true); +$form .= '
'; +ui_toggle($form, __("Filter"), "", false); + +// ui_toggle(graphic_user_activity(400, 150), __("Chart")); + +$filter = "1=1"; + +if (!empty($filter_type)) { + $filter .= sprintf (" AND accion = '%s'", $filter_type); } -if ($filter_hours_old != 0) { +if (!empty($filter_user)) { + $filter .= sprintf(" AND id_usuario = '%s'", $filter_user); +} + +if (!empty($filter_text)) { + $filter .= " AND (accion LIKE '%'" . $filter_text . "'%' OR descripcion LIKE '%'" . $filter_text . "'%')"; +} + +if (!empty($filter_ip)) { + $filter .= sprintf(" AND ip_origen LIKE '%'", $filter_ip); +} + +if (!empty($filter_period)) { switch ($config["dbtype"]) { case "mysql": - $filter .= ' AND fecha >= DATE_ADD(NOW(), INTERVAL -' . $filter_hours_old . ' HOUR)'; + $filter .= ' AND fecha >= DATE_ADD(NOW(), INTERVAL -' . $filter_period . ' HOUR)'; break; case "postgresql": - $filter .= ' AND fecha >= NOW() - INTERVAL \'' . $filter_hours_old . ' HOUR \''; + $filter .= ' AND fecha >= NOW() - INTERVAL \'' . $filter_period . ' HOUR \''; break; case "oracle": - $filter .= ' AND fecha >= (SYSTIMESTAMP - INTERVAL \'' . $filter_hours_old . '\' HOUR)'; + $filter .= ' AND fecha >= (SYSTIMESTAMP - INTERVAL \'' . $filter_period . '\' HOUR)'; break; } } -$sql = "SELECT COUNT(*) FROM tsesion " . $filter; -$count = db_get_sql ($sql); -$url = "index.php?sec=godmode&sec2=godmode/admin_access_logs&tipo_log=".$tipo_log."&user_filter=".$user_filter."&filter_text=".$filter_text."&filter_hours_old=".$filter_hours_old."&filter_ip=".$filter_ip; - -ui_pagination ($count, $url); +$count_sql = sprintf("SELECT COUNT(*) FROM tsesion WHERE %s", $filter); +$count = (int) db_get_value_sql($count_sql); +$url = "index.php?sec=godmode&sec2=godmode/admin_access_logs" . $filter_query; +ui_pagination($count, $url); switch ($config["dbtype"]) { case "mysql": - $sql = sprintf ("SELECT * + $sql = sprintf( + "SELECT * FROM tsesion - %s + WHERE %s ORDER BY fecha DESC - LIMIT %d, %d", $filter, $offset, $config["block_size"]); + LIMIT %d, %d", + $filter, $offset, $config["block_size"] + ); break; case "postgresql": - $sql = sprintf ("SELECT * + $sql = sprintf( + "SELECT * FROM tsesion - %s + WHERE %s ORDER BY fecha DESC - LIMIT %d OFFSET %d", $filter, $config["block_size"], $offset); + LIMIT %d OFFSET %d", + $filter, $config["block_size"], $offset + ); break; case "oracle": $set = array(); $set['limit'] = $config["block_size"]; $set['offset'] = $offset; - $sql = sprintf ("SELECT * + $sql = sprintf( + "SELECT * FROM tsesion - %s - ORDER BY fecha DESC", $filter); - $result = oracle_recode_query ($sql, $set); + WHERE %s + ORDER BY fecha DESC", + $filter + ); + $result = oracle_recode_query($sql, $set); break; } -$result = db_get_all_rows_sql ($sql); - -// Delete rnum row generated by oracle_recode_query() function -if (($config["dbtype"] == 'oracle') && ($result !== false)) { - for ($i=0; $i < count($result); $i++) { - unset($result[$i]['rnum']); - } -} - -if (empty ($result)) { - $result = array (); -} +$result = db_get_all_rows_sql($sql); +if (empty($result)) $result = array(); $table = new stdClass(); $table->cellpadding = 4; $table->cellspacing = 4; $table->width = '100%'; $table->class = "databox data"; -$table->size = array (); -$table->data = array (); -$table->head = array (); +$table->size = array(); +$table->data = array(); +$table->head = array(); $table->align = array(); $table->rowclass = array(); @@ -192,9 +191,6 @@ $table->head[3] = __('Source IP'); $table->head[4] = __('Comments'); if ($enterprise_include !== ENTERPRISE_NOT_HOOK) { $table->head[5] = enterprise_hook('tableHeadEnterpriseAudit', array('title1')); -} - -if ($enterprise_include !== ENTERPRISE_NOT_HOOK) { $table->head[6] = enterprise_hook('tableHeadEnterpriseAudit', array('title2')); } @@ -204,106 +200,54 @@ $table->size[3] = 100; $table->size[4] = 200; if ($enterprise_include !== ENTERPRISE_NOT_HOOK) { $table->size[5] = enterprise_hook('tableHeadEnterpriseAudit', array('size1')); -} -if ($enterprise_include !== ENTERPRISE_NOT_HOOK) { $table->size[6] = enterprise_hook('tableHeadEnterpriseAudit', array('size2')); -} - - -if ($enterprise_include !== ENTERPRISE_NOT_HOOK) { $table->align[5] = enterprise_hook('tableHeadEnterpriseAudit', array('align')); -} -if ($enterprise_include !== ENTERPRISE_NOT_HOOK) { $table->align[6] = enterprise_hook('tableHeadEnterpriseAudit', array('align2')); } $table->colspan = array(); $table->rowstyle = array(); - $rowPair = true; $iterator = 0; // Get data foreach ($result as $row) { - if ($rowPair) - $table->rowclass[$iterator] = 'rowPair'; - else - $table->rowclass[$iterator] = 'rowOdd'; - $rowPair = !$rowPair; $iterator++; + + $table->rowclass[] = $rowPair ? "rowPair" : "rowOdd"; + $rowPair = !$rowPair; - $data = array (); - switch ($config['dbtype']) { - case "mysql": - case "postgresql": - $data[0] = $row["id_usuario"]; - break; - case "oracle": - $data[0] = $row["id_usuario"]; - break; - } - $data[1] = ui_print_session_action_icon ($row['accion'], true); - $data[1] .= $row["accion"]; - $data[2] = ui_print_help_tip($row['fecha'], true) . ui_print_timestamp($row['utimestamp'], true); - switch ($config['dbtype']) { - case "mysql": - case "postgresql": - $data[3] = $row["ip_origen"]; - break; - case "oracle": - $data[3] = $row["ip_origen"]; - break; - } - $data[4] = io_safe_output($row["descripcion"]); - if ($enterprise_include !== ENTERPRISE_NOT_HOOK) { - switch ($config['dbtype']) { - case "mysql": - case "postgresql": - $data[5] = enterprise_hook('cell1EntepriseAudit', array($row['id_sesion'])); - break; - case "oracle": - $data[5] = enterprise_hook('cell1EntepriseAudit', array($row['id_sesion'])); - break; - } - } - if ($enterprise_include !== ENTERPRISE_NOT_HOOK) { - switch ($config['dbtype']) { - case "mysql": - case "postgresql": - $data[6] = enterprise_hook('cell2EntepriseAudit', array($row['id_sesion'])); - break; - case "oracle": - $data[6] = enterprise_hook('cell2EntepriseAudit', array($row['id_sesion'])); - break; - } - } - array_push ($table->data, $data); - + $data = array(); + $data[0] = $row["id_usuario"]; + $data[1] = ui_print_session_action_icon($row["accion"], true) . $row["accion"]; + $data[2] = ui_print_help_tip($row["fecha"], true) . ui_print_timestamp($row["utimestamp"], true); + $data[3] = $row["ip_origen"]; + $data[4] = $row["descripcion"]; if ($enterprise_include !== ENTERPRISE_NOT_HOOK) { - switch ($config['dbtype']) { - case "mysql": - case "postgresql": - rowEnterpriseAudit($table, $iterator, $row['id_sesion']); - break; - case "oracle": - rowEnterpriseAudit($table, $iterator, $row['id_sesion']); - break; - } + $data[5] = enterprise_hook("cell1EntepriseAudit", array($row["id_sesion"])); + $data[6] = enterprise_hook("cell2EntepriseAudit", array($row["id_sesion"])); + } + + $table->data[] = $data; + + if ($enterprise_include !== ENTERPRISE_NOT_HOOK) { + rowEnterpriseAudit($table, $iterator, $row["id_sesion"]); } } -html_print_table ($table); +html_print_table($table); echo '
'; -echo '' . - html_print_button (__('Export to CSV '), 'export_csv', false, '', 'class=sub upd', true, false). ''; +$csv_url = ui_get_full_url(false, false, false, false) . 'index.php?sec=gextensions&sec2=godmode/audit_log_csv' . $filter_query; +echo '' + . html_print_button(__("Export to CSV"), "export_csv", false, "", "class=sub upd", true, false) + . ''; echo '
'; if ($enterprise_include !== ENTERPRISE_NOT_HOOK) { enterprise_hook('enterpriseAuditFooter'); } + ?> diff --git a/pandora_console/godmode/audit_log_csv.php b/pandora_console/godmode/audit_log_csv.php index b5020bc9a4..13f7ca384f 100644 --- a/pandora_console/godmode/audit_log_csv.php +++ b/pandora_console/godmode/audit_log_csv.php @@ -12,22 +12,19 @@ $ownDir = dirname(__FILE__) . '/'; $ownDir = str_replace("\\", "/", $ownDir); -require_once ($ownDir.'../include/config.php'); +require_once($ownDir . "../include/config.php"); + +require_once($config["homedir"] . "/include/functions.php"); +require_once($config["homedir"] . "/include/functions_db.php"); +require_once($config["homedir"] . "/include/auth/mysql.php"); global $config; -require_once ($config["homedir"]."/include/functions.php"); -require_once ($config["homedir"]."/include/functions_db.php"); -require_once ($config["homedir"]."/include/auth/mysql.php"); -error_reporting(E_ALL); -ini_set("display_errors", 1); - -if (! isset ($_SESSION["id_usuario"])) { - session_start (); - session_write_close (); +if (! isset($_SESSION["id_usuario"])) { + session_start(); + session_write_close(); } - // Login check if (!isset($_SESSION["id_usuario"])) { $config['id_user'] = null; @@ -36,94 +33,56 @@ else { $config['id_user'] = $_SESSION["id_usuario"]; } -if (!check_login()) { - db_pandora_audit("ACL Violation", "Trying to access graph builder"); - include ($config["homedir"]."/general/noaccess.php"); - return; -} +check_login(); -if (! check_acl ($config['id_user'], 0, "PM")) { - db_pandora_audit( "ACL Violation", - "Trying to access event viewer"); - require ("general/noaccess.php"); +if (! check_acl($config['id_user'], 0, "PM")) { + db_pandora_audit("ACL Violation", "Trying to access audit CSV export"); + require("general/noaccess.php"); exit; } -$tipo_log = get_parameter ("tipo_log", 'all'); -$user_filter = get_parameter('user_filter', 'all'); -$filter_text = get_parameter('filter_text', ''); -$filter_hours_old = get_parameter('filter_hours_old', 24); -$filter_ip = get_parameter('filter_ip', ''); +$filter_type = (string) get_parameter("filter_type"); +$filter_user = (string) get_parameter("filter_user"); +$filter_text = (string) get_parameter("filter_text"); +$filter_period = get_parameter("filter_period", null); +$filter_period = ($filter_period !== null) ? (int) $filter_period : 24; +$filter_ip = (string) get_parameter("filter_ip"); -$filter = 'WHERE 1 = 1'; +$filter = "1=1"; -if ($tipo_log != 'all') { - $filter .= " AND accion = '$tipo_log'"; -} -switch ($config['dbtype']) { - case "mysql": - if ($user_filter != 'all') { - $filter .= sprintf(' AND id_usuario = "%s"', $user_filter); - } - - $filter .= ' AND (accion LIKE "%' . $filter_text . '%" OR descripcion LIKE "%' . $filter_text . '%")'; - - if ($filter_ip != '') { - $filter .= sprintf(' AND ip_origen LIKE "%s"', $filter_ip); - } - break; - case "postgresql": - case "oracle": - if ($user_filter != 'all') { - $filter .= sprintf(' AND id_usuario = \'%s\'', $user_filter); - } - - $filter .= ' AND (accion LIKE \'%' . $filter_text . '%\' OR descripcion LIKE \'%' . $filter_text . '%\')'; - - if ($filter_ip != '') { - $filter .= sprintf(' AND ip_origen LIKE \'%s\'', $filter_ip); - } - break; +if (!empty($filter_type)) { + $filter .= sprintf (" AND accion = '%s'", $filter_type); } -if ($filter_hours_old != 0) { +if (!empty($filter_user)) { + $filter .= sprintf(" AND id_usuario = '%s'", $filter_user); +} + +if (!empty($filter_text)) { + $filter .= " AND (accion LIKE '%'" . $filter_text . "'%' OR descripcion LIKE '%'" . $filter_text . "'%')"; +} + +if (!empty($filter_ip)) { + $filter .= sprintf(" AND ip_origen LIKE '%'", $filter_ip); +} + +if (!empty($filter_period)) { switch ($config["dbtype"]) { case "mysql": - $filter .= ' AND fecha >= DATE_ADD(NOW(), INTERVAL -' . $filter_hours_old . ' HOUR)'; + $filter .= ' AND fecha >= DATE_ADD(NOW(), INTERVAL -' . $filter_period . ' HOUR)'; break; case "postgresql": - $filter .= ' AND fecha >= NOW() - INTERVAL \'' . $filter_hours_old . ' HOUR \''; + $filter .= ' AND fecha >= NOW() - INTERVAL \'' . $filter_period . ' HOUR \''; break; case "oracle": - $filter .= ' AND fecha >= (SYSTIMESTAMP - INTERVAL \'' . $filter_hours_old . '\' HOUR)'; + $filter .= ' AND fecha >= (SYSTIMESTAMP - INTERVAL \'' . $filter_period . '\' HOUR)'; break; } } -switch ($config["dbtype"]) { - case "mysql": - $sql = sprintf ("SELECT * - FROM tsesion - %s - ORDER BY fecha DESC", $filter); - break; - case "postgresql": - $sql = sprintf ("SELECT * - FROM tsesion - %s - ORDER BY fecha DESC", $filter); - break; - case "oracle": - $sql = sprintf ("SELECT * - FROM tsesion - %s - ORDER BY fecha DESC", $filter); - $result = oracle_recode_query ($sql, $set); - break; -} +$sql = sprintf( "SELECT * FROM tsesion WHERE %s ORDER BY fecha DESC", $filter); +$result = db_get_all_rows_sql($sql); -$result = db_get_all_rows_sql ($sql); - -print_audit_csv ($result); +print_audit_csv($result); ?> diff --git a/pandora_console/include/functions_io.php b/pandora_console/include/functions_io.php index c3d7b7b2b4..058003215f 100755 --- a/pandora_console/include/functions_io.php +++ b/pandora_console/include/functions_io.php @@ -396,7 +396,7 @@ function __ ($string /*, variable arguments */) { return $tranlateString; } } - elseif (enterprise_installed && + elseif (enterprise_installed() && isset($config['translate_string_extension_installed']) && $config['translate_string_extension_installed'] == 1 && array_key_exists('translate_string.php', $extensions)) { From 57fb63bd917109e7bed8d44c683f7a43560f03cb Mon Sep 17 00:00:00 2001 From: fermin831 Date: Mon, 7 May 2018 19:40:38 +0200 Subject: [PATCH 04/28] Fixed snapshots view in string data --- pandora_console/include/functions.php | 12 ++++++++++++ pandora_console/include/functions_ui.php | 11 +++++------ pandora_console/operation/agentes/status_monitor.php | 9 +++++---- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index 6c4d0a8199..27dd557c24 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -2162,6 +2162,18 @@ function is_snapshot_data ($data) { return is_image_data($data); } +/** + * Check if text is too long to put it into a black screen + * + * @param string Data value + * @return bool True if black window should be displayed + */ +function is_text_to_black_string ($data) { + if (is_image_data($data)) return false; + // Consider large text if data is greater than 200 characters + return ((int)strlen($data)) > 200; +} + /** * Create an invisible div with a provided ID and value to * can retrieve it from javascript with function get_php_value(name) diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index caffcad739..43c075b733 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -3814,12 +3814,11 @@ function ui_print_module_string_value($value, $id_agente_module, if ($is_web_content_string) { $value = io_safe_input($value); } - - - + $is_snapshot = is_snapshot_data($value); - - if (($config['command_snapshot']) && ($is_snapshot)) { + $is_large_image = is_text_to_black_string ($value); + + if (($config['command_snapshot']) && ($is_snapshot || $is_large_image)) { $handle = "snapshot" . "_" . $id_agente_module; $url = 'include/procesos.php?agente=' . $id_agente_module; $win_handle = dechex(crc32($handle)); @@ -3828,7 +3827,7 @@ function ui_print_module_string_value($value, $id_agente_module, "id=" . $id_agente_module . "&refr=" . $current_interval . "&label=" . rawurlencode(urlencode(io_safe_output($module_name))) . "','" . $win_handle . "', 700,480)"; - if (is_image_data($value)) { + if ($is_snapshot) { $salida = '' . html_print_image("images/photo.png", true, array("border" => '0', diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php index f630953dd5..344e3c4aeb 100644 --- a/pandora_console/operation/agentes/status_monitor.php +++ b/pandora_console/operation/agentes/status_monitor.php @@ -1370,10 +1370,11 @@ if (!empty($result)) { else { $module_value = io_safe_output($row['datos']); } - + $is_snapshot = is_snapshot_data ( $module_value ); - - if (($config['command_snapshot']) && ($is_snapshot)) { + $is_large_image = is_text_to_black_string ( $module_value ); + + if (($config['command_snapshot']) && ($is_snapshot || $is_large_image)) { $link = ui_get_snapshot_link( array( 'id_module' => $row['id_agente_modulo'], 'last_data' => $row['datos'], @@ -1382,7 +1383,7 @@ if (!empty($result)) { 'module_name' => $row['module_name'] )); - if(!is_image_data($row['datos'])){ + if($is_large_image){ $salida = '' . html_print_image('images/default_list.png', true, array('border' => '0', From 931c41698bf22deb9aff3b4ddc28c3f8e6456b25 Mon Sep 17 00:00:00 2001 From: danielmaya Date: Wed, 9 May 2018 10:52:06 +0200 Subject: [PATCH 05/28] Fixed check login in ajax.php --- pandora_console/ajax.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pandora_console/ajax.php b/pandora_console/ajax.php index 261babb5aa..b3e9fff95f 100644 --- a/pandora_console/ajax.php +++ b/pandora_console/ajax.php @@ -46,8 +46,19 @@ if (isset ($_GET["loginhash"])) { } } +$public_hash = get_parameter('hash', false); + // Check user -//check_login (); +if ($public_hash === false) { + check_login(); +} else { + enterprise_include_once('include/functions_dashboard.php'); + if (dashboard_check_public_hash($public_hash) === false) { + db_pandora_audit("Invalid public hash", "Trying to access public dashboard"); + require ("general/noaccess.php"); + exit; + } +} define ('AJAX', true); From 1abba49c707198a7548f10da29498e5118f349c0 Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Wed, 9 May 2018 10:57:14 +0200 Subject: [PATCH 06/28] Create the extras directory. --- pandora_server/extras/.gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 pandora_server/extras/.gitignore diff --git a/pandora_server/extras/.gitignore b/pandora_server/extras/.gitignore new file mode 100644 index 0000000000..e69de29bb2 From 3c7fe95a33a6470d0bf4f5831577f198cc348aed Mon Sep 17 00:00:00 2001 From: danielmaya Date: Wed, 9 May 2018 11:37:53 +0200 Subject: [PATCH 07/28] Added check login and check acl in update_manager.ajax --- pandora_console/include/ajax/update_manager.ajax.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pandora_console/include/ajax/update_manager.ajax.php b/pandora_console/include/ajax/update_manager.ajax.php index 80c62539da..3a74f6d941 100644 --- a/pandora_console/include/ajax/update_manager.ajax.php +++ b/pandora_console/include/ajax/update_manager.ajax.php @@ -15,6 +15,14 @@ global $config; +check_login (); + +if (! check_acl ($config['id_user'], 0, "PM") && ! is_user_admin ($config['id_user'])) { + db_pandora_audit("ACL Violation", "Trying to access update Management"); + require ("general/noaccess.php"); + return; +} + require_once($config['homedir'] . "/include/functions_update_manager.php"); require_once($config['homedir'] . "/include/functions_graph.php"); enterprise_include_once("include/functions_update_manager.php"); From 10685e6aa2a94079fa424cdb7599ed0b7646a019 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Wed, 9 May 2018 12:00:38 +0200 Subject: [PATCH 08/28] Added pandora_plugin_jmx to update version procedure --- extras/pandora_update_version.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/extras/pandora_update_version.sh b/extras/pandora_update_version.sh index 6d486a253c..c4482d3c0e 100755 --- a/extras/pandora_update_version.sh +++ b/extras/pandora_update_version.sh @@ -56,6 +56,7 @@ AGENT_WIN_RC_FILE="$CODEHOME/pandora_agents/win32/versioninfo.rc" SATELLITE_FILE="$PANDHOME_ENT/satellite_server/satellite_server.pl" PERL_PLUGIN_FILES="$PANDHOME_ENT/pandora_plugins/NGINX/nginx_requests_queued.pl \ $PANDHOME_ENT/pandora_plugins/Sybase/sybase_plugin.pl \ +$PANDHOME_ENT/pandora_plugins/JMX/pandora_plugin_jmx.pl \ $PANDHOME_ENT/pandora_plugins/MarkLogic/pandora_marklogic.pl \ $PANDHOME_ENT/pandora_plugins/Apache/pandora_apache.pl \ $PANDHOME_ENT/pandora_plugins/Oracle/Database/pandora_oracle.pl \ From e9d8af152d2c51f52e5bea0701367e815c2b9855 Mon Sep 17 00:00:00 2001 From: artica Date: Thu, 10 May 2018 00:01:25 +0200 Subject: [PATCH 09/28] 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 1353032e27..5a21e0240c 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.722-180509 +Version: 7.0NG.722-180510 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 1d58b02f5b..f43cf78b12 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.722-180509" +pandora_version="7.0NG.722-180510" 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 f19a4686c5..c87dcd5339 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.722'; -use constant AGENT_BUILD => '180509'; +use constant AGENT_BUILD => '180510'; # 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 946077f8aa..f7c64d1315 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.722 -%define release 180509 +%define release 180510 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 c60d45ddf8..7440866844 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.722 -%define release 180509 +%define release 180510 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 59e9f2254e..fe761d2280 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.722" -PI_BUILD="180509" +PI_BUILD="180510" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index b0778f767a..c5197b2f71 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{180509} +{180510} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index df2ff3a6c2..e224e821f6 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.722(Build 180509)") +#define PANDORA_VERSION ("7.0NG.722(Build 180510)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index cf3c37f6e9..dcc4833585 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.722(Build 180509))" + VALUE "ProductVersion", "(7.0NG.722(Build 180510))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 42f1670403..335495a622 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.722-180509 +Version: 7.0NG.722-180510 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 cac280e543..fdfd50f889 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.722-180509" +pandora_version="7.0NG.722-180510" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 3f66d1ee20..781559cc74 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 = 'PC180509'; +$build_version = 'PC180510'; $pandora_version = 'v7.0NG.722'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index bd8901ac85..106ef13712 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 7b01f83a59..7d3f6e4322 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.722 -%define release 180509 +%define release 180510 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index ab55ab882f..812ad41c00 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.722 -%define release 180509 +%define release 180510 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 89183c2f6a..b51199705a 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.722" -PI_BUILD="180509" +PI_BUILD="180510" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index cbbaccb753..e88931feee 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -33,7 +33,7 @@ use PandoraFMS::Tools; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.722 PS180509"; +my $version = "7.0NG.722 PS180510"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index ac4c550cc1..bba9b996a7 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.722 PS180509"; +my $version = "7.0NG.722 PS180510"; # save program name for logging my $progname = basename($0); From 9af7b75e3ef832898274e3941368617d34244b09 Mon Sep 17 00:00:00 2001 From: Alejandro Gallardo Escobar Date: Thu, 10 May 2018 11:46:49 +0200 Subject: [PATCH 10/28] The node names of the networkmap are reduced if they are too long --- .../include/javascript/functions_pandora_networkmap.js | 8 ++++---- pandora_console/include/javascript/pandora.js | 9 ++++++++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/pandora_console/include/javascript/functions_pandora_networkmap.js b/pandora_console/include/javascript/functions_pandora_networkmap.js index b5a85ee5c3..72653abf07 100644 --- a/pandora_console/include/javascript/functions_pandora_networkmap.js +++ b/pandora_console/include/javascript/functions_pandora_networkmap.js @@ -213,7 +213,7 @@ function update_fictional_node(id_db_node) { graph.nodes[i].networkmap_id = networkmap_to_link; $("#id_node_" + i + networkmap_id + " title").html(name); - $("#id_node_" + i + networkmap_id + " tspan").html(name); + $("#id_node_" + i + networkmap_id + " tspan").html(ellipsize(name, 30)); } }); @@ -251,7 +251,7 @@ function update_node_name(id_db_node) { graph.nodes[i]['raw_text'] = data['raw_text']; $("#id_node_" + i + networkmap_id + " title").html(data['raw_text']); - $("#id_node_" + i + networkmap_id + " tspan").html(data['raw_text']); + $("#id_node_" + i + networkmap_id + " tspan").html(ellipsize(data['raw_text'], 30)); } }); @@ -773,7 +773,7 @@ function edit_node(data_node, dblClick) { $("#dialog_node_edit") .dialog("option", "title", - dialog_node_edit_title.replace("%s", node_selected['text'])); // It doesn't eval the possible XSS so it's ok + dialog_node_edit_title.replace("%s", ellipsize(node_selected['text'], 40))); // It doesn't eval the possible XSS so it's ok $("#dialog_node_edit").dialog("open"); if (node_selected.id_agent == undefined || node_selected.id_agent == -2) { @@ -3658,7 +3658,7 @@ function draw_elements_graph() { .append("tspan") .attr("style", "font-size: " + font_size + "px !important; font-family:Verdana; text-align:center; text-anchor:middle; fill:#000000") .text(function (d) { - return d.text; + return ellipsize(d.text, 30); }) .classed('dragable_node', true) //own dragable .on("click", selected_node) diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js index 8a1965268f..46e376509f 100644 --- a/pandora_console/include/javascript/pandora.js +++ b/pandora_console/include/javascript/pandora.js @@ -1562,4 +1562,11 @@ function round_with_decimals (value, multiplier = 1) { return Math.round(value * multiplier) / multiplier; } return round_with_decimals (value, multiplier * 10); -} \ No newline at end of file +} + +function ellipsize (str, max, ellipse) { + if (max == null) max = 140; + if (ellipse == null) ellipse = "…"; + + return str.trim().length > max ? str.substr(0, max).trim() + ellipse : str; +} From fcebfceffb9123c27ca9ff47507c902c1f1be36b Mon Sep 17 00:00:00 2001 From: fermin831 Date: Thu, 10 May 2018 17:29:50 +0200 Subject: [PATCH 11/28] Do not show always the percentil in custom graphs --- pandora_console/include/ajax/graph.ajax.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/ajax/graph.ajax.php b/pandora_console/include/ajax/graph.ajax.php index 090a79f61e..ed1651ee3c 100644 --- a/pandora_console/include/ajax/graph.ajax.php +++ b/pandora_console/include/ajax/graph.ajax.php @@ -225,7 +225,7 @@ if ($get_graphs){ $homeurl = ui_get_full_url(false, false, false, false); $graph_conf = db_get_row('tgraph', 'id_graph', $value['id_graph']); - + if($graph_conf['stacked'] == 4 || $graph_conf['stacked'] == 9){ $height = 50; } else if ($graph_conf['stacked'] == 5){ @@ -262,7 +262,7 @@ if ($get_graphs){ $labels, false, false, - true, + $graph_conf['percentil'] == 1, false, false, $value['fullscale'] From 65f9fe1cb713d158ad6f71b697678849e7e511d1 Mon Sep 17 00:00:00 2001 From: artica Date: Fri, 11 May 2018 00:01:26 +0200 Subject: [PATCH 12/28] 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 5a21e0240c..9851699bf0 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.722-180510 +Version: 7.0NG.722-180511 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 f43cf78b12..5f3edf0274 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.722-180510" +pandora_version="7.0NG.722-180511" 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 c87dcd5339..ad618b040c 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.722'; -use constant AGENT_BUILD => '180510'; +use constant AGENT_BUILD => '180511'; # 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 f7c64d1315..b9c2b4b479 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.722 -%define release 180510 +%define release 180511 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 7440866844..15581d5635 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.722 -%define release 180510 +%define release 180511 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 fe761d2280..7e3cd4f62a 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.722" -PI_BUILD="180510" +PI_BUILD="180511" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index c5197b2f71..1f9f1bf489 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{180510} +{180511} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index e224e821f6..99052fae2b 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.722(Build 180510)") +#define PANDORA_VERSION ("7.0NG.722(Build 180511)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index dcc4833585..53807081f0 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.722(Build 180510))" + VALUE "ProductVersion", "(7.0NG.722(Build 180511))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 335495a622..ceaaea54ae 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.722-180510 +Version: 7.0NG.722-180511 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 fdfd50f889..5d2b9aa01a 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.722-180510" +pandora_version="7.0NG.722-180511" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 781559cc74..347b7eb142 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 = 'PC180510'; +$build_version = 'PC180511'; $pandora_version = 'v7.0NG.722'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 106ef13712..9b96d6d912 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 7d3f6e4322..8bc2768883 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.722 -%define release 180510 +%define release 180511 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 812ad41c00..81e6c5ff33 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.722 -%define release 180510 +%define release 180511 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index b51199705a..fe50496afd 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.722" -PI_BUILD="180510" +PI_BUILD="180511" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index e88931feee..9ecae27efd 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -33,7 +33,7 @@ use PandoraFMS::Tools; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.722 PS180510"; +my $version = "7.0NG.722 PS180511"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index bba9b996a7..c004d37953 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.722 PS180510"; +my $version = "7.0NG.722 PS180511"; # save program name for logging my $progname = basename($0); From 6479e3ac64692618c041a63650bb02df60704931 Mon Sep 17 00:00:00 2001 From: Fermin Date: Fri, 11 May 2018 13:14:08 +0200 Subject: [PATCH 13/28] Fixed repeated real time item on agents view --- pandora_console/include/ajax/module.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php index 10b181baee..a98d65ed1e 100755 --- a/pandora_console/include/ajax/module.php +++ b/pandora_console/include/ajax/module.php @@ -1084,7 +1084,7 @@ if ($list_modules) { $win_handle=dechex(crc32($module["id_agente_modulo"].$module["nombre"])); // Try to display the SNMP module realtime graph - $rt_button .= get_module_realtime_link_graph($module); + $rt_button = get_module_realtime_link_graph($module); if (!empty($rt_button)) $data[8] = $rt_button . "  "; # Show events for boolean modules by default. From d63f31604293302ad1d310981322a19562e00086 Mon Sep 17 00:00:00 2001 From: artica Date: Sun, 13 May 2018 00:02:13 +0200 Subject: [PATCH 14/28] 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 9851699bf0..15823c8395 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.722-180511 +Version: 7.0NG.722-180513 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 5f3edf0274..de33c9e6e1 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.722-180511" +pandora_version="7.0NG.722-180513" 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 ad618b040c..e1fec0a33e 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.722'; -use constant AGENT_BUILD => '180511'; +use constant AGENT_BUILD => '180513'; # 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 b9c2b4b479..98a2bf4dff 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.722 -%define release 180511 +%define release 180513 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 15581d5635..cf851d43aa 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.722 -%define release 180511 +%define release 180513 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 7e3cd4f62a..687e88e038 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.722" -PI_BUILD="180511" +PI_BUILD="180513" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 1f9f1bf489..213c5e3d5e 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{180511} +{180513} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 99052fae2b..3130e55edb 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.722(Build 180511)") +#define PANDORA_VERSION ("7.0NG.722(Build 180513)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 53807081f0..232efb0278 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.722(Build 180511))" + VALUE "ProductVersion", "(7.0NG.722(Build 180513))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index ceaaea54ae..0c73547f75 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.722-180511 +Version: 7.0NG.722-180513 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 5d2b9aa01a..26fc7e469b 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.722-180511" +pandora_version="7.0NG.722-180513" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 347b7eb142..54b6bc9179 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 = 'PC180511'; +$build_version = 'PC180513'; $pandora_version = 'v7.0NG.722'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 9b96d6d912..3b36647d42 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 8bc2768883..ef8dcaa1f1 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.722 -%define release 180511 +%define release 180513 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 81e6c5ff33..b28bd8be83 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.722 -%define release 180511 +%define release 180513 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index fe50496afd..54deb12c75 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.722" -PI_BUILD="180511" +PI_BUILD="180513" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 9ecae27efd..e9103c3667 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -33,7 +33,7 @@ use PandoraFMS::Tools; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.722 PS180511"; +my $version = "7.0NG.722 PS180513"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index c004d37953..49447f0c23 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.722 PS180511"; +my $version = "7.0NG.722 PS180513"; # save program name for logging my $progname = basename($0); From 3e8f9cbb344a78fa188139646fc0c53b7489105a Mon Sep 17 00:00:00 2001 From: artica Date: Mon, 14 May 2018 00:01:23 +0200 Subject: [PATCH 15/28] 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 15823c8395..d95dd759ee 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.722-180513 +Version: 7.0NG.722-180514 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 de33c9e6e1..f67375ae4a 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.722-180513" +pandora_version="7.0NG.722-180514" 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 e1fec0a33e..d1b905a731 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.722'; -use constant AGENT_BUILD => '180513'; +use constant AGENT_BUILD => '180514'; # 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 98a2bf4dff..99e948cc9f 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.722 -%define release 180513 +%define release 180514 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 cf851d43aa..f0fff3c1b3 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.722 -%define release 180513 +%define release 180514 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 687e88e038..41d55d5d52 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.722" -PI_BUILD="180513" +PI_BUILD="180514" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 213c5e3d5e..0de3e6cd88 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{180513} +{180514} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 3130e55edb..ba3b9e741a 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.722(Build 180513)") +#define PANDORA_VERSION ("7.0NG.722(Build 180514)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 232efb0278..0cdc75a938 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.722(Build 180513))" + VALUE "ProductVersion", "(7.0NG.722(Build 180514))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 0c73547f75..5e70a3d5d9 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.722-180513 +Version: 7.0NG.722-180514 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 26fc7e469b..a3566ff9db 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.722-180513" +pandora_version="7.0NG.722-180514" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 54b6bc9179..903f2f175a 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 = 'PC180513'; +$build_version = 'PC180514'; $pandora_version = 'v7.0NG.722'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 3b36647d42..170d38ca94 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 ef8dcaa1f1..baa62aa195 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.722 -%define release 180513 +%define release 180514 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index b28bd8be83..a3298040f5 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.722 -%define release 180513 +%define release 180514 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 54deb12c75..5c29d2f897 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.722" -PI_BUILD="180513" +PI_BUILD="180514" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index e9103c3667..3527fdef2a 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -33,7 +33,7 @@ use PandoraFMS::Tools; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.722 PS180513"; +my $version = "7.0NG.722 PS180514"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 49447f0c23..a940ab3d57 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.722 PS180513"; +my $version = "7.0NG.722 PS180514"; # save program name for logging my $progname = basename($0); From 007715fb93117ecd141b8cf7c96f26cb32d5fc24 Mon Sep 17 00:00:00 2001 From: artica Date: Tue, 15 May 2018 00:01:26 +0200 Subject: [PATCH 16/28] 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 d95dd759ee..22ab1be5d3 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.722-180514 +Version: 7.0NG.722-180515 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 f67375ae4a..51e7016ffa 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.722-180514" +pandora_version="7.0NG.722-180515" 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 d1b905a731..1fb9b4a376 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.722'; -use constant AGENT_BUILD => '180514'; +use constant AGENT_BUILD => '180515'; # 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 99e948cc9f..24b5a12fbf 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.722 -%define release 180514 +%define release 180515 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 f0fff3c1b3..eb14a1e288 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.722 -%define release 180514 +%define release 180515 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 41d55d5d52..38c40f6a75 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.722" -PI_BUILD="180514" +PI_BUILD="180515" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 0de3e6cd88..65cc554209 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{180514} +{180515} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index ba3b9e741a..07e620ff80 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.722(Build 180514)") +#define PANDORA_VERSION ("7.0NG.722(Build 180515)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 0cdc75a938..d688603086 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.722(Build 180514))" + VALUE "ProductVersion", "(7.0NG.722(Build 180515))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 5e70a3d5d9..21aa0cd98e 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.722-180514 +Version: 7.0NG.722-180515 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 a3566ff9db..ace833712e 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.722-180514" +pandora_version="7.0NG.722-180515" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 903f2f175a..583e9bc03f 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 = 'PC180514'; +$build_version = 'PC180515'; $pandora_version = 'v7.0NG.722'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 170d38ca94..255f2d528a 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 baa62aa195..6c995263c9 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.722 -%define release 180514 +%define release 180515 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index a3298040f5..998745164e 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.722 -%define release 180514 +%define release 180515 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 5c29d2f897..bc63cf61e9 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.722" -PI_BUILD="180514" +PI_BUILD="180515" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 3527fdef2a..6184b0b315 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -33,7 +33,7 @@ use PandoraFMS::Tools; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.722 PS180514"; +my $version = "7.0NG.722 PS180515"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index a940ab3d57..4b44d297b7 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.722 PS180514"; +my $version = "7.0NG.722 PS180515"; # save program name for logging my $progname = basename($0); From 5f8e010d01f47b62d25aacd02627c3406b06d5d6 Mon Sep 17 00:00:00 2001 From: artica Date: Wed, 16 May 2018 00:01:21 +0200 Subject: [PATCH 17/28] 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 22ab1be5d3..5750527901 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.722-180515 +Version: 7.0NG.722-180516 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 51e7016ffa..cf22b8017e 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.722-180515" +pandora_version="7.0NG.722-180516" 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 1fb9b4a376..70ca73e36a 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.722'; -use constant AGENT_BUILD => '180515'; +use constant AGENT_BUILD => '180516'; # 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 24b5a12fbf..f62dd2ac29 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.722 -%define release 180515 +%define release 180516 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 eb14a1e288..ba3467eb55 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.722 -%define release 180515 +%define release 180516 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 38c40f6a75..5067c37812 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.722" -PI_BUILD="180515" +PI_BUILD="180516" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 65cc554209..6354bfaaff 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{180515} +{180516} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 07e620ff80..3f90329e4a 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.722(Build 180515)") +#define PANDORA_VERSION ("7.0NG.722(Build 180516)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index d688603086..8b5f56e6e5 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.722(Build 180515))" + VALUE "ProductVersion", "(7.0NG.722(Build 180516))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 21aa0cd98e..680c4b1487 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.722-180515 +Version: 7.0NG.722-180516 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 ace833712e..783e47ee3d 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.722-180515" +pandora_version="7.0NG.722-180516" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 583e9bc03f..a98498eea9 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 = 'PC180515'; +$build_version = 'PC180516'; $pandora_version = 'v7.0NG.722'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 255f2d528a..511c92910d 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 6c995263c9..cd753d983c 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.722 -%define release 180515 +%define release 180516 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 998745164e..b650b0cd7d 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.722 -%define release 180515 +%define release 180516 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index bc63cf61e9..1bed1f240f 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.722" -PI_BUILD="180515" +PI_BUILD="180516" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 6184b0b315..d758d8976c 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -33,7 +33,7 @@ use PandoraFMS::Tools; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.722 PS180515"; +my $version = "7.0NG.722 PS180516"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 4b44d297b7..521f67e5fe 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.722 PS180515"; +my $version = "7.0NG.722 PS180516"; # save program name for logging my $progname = basename($0); From a79f3b2d054f6ba5db47d615f2e7b91b25fd191a Mon Sep 17 00:00:00 2001 From: artica Date: Thu, 17 May 2018 00:01:23 +0200 Subject: [PATCH 18/28] 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 5750527901..1ce77da748 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.722-180516 +Version: 7.0NG.722-180517 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 cf22b8017e..d6e1d5deef 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.722-180516" +pandora_version="7.0NG.722-180517" 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 70ca73e36a..5cf3f356c5 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.722'; -use constant AGENT_BUILD => '180516'; +use constant AGENT_BUILD => '180517'; # 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 f62dd2ac29..40cd18f243 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.722 -%define release 180516 +%define release 180517 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 ba3467eb55..4ead6ca3c5 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.722 -%define release 180516 +%define release 180517 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 5067c37812..ca3f8d5c94 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.722" -PI_BUILD="180516" +PI_BUILD="180517" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 6354bfaaff..80d8f6e967 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{180516} +{180517} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 3f90329e4a..a049668117 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.722(Build 180516)") +#define PANDORA_VERSION ("7.0NG.722(Build 180517)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 8b5f56e6e5..5f8ae724f7 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.722(Build 180516))" + VALUE "ProductVersion", "(7.0NG.722(Build 180517))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 680c4b1487..07d96ce639 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.722-180516 +Version: 7.0NG.722-180517 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 783e47ee3d..0c413ce097 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.722-180516" +pandora_version="7.0NG.722-180517" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index a98498eea9..fefbf0fda5 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 = 'PC180516'; +$build_version = 'PC180517'; $pandora_version = 'v7.0NG.722'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 511c92910d..eafdab6012 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 cd753d983c..ac236be369 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.722 -%define release 180516 +%define release 180517 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index b650b0cd7d..3cbc415779 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.722 -%define release 180516 +%define release 180517 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 1bed1f240f..7f102dc548 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.722" -PI_BUILD="180516" +PI_BUILD="180517" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index d758d8976c..fa5d1189d9 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -33,7 +33,7 @@ use PandoraFMS::Tools; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.722 PS180516"; +my $version = "7.0NG.722 PS180517"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 521f67e5fe..ecd6449505 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.722 PS180516"; +my $version = "7.0NG.722 PS180517"; # save program name for logging my $progname = basename($0); From 7783f81f5946e05ddfbdac9d1666bdde0bd3bf46 Mon Sep 17 00:00:00 2001 From: danielmaya Date: Thu, 17 May 2018 16:43:31 +0200 Subject: [PATCH 19/28] Fixed mobile graph --- pandora_console/mobile/operation/module_graph.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pandora_console/mobile/operation/module_graph.php b/pandora_console/mobile/operation/module_graph.php index 3af94962be..9e62f44c9f 100644 --- a/pandora_console/mobile/operation/module_graph.php +++ b/pandora_console/mobile/operation/module_graph.php @@ -278,6 +278,14 @@ class ModuleGraph { private function javascript_code() { ob_start(); + + global $config; + if ($config['flash_charts']) { + //Include the javascript for the js charts library + echo include_javascript_dependencies_flot_graph(true); + ui_require_javascript_file('pandora', 'include/javascript/',true); + } + ?>