From 9212e6a8920785e4a217fd60c76429e940de484a Mon Sep 17 00:00:00 2001 From: "manuel.montes" Date: Wed, 9 Jan 2019 16:06:08 +0100 Subject: [PATCH 01/19] Visual change in the data of general type reports Former-commit-id: fda11ae1c7233653728da7855fd010983a35d4fe --- .../include/functions_reporting_html.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php index 182977207d..2e4b2b521a 100644 --- a/pandora_console/include/functions_reporting_html.php +++ b/pandora_console/include/functions_reporting_html.php @@ -2570,6 +2570,15 @@ function reporting_html_general(&$table, $item) { /* End - Order by agent */ foreach ($item['data'] as $row) { + $module_type = db_get_value("id_tipo_modulo", "tagente_modulo","nombre", $row['module']); + if($module_type == 6 || $module_type == 9 || $module_type == 18 || $module_type == 2){ + $row['formated_value'] = round($row['formated_value'], 0, PHP_ROUND_HALF_DOWN); + } + if(($module_type == 6 || $module_type == 9 || $module_type == 18 || $module_type == 2) && $row['formated_value'] == 1){ + $row['formated_value'] = "Up"; + }elseif(($module_type == 6 || $module_type == 9 || $module_type == 18 || $module_type == 2) && $row['formated_value'] == 0){ + $row['formated_value'] = "Down"; + } if ($item['date']['period'] != 0) { $table1->data[] = array( $row['agent'], @@ -2640,8 +2649,18 @@ function reporting_html_general(&$table, $item) { $row['agent'] = $agent; $table1->style['agent'] = 'text-align: center;'; foreach ($list_modules as $name) { + $module_type = db_get_value("id_tipo_modulo", "tagente_modulo","nombre", $name); + if($module_type == 6 || $module_type == 9 || $module_type == 18 || $module_type == 2){ + $modules[$name] = round($modules[$name], 0, PHP_ROUND_HALF_DOWN); + } $table1->style[$name] = 'text-align: center;'; if (isset($modules[$name])) { + if(($module_type == 6 || $module_type == 9 || $module_type == 18 || $module_type == 2) && $modules[$name] == 1){ + $modules[$name] = "Up"; + }elseif(($module_type == 6 || $module_type == 9 || $module_type == 18 || $module_type == 2) && $modules[$name] == 0){ + hd( $modules[$name], true); + $modules[$name] = "Down"; + } $row[$name] = $modules[$name]; } else { From 439f1db62055edd048425ac179d6c2ead9ba000e Mon Sep 17 00:00:00 2001 From: samucarc Date: Wed, 9 Jan 2019 18:11:21 +0100 Subject: [PATCH 02/19] Fixed link in cron job and visual console manager Former-commit-id: 6533fcc628157231c7bd524d878c144faac02447 --- pandora_console/godmode/reporting/map_builder.php | 9 +++++++++ .../godmode/reporting/visual_console_favorite.php | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/pandora_console/godmode/reporting/map_builder.php b/pandora_console/godmode/reporting/map_builder.php index a9df342750..cebc0b6c8a 100644 --- a/pandora_console/godmode/reporting/map_builder.php +++ b/pandora_console/godmode/reporting/map_builder.php @@ -43,6 +43,7 @@ else{ $url_visual_console_favorite = 'index.php?sec=screen&sec2=screens/screens&action=visualmap_favorite'; $url_visual_console_template = 'index.php?sec=screen&sec2=screens/screens&action=visualmap_template'; $url_visual_console_template_wizard = 'index.php?sec=screen&sec2=screens/screens&action=visualmap_wizard'; + $url_visual_console_manager = 'index.php?sec=screen&sec2=enterprise/extensions/visual_console_manager'; } $pure = (int)get_parameter('pure', 0); @@ -74,6 +75,14 @@ if($is_enterprise && $vconsoles_manage){ 'text' => '' . html_print_image ("images/wand.png", true, array ("title" => __('Visual Console Template Wizard'))) .'' ); + + if ($is_metaconsole) { + $buttons['visual_console_manager'] = array( + 'active' => false, + 'text' => '' . + html_print_image ("images/builder.png", true, array ("title" => __('Visual Console Manager'))) .'' + ); + } } if (!$is_metaconsole) { diff --git a/pandora_console/godmode/reporting/visual_console_favorite.php b/pandora_console/godmode/reporting/visual_console_favorite.php index a660a81007..0031879a32 100644 --- a/pandora_console/godmode/reporting/visual_console_favorite.php +++ b/pandora_console/godmode/reporting/visual_console_favorite.php @@ -42,6 +42,7 @@ else{ $url_visual_console_favorite = 'index.php?sec=screen&sec2=screens/screens&action=visualmap_favorite'; $url_visual_console_template = 'index.php?sec=screen&sec2=screens/screens&action=visualmap_template'; $url_visual_console_template_wizard = 'index.php?sec=screen&sec2=screens/screens&action=visualmap_wizard'; + $url_visual_console_manager = 'index.php?sec=screen&sec2=enterprise/extensions/visual_console_manager'; } $buttons['visual_console'] = array( @@ -68,6 +69,14 @@ if($is_enterprise && $vconsoles_manage){ 'text' => '' . html_print_image ("images/wand.png", true, array ("title" => __('Visual Console Template Wizard'))) .'' ); + + if ($is_metaconsole) { + $buttons['visual_console_manager'] = array( + 'active' => false, + 'text' => '' . + html_print_image ("images/builder.png", true, array ("title" => __('Visual Console Manager'))) .'' + ); + } } if (!$is_metaconsole) { From cc7e9e55375bdf5980784e0f1cab6aac28c11c87 Mon Sep 17 00:00:00 2001 From: "manuel.montes" Date: Thu, 10 Jan 2019 17:33:24 +0100 Subject: [PATCH 03/19] Visuals changes in the data of general type reports Former-commit-id: 15d0c6f67d2b1cafddd372c96807e8c4201c4f7f --- .../include/functions_reporting.php | 19 +++++++++++++---- .../include/functions_reporting_html.php | 21 ++++--------------- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index 3209a61492..9683fc5158 100755 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -6126,7 +6126,7 @@ function reporting_general($report, $content) { $unit = db_get_value('unit', 'tagente_modulo', 'id_agente_modulo', $row['id_agent_module']); - + $id_module_type = db_get_value("id_tipo_modulo", "tagente_modulo","nombre", $mod_name); if ($content['period'] == 0) { $data_res[$index] = modules_get_last_value($row['id_agent_module']); @@ -6167,9 +6167,21 @@ function reporting_general($report, $content) { $agent_name[$index] = $ag_name; $module_name[$index] = $mod_name; $units[$index] = $unit; + $id_module_types[$index] = $id_module_type; $operations[$index] = $row['operation']; break; case REPORT_GENERAL_GROUP_BY_AGENT: + $id_module_types[$index] = $id_module_type; + if($id_module_types[$index] == 2 || $id_module_types[$index] == 6 || $id_module_types[$index] == 9 || $id_module_types[$index] == 18 ){ + $data_res[$index] = round($data_res[$index], 0, PHP_ROUND_HALF_DOWN); + } + if($id_module_types[$index] == 2 || $id_module_types[$index] == 6 || $id_module_types[$index] == 9 || $id_module_types[$index] == 18 ){ + if($data_res[$index] == 1){ + $data_res[$index] = "Up"; + }elseif($data_res[$index] == 0){ + $data_res[$index] = "Down"; + } + } if ($data_res[$index] === false) { $return["data"][$ag_name][$mod_name] = null; } @@ -6178,6 +6190,7 @@ function reporting_general($report, $content) { $return["data"][$ag_name][$mod_name] = $data_res[$index]; } else { + hd($data_res[$index], true); $return["data"][$ag_name][$mod_name] = format_for_graph($data_res[$index], 2) . " " . $unit; } @@ -6267,8 +6280,6 @@ function reporting_general($report, $content) { break; } - - $i = 0; foreach ($data_res as $d) { $data = array(); @@ -6276,7 +6287,7 @@ function reporting_general($report, $content) { $data['module'] = $module_name[$i]; $data['id_agent_module'] = $id_agent_module[$i]; $data['id_agent'] = agents_get_agent_id_by_module_id($id_agent_module[$i]); - + $data['id_module_type'] = $id_module_types[$i]; $data['operator'] = ""; if ($content['period'] != 0) { switch ($operations[$i]) { diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php index 2e4b2b521a..e9a3f41029 100644 --- a/pandora_console/include/functions_reporting_html.php +++ b/pandora_console/include/functions_reporting_html.php @@ -2568,15 +2568,14 @@ function reporting_html_general(&$table, $item) { array_multisort($aux, SORT_ASC, $item['data']); /* End - Order by agent */ - + foreach ($item['data'] as $row) { - $module_type = db_get_value("id_tipo_modulo", "tagente_modulo","nombre", $row['module']); - if($module_type == 6 || $module_type == 9 || $module_type == 18 || $module_type == 2){ + if($row['id_module_type'] == 6 || $row['id_module_type'] == 9 || $row['id_module_type'] == 18 || $row['id_module_type'] == 2){ $row['formated_value'] = round($row['formated_value'], 0, PHP_ROUND_HALF_DOWN); } - if(($module_type == 6 || $module_type == 9 || $module_type == 18 || $module_type == 2) && $row['formated_value'] == 1){ + if(($row['id_module_type'] == 6 || $row['id_module_type'] == 9 || $row['id_module_type'] == 18 || $row['id_module_type'] == 2) && $row['formated_value'] == 1){ $row['formated_value'] = "Up"; - }elseif(($module_type == 6 || $module_type == 9 || $module_type == 18 || $module_type == 2) && $row['formated_value'] == 0){ + }elseif(($row['id_module_type'] == 6 || $row['id_module_type'] == 9 || $row['id_module_type'] == 18 || $row['id_module_type'] == 2) && $row['formated_value'] == 0){ $row['formated_value'] = "Down"; } if ($item['date']['period'] != 0) { @@ -2639,28 +2638,16 @@ function reporting_html_general(&$table, $item) { } } $list_modules = array_keys($list_modules); - $table1->width = '99%'; $table1->data = array (); $table1->head = array_merge(array(__('Agent')), $list_modules); foreach ($item['data'] as $agent => $modules) { $row = array(); - $row['agent'] = $agent; $table1->style['agent'] = 'text-align: center;'; foreach ($list_modules as $name) { - $module_type = db_get_value("id_tipo_modulo", "tagente_modulo","nombre", $name); - if($module_type == 6 || $module_type == 9 || $module_type == 18 || $module_type == 2){ - $modules[$name] = round($modules[$name], 0, PHP_ROUND_HALF_DOWN); - } $table1->style[$name] = 'text-align: center;'; if (isset($modules[$name])) { - if(($module_type == 6 || $module_type == 9 || $module_type == 18 || $module_type == 2) && $modules[$name] == 1){ - $modules[$name] = "Up"; - }elseif(($module_type == 6 || $module_type == 9 || $module_type == 18 || $module_type == 2) && $modules[$name] == 0){ - hd( $modules[$name], true); - $modules[$name] = "Down"; - } $row[$name] = $modules[$name]; } else { From 0d48b4573a66e0f51d63d05eba427d3bf938e14f Mon Sep 17 00:00:00 2001 From: samucarc Date: Mon, 14 Jan 2019 18:54:43 +0100 Subject: [PATCH 04/19] Fixed Label in the Console Menu Former-commit-id: eb73f14fa5631dd481b36711ea0bb62943ec43e5 --- pandora_console/general/main_menu.php | 19 +++++++++++++++++-- pandora_console/include/functions_menu.php | 2 +- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/pandora_console/general/main_menu.php b/pandora_console/general/main_menu.php index 8cb37fa2c4..3c82b4659f 100644 --- a/pandora_console/general/main_menu.php +++ b/pandora_console/general/main_menu.php @@ -324,6 +324,23 @@ $(document).ready( function() { } else { $('div#title_menu').hide(); + if(!click_display){ + $('#menu').mouseenter(function() { + handsInMenu = 1; + openTimeMenu = new Date().getTime(); + $('ul.submenu').css('left', '44px'); + }).mouseleave(function() { + handsInMenu = 0; + setTimeout(function() { + openedMenu = new Date().getTime() - openTimeMenu; + if(openedMenu > 1000 && handsInMenu == 0) { + $('li.menu_icon').removeClass( " no_hidden_menu"); + $('li.menu_icon').find('li').removeClass( " no_hidden_menu" ); + $('ul.submenu').css('left', '44px'); + } + }, 2500); + }); + } } }); /* ]]> */ @@ -336,7 +353,6 @@ $(document).ready( function() { handsIn2 = 0; if(!click_display){ - if (autohidden_menu) { $('.menu_icon').mouseenter(function() { table_hover = $(this); handsIn = 1; @@ -356,7 +372,6 @@ $(document).ready( function() { } }, 2500); }); - } }else{ $(document).ready(function() { if (autohidden_menu) { diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php index a07bde5528..3e80acfc9d 100644 --- a/pandora_console/include/functions_menu.php +++ b/pandora_console/include/functions_menu.php @@ -395,7 +395,7 @@ function menu_print_menu (&$menu) { $seleccionado = ''; //Print out the first level - $output .= '
  • '; + $output .= '
  • '; //onclick="location.href=\'index.php?sec='.$mainsec.'&sec2='.$main["sec2"].($main["refr"] ? '&refr='.$main["refr"] : '').'\'">'; $length = strlen(__($main["text"])); From 0c9446fcebbeb1076bd70fb6d327c30af8c10591 Mon Sep 17 00:00:00 2001 From: samucarc Date: Fri, 18 Jan 2019 17:24:32 +0100 Subject: [PATCH 05/19] Added new functionality in CLI and API to update module counts and alert counts Former-commit-id: aca543eb33de0dc231d18a4776676a4700b37120 --- pandora_console/include/functions_api.php | 52 +++++++++++++++++++++++ pandora_server/util/pandora_manage.pl | 20 ++++++++- 2 files changed, 71 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php index c1db0fadfb..15cc1a87b9 100644 --- a/pandora_console/include/functions_api.php +++ b/pandora_console/include/functions_api.php @@ -12296,4 +12296,56 @@ function api_get_session_timeout($thrash1, $thrash2, $other, $thrash3) { } } +/** + * Resets module counts and alert counts in the agents + * @param $id id of the agent you want to synchronize. Add "All" to synchronize all agents + * @param $trash1 + * @param $trash2 + * @param $trash3 + * + * Example: + * api.php?op=set&op2=reset_agent_counts&apipass=1234&user=admin&pass=pandora&id=All + */ +function api_set_reset_agent_counts ($id, $thrash1, $thrash2, $thrash3) { + global $config; + + if (!check_acl($config['id_user'], 0, "AW")){ + returnError('forbidden', 'string'); + return; + } + + if ($id == '' || !$id) { + returnError('error_parameter', __('Error. Agent cannot be left blank.')); + return; + } + + if ($id != "All"){ + $agent = db_get_row_filter('tagente', array('id_agente' => $id)); + if (empty ($agent)){ + returnError('error_agent', __('This agent does not exist.')); + return; + }else { + $return = db_process_sql_update ('tagente', + array ('update_module_count' => 1, 'update_alert_count' => 1), + array('id_agente' => $id) + ); + } + } + else { + $return = db_process_sql_update ('tagente', + array ('update_module_count' => 1, 'update_alert_count' => 1) + ); + } + + + $data = __('Successfully updated module/alert count in id agent %d.', $id); + + if ($return === false) + returnError('error_reset_agent_counts', 'Could not be updated module/alert counts in id agent %d.', $id); + else + returnData('string', array('type' => 'string', 'data' => $data)); + + +} + ?> diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 891653efc6..40fae0e892 100644 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -137,6 +137,7 @@ sub help_screen{ help_screen_line('--delete_cluster_item', '', 'Deleting cluster item'); help_screen_line('--get_cluster_status', '', 'Getting cluster status'); help_screen_line('--set_disabled_and_standby', ' ', 'Overwrite and disable and standby status'); + help_screen_line('--reset_agent_counts', '', 'Resets module counts and alert counts in the agents'); print "\nMODULES:\n\n" unless $param ne ''; help_screen_line('--create_data_module', " [ \n\t \n\t \n\t \n\t \n\t ]", 'Add data server module to agent'); help_screen_line('--create_web_module', " [ \n\t \n\t \n\t \n\t \n\t \n\t ].\n\t The valid data types are web_data, web_proc, web_content_data or web_content_string", 'Add web server module to agent'); @@ -6156,6 +6157,10 @@ sub pandora_manage_main ($$$) { param_check($ltotal, 3, 1); cli_set_disabled_and_standby(); } + elsif ($param eq '--reset_agent_counts') { + param_check($ltotal, 1, 0); + cli_reset_agent_counts(); + } else { print_log "[ERROR] Invalid option '$param'.\n\n"; $param = ''; @@ -6759,4 +6764,17 @@ sub cli_set_disabled_and_standby() { my $exit_code = (defined($result) && "$result" eq "1") ? "1" : "0"; print "\n$exit_code\n"; -} \ No newline at end of file +} + +############################################################################## +# Resets module counts and alert counts in the agents. +# Related option: --reset_agent_counts +############################################################################## + +sub cli_reset_agent_counts() { + my $agent_id = @ARGV[2]; + + my $result = api_call(\%conf,'set', 'reset_agent_counts', $agent_id); + print "$result \n\n "; + +} From 344589494a1bd3dbfa924fdc858e4f8831951942 Mon Sep 17 00:00:00 2001 From: samucarc Date: Fri, 18 Jan 2019 17:33:29 +0100 Subject: [PATCH 06/19] Fixed minor error Former-commit-id: 56aafe5689d627ac515c80b0158fc998992bd457 --- pandora_console/include/functions_api.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php index 15cc1a87b9..9a5f863b4f 100644 --- a/pandora_console/include/functions_api.php +++ b/pandora_console/include/functions_api.php @@ -12339,6 +12339,8 @@ function api_set_reset_agent_counts ($id, $thrash1, $thrash2, $thrash3) { $data = __('Successfully updated module/alert count in id agent %d.', $id); + if ($id == "All") + $data = __('Successfully updated module/alert count in all agents'); if ($return === false) returnError('error_reset_agent_counts', 'Could not be updated module/alert counts in id agent %d.', $id); From 7bc5fb47a00dece3ccc863be442bc893e0daecfd Mon Sep 17 00:00:00 2001 From: "tatiana.llorente@artica.es" Date: Mon, 28 Jan 2019 17:06:35 +0100 Subject: [PATCH 07/19] Don't show image for groups without icon - #3446 Former-commit-id: 6a67e368a2aef7f2df04a3937a0466064fa6894e --- pandora_console/godmode/groups/group_list.php | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php index 0efe11ad31..9542da72bc 100644 --- a/pandora_console/godmode/groups/group_list.php +++ b/pandora_console/godmode/groups/group_list.php @@ -491,17 +491,23 @@ else{ $url_delete = "index.php?sec=gagente&sec2=godmode/groups/group_list&delete_group=1&id_group=" . $group['id_grupo']; $table->data[$key][0] = $group['id_grupo']; $table->data[$key][1] = "" . $group['nombre'] . ""; - $table->data[$key][2] = html_print_image( - "images/groups_small/" . $group['icon'] . ".png", - true, - array( - "style" => '', - "class" => "bot", - "alt" => $group['nombre'], - "title" => $group['nombre'], - false, false, false, true - ) - ); + + if($group['icon'] != ''){ + $table->data[$key][2] = html_print_image( + "images/groups_small/" . $group['icon'] . ".png", + true, + array( + "style" => '', + "class" => "bot", + "alt" => $group['nombre'], + "title" => $group['nombre'], + false, false, false, true + ) + ); + } + else{ + $table->data[$key][2] = ""; + } //reporting_get_group_stats $table->data[$key][3] = $group['disabled'] ? __('Disabled') : __('Enabled'); From 2fc1e9715c418f945ef4d565cd4dbd60aa802304 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Tue, 29 Jan 2019 11:55:08 +0100 Subject: [PATCH 08/19] Fixed agent status in visual map Former-commit-id: b321113da85364845ddbf31e55bd0c4442eb488c --- pandora_console/include/functions_visual_map.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php index 24491f592d..4a60773c1a 100755 --- a/pandora_console/include/functions_visual_map.php +++ b/pandora_console/include/functions_visual_map.php @@ -3550,11 +3550,14 @@ function visual_map_get_user_layouts ($id_user = 0, $only_names = false, $filter function visual_map_translate_agent_status ($agent_status) { switch ($agent_status) { case AGENT_STATUS_NORMAL: + AGENT_MODULE_STATUS_NORMAL_ALERT: default: return VISUAL_MAP_STATUS_NORMAL; case AGENT_STATUS_CRITICAL: + case AGENT_MODULE_STATUS_CRITICAL_ALERT: return VISUAL_MAP_STATUS_CRITICAL_BAD; case AGENT_STATUS_WARNING: + case AGENT_MODULE_STATUS_WARNING_ALERT: return VISUAL_MAP_STATUS_WARNING; case AGENT_STATUS_NOT_INIT: case AGENT_STATUS_UNKNOWN: @@ -4121,4 +4124,4 @@ function visual_map_get_color_cloud_element ($data) { return ob_get_clean(); } -?> \ No newline at end of file +?> From fad670f32250956a0b144e7efbffc38e8545a328 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Tue, 29 Jan 2019 14:44:56 +0100 Subject: [PATCH 09/19] Fixed agent status in visual map 2 Former-commit-id: 3294be4d9d8f66edd477486a50130920144d40f7 --- pandora_console/include/functions_visual_map.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php index 4a60773c1a..eaf93d7316 100755 --- a/pandora_console/include/functions_visual_map.php +++ b/pandora_console/include/functions_visual_map.php @@ -3550,7 +3550,7 @@ function visual_map_get_user_layouts ($id_user = 0, $only_names = false, $filter function visual_map_translate_agent_status ($agent_status) { switch ($agent_status) { case AGENT_STATUS_NORMAL: - AGENT_MODULE_STATUS_NORMAL_ALERT: + case AGENT_MODULE_STATUS_NORMAL_ALERT: default: return VISUAL_MAP_STATUS_NORMAL; case AGENT_STATUS_CRITICAL: From 2626605030678925e60db25d36480dd6e4d19100 Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Wed, 30 Jan 2019 12:58:31 +0100 Subject: [PATCH 10/19] Validate alerts at the time agents/modules are modified. Former-commit-id: de1f4d5bbf7abda60a99b3a9718727f73657be75 --- .../godmode/agentes/configurar_agente.php | 5 ++++ .../godmode/massive/massive_edit_agents.php | 5 ++++ pandora_console/include/functions_alerts.php | 26 +++++++++++++++++++ pandora_console/include/functions_modules.php | 7 ++++- pandora_server/util/pandora_db.pl | 5 ---- 5 files changed, 42 insertions(+), 6 deletions(-) diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index fab0ad7637..7b39f806d0 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -868,6 +868,11 @@ if ($update_agent) { // if modified some agent paramenter 'config_agents_update_config_token', array($id_agente, 'standby', $disabled ? "1" : "0") ); + + // Validate alerts for disabled agents. + if ($disabled) { + alerts_validate_alert_agent($id_agente); + } } if($tpolicy_group_old){ diff --git a/pandora_console/godmode/massive/massive_edit_agents.php b/pandora_console/godmode/massive/massive_edit_agents.php index eb6dc869f3..362a820d62 100755 --- a/pandora_console/godmode/massive/massive_edit_agents.php +++ b/pandora_console/godmode/massive/massive_edit_agents.php @@ -159,6 +159,11 @@ if ($update_agents) { 'config_agents_update_config_token', array($id_agent, 'standby', $values['disabled']) ); + + // Validate alerts for disabled agents. + if ($values['disabled'] == 1) { + alerts_validate_alert_agent($id_agent); + } } if($group_old || $result){ diff --git a/pandora_console/include/functions_alerts.php b/pandora_console/include/functions_alerts.php index 57677b8dea..e8203b3530 100644 --- a/pandora_console/include/functions_alerts.php +++ b/pandora_console/include/functions_alerts.php @@ -1431,6 +1431,32 @@ function alerts_get_effective_alert_actions($id_agent_module) { return $return; } +/** + * Validate alerts for the given module. + * + * @param int agent_module_id ID of the module + */ +function alerts_validate_alert_module ($agent_module_id) { + + db_process_sql(sprintf('UPDATE talert_template_modules + SET times_fired=0, internal_counter=0 + WHERE id_agent_module = %d', + $agent_module_id)); +} + +/** + * Validate alerts for the given agent. + * + * @param int agent_id ID of the agent + */ +function alerts_validate_alert_agent ($agent_id) { + db_process_sql(sprintf('UPDATE talert_template_modules tm + INNER JOIN tagente_modulo am ON tm.id_agent_module = am.id_agente_modulo + SET tm.times_fired=0, tm.internal_counter=0 + WHERE am.id_agente = %d', + $agent_id)); +} + /** * Validates an alert id or an array of alert id's. * diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php index 78cb1e8c96..4cc0e4a3b6 100755 --- a/pandora_console/include/functions_modules.php +++ b/pandora_console/include/functions_modules.php @@ -262,6 +262,11 @@ function modules_change_disabled($id_agent_module, $new_value = 1) { if ($current_disabled == $new_value) { continue; } + + // Validate alerts for disabled modules. + if ($new_value == 1) { + alerts_validate_alert_module($id_module); + } $id_agent_changed[] = modules_get_agentmodule_agent($id_module); $id_agent_module_changed[] = $id_module; @@ -2817,4 +2822,4 @@ function modules_get_state_condition($state, $prefix = "tae") { // If the state is not an expected state, return no condition return "1=1"; } -?> \ No newline at end of file +?> diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 8c9df508ca..ec683bbc30 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -171,11 +171,6 @@ sub pandora_purgedb ($$) { if (!defined($conf->{'_string_purge'})){ $conf->{'_string_purge'} = 7; } - # Update alert with last_fired older than today - time_threshold - my @templates = get_db_rows ($dbh, 'SELECT t1.id,t1.time_threshold FROM talert_templates t1 WHERE EXISTS ( SELECT * FROM talert_template_modules t2 WHERE t1.id = t2.id_alert_template );'); - foreach my $template(@templates) { - db_do($dbh, 'UPDATE talert_template_modules SET times_fired = 0 WHERE id_alert_template = ? AND times_fired > 0 AND last_fired < (? - ?)',$template->{'id'},time(),$template->{'time_threshold'}); - } if ($conf->{'_string_purge'} > 0) { $ulimit_access_timestamp = time() - 86400; From f4c22d2250bcedf7b2bf7663ef0f1286161e5c0b Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Thu, 7 Feb 2019 13:01:21 +0100 Subject: [PATCH 11/19] added extra arguments to get_snmpwalk Former-commit-id: bf02258e312d3a81673e79a144173b53e0c2c153 --- pandora_console/include/functions.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index d1b5fb7831..6f13388fc0 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -1754,7 +1754,8 @@ function get_snmpwalk( $quick_print=0, $base_oid='', $snmp_port='', - $server_to_exec=0 + $server_to_exec=0, + $extra_arguments='' ) { global $config; @@ -1805,15 +1806,15 @@ function get_snmpwalk( case '3': switch ($snmp3_security_level) { case 'authNoPriv': - $command_str = $snmpwalk_bin.' -m ALL -Oa -v 3'.' -u '.escapeshellarg($snmp3_auth_user).' -A '.escapeshellarg($snmp3_auth_pass).' -l '.escapeshellarg($snmp3_security_level).' -a '.escapeshellarg($snmp3_auth_method).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir; + $command_str = $snmpwalk_bin.' -m ALL -Oa '.$extra_arguments.' -v 3'.' -u '.escapeshellarg($snmp3_auth_user).' -A '.escapeshellarg($snmp3_auth_pass).' -l '.escapeshellarg($snmp3_security_level).' -a '.escapeshellarg($snmp3_auth_method).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir; break; case 'noAuthNoPriv': - $command_str = $snmpwalk_bin.' -m ALL -Oa -v 3'.' -u '.escapeshellarg($snmp3_auth_user).' -l '.escapeshellarg($snmp3_security_level).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir; + $command_str = $snmpwalk_bin.' -m ALL -Oa '.$extra_arguments.' -v 3'.' -u '.escapeshellarg($snmp3_auth_user).' -l '.escapeshellarg($snmp3_security_level).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir; break; default: - $command_str = $snmpwalk_bin.' -m ALL -Oa -v 3'.' -u '.escapeshellarg($snmp3_auth_user).' -A '.escapeshellarg($snmp3_auth_pass).' -l '.escapeshellarg($snmp3_security_level).' -a '.escapeshellarg($snmp3_auth_method).' -x '.escapeshellarg($snmp3_privacy_method).' -X '.escapeshellarg($snmp3_privacy_pass).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir; + $command_str = $snmpwalk_bin.' -m ALL -Oa '.$extra_arguments.' -v 3'.' -u '.escapeshellarg($snmp3_auth_user).' -A '.escapeshellarg($snmp3_auth_pass).' -l '.escapeshellarg($snmp3_security_level).' -a '.escapeshellarg($snmp3_auth_method).' -x '.escapeshellarg($snmp3_privacy_method).' -X '.escapeshellarg($snmp3_privacy_pass).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir; break; } break; @@ -1822,7 +1823,7 @@ function get_snmpwalk( case '2c': case '1': default: - $command_str = $snmpwalk_bin.' -m ALL -Oa -v '.escapeshellarg($snmp_version).' -c '.escapeshellarg(io_safe_output($snmp_community)).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir; + $command_str = $snmpwalk_bin.' -m ALL '.$extra_arguments.' -Oa -v '.escapeshellarg($snmp_version).' -c '.escapeshellarg(io_safe_output($snmp_community)).' '.escapeshellarg($ip_target).' '.$base_oid.' 2> '.$error_redir_dir; break; } From e6abb61a132aabd60ba21962888dd3eec976f03e Mon Sep 17 00:00:00 2001 From: artica Date: Fri, 8 Feb 2019 00:01:29 +0100 Subject: [PATCH 12/19] Auto-updated build strings. Former-commit-id: 0f011fb8fe35e16e311b4cd0f946fec051170c32 --- 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 | 4 ++-- 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, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index e15649e232..b0d91124af 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.731-190207 +Version: 7.0NG.731-190208 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 a631fb09e0..18b7ecf8d3 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.731-190207" +pandora_version="7.0NG.731-190208" 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 3af9a430e3..52420004de 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.731'; -use constant AGENT_BUILD => '190207'; +use constant AGENT_BUILD => '190208'; # 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 911ba417ad..3993a5bd13 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.731 -%define release 190207 +%define release 190208 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 541e84d5d2..442973f4b5 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.731 -%define release 190207 +%define release 190208 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 f0bcf0ca6c..2120d8b93d 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.731" -PI_BUILD="190207" +PI_BUILD="190208" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 32199ce71a..008d448846 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{190207} +{190208} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 41b2406096..3b53ff7396 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.731(Build 190207)") +#define PANDORA_VERSION ("7.0NG.731(Build 190208)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 3df3840653..e4f02cd597 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.731(Build 190207))" + VALUE "ProductVersion", "(7.0NG.731(Build 190208))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index d34d864b44..94f0ca1d13 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.731-190207 +Version: 7.0NG.731-190208 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 56e2337ea7..ae82ac8e38 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.731-190207" +pandora_version="7.0NG.731-190208" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index b7d7211711..14c7eee371 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC190207'; +$build_version = 'PC190208'; $pandora_version = 'v7.0NG.731'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 68cd6dcbde..aa4ec21ada 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -112,8 +112,8 @@
    [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index b737e6e75f..c425d82675 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.731 -%define release 190207 +%define release 190208 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 0d0a9e3a3b..4ce9ced407 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.731 -%define release 190207 +%define release 190208 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 89c4249a12..bd92093f41 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.731" -PI_BUILD="190207" +PI_BUILD="190208" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 71e6375747..d1ff8d455f 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -34,7 +34,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.731 PS190207"; +my $version = "7.0NG.731 PS190208"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 13823fe4e6..5711034fcc 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.731 PS190207"; +my $version = "7.0NG.731 PS190208"; # save program name for logging my $progname = basename($0); From f992e7b1f4f8ec04d792ae113e5b29499fc58960 Mon Sep 17 00:00:00 2001 From: artica Date: Sat, 9 Feb 2019 00:01:35 +0100 Subject: [PATCH 13/19] Auto-updated build strings. Former-commit-id: 7eb19cce56cb06b70ee9269f4b51d7b45b19f5d9 --- 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 b0d91124af..35b305158a 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.731-190208 +Version: 7.0NG.731-190209 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 18b7ecf8d3..06e3132c6d 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.731-190208" +pandora_version="7.0NG.731-190209" 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 52420004de..a111e0ac4d 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.731'; -use constant AGENT_BUILD => '190208'; +use constant AGENT_BUILD => '190209'; # 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 3993a5bd13..835d775c9f 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.731 -%define release 190208 +%define release 190209 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 442973f4b5..10cc69c6a2 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.731 -%define release 190208 +%define release 190209 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 2120d8b93d..1f14979290 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.731" -PI_BUILD="190208" +PI_BUILD="190209" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 008d448846..02cf08ea7e 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{190208} +{190209} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 3b53ff7396..6a713b2708 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.731(Build 190208)") +#define PANDORA_VERSION ("7.0NG.731(Build 190209)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index e4f02cd597..deb57c1a23 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.731(Build 190208))" + VALUE "ProductVersion", "(7.0NG.731(Build 190209))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 94f0ca1d13..ca94d0101c 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.731-190208 +Version: 7.0NG.731-190209 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 ae82ac8e38..b2c6cba986 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.731-190208" +pandora_version="7.0NG.731-190209" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 14c7eee371..1b5bd84ebf 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC190208'; +$build_version = 'PC190209'; $pandora_version = 'v7.0NG.731'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index aa4ec21ada..94db42da2d 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -113,7 +113,7 @@
    [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index c425d82675..7add6e9d23 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.731 -%define release 190208 +%define release 190209 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 4ce9ced407..942ae54fa6 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.731 -%define release 190208 +%define release 190209 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index bd92093f41..d27dcf4114 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.731" -PI_BUILD="190208" +PI_BUILD="190209" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index d1ff8d455f..d1354375a1 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -34,7 +34,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.731 PS190208"; +my $version = "7.0NG.731 PS190209"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 5711034fcc..ff63c790fb 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.731 PS190208"; +my $version = "7.0NG.731 PS190209"; # save program name for logging my $progname = basename($0); From 56797e717beca14948ffb03dec7a98f5647c032f Mon Sep 17 00:00:00 2001 From: artica Date: Sun, 10 Feb 2019 00:01:25 +0100 Subject: [PATCH 14/19] Auto-updated build strings. Former-commit-id: 728a4013a020328735f2e76b4ecb49e87d815d10 --- 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 35b305158a..ceeef66e8c 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.731-190209 +Version: 7.0NG.731-190210 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 06e3132c6d..6b93c4a1e9 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.731-190209" +pandora_version="7.0NG.731-190210" 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 a111e0ac4d..5ca02d4a39 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.731'; -use constant AGENT_BUILD => '190209'; +use constant AGENT_BUILD => '190210'; # 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 835d775c9f..bb6fe292e9 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.731 -%define release 190209 +%define release 190210 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 10cc69c6a2..d52908f16a 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.731 -%define release 190209 +%define release 190210 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 1f14979290..08bfc8b4a8 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.731" -PI_BUILD="190209" +PI_BUILD="190210" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 02cf08ea7e..643bd96377 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{190209} +{190210} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 6a713b2708..48174cc8b1 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.731(Build 190209)") +#define PANDORA_VERSION ("7.0NG.731(Build 190210)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index deb57c1a23..939e27500f 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.731(Build 190209))" + VALUE "ProductVersion", "(7.0NG.731(Build 190210))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index ca94d0101c..9b54dd0485 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.731-190209 +Version: 7.0NG.731-190210 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 b2c6cba986..e4bd1c3bc9 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.731-190209" +pandora_version="7.0NG.731-190210" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 1b5bd84ebf..c78a673cc9 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC190209'; +$build_version = 'PC190210'; $pandora_version = 'v7.0NG.731'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 94db42da2d..d0b3a710a6 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -113,7 +113,7 @@
    [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 7add6e9d23..3b97143de1 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.731 -%define release 190209 +%define release 190210 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 942ae54fa6..9b98000225 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.731 -%define release 190209 +%define release 190210 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index d27dcf4114..cc242decba 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.731" -PI_BUILD="190209" +PI_BUILD="190210" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index d1354375a1..01379b53b4 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -34,7 +34,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.731 PS190209"; +my $version = "7.0NG.731 PS190210"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index ff63c790fb..0c3441e67c 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.731 PS190209"; +my $version = "7.0NG.731 PS190210"; # save program name for logging my $progname = basename($0); From 3acd6b8d31562be3a8a2972475c2a06e2705b147 Mon Sep 17 00:00:00 2001 From: artica Date: Mon, 11 Feb 2019 00:01:26 +0100 Subject: [PATCH 15/19] Auto-updated build strings. Former-commit-id: bb603dd63396712b8a649e3c08320653021c1289 --- 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 ceeef66e8c..64726c200d 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.731-190210 +Version: 7.0NG.731-190211 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 6b93c4a1e9..c250ad0133 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.731-190210" +pandora_version="7.0NG.731-190211" 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 5ca02d4a39..650b805708 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.731'; -use constant AGENT_BUILD => '190210'; +use constant AGENT_BUILD => '190211'; # 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 bb6fe292e9..440400d161 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.731 -%define release 190210 +%define release 190211 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 d52908f16a..5f5fff46a6 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.731 -%define release 190210 +%define release 190211 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 08bfc8b4a8..d2a09dc251 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.731" -PI_BUILD="190210" +PI_BUILD="190211" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 643bd96377..e25d5bb13d 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{190210} +{190211} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 48174cc8b1..c6f60b7aa2 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.731(Build 190210)") +#define PANDORA_VERSION ("7.0NG.731(Build 190211)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 939e27500f..a7f6242409 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.731(Build 190210))" + VALUE "ProductVersion", "(7.0NG.731(Build 190211))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 9b54dd0485..4d05af5d90 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.731-190210 +Version: 7.0NG.731-190211 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 e4bd1c3bc9..21b609d656 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.731-190210" +pandora_version="7.0NG.731-190211" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index c78a673cc9..b2e74f4053 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC190210'; +$build_version = 'PC190211'; $pandora_version = 'v7.0NG.731'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index d0b3a710a6..d953a9e48d 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -113,7 +113,7 @@
    [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 3b97143de1..68bac0e6a0 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.731 -%define release 190210 +%define release 190211 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 9b98000225..af6c012946 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.731 -%define release 190210 +%define release 190211 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index cc242decba..b14c6574b3 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.731" -PI_BUILD="190210" +PI_BUILD="190211" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 01379b53b4..0a0c73e505 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -34,7 +34,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.731 PS190210"; +my $version = "7.0NG.731 PS190211"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 0c3441e67c..307d2ee1d6 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.731 PS190210"; +my $version = "7.0NG.731 PS190211"; # save program name for logging my $progname = basename($0); From b9a09cef45c42107371371118f94007ccaa1ed8c Mon Sep 17 00:00:00 2001 From: "manuel.montes" Date: Mon, 11 Feb 2019 12:11:23 +0100 Subject: [PATCH 16/19] fixed bug in functions_reporting_html Former-commit-id: 53fd11f9b6ff51c55c0009b1e1448834ed7f0161 --- .../include/functions_reporting_html.php | 160 ------------------ 1 file changed, 160 deletions(-) diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php index 91c5ecfac6..54f81e32bc 100644 --- a/pandora_console/include/functions_reporting_html.php +++ b/pandora_console/include/functions_reporting_html.php @@ -2812,166 +2812,6 @@ function get_agent_first_time($agent_name) } -function reporting_html_general(&$table, $item) -{ - if (!empty($item['data'])) { - $data_in_same_row = $item['show_in_same_row']; - switch ($item['subtype']) { - case REPORT_GENERAL_NOT_GROUP_BY_AGENT: - if (!$data_in_same_row) { - $table1 = new stdClass(); - $table1->width = '99%'; - $table1->data = []; - $table1->head = []; - $table1->head[0] = __('Agent'); - $table1->head[1] = __('Module'); - if ($item['date']['period'] != 0) { - $table1->head[2] = __('Operation'); - } - - $table1->head[3] = __('Value'); - $table1->style[0] = 'text-align: left'; - $table1->style[1] = 'text-align: left'; - $table1->style[2] = 'text-align: left'; - $table1->style[3] = 'text-align: left'; - - // Begin - Order by agent - foreach ($item['data'] as $key => $row) { - $aux[$key] = $row['agent']; - } - - array_multisort($aux, SORT_ASC, $item['data']); - - // End - Order by agent - foreach ($item['data'] as $row) { - if ($item['date']['period'] != 0) { - $table1->data[] = [ - $row['agent'], - $row['module'], - $row['operator'], - $row['formated_value'], - ]; - } else { - $table1->data[] = [ - $row['agent'], - $row['module'], - $row['formated_value'], - ]; - } - } - } else { - $order_data = []; - foreach ($item['data'] as $row) { - $order_data[$row['id_agent']][$row['id_agent_module']][$row['operator']] = $row['formated_value']; - } - - $table1 = new stdClass(); - $table1->width = '99%'; - $table1->data = []; - $table1->head = []; - $table1->head[0] = __('Agent'); - $table1->head[1] = __('Module'); - $table1->head[2] = __('Avg'); - $table1->head[3] = __('Max'); - $table1->head[4] = __('Min'); - $table1->head[5] = __('Sum'); - $table1->style[0] = 'text-align: center'; - $table1->style[1] = 'text-align: center'; - $table1->style[2] = 'text-align: center'; - $table1->style[3] = 'text-align: center'; - $table1->style[4] = 'text-align: center'; - $table1->style[4] = 'text-align: center'; - - foreach ($order_data as $id_agent => $row) { - foreach ($row as $id_module => $row2) { - $table1->data[] = [ - agents_get_alias($id_agent), - modules_get_agentmodule_name($id_module), - $row2['Rate'], - $row2['Maximum'], - $row2['Minimum'], - $row2['Summatory'], - ]; - } - } - } - break; - - case REPORT_GENERAL_GROUP_BY_AGENT: - $list_modules = []; - foreach ($item['data'] as $modules) { - foreach ($modules as $name => $value) { - $list_modules[$name] = null; - } - } - - $list_modules = array_keys($list_modules); - - $table1->width = '99%'; - $table1->data = []; - $table1->head = array_merge([__('Agent')], $list_modules); - foreach ($item['data'] as $agent => $modules) { - $row = []; - - $row['agent'] = $agent; - $table1->style['agent'] = 'text-align: center;'; - foreach ($list_modules as $name) { - $table1->style[$name] = 'text-align: center;'; - if (isset($modules[$name])) { - $row[$name] = $modules[$name]; - } else { - $row[$name] = '--'; - } - } - - $table1->data[] = $row; - } - break; - } - - $table->colspan['data']['cell'] = 3; - $table->cellstyle['data']['cell'] = 'text-align: center;'; - $table->data['data']['cell'] = html_print_table($table1, true); - } else { - $table->colspan['error']['cell'] = 3; - $table->data['error']['cell'] = __('There are no Agent/Modules defined'); - } - - if ($item['resume'] && !empty($item['data'])) { - $table_summary = new stdClass(); - $table_summary->width = '99%'; - - $table_summary->data = []; - $table_summary->head = []; - $table_summary->head_colspan = []; - $table_summary->align = []; - - $table_summary->align[0] = 'left'; - $table_summary->align[1] = 'right'; - $table_summary->align[2] = 'right'; - $table_summary->align[3] = 'left'; - $table_summary->align[4] = 'right'; - - $table_summary->head_colspan[0] = 2; - $table_summary->head[0] = __('Min Value'); - $table_summary->head[1] = __('Average Value'); - $table_summary->head_colspan[2] = 2; - $table_summary->head[2] = __('Max Value'); - - $table_summary->data[0][0] = $item['min']['agent'].' - '.$item['min']['module']; - $table_summary->data[0][1] = $item['min']['formated_value']; - $table_summary->data[0][2] = format_for_graph($item['avg_value'], 2); - $table_summary->data[0][3] = $item['max']['agent'].' - '.$item['max']['module']; - $table_summary->data[0][4] = $item['max']['formated_value']; - - $table->colspan['summary_title']['cell'] = 3; - $table->data['summary_title']['cell'] = ''.__('Summary').''; - $table->colspan['summary_table']['cell'] = 3; - $table->data['summary_table']['cell'] = html_print_table($table_summary, true); - } -} - - function reporting_html_sql(&$table, $item) { if (!$item['correct']) { From bbd3cb79ce3ace21b786d4561e42687660a814b9 Mon Sep 17 00:00:00 2001 From: artica Date: Tue, 12 Feb 2019 00:01:37 +0100 Subject: [PATCH 17/19] Auto-updated build strings. Former-commit-id: ca52afd38b1d242e4823639dd6c1e8cbc265ef04 --- 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 64726c200d..607627a3ee 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.731-190211 +Version: 7.0NG.731-190212 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 c250ad0133..9ba665ed46 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.731-190211" +pandora_version="7.0NG.731-190212" 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 650b805708..b725810739 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.731'; -use constant AGENT_BUILD => '190211'; +use constant AGENT_BUILD => '190212'; # 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 440400d161..efeb0694d6 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.731 -%define release 190211 +%define release 190212 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 5f5fff46a6..5a9cffadd1 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.731 -%define release 190211 +%define release 190212 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 d2a09dc251..7a5ddeaa91 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.731" -PI_BUILD="190211" +PI_BUILD="190212" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index e25d5bb13d..86d8e9de52 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{190211} +{190212} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index c6f60b7aa2..1e42bbc738 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.731(Build 190211)") +#define PANDORA_VERSION ("7.0NG.731(Build 190212)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index a7f6242409..e2a88d86bf 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.731(Build 190211))" + VALUE "ProductVersion", "(7.0NG.731(Build 190212))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 4d05af5d90..26c3ee5b1f 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.731-190211 +Version: 7.0NG.731-190212 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 21b609d656..6392c5a84a 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.731-190211" +pandora_version="7.0NG.731-190212" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index b2e74f4053..1bb868d2cc 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC190211'; +$build_version = 'PC190212'; $pandora_version = 'v7.0NG.731'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index d953a9e48d..c8224c01c0 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -113,7 +113,7 @@
    [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 68bac0e6a0..11b2df4ed0 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.731 -%define release 190211 +%define release 190212 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index af6c012946..b3548ca8f7 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.731 -%define release 190211 +%define release 190212 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index b14c6574b3..189467a643 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.731" -PI_BUILD="190211" +PI_BUILD="190212" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 0a0c73e505..b7c3b42ea3 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -34,7 +34,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.731 PS190211"; +my $version = "7.0NG.731 PS190212"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 307d2ee1d6..2d8697cfc9 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.731 PS190211"; +my $version = "7.0NG.731 PS190212"; # save program name for logging my $progname = basename($0); From fa7f519d3446a16b87bb4f623cf9dca2d4dfb765 Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Tue, 12 Feb 2019 14:52:18 +0100 Subject: [PATCH 18/19] Merged from develop. Former-commit-id: 438c0bfa6cfa77ef0b75df02f3bce020122692b9 --- .../godmode/agentes/configurar_agente.php | 40 +++++---- .../godmode/massive/massive_edit_agents.php | 17 ++-- pandora_console/include/functions_modules.php | 86 ++++++++++--------- 3 files changed, 76 insertions(+), 67 deletions(-) diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index c6a01fbe53..dfa28988a8 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -824,23 +824,25 @@ if ($update_agent) { ] ); - # Update the configuration files - if ($old_values['intervalo'] != $intervalo) { - enterprise_hook( - 'config_agents_update_config_token', - array($id_agente, 'interval', $intervalo) - ); - } - if ($old_values['disabled'] != $disabled) { - enterprise_hook( - 'config_agents_update_config_token', - array($id_agente, 'standby', $disabled ? "1" : "0") - ); - // Validate alerts for disabled agents. - if ($disabled) { - alerts_validate_alert_agent($id_agente); - } - } + if ($old_value === false) { + // Create custom field if not exist + $update_custom = db_process_sql_insert( + 'tagent_custom_data', + [ + 'id_field' => $key, + 'id_agent' => $id_agente, + 'description' => $value, + ] + ); + } else { + $update_custom = db_process_sql_update( + 'tagent_custom_data', + ['description' => $value], + [ + 'id_field' => $key, + 'id_agent' => $id_agente, + ] + ); if ($update_custom == 1) { $update_custom_result = 1; @@ -943,6 +945,10 @@ if ($update_agent) { $disabled ? '1' : '0', ] ); + // Validate alerts for disabled agents. + if ($disabled) { + alerts_validate_alert_agent($id_agente); + } } if ($tpolicy_group_old) { diff --git a/pandora_console/godmode/massive/massive_edit_agents.php b/pandora_console/godmode/massive/massive_edit_agents.php index 0b449ac8db..2011eec564 100755 --- a/pandora_console/godmode/massive/massive_edit_agents.php +++ b/pandora_console/godmode/massive/massive_edit_agents.php @@ -63,16 +63,9 @@ if ($update_agents) { $values['intervalo'] = get_parameter('interval'); } - if ($disabled_old !== false && $disabled_old != $values['disabled']) { - enterprise_hook( - 'config_agents_update_config_token', - array($id_agent, 'standby', $values['disabled']) - ); - // Validate alerts for disabled agents. - if ($values['disabled'] == 1) { - alerts_validate_alert_agent($id_agent); - } - } + if (get_parameter('id_os', '') != -1) { + $values['id_os'] = get_parameter('id_os'); + } if (get_parameter('id_parent', '') != '') { $values['id_parent'] = get_parameter('id_agent_parent', 0); @@ -212,6 +205,10 @@ if ($update_agents) { $values['disabled'], ] ); + // Validate alerts for disabled agents. + if ($values['disabled'] == 1) { + alerts_validate_alert_agent($id_agent); + } } if ($group_old || $result) { diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php index d14483d088..164660fc25 100755 --- a/pandora_console/include/functions_modules.php +++ b/pandora_console/include/functions_modules.php @@ -311,48 +311,54 @@ function modules_copy_agent_module_to_agent($id_agent_module, $id_destiny_agent, * * @return True if the module was disabled. False if not. */ -function modules_change_disabled($id_agent_module, $new_value = 1) { - $id_agent_module = (array) $id_agent_module; - - $id_agent_module_changed = array(); - - foreach ($id_agent_module as $id_module) { - // If the module is already disabled/enabled ignore - $current_disabled = db_get_value('disabled', 'tagente_modulo', - 'id_agente_modulo', $id_module); - if ($current_disabled == $new_value) { - continue; - } +function modules_change_disabled($id_agent_module, $new_value=1) +{ + $id_agent_module = (array) $id_agent_module; - // Validate alerts for disabled modules. - if ($new_value == 1) { - alerts_validate_alert_module($id_module); - } + $id_agent_module_changed = []; - $id_agent_changed[] = modules_get_agentmodule_agent($id_module); - $id_agent_module_changed[] = $id_module; - } - - if (empty($id_agent_module_changed)) { - return NOERR; - } - else { - $result = db_process_sql_update('tagente_modulo', - array('disabled' => (int) $new_value), - array('id_agente_modulo' => $id_agent_module_changed)); - } - - if ($result) { - // Change the agent flag to update modules count - db_process_sql_update('tagente', - array('update_module_count' => 1), - array('id_agente' => $id_agent_changed)); - - return NOERR; - } - else { - return ERR_GENERIC; - } + foreach ($id_agent_module as $id_module) { + // If the module is already disabled/enabled ignore + $current_disabled = db_get_value( + 'disabled', + 'tagente_modulo', + 'id_agente_modulo', + $id_module + ); + if ($current_disabled == $new_value) { + continue; + } + // Validate alerts for disabled modules. + if ($new_value == 1) { + alerts_validate_alert_module($id_module); + } + + $id_agent_changed[] = modules_get_agentmodule_agent($id_module); + $id_agent_module_changed[] = $id_module; + } + + if (empty($id_agent_module_changed)) { + return NOERR; + } else { + $result = db_process_sql_update( + 'tagente_modulo', + ['disabled' => (int) $new_value], + ['id_agente_modulo' => $id_agent_module_changed] + ); + } + + if ($result) { + // Change the agent flag to update modules count + db_process_sql_update( + 'tagente', + ['update_module_count' => 1], + ['id_agente' => $id_agent_changed] + ); + + return NOERR; + } else { + return ERR_GENERIC; + } } From 0e39e3fef7b7946d93101f2d8396aa27debbb25e Mon Sep 17 00:00:00 2001 From: artica Date: Wed, 13 Feb 2019 00:01:37 +0100 Subject: [PATCH 19/19] Auto-updated build strings. Former-commit-id: 7c2aabad85c99a55d80b3dc856c931f160cb35d7 --- 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 | 4 ++-- 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, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 607627a3ee..5e6cdcaf52 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.731-190212 +Version: 7.0NG.731-190213 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 9ba665ed46..36394c1753 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.731-190212" +pandora_version="7.0NG.731-190213" 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 b725810739..51cfc9b3b4 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.731'; -use constant AGENT_BUILD => '190212'; +use constant AGENT_BUILD => '190213'; # 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 efeb0694d6..dd33121a7b 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.731 -%define release 190212 +%define release 190213 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 5a9cffadd1..594a55cf67 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.731 -%define release 190212 +%define release 190213 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 7a5ddeaa91..a1fe47bf4d 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.731" -PI_BUILD="190212" +PI_BUILD="190213" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 86d8e9de52..97198033b0 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{190212} +{190213} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 1e42bbc738..e733c2c808 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.731(Build 190212)") +#define PANDORA_VERSION ("7.0NG.731(Build 190213)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index e2a88d86bf..0a946f611d 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.731(Build 190212))" + VALUE "ProductVersion", "(7.0NG.731(Build 190213))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 26c3ee5b1f..48853b25f5 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.731-190212 +Version: 7.0NG.731-190213 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 6392c5a84a..72b51f04c3 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.731-190212" +pandora_version="7.0NG.731-190213" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 1bb868d2cc..88feb4717c 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC190212'; +$build_version = 'PC190213'; $pandora_version = 'v7.0NG.731'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 9d90a6df26..c232b43ac7 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -112,8 +112,8 @@
    [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 11b2df4ed0..dd9d6163cb 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.731 -%define release 190212 +%define release 190213 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index b3548ca8f7..89ac48edce 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.731 -%define release 190212 +%define release 190213 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 189467a643..3e1b7760d5 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.731" -PI_BUILD="190212" +PI_BUILD="190213" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index bb776164da..c3c75fffb1 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -34,7 +34,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.731 PS190212"; +my $version = "7.0NG.731 PS190213"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 2d8697cfc9..65d4942d52 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.731 PS190212"; +my $version = "7.0NG.731 PS190213"; # save program name for logging my $progname = basename($0);