From 0fc33f3fa265614326e7bdefd3161eb5b96547e1 Mon Sep 17 00:00:00 2001 From: danielmaya Date: Fri, 23 Feb 2018 14:38:26 +0100 Subject: [PATCH 01/69] Fixed module filter in view events --- pandora_console/operation/events/events.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php index a7e6523c7e..9564e87b5e 100644 --- a/pandora_console/operation/events/events.php +++ b/pandora_console/operation/events/events.php @@ -275,7 +275,7 @@ if ($id_agent != 0) { } $text_module = (string) get_parameter('module_search', ''); -$id_agent_module = get_parameter('module_search_hidden', 0); +$id_agent_module = get_parameter('module_search_hidden', get_parameter('id_agent_module',0)); if ($id_agent_module != 0) { $text_module = db_get_value('nombre', 'tagente_modulo', 'id_agente_modulo', $id_agent_module); if ($text_module == false) { From 3ee2f8615ff63f002faf9921e0f259788ef031ab Mon Sep 17 00:00:00 2001 From: enriquecd Date: Mon, 26 Feb 2018 19:10:53 +0100 Subject: [PATCH 02/69] API and CLI apply template components - #983 --- pandora_console/include/functions_api.php | 143 ++++++++++++++++++++++ pandora_server/util/pandora_manage.pl | 98 ++++++++++++++- 2 files changed, 240 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php index e6d247b421..1d800fe386 100644 --- a/pandora_console/include/functions_api.php +++ b/pandora_console/include/functions_api.php @@ -10142,4 +10142,147 @@ function api_set_metaconsole_synch($keys) { } +function api_set_apply_module_template($id_template, $id_agent, $thrash3, $thrash4) { + + if (isset ($id_template)) { + // Take agent data + $row = db_get_row ("tagente", "id_agente", $id_agent); + + if ($row !== false) { + $intervalo = $row["intervalo"]; + $nombre_agente = $row["nombre"]; + $direccion_agente =$row["direccion"]; + $ultima_act = $row["ultimo_contacto"]; + $ultima_act_remota =$row["ultimo_contacto_remoto"]; + $comentarios = $row["comentarios"]; + $id_grupo = $row["id_grupo"]; + $id_os= $row["id_os"]; + $os_version = $row["os_version"]; + $agent_version = $row["agent_version"]; + $disabled= $row["disabled"]; + } + else { + return; + } + + $id_np = $id_template; + $name_template = db_get_value ('name', 'tnetwork_profile', 'id_np', $id_np); + $npc = db_get_all_rows_field_filter ("tnetwork_profile_component", "id_np", $id_np); + + if ($npc === false) { + $npc = array (); + } + + $success_count = $error_count = 0; + $modules_already_added = array(); + + foreach ($npc as $row) { + $nc = db_get_all_rows_field_filter ("tnetwork_component", "id_nc", $row["id_nc"]); + + if ($nc === false) { + $nc = array (); + } + foreach ($nc as $row2) { + // Insert each module from tnetwork_component into agent + $values = array( + 'id_agente' => $id_agent, + 'id_tipo_modulo' => $row2["type"], + 'descripcion' => __('Created by template ').$name_template. ' . '.$row2["description"], + 'max' => $row2["max"], + 'min' => $row2["min"], + 'module_interval' => $row2["module_interval"], + 'tcp_port' => $row2["tcp_port"], + 'tcp_send' => $row2["tcp_send"], + 'tcp_rcv' => $row2["tcp_rcv"], + 'snmp_community' => $row2["snmp_community"], + 'snmp_oid' => $row2["snmp_oid"], + 'ip_target' => $direccion_agente, + 'id_module_group' => $row2["id_module_group"], + 'id_modulo' => $row2["id_modulo"], + 'plugin_user' => $row2["plugin_user"], + 'plugin_pass' => $row2["plugin_pass"], + 'plugin_parameter' => $row2["plugin_parameter"], + 'unit' => $row2["unit"], + 'max_timeout' => $row2["max_timeout"], + 'max_retries' => $row2["max_retries"], + 'id_plugin' => $row2['id_plugin'], + 'post_process' => $row2['post_process'], + 'dynamic_interval' => $row2['dynamic_interval'], + 'dynamic_max' => $row2['dynamic_max'], + 'dynamic_min' => $row2['dynamic_min'], + 'dynamic_two_tailed' => $row2['dynamic_two_tailed'], + 'min_warning' => $row2['min_warning'], + 'max_warning' => $row2['max_warning'], + 'str_warning' => $row2['str_warning'], + 'min_critical' => $row2['min_critical'], + 'max_critical' => $row2['max_critical'], + 'str_critical' => $row2['str_critical'], + 'critical_inverse' => $row2['critical_inverse'], + 'warning_inverse' => $row2['warning_inverse'], + 'critical_instructions' => $row2['critical_instructions'], + 'warning_instructions' => $row2['warning_instructions'], + 'unknown_instructions' => $row2['unknown_instructions'], + 'id_category' => $row2['id_category'], + 'macros' => $row2['macros'], + 'each_ff' => $row2['each_ff'], + 'min_ff_event' => $row2['min_ff_event'], + 'min_ff_event_normal' => $row2['min_ff_event_normal'], + 'min_ff_event_warning' => $row2['min_ff_event_warning'], + 'min_ff_event_critical' => $row2['min_ff_event_critical'] + ); + + $name = $row2["name"]; + + // Put tags in array if the component has to add them later + if(!empty($row2["tags"])) { + $tags = explode(',', $row2["tags"]); + } + else { + $tags = array(); + } + + // Check if this module exists in the agent + $module_name_check = db_get_value_filter('id_agente_modulo', 'tagente_modulo', array('delete_pending' => 0, 'nombre' => $name, 'id_agente' => $id_agent)); + + if ($module_name_check !== false) { + $modules_already_added[] = $row2["name"]; + $error_count++; + } + else { + $id_agente_modulo = modules_create_agent_module($id_agent, $name, $values); + + if ($id_agente_modulo === false) { + $error_count++; + } + else { + if(!empty($tags)) { + // Creating tags + $tag_ids = array(); + foreach ($tags as $tag_name) { + $tag_id = tags_get_id($tag_name); + + //If tag exists in the system we store to create it + $tag_ids[] = $tag_id; + } + + tags_insert_module_tag ($id_agente_modulo, $tag_ids); + } + + $success_count++; + } + } + } + } + if ($error_count > 0) { + if (empty($modules_already_added)) + ui_print_error_message(__('Error adding modules') . sprintf(' (%s)', $error_count)); + else + ui_print_error_message(__('Error adding modules. The following errors already exists: ') . implode(', ', $modules_already_added)); + } + if ($success_count > 0) + ui_print_success_message(__('Modules successfully added')); + } + +} + ?> diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 90db5fa2f7..c07d838da8 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.719 PS180226"; +my $version = "7.0NG.719 PS180219"; # save program name for logging my $progname = basename($0); @@ -6066,6 +6066,10 @@ sub pandora_manage_main ($$$) { param_check($ltotal, 3, 2); cli_export_visual_console(); } + elsif ($param eq '--apply_module_template') { + param_check($ltotal, 2, 2); + cli_apply_module_template(); + } else { print_log "[ERROR] Invalid option '$param'.\n\n"; $param = ''; @@ -6436,3 +6440,95 @@ sub cli_add_tag_to_module() { my $result = api_call(\%conf, 'set', 'add_tag_module', $module_id, $tag_id); print "\n$result\n"; } + +sub cli_apply_module_template() { + my ($id_template, $id_agent) = @ARGV[2..3]; + + my @row = get_db_rows ($dbh,"select * from tagente where id_agente = ".$id_agent); + + return if (scalar (@row) == 0); + + my $name_template = get_db_value ($dbh,'select name from tnetwork_profile where id_np = '.$id_template); + + my @npc = get_db_rows($dbh,"select * from tnetwork_profile_component where id_np = ".$id_template); + + foreach my $component (@npc) { + + my @template_values = get_db_rows ($dbh,"SELECT * FROM tnetwork_component where id_nc = ".$component->{'id_nc'}); + + return if (scalar (@template_values) == 0); + + foreach my $element (@template_values) { + my $agent_values; + $agent_values->{'id_agente'} = $id_agent; + $agent_values->{'id_tipo_modulo'} = $element->{"type"}; + $agent_values->{'descripcion'} = 'Created by template '.$name_template.' '.$element->{"description"}; + $agent_values->{'max'} = $element->{"max"}; + $agent_values->{'min'} = $element->{"min"}; + $agent_values->{'module_interval'} = $element->{"module_interval"}; + $agent_values->{'tcp_port'} = $element->{"tcp_port"}; + $agent_values->{'tcp_send'} = $element->{"tcp_send"}; + $agent_values->{'tcp_rcv'} = $element->{"tcp_rcv"}; + $agent_values->{'snmp_community'} = $element->{"snmp_community"}; + $agent_values->{'snmp_oid'} = $element->{"snmp_oid"}; + $agent_values->{'ip_target'} = $row[0]->{"direccion"}; + $agent_values->{'id_module_group'} = $element->{"id_module_group"}; + $agent_values->{'id_modulo'} = $element->{"id_modulo"}; + $agent_values->{'plugin_user'} = $element->{"plugin_user"}; + $agent_values->{'plugin_pass'} = $element->{"plugin_pass"}; + $agent_values->{'plugin_parameter'} = $element->{"plugin_parameter"}; + $agent_values->{'unit'} = $element->{"unit"}; + $agent_values->{'max_timeout'} = $element->{"max_timeout"}; + $agent_values->{'max_retries'} = $element->{"max_retries"}; + $agent_values->{'id_plugin'} = $element->{"id_plugin"}; + $agent_values->{'post_process'} = $element->{"post_process"}; + $agent_values->{'dynamic_interval'} = $element->{"dynamic_interval"}; + $agent_values->{'dynamic_max'} = $element->{"dynamic_max"}; + $agent_values->{'dynamic_min'} = $element->{"dynamic_min"}; + $agent_values->{'dynamic_two_tailed'} = $element->{"dynamic_two_tailed"}; + $agent_values->{'min_warning'} = $element->{"min_warning"}; + $agent_values->{'max_warning'} = $element->{"max_warning"}; + $agent_values->{'str_warning'} = $element->{"str_warning"}; + $agent_values->{'min_critical'} = $element->{"min_critical"}; + $agent_values->{'max_critical'} = $element->{"max_critical"}; + $agent_values->{'str_critical'} = $element->{"str_critical"}; + $agent_values->{'critical_inverse'} = $element->{"critical_inverse"}; + $agent_values->{'warning_inverse'} = $element->{"warning_inverse"}; + $agent_values->{'critical_instructions'} = $element->{"critical_instructions"}; + $agent_values->{'warning_instructions'} = $element->{"warning_instructions"}; + $agent_values->{'unknown_instructions'} = $element->{"unknown_instructions"}; + $agent_values->{'id_category'} = $element->{"id_category"}; + $agent_values->{'macros'} = $element->{"macros"}; + $agent_values->{'each_ff'} = $element->{"each_ff"}; + $agent_values->{'min_ff_event'} = $element->{"min_ff_event"}; + $agent_values->{'min_ff_event_normal'} = $element->{"min_ff_event_normal"}; + $agent_values->{'min_ff_event_warning'} = $element->{"min_ff_event_warning"}; + $agent_values->{'min_ff_event_critical'} = $element->{"min_ff_event_critical"}; + $agent_values->{'nombre'} = $element->{"name"}; + + my @tags; + if($element->{"tags"} ne '') { + @tags = split(',', $element->{"tags"}); + } + + my $module_name_check = get_db_value ($dbh,'select id_agente_modulo from tagente_modulo where delete_pending = 0 and nombre ="'.$agent_values->{'nombre'}.'" and id_agente = '.$id_agent); + + if (!defined($module_name_check)) { + + my $id_agente_modulo = pandora_create_module_from_hash(\%conf,$agent_values,$dbh); + + if ($id_agente_modulo != -1) { + + foreach my $tag_name (@tags) { + + my $tag_id = get_db_value($dbh,'select id_tag from ttag where name = "'.$tag_name.'"'); + + db_do($dbh,'insert into ttag_module (id_tag,id_agente_modulo) values ("'.$tag_id.'","'.$id_agente_modulo.'")'); + + } + } + } + } + } +} + From 9a4ea419420db3732596b81a11b53c35021f5117 Mon Sep 17 00:00:00 2001 From: enriquecd Date: Wed, 7 Mar 2018 16:18:35 +0100 Subject: [PATCH 03/69] Add search bar to cluster agent aggregator - #1866 --- .../operation/agentes/ver_agente.php | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php index b94a7733db..6058b90724 100644 --- a/pandora_console/operation/agentes/ver_agente.php +++ b/pandora_console/operation/agentes/ver_agente.php @@ -44,12 +44,16 @@ if (is_ajax ()) { $get_agentmodule_status_tooltip = (bool) get_parameter ("get_agentmodule_status_tooltip"); $get_group_status_tooltip = (bool) get_parameter ("get_group_status_tooltip"); $get_agent_id = (bool) get_parameter ("get_agent_id"); + $cluster_mode = (bool) get_parameter ("cluster_mode",0); + $agent_alias = get_parameter('alias', ''); + $agents_inserted = get_parameter('agents_inserted', array()); $id_group = (int) get_parameter('id_group'); if ($get_agents_group_json) { $id_group = (int) get_parameter('id_group'); $recursion = get_parameter ('recursion'); $id_os = get_parameter('id_os', ''); $agent_name = get_parameter('name', ''); + $privilege = (string) get_parameter ('privilege', "AR"); // Is is possible add keys prefix to avoid auto sorting in js object conversion $keys_prefix = (string) get_parameter ('keys_prefix', ''); @@ -75,6 +79,8 @@ if (is_ajax ()) { $filter['id_os'] = $id_os; if (!empty($agent_name)) $filter['nombre'] = '%' . $agent_name . '%'; + if (!empty($agent_alias)) + $filter['alias'] = '%' . $agent_alias . '%'; switch ($status_agents) { case AGENT_STATUS_NORMAL: @@ -98,6 +104,43 @@ if (is_ajax ()) { } $filter['order'] = "alias ASC"; + if($cluster_mode){ + + $agent_id_os = db_get_all_rows_sql('select id_os from tconfig_os where id_os != 21'); + + foreach ($agent_id_os as $key => $value) { + $agent_id_os_array[] = $agent_id_os[$key]['id_os']; + } + + $filter['id_os'] = $agent_id_os_array; + + if($agents_inserted[0] != ''){ + + $agents_id_list = ''; + + foreach($agents_inserted as $elem) { + + if ($elem === end($agents_inserted)) { + $agents_id_list .= $elem; + } + else{ + $agents_id_list .= $elem.','; + } + + } + + $agent_id_agente = db_get_all_rows_sql('select id_agente from tagente where id_agente not in ('.$agents_id_list.')'); + + foreach ($agent_id_agente as $key => $value) { + $agent_id_agente_array[] = $agent_id_agente[$key]['id_agente']; + } + + $filter['id_agente'] = $agent_id_agente_array; + + } + + } + // Build fields $fields = array('id_agente', 'alias'); From 97bcaec72050c8926d42dff895dc1ce59472fc75 Mon Sep 17 00:00:00 2001 From: enriquecd Date: Thu, 8 Mar 2018 11:58:31 +0100 Subject: [PATCH 04/69] Not blink separator dots for digital clocks - #2026 --- pandora_console/include/graphs/pandora.d3.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/graphs/pandora.d3.js b/pandora_console/include/graphs/pandora.d3.js index 98d4a54557..300ff0b665 100644 --- a/pandora_console/include/graphs/pandora.d3.js +++ b/pandora_console/include/graphs/pandora.d3.js @@ -2334,7 +2334,7 @@ var digitPattern = [ digit.select("path:nth-child(5)").classed("lit", function(d) { return digitPattern[4][d]; }); digit.select("path:nth-child(6)").classed("lit", function(d) { return digitPattern[5][d]; }); digit.select("path:nth-child(7)").classed("lit", function(d) { return digitPattern[6][d]; }); - separator.classed("lit", seconds & 1); + separator.classed("lit", seconds); setTimeout(tick, 1000 - now % 1000); })(); From 753d10920ab6e28e7794d68365b2e9f06953f80f Mon Sep 17 00:00:00 2001 From: enriquecd Date: Tue, 13 Mar 2018 12:46:27 +0100 Subject: [PATCH 05/69] Hide password custom fields data in agent custom fileds section - #2030 --- .../operation/agentes/custom_fields.php | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pandora_console/operation/agentes/custom_fields.php b/pandora_console/operation/agentes/custom_fields.php index b9f33aa672..607ab06360 100644 --- a/pandora_console/operation/agentes/custom_fields.php +++ b/pandora_console/operation/agentes/custom_fields.php @@ -78,19 +78,22 @@ else { $data[1] = html_print_image('images/delete.png', true); } - $custom_value = db_get_value_filter('description', - 'tagent_custom_data', array( - 'id_field' => $field['id_field'], - 'id_agent' => $id_agente)); - - if ($custom_value === false || $custom_value == '') { - $custom_value = '-'.__('empty').'-'; + $custom_value = db_get_all_rows_sql("select tagent_custom_data.description,tagent_custom_fields.is_password_type from tagent_custom_fields + INNER JOIN tagent_custom_data ON tagent_custom_fields.id_field = tagent_custom_data.id_field where tagent_custom_fields.id_field = ".$field['id_field']." and tagent_custom_data.id_agent = ".$id_agente); + + if ($custom_value[0]['description'] === false || $custom_value[0]['description'] == '') { + $custom_value[0]['description'] = '-'.__('empty').'-'; } else { - $custom_value = ui_bbcode_to_html($custom_value); + $custom_value[0]['description'] = ui_bbcode_to_html($custom_value[0]['description']); } - $data[2] = $custom_value; + if($custom_value[0]['is_password_type']){ + $data[2] = '••••••••'; + } + else{ + $data[2] = $custom_value[0]['description']; + } array_push ($table->data, $data); } From d38df88c79656117162e131628a0b7b1b73821ea Mon Sep 17 00:00:00 2001 From: fermin831 Date: Tue, 13 Mar 2018 19:07:31 +0100 Subject: [PATCH 06/69] [Pie charts] Adding more space in legend --- pandora_console/include/graphs/functions_pchart.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/graphs/functions_pchart.php b/pandora_console/include/graphs/functions_pchart.php index fcbd67f00a..0114d36e32 100644 --- a/pandora_console/include/graphs/functions_pchart.php +++ b/pandora_console/include/graphs/functions_pchart.php @@ -522,7 +522,7 @@ function pch_pie_graph ($graph_type, $data_values, $legend_values, $width, if ($legend_position != 'hidden') { // This is a hardcore adjustment to match most of the graphs, please don't alter - $legend_with_aprox = 32 + (4.5 * $max_chars); + $legend_with_aprox = 32 + (9.5 * $max_chars); $PieChart->drawPieLegend($width - $legend_with_aprox, 5, array("R"=>255,"G"=>255,"B"=>255, "BoxSize"=>10)); } From 690ad81a6265f31376f2a651d3b23fe051bc1354 Mon Sep 17 00:00:00 2001 From: fermin831 Date: Wed, 14 Mar 2018 13:31:54 +0100 Subject: [PATCH 07/69] [Visual Console] Changed simple select by group select in restricted group advanced fieldin static graph --- .../include/functions_visual_map_editor.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/functions_visual_map_editor.php b/pandora_console/include/functions_visual_map_editor.php index c9e8074dc1..b5f39f80d6 100755 --- a/pandora_console/include/functions_visual_map_editor.php +++ b/pandora_console/include/functions_visual_map_editor.php @@ -735,7 +735,17 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) { 'icon', 'label', 'datos'); $form_items_advance['element_group_row']['html'] = ''. __('Restrict access to group') . '' . - '' . html_print_select($user_groups, 'element_group', '', '', '', 0, true) . + '' . + html_print_select_groups( + $config['id_user'], + "VR", + true, + 'element_group', + __('All'), + '', + '', + 0, + true) . ui_print_help_tip ( __("If selected, restrict visualization of this item in the visual console to users who have access to selected group. This is also used on calculating child visual consoles."), true) . ''; From a8cb366508d944d6ff0ba8b64c64bb80ad64a5f1 Mon Sep 17 00:00:00 2001 From: fermin831 Date: Wed, 14 Mar 2018 17:24:34 +0100 Subject: [PATCH 08/69] [Alerts view] Fixed validation in alerts view --- pandora_console/include/functions_ui.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index 751b1bf34e..caffcad739 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -961,9 +961,15 @@ function ui_format_alert_row ($alert, $agent = true, $url = '', $agent_style = f if (!defined('METACONSOLE')) { if (check_acl ($config["id_user"], $id_group, "LW") || check_acl ($config["id_user"], $id_group, "LM")) { $data[$index['validate']] = ''; - - - $data[$index['validate']] .= html_print_checkbox ("validate[]", $alert["id"], false, true); + + $data[$index['validate']] .= html_print_checkbox ( + "validate[]", + $alert["id"], + false, + true, + false, + '', + true); } } From 1001240cf460375f22dd1adb92729bda3626a485 Mon Sep 17 00:00:00 2001 From: fermin831 Date: Thu, 15 Mar 2018 16:03:46 +0100 Subject: [PATCH 09/69] [SNMP] Fixed translation of custom mibs, added custom description data and change style of OID details --- .../extensions/realtime_graphs.php | 2 +- .../agentes/module_manager_editor_network.php | 2 +- .../include/functions_snmp_browser.php | 41 +++++++++++-------- .../javascript/pandora_snmp_browser.js | 3 +- pandora_console/include/styles/pandora.css | 9 +++- 5 files changed, 35 insertions(+), 22 deletions(-) diff --git a/pandora_console/extensions/realtime_graphs.php b/pandora_console/extensions/realtime_graphs.php index b4fade177d..a218d59710 100644 --- a/pandora_console/extensions/realtime_graphs.php +++ b/pandora_console/extensions/realtime_graphs.php @@ -122,7 +122,7 @@ function pandora_realtime_graphs () { echo ''; // Define a custom action to save the OID selected in the SNMP browser to the form - html_print_input_hidden ('custom_action', urlencode (base64_encode(' ')), false); + html_print_input_hidden ('custom_action', urlencode (base64_encode(' ')), false); html_print_input_hidden ('incremental_base', '0'); echo ''; diff --git a/pandora_console/godmode/agentes/module_manager_editor_network.php b/pandora_console/godmode/agentes/module_manager_editor_network.php index 915d1b542a..557b17f388 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_network.php +++ b/pandora_console/godmode/agentes/module_manager_editor_network.php @@ -27,7 +27,7 @@ html_print_input_hidden ('ajax_url', ui_get_full_url("ajax.php"), false); html_print_input_hidden ('search_matches_translation', __("Search matches"), false); // Define a custom action to save the OID selected in the SNMP browser to the form -html_print_input_hidden ('custom_action', urlencode (base64_encode(' ')), false); +html_print_input_hidden ('custom_action', urlencode (base64_encode(' ')), false); $isFunctionPolicies = enterprise_include_once('include/functions_policies.php'); diff --git a/pandora_console/include/functions_snmp_browser.php b/pandora_console/include/functions_snmp_browser.php index 390d6ec151..f101faee0f 100644 --- a/pandora_console/include/functions_snmp_browser.php +++ b/pandora_console/include/functions_snmp_browser.php @@ -383,7 +383,7 @@ function snmp_browser_get_oid ($target_ip, $community, $target_oid, $version = ' else { $snmptranslate_bin = $config['snmptranslate']; } - exec ($snmptranslate_bin . " -Td " . escapeshellarg($oid), + exec ($snmptranslate_bin . ' -m ALL -M +' . escapeshellarg($config['homedir'] . '/attachment/mibs') . " -Td " . escapeshellarg($oid), $translate_output); foreach ($translate_output as $line) { if (preg_match ('/SYNTAX\s+(.*)/', $line, $matches) == 1) { @@ -399,13 +399,18 @@ function snmp_browser_get_oid ($target_ip, $community, $target_oid, $version = ' $oid_data['display_hint'] = $matches[1]; } } - - // Parse the description - $translate_output = implode ('', $translate_output); - if (preg_match ('/DESCRIPTION\s+\"(.*)\"/', $translate_output, $matches) == 1) { - $oid_data['description'] = $matches[1]; + + // Parse the description. First search for it in custom values + $custom_data = db_get_row('ttrap_custom_values', 'oid', $oid); + if ($custom_data === false) { + $translate_output = implode ('', $translate_output); + if (preg_match ('/DESCRIPTION\s+\"(.*)\"/', $translate_output, $matches) == 1) { + $oid_data['description'] = $matches[1]; + } + } else { + $oid_data['description'] = $custom_data['description']; } - + $full_value = explode (':', trim ($full_oid[1])); if (! isset ($full_value[1])) { $oid_data['value'] = trim ($full_oid[1]); @@ -482,26 +487,26 @@ function snmp_browser_print_oid ($oid = array(), $custom_action = '', $table->data[$i][1] = $oid['status']; $i++; } - + $closer = ''; $closer .= html_print_image ("images/blade.png", true, array ("title" => __('Close'), "style" => 'vertical-align: middle;'), false); $closer .= ''; - - $table->head[0] = $closer; - $table->head[1] = __('OID Information'); - + // Add a span for custom actions if ($custom_action != '') { - $output .= '' . $closer . $custom_action . ''; + $table->head[0] = '' . $closer . $custom_action . ''; + } else { + $table->head[0] = $closer; } - + + $table->head[1] = __('OID Information'); $output .= html_print_table($table, true); - + $url = "index.php?" . "sec=gmodules&" . "sec2=godmode/modules/manage_network_components"; - $output .= '
'; + $output .= ''; $output .= html_print_input_hidden('create_network_from_snmp_browser', 1, true); $output .= html_print_input_hidden('id_component_type', 2, true); $output .= html_print_input_hidden('type', 17, true); @@ -519,7 +524,7 @@ function snmp_browser_print_oid ($oid = array(), $custom_action = '', $output .= html_print_input_hidden('snmp_community', $community, true); $output .= html_print_input_hidden('snmp_version', $snmp_version, true); $output .= html_print_submit_button(__('Create network component'), - '', false, '', true); + '', false, 'class="sub add"', true); $output .= '
'; if ($return) { @@ -672,7 +677,7 @@ function snmp_browser_print_container ($return = false, $width = '100%', $height $output .= ''; $output .= ''; $output .= '
'; - $output .= '
'; + $output .= '
'; $output .= ''; $output .= ''; $output .= ''; diff --git a/pandora_console/include/javascript/pandora_snmp_browser.js b/pandora_console/include/javascript/pandora_snmp_browser.js index fd202ad4dc..60f914c9e9 100644 --- a/pandora_console/include/javascript/pandora_snmp_browser.js +++ b/pandora_console/include/javascript/pandora_snmp_browser.js @@ -203,8 +203,9 @@ function hideOIDData() { // Empty previous OID data $("#snmp_data").empty(); - + $("#snmp_data").css('display', 'none'); + $(".forced_title_layer").css('display', 'none'); } // Search the SNMP tree for a matching string diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 28c6e3691d..6601807581 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -4619,4 +4619,11 @@ form ul.form_flex li ul li{ .events_bar { margin:0 auto; -} \ No newline at end of file +} + +#snmp_data { + background: #f9faf9; +} +#snmp_data .databox { + border: 0px; +} From 39ce3605206ead960fe52ca5802222d0f90dbb92 Mon Sep 17 00:00:00 2001 From: fermin831 Date: Fri, 16 Mar 2018 11:12:19 +0100 Subject: [PATCH 10/69] [Logs] Scaped CDATAs on logs of windows agent --- pandora_agents/win32/modules/pandora_module.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pandora_agents/win32/modules/pandora_module.cc b/pandora_agents/win32/modules/pandora_module.cc index d7d5fb63c0..eac38c8fa1 100644 --- a/pandora_agents/win32/modules/pandora_module.cc +++ b/pandora_agents/win32/modules/pandora_module.cc @@ -532,6 +532,7 @@ Pandora_Module::getXml () { try { data_clean = strreplace (this->getDataOutput (data), "%", "%%" ); + data_clean = strreplace (data_clean, "]]>", "]]>front (); try { data_clean = strreplace (this->getDataOutput (data), "%", "%%" ); + data_clean = strreplace (data_clean, "]]>", "]]> Date: Fri, 16 Mar 2018 11:48:59 +0100 Subject: [PATCH 11/69] [Logs] Scaped CDATAs on logs of linux plugin --- pandora_agents/unix/plugins/grep_log_module | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pandora_agents/unix/plugins/grep_log_module b/pandora_agents/unix/plugins/grep_log_module index 0769128cbd..6fc1cff239 100755 --- a/pandora_agents/unix/plugins/grep_log_module +++ b/pandora_agents/unix/plugins/grep_log_module @@ -215,6 +215,7 @@ sub print_log (@) { $output .= "\n"; $output .= ""; @@ -229,6 +230,7 @@ sub print_log (@) { $output .= "\n"; $output .= "\n"; foreach my $line (@data) { + $line =~ s/\]\]/]]]]>\n"; } $output .= "\n"; From d881e0028d4fcb1642dbfd18d8ef21e83876334e Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 16 Mar 2018 12:03:51 +0100 Subject: [PATCH 12/69] fixed errors detected SLA --- pandora_console/include/functions_modules.php | 27 +++++++------------ 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php index b940072a6a..dfe09384b7 100755 --- a/pandora_console/include/functions_modules.php +++ b/pandora_console/include/functions_modules.php @@ -1087,21 +1087,14 @@ function modules_get_agentmodule_descripcion ($id_agente_modulo) { * * @return string Module type of the given agent module. */ -function modules_get_agentmodule_type ($id_agentmodule, $metaconsole = false, $id_server = null) { - - if ($metaconsole) { - $server = db_get_row('tmetaconsole_setup', 'id', $id_server); - - $return = db_get_value ('id_tipo_modulo', - 'tagente_modulo', 'id_agente_modulo', (int) $id_agentmodule); - - metaconsole_restore_db(); - } - else { - $return = db_get_value ('id_tipo_modulo', - 'tagente_modulo', 'id_agente_modulo', (int) $id_agentmodule); - } - +function modules_get_agentmodule_type ($id_agentmodule) { + $return = db_get_value ( + 'id_tipo_modulo', + 'tagente_modulo', + 'id_agente_modulo', + (int) $id_agentmodule + ); + return (int) $return; } @@ -2318,10 +2311,10 @@ function modules_change_relation_lock ($id_relation) { */ function modules_get_first_date($id_agent_module, $datelimit = 0) { global $config; - + //check datatype string or normal $table = "tagente_datos"; - $module_type_str = modules_get_type_name ($id_agent_module); + $module_type_str = modules_get_agentmodule_type($id_agent_module); if (strstr ($module_type_str, 'string') !== false) { $table = "tagente_datos_string"; } From 4aa57b23666b8252b567d9344a5a7552c3e951e8 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Tue, 20 Mar 2018 11:59:53 +0100 Subject: [PATCH 13/69] Fixed plugin path in pandora_update_version --- extras/pandora_update_version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extras/pandora_update_version.sh b/extras/pandora_update_version.sh index 2b77dd8e02..17870d36e0 100755 --- a/extras/pandora_update_version.sh +++ b/extras/pandora_update_version.sh @@ -65,7 +65,7 @@ $PANDHOME_ENT/pandora_plugins/MTL/pandora_mtl.pl \ $PANDHOME_ENT/pandora_plugins/Informix/informix.pl \ $PANDHOME_ENT/pandora_plugins/Ruckus/ruckus.pl \ $PANDHOME_ENT/pandora_plugins/UX/pandora_ux.pl \ -$PANDHOME_ENT/pandora_server/util/plugins/vmware-plugin.pl " +$PANDHOME_ENT/pandora_server/util/plugin/vmware-plugin.pl " PLUGIN_LIB_FILE="$CODEHOME/pandora_server/lib/PandoraFMS/PluginTools.pm" # Update version in spec files From 835e791ef17179cbc75f5bcd372612668bfa9c6e Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Wed, 21 Mar 2018 13:40:15 +0100 Subject: [PATCH 14/69] Fixed label shortener in hbar --- pandora_console/include/graphs/fgraph.php | 10 ++--- .../include/graphs/flot/pandora.flot.js | 41 ++++++++----------- .../include/graphs/functions_flot.php | 2 +- pandora_console/include/styles/pandora.css | 8 +++- 4 files changed, 31 insertions(+), 30 deletions(-) diff --git a/pandora_console/include/graphs/fgraph.php b/pandora_console/include/graphs/fgraph.php index 50939b4271..259876c896 100644 --- a/pandora_console/include/graphs/fgraph.php +++ b/pandora_console/include/graphs/fgraph.php @@ -653,13 +653,13 @@ function hbar_graph($flash_chart, $chart_data, $width, $height, else { foreach ($chart_data as $key => $value) { - if(strlen($key) > 40){ - if(strpos($key, ' - ') != -1){ - $key_temp = explode(" - ",$key); - $key_temp[0] = $key_temp[0]." \n"; + $str_key = io_safe_output($key); + if(strlen($str_key) > 40){ + if(strpos($str_key, ' - ') != -1){ + $key_temp = explode(" - ",$str_key); + $key_temp[0] = $key_temp[0]."
"; $key_temp[1]= '...'.substr($key_temp[1],-20); $key2 = $key_temp[0].$key_temp[1]; - io_safe_output($key2); } $chart_data[$key2]['g'] = $chart_data[$key]['g']; unset($chart_data[$key]); diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js index 9719f77642..400125a219 100644 --- a/pandora_console/include/graphs/flot/pandora.flot.js +++ b/pandora_console/include/graphs/flot/pandora.flot.js @@ -419,28 +419,22 @@ function pandoraFlotHBars(graph_id, values, labels, water_mark, for (i = 0; i < labels_total.length; i++) { var label = labels_total[i][1]; // var shortLabel = reduceText(label, 25); - var title = ''; - // if (label !== shortLabel) { - title = label; - // label = shortLabel; - // } - - if(label.length > 30){ - if(label.indexOf(" - ")){ - var label_temp = label.split(" - "); - } - else if(label.indexOf(" ")){ - var label_temp = label.split(" "); - } - else{ - var label_temp = ''; - label_temp[0] = label.substring(0, (label.length/2)); - label_temp[1] = label.substring((label.length/2)); - } - label = reduceText(label_temp[0], 20)+"
"+reduceText(label_temp[1], 20); + var title = label; + var margin_top = 0; + if(label.length > 33){ + label = reduceText(label, 33); } - - format.push([i,'
' + var div_attributes = 'style="font-size:'+font_size+'pt !important;' + + ' margin: 0; max-width: 150px;' + + 'margin-right:5px;'; + + if (label.indexOf("
") != -1) { + div_attributes += "min-height: 2.5em;"; + } + + div_attributes += '" title="'+title+'" class="'+font+'"'; + + format.push([i,'
' + label + '
']); } @@ -2325,8 +2319,9 @@ function add_threshold (data_base, threshold_data, y_min, y_max, } function reduceText (text, maxLength) { + if(!text) return text; if (text.length <= maxLength) return text - var firstSlideEnd = parseInt((maxLength - 3) / 2); + var firstSlideEnd = parseInt((maxLength - 3)/1.6); var str_cut = text.substr(0, firstSlideEnd); - return str_cut + '...' + text.substr(-firstSlideEnd - 3); + return str_cut + '...
' + text.substr(-firstSlideEnd - 3); } diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php index 527539bcc9..1c38ade1db 100644 --- a/pandora_console/include/graphs/functions_flot.php +++ b/pandora_console/include/graphs/functions_flot.php @@ -712,7 +712,7 @@ function flot_hcolumn_chart ($graph_data, $width, $height, $water_mark, $font = $data = array(); foreach ($graph_data as $label => $values) { - $labels[] = $label; + $labels[] = io_safe_output($label); $i--; foreach ($values as $key => $value) { diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 28c6e3691d..ca555e3bd5 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -4619,4 +4619,10 @@ form ul.form_flex li ul li{ .events_bar { margin:0 auto; -} \ No newline at end of file +} + +.tickLabel { + white-space: nowrap; + overflow-x: hidden; + line-height: 1.05em!important; +} From 364daa8579fa3ee89d64bab9e6209f201fc92327 Mon Sep 17 00:00:00 2001 From: danielmaya Date: Wed, 21 Mar 2018 16:51:08 +0100 Subject: [PATCH 15/69] Added group_id in cron job(mr and migrate) --- pandora_console/extras/mr/14.sql | 10 ++++++++++ .../extras/pandoradb_migrate_6.0_to_7.0.mysql.sql | 1 + 2 files changed, 11 insertions(+) diff --git a/pandora_console/extras/mr/14.sql b/pandora_console/extras/mr/14.sql index 46e66e3ab5..837eb40bd5 100644 --- a/pandora_console/extras/mr/14.sql +++ b/pandora_console/extras/mr/14.sql @@ -4,4 +4,14 @@ UPDATE `tagente` SET `id_os` = 100 WHERE `id_os` = 21 and (select `id_os` from ` DELETE FROM `tconfig_os` where `id_os` = 21 and `name` = 'Cluster'; +SET @st_oum721 = (SELECT IF( + (SELECT COUNT(*) FROM information_schema.tables WHERE table_schema = DATABASE() AND table_name = 'tuser_task_scheduled') > 0, + "ALTER TABLE tuser_task_scheduled ADD (id_grupo int(10) unsigned NOT NULL Default 0)", + "0" +)); + +PREPARE pr_oum721 FROM @st_oum721; +EXECUTE pr_oum721; +DEALLOCATE PREPARE pr_oum721; + COMMIT; \ No newline at end of file diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql index 4d67628920..87781d7a5f 100644 --- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql @@ -1368,6 +1368,7 @@ END IF; SET @vv2 = (SELECT COUNT(*) FROM information_schema.tables WHERE table_schema = DATABASE() AND table_name = 'tuser_task_scheduled'); IF @vv2>0 THEN ALTER TABLE tuser_task_scheduled MODIFY args TEXT NOT NULL; + ALTER TABLE tuser_task_scheduled ADD (id_grupo int(10) unsigned NOT NULL Default 0); END IF; END; // From 5e3cf3162a296f20625137b60faba852b63e302b Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Wed, 21 Mar 2018 16:58:42 +0100 Subject: [PATCH 16/69] CLI example check/get server_address --- pandora_server/util/pandora_manage.pl | 84 +++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 201ce190ba..ab7b7c0f63 100644 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -5612,6 +5612,82 @@ sub cli_export_visual_console() { print_log "[INFO] JSON file now contents: \n" . $data_to_json . "\n\n"; } +############################################################################## +# cli_get_server_address gets first occurrence of IP address +############################################################################## +sub cli_get_server_address { + my ($target_node_name) = $ARGV[2]; + + if (is_metaconsole($conf)) { + my $rs = enterprise_hook("get_server_address",[\%conf, $dbh, $target_node_name]); + if (!defined($rs) || $rs eq '') { + print_log("0\n"); + print STDERR "Error, no IP set in $target_node_name.\n" if ($conf->{'verbosity'} >= 3); + return; + } + + print_log("$rs\n"); + } + else { + my $server_address = get_db_value($dbh, "SELECT ip_address FROM tserver where name = ? AND ip_address!= '' ", + $target_node_name); + + if (defined($server_address) && ("$server_address" ne "")) { + print_log("$server_address\n"); + } + else { + print_log("0\n"); + print STDERR "Error, no IP set in $target_node_name.\n" if ($conf->{'verbosity'} >= 3); + } + } +} + + +############################################################################## +# cli_check_server_address +############################################################################## +sub cli_check_server_address { + my ($target_node_name) = $ARGV[2]; + + if (!is_metaconsole($conf)) { + print_log("0\n"); + print STDERR "Error, this is not a Metaconsole Server.\n" if ($conf->{'verbosity'} >= 1); + return; + } + + my $rs = enterprise_hook("get_server_address",[\%conf, $dbh, $target_node_name]); + if (!defined($rs) || $rs eq '') { + print_log("0\n"); + print STDERR "Error, no IP set in $target_node_name.\n" if ($conf->{'verbosity'} >= 3); + return; + } + + print_log("1\n"); +} + + +# +sub cli_check_mr_same {} +# +sub cli_check_alerts_act_exist {} +# +sub cli_check_alerts_temp_exist {} +# +sub cli_check_inventory_exist {} +# +sub cli_check_agent_conf {} +# +sub cli_check_collections_exist {} +# +sub cli_check_plugins_exist {} +# +sub cli_check_policies_exist {} +# +sub cli_check_group_exist {} +# +sub cli_check_agent_exist {} + + ############################################################################### ############################################################################### # MAIN @@ -6066,6 +6142,14 @@ sub pandora_manage_main ($$$) { param_check($ltotal, 3, 2); cli_export_visual_console(); } + elsif ($param eq '--check_server_address') { + param_check($ltotal, 1, 0); + cli_check_server_address(); + } + elsif ($param eq '--get_server_address') { + param_check($ltotal, 1, 0); + cli_get_server_address(); + } else { print_log "[ERROR] Invalid option '$param'.\n\n"; $param = ''; From f5e8d4f90ff86a25a41893da49b54be0d89631fe Mon Sep 17 00:00:00 2001 From: enriquecd Date: Wed, 21 Mar 2018 19:18:24 +0100 Subject: [PATCH 17/69] Help icon in module creator - #2081 --- pandora_console/godmode/agentes/configurar_agente.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index 3e0aac7af1..1dc4daea66 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -555,7 +555,7 @@ if ($id_agente) { $help_header = 'plugins_tab'; break; case "module": - $type_module_t = (int) get_parameter ('moduletype', ''); + $type_module_t = get_parameter ('moduletype', ''); $tab_description = '- '. __('Modules'); if($type_module_t == 'webux'){ $help_header = 'wux_console'; From 243e24e56eb747c2ad23d383a16f30090ec21859 Mon Sep 17 00:00:00 2001 From: artica Date: Thu, 22 Mar 2018 00:01:23 +0100 Subject: [PATCH 18/69] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 998d883c51..5af97851a6 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.720-180321 +Version: 7.0NG.720-180322 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 cd8f91a9fd..827e42a56e 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.720-180321" +pandora_version="7.0NG.720-180322" 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 2867fcbc66..130c867a06 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.720'; -use constant AGENT_BUILD => '180321'; +use constant AGENT_BUILD => '180322'; # 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 0bb6b96b3c..ec109b6c68 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.720 -%define release 180321 +%define release 180322 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 3de5e65d15..727d3d6cba 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.720 -%define release 180321 +%define release 180322 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 690f0e5e52..9a367e6c91 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.720" -PI_BUILD="180321" +PI_BUILD="180322" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index ecf3f1fadc..734cecfe42 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{180321} +{180322} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 49c1c7d9b2..188d7454c9 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.720(Build 180321)") +#define PANDORA_VERSION ("7.0NG.720(Build 180322)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index a20eb79e32..3de8f1551a 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.720(Build 180321))" + VALUE "ProductVersion", "(7.0NG.720(Build 180322))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index d441d4207c..aa7f25f878 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.720-180321 +Version: 7.0NG.720-180322 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 82e7e40b1f..2c9364762c 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.720-180321" +pandora_version="7.0NG.720-180322" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index c654b48fd2..05eb0ab0e8 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC180321'; +$build_version = 'PC180322'; $pandora_version = 'v7.0NG.720'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 0a3ac1acf9..3725bf6847 100755 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index c7f2e5d382..9a87ae5704 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.720 -%define release 180321 +%define release 180322 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index a190e8b030..80a197e3b4 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.720 -%define release 180321 +%define release 180322 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index cfa1cf7d0f..5b362ab884 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.720" -PI_BUILD="180321" +PI_BUILD="180322" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 87db9b804f..dbf37ee39f 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -33,7 +33,7 @@ use PandoraFMS::Tools; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.720 PS180321"; +my $version = "7.0NG.720 PS180322"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 201ce190ba..cdb88b534d 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.720 PS180321"; +my $version = "7.0NG.720 PS180322"; # save program name for logging my $progname = basename($0); From 632845c9b3896f5eed550778611eebdb674a5797 Mon Sep 17 00:00:00 2001 From: enriquecd Date: Thu, 22 Mar 2018 11:04:19 +0100 Subject: [PATCH 19/69] Adapt search bar to cluster id_os 100 - #1866 --- pandora_console/operation/agentes/ver_agente.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php index 6058b90724..52ad3766bc 100644 --- a/pandora_console/operation/agentes/ver_agente.php +++ b/pandora_console/operation/agentes/ver_agente.php @@ -106,7 +106,7 @@ if (is_ajax ()) { if($cluster_mode){ - $agent_id_os = db_get_all_rows_sql('select id_os from tconfig_os where id_os != 21'); + $agent_id_os = db_get_all_rows_sql('select id_os from tconfig_os where id_os != 100'); foreach ($agent_id_os as $key => $value) { $agent_id_os_array[] = $agent_id_os[$key]['id_os']; From dd02b6e2b83408145c46ae14b517bc83f78f43b1 Mon Sep 17 00:00:00 2001 From: enriquecd Date: Thu, 22 Mar 2018 12:07:08 +0100 Subject: [PATCH 20/69] Check create_web_modules CLI functions - #2101 --- pandora_server/util/pandora_manage.pl | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index cdb88b534d..699dad757e 100644 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -195,7 +195,6 @@ sub help_screen{ \n\t ]", 'Add snmp network module to policy'); help_screen_line('--create_policy_plugin_module', " \n\t [ \n\t \n\t \n\t \n\t \n\t \n\t ]", 'Add plug-in module to policy'); help_screen_line('--create_policy_data_module_from_local_component', ' '); - help_screen_line('--create_policy_web_module_from_local_component', ' '); help_screen_line('--add_collection_to_policy', " "); help_screen_line('--validate_policy_alerts', '', 'Validate the alerts of a given policy'); help_screen_line('--get_policy_modules', '', 'Get the modules of a policy'); @@ -5828,10 +5827,6 @@ sub pandora_manage_main ($$$) { param_check($ltotal, 2, 2); cli_create_policy_data_module_from_local_component(); } - elsif ($param eq '--create_policy_web_module_from_local_component') { - param_check($ltotal, 2, 2); - cli_create_policy_web_module_from_local_component(); - } elsif ($param eq '--create_policy') { param_check($ltotal, 3, 2); cli_create_policy(); @@ -6275,25 +6270,6 @@ sub cli_create_policy_data_module_from_local_component() { enterprise_hook('pandora_create_policy_data_module_from_local_component',[$conf, $component, $policy_id, $dbh]); } -############################################################################## -# Create policy web module from local component. -# Related option: --create_policy_web_module_from_local_component -############################################################################## -sub cli_create_policy_web_module_from_local_component() { - my ($policy_name, $component_name) = @ARGV[2..3]; - - my $policy_id = enterprise_hook('get_policy_id',[$dbh, safe_input($policy_name)]); - exist_check($policy_id,'policy',$policy_name); - - my $lc_id = pandora_get_local_component_id($dbh, $component_name); - exist_check($lc_id,'local component',$component_name); - - # Get local component web - my $component = get_db_single_row ($dbh, 'SELECT * FROM tlocal_component WHERE id = ?', $lc_id); - - enterprise_hook('pandora_create_policy_web_module_from_local_component',[$conf, $component, $policy_id, $dbh]); -} - ############################################################################## # Create local component. # Related option: --create_local_component From 078b370cbd5771be6e494057a7d0b2330a6adf32 Mon Sep 17 00:00:00 2001 From: enriquecd Date: Thu, 22 Mar 2018 13:10:25 +0100 Subject: [PATCH 21/69] Hide passwords fields data in treeview and events - #2030 --- pandora_console/include/functions_events.php | 14 +++++++++++--- pandora_console/include/functions_treeview.php | 8 +++++++- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index b8c0c6834b..1a2426aeb8 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -2042,9 +2042,17 @@ function events_page_custom_fields ($event) { $data = array(); $data[0] = $field['name']; - $data[1] = empty($fields_data[$field['id_field']]) - ? ''.__('N/A').'' - : ui_bbcode_to_html($fields_data[$field['id_field']]); + if(empty($fields_data[$field['id_field']])){ + $data[1] = ''.__('N/A').''; + } + else{ + if($field['is_password_type']){ + $data[1] = '••••••••'; + } + else{ + $data[1] = ui_bbcode_to_html($fields_data[$field['id_field']]); + } + } $field['id_field']; diff --git a/pandora_console/include/functions_treeview.php b/pandora_console/include/functions_treeview.php index 9da64a6dbe..e30b9465ae 100755 --- a/pandora_console/include/functions_treeview.php +++ b/pandora_console/include/functions_treeview.php @@ -695,7 +695,13 @@ function treeview_printTable($id_agente, $server_data = array(), $no_head = fals if (!empty($custom_value)) { $row = array(); $row['title'] = $field['name'] . ui_print_help_tip (__('Custom field'), true); - $row['data'] = ui_bbcode_to_html($custom_value); + if($field['is_password_type']){ + $row['data'] = '••••••••'; + } + else{ + $row['data'] = ui_bbcode_to_html($custom_value); + } + $table->data['custom_field_'.$field['id_field']] = $row; } } From b61f8d5cdd85e3f6c89be116edb6045250ae012e Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 22 Mar 2018 13:18:48 +0100 Subject: [PATCH 22/69] add new functions cli --- pandora_server/util/pandora_manage.pl | 126 ++++++++++---------------- 1 file changed, 48 insertions(+), 78 deletions(-) diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index ab7b7c0f63..356f62ef21 100644 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -223,7 +223,10 @@ sub help_screen{ help_screen_line('--duplicate_visual_console', ' []', 'Duplicate a visual console'); help_screen_line('--export_json_visual_console', ' [] []', 'Creates a json with the visual console elements information'); + help_screen_line('--migration_agent_queue', ' []', 'Migrate agent only metaconsole'); + help_screen_line('--migrate_agent', ' ', 'Is migrating the agent only metaconsole'); + print "\n"; exit; } @@ -5612,80 +5615,7 @@ sub cli_export_visual_console() { print_log "[INFO] JSON file now contents: \n" . $data_to_json . "\n\n"; } -############################################################################## -# cli_get_server_address gets first occurrence of IP address -############################################################################## -sub cli_get_server_address { - my ($target_node_name) = $ARGV[2]; - if (is_metaconsole($conf)) { - my $rs = enterprise_hook("get_server_address",[\%conf, $dbh, $target_node_name]); - if (!defined($rs) || $rs eq '') { - print_log("0\n"); - print STDERR "Error, no IP set in $target_node_name.\n" if ($conf->{'verbosity'} >= 3); - return; - } - - print_log("$rs\n"); - } - else { - my $server_address = get_db_value($dbh, "SELECT ip_address FROM tserver where name = ? AND ip_address!= '' ", - $target_node_name); - - if (defined($server_address) && ("$server_address" ne "")) { - print_log("$server_address\n"); - } - else { - print_log("0\n"); - print STDERR "Error, no IP set in $target_node_name.\n" if ($conf->{'verbosity'} >= 3); - } - } -} - - -############################################################################## -# cli_check_server_address -############################################################################## -sub cli_check_server_address { - my ($target_node_name) = $ARGV[2]; - - if (!is_metaconsole($conf)) { - print_log("0\n"); - print STDERR "Error, this is not a Metaconsole Server.\n" if ($conf->{'verbosity'} >= 1); - return; - } - - my $rs = enterprise_hook("get_server_address",[\%conf, $dbh, $target_node_name]); - if (!defined($rs) || $rs eq '') { - print_log("0\n"); - print STDERR "Error, no IP set in $target_node_name.\n" if ($conf->{'verbosity'} >= 3); - return; - } - - print_log("1\n"); -} - - -# -sub cli_check_mr_same {} -# -sub cli_check_alerts_act_exist {} -# -sub cli_check_alerts_temp_exist {} -# -sub cli_check_inventory_exist {} -# -sub cli_check_agent_conf {} -# -sub cli_check_collections_exist {} -# -sub cli_check_plugins_exist {} -# -sub cli_check_policies_exist {} -# -sub cli_check_group_exist {} -# -sub cli_check_agent_exist {} ############################################################################### @@ -6142,13 +6072,13 @@ sub pandora_manage_main ($$$) { param_check($ltotal, 3, 2); cli_export_visual_console(); } - elsif ($param eq '--check_server_address') { - param_check($ltotal, 1, 0); - cli_check_server_address(); + elsif ($param eq '--migration_agent_queue') { + param_check($ltotal, 4, 1); + cli_migration_agent_queue(); } - elsif ($param eq '--get_server_address') { + elsif ($param eq '--migration_agent') { param_check($ltotal, 1, 0); - cli_get_server_address(); + cli_migration_agent(); } else { print_log "[ERROR] Invalid option '$param'.\n\n"; @@ -6520,3 +6450,43 @@ sub cli_add_tag_to_module() { my $result = api_call(\%conf, 'set', 'add_tag_module', $module_id, $tag_id); print "\n$result\n"; } + +############################################################################## +# Only meta migrate agent +############################################################################## +sub cli_migration_agent_queue() { + my ($id_agent, $source_name, $target_name, $only_db) = @ARGV[2..5]; + + if( !defined($id_agent) || !defined($source_name) || !defined($target_name) ){ + print "\n0\n"; + } + + if(!defined($only_db)){ + $only_db = 0; + } + + # Call the API. + my $result = api_call( $conf, 'set', 'migrate_agent', $id_agent, 0, "$source_name|$target_name|$only_db" ); + print "\n$result\n"; +} + +############################################################################## +# Only meta is migrate agent +############################################################################## +sub cli_migration_agent() { + my ($id_agent) = @ARGV[2]; + + if( !defined($id_agent) ){ + print "\n0\n"; + } + + # Call the API. + my $result = api_call( $conf, 'get', 'migrate_agent', $id_agent); + + if( defined($result) && "$result" ne "" ){ + print "\n1\n"; + } + else{ + print "\n0\n"; + } +} From 55d0ca122b1f9706a8d785d5e0100c7c345f46bb Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 22 Mar 2018 13:28:18 +0100 Subject: [PATCH 23/69] fixed error --- pandora_server/util/pandora_manage.pl | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 0291c9e46c..f99b93c3c1 100644 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -6067,21 +6067,10 @@ sub pandora_manage_main ($$$) { param_check($ltotal, 3, 2); cli_export_visual_console(); } -<<<<<<< HEAD - elsif ($param eq '--migration_agent_queue') { - param_check($ltotal, 4, 1); - cli_migration_agent_queue(); - } - elsif ($param eq '--migration_agent') { - param_check($ltotal, 1, 0); - cli_migration_agent(); - } -======= elsif ($param eq '--apply_module_template') { param_check($ltotal, 2, 2); cli_apply_module_template(); } ->>>>>>> origin/develop else { print_log "[ERROR] Invalid option '$param'.\n\n"; $param = ''; @@ -6434,7 +6423,6 @@ sub cli_add_tag_to_module() { print "\n$result\n"; } -<<<<<<< HEAD ############################################################################## # Only meta migrate agent ############################################################################## @@ -6474,7 +6462,7 @@ sub cli_migration_agent() { print "\n0\n"; } } -======= + sub cli_apply_module_template() { my ($id_template, $id_agent) = @ARGV[2..3]; @@ -6566,4 +6554,3 @@ sub cli_apply_module_template() { } } ->>>>>>> origin/develop From 0156bff9e63c9f68c4c6a96e19fa4e4fc4f1c272 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 22 Mar 2018 13:33:23 +0100 Subject: [PATCH 24/69] fixed error --- pandora_server/util/pandora_manage.pl | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index f99b93c3c1..f5a9e1e665 100644 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -6070,7 +6070,15 @@ sub pandora_manage_main ($$$) { elsif ($param eq '--apply_module_template') { param_check($ltotal, 2, 2); cli_apply_module_template(); - } + } + elsif ($param eq '--migration_agent_queue') { + param_check($ltotal, 4, 1); + cli_migration_agent_queue(); + } + elsif ($param eq '--migration_agent') { + param_check($ltotal, 1, 0); + cli_migration_agent(); + } else { print_log "[ERROR] Invalid option '$param'.\n\n"; $param = ''; From ad2746e6c39e403b870c6af81d182186a319344f Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 22 Mar 2018 13:36:24 +0100 Subject: [PATCH 25/69] fixed add help incli --- pandora_server/util/pandora_manage.pl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index f5a9e1e665..70901f77a3 100644 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -126,6 +126,8 @@ sub help_screen{ help_screen_line('--clean_conf_file', '', "Clean a local conf of a given agent deleting all modules, \n\t policies, file collections and comments"); help_screen_line('--get_bad_conf_files', '', 'Get the files bad configured (without essential tokens)'); help_screen_line('--locate_agent', '', 'Search a agent into of nodes of metaconsole. Only Enterprise.'); + help_screen_line('--migration_agent_queue', ' []', 'Migrate agent only metaconsole'); + help_screen_line('--migration_agent', ' ', 'Is migrating the agent only metaconsole'); 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 The valid data types are web_data, web_proc, web_content_data or web_content_string", 'Add web server module to agent'); @@ -222,9 +224,6 @@ sub help_screen{ help_screen_line('--duplicate_visual_console', ' []', 'Duplicate a visual console'); help_screen_line('--export_json_visual_console', ' [] []', 'Creates a json with the visual console elements information'); - help_screen_line('--migration_agent_queue', ' []', 'Migrate agent only metaconsole'); - help_screen_line('--migrate_agent', ' ', 'Is migrating the agent only metaconsole'); - print "\n"; exit; From ae3d8ff9a52c3448ca92fefdf3216353889ebaf8 Mon Sep 17 00:00:00 2001 From: Ramon Novoa Date: Thu, 22 Mar 2018 12:21:18 +0100 Subject: [PATCH 26/69] Add a Dockerfile to build the Pandora FMS image. --- extras/Dockerfile | 1 + extras/docker/Dockerfile | 50 +++++++++++++++++++++++++++++++++ extras/docker/build_and_push.sh | 3 ++ 3 files changed, 54 insertions(+) create mode 100644 extras/docker/Dockerfile create mode 100755 extras/docker/build_and_push.sh diff --git a/extras/Dockerfile b/extras/Dockerfile index fcd39254fb..8f27c730b8 100644 --- a/extras/Dockerfile +++ b/extras/Dockerfile @@ -1,3 +1,4 @@ +# Dockerfile for the Pandora FMS image. FROM debian:jessie # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added diff --git a/extras/docker/Dockerfile b/extras/docker/Dockerfile new file mode 100644 index 0000000000..5ffe12f2d5 --- /dev/null +++ b/extras/docker/Dockerfile @@ -0,0 +1,50 @@ +FROM pandorafms/pandorafms-base + +# Build variables. +ARG BRANCH=develop +ARG DB_PASS=pandora + +# Clone the Pandora FMS repo. +RUN git clone --depth 1 -b "$BRANCH" https://github.com/pandorafms/pandorafms.git /tmp/pandorafms + +# Install the Pandora FMS Server. +RUN cd /tmp/pandorafms/pandora_server && \ +yes | ./pandora_server_installer --install && \ +sed -i "s/^dbuser.*/dbuser root/" /etc/pandora/pandora_server.conf && \ +sed -i "s/^dbpass.*/dbpass $DB_PASS/" /etc/pandora/pandora_server.conf + +# Install the Pandora FMS Agent. +RUN cd /tmp/pandorafms/pandora_agents/unix && \ +./pandora_agent_installer --install + +# Set the server's name in Apache's configuration file to avoid warnings. +RUN sed -i "s/#ServerName.*/ServerName localhost:80/" /etc/httpd/conf/httpd.conf + +# Install the Pandora FMS Console. +RUN service mysqld start && \ +/usr/bin/mysqladmin -u root password "$DB_PASS" && \ +service httpd start && \ +cp -r /tmp/pandorafms/pandora_console /var/www/html && \ +chown -R apache.apache /var/www/html/pandora_console/ && \ +python /tmp/pandorafms/tests/install_console.py + +# Redirect HTTP requests to / to the Pandora FMS Console. +RUN echo '' > /var/www/html/index.html + +# Create the entrypoint script. +RUN echo -e '#/bin/bash\n \ +service mysqld start &&\n \ +service httpd start &&\n \ +service crond start &&\n \ +/etc/init.d/pandora_agent_daemon start && \ +/etc/init.d/pandora_server start && \ +tail -f /var/log/pandora/pandora_server.log' \ +>> /entrypoint.sh && \ +chmod +x /entrypoint.sh + +# Clean-up. +RUN rm -rf /tmp/pandorafms +RUN yum clean all + +EXPOSE 80 3306 41121 +ENTRYPOINT ["/bin/bash", "/entrypoint.sh"] diff --git a/extras/docker/build_and_push.sh b/extras/docker/build_and_push.sh new file mode 100755 index 0000000000..980087cfe5 --- /dev/null +++ b/extras/docker/build_and_push.sh @@ -0,0 +1,3 @@ +#!/bin/bash +docker build --rm=true --build-arg BRANCH="develop" --build-arg DB_PASS="pandora" -t pandorafms/pandorafms:7 . && \ +docker push pandorafms/pandorafms:7 From dd597047292a19850f6c4b707ccff289f2fc4c23 Mon Sep 17 00:00:00 2001 From: artica Date: Fri, 23 Mar 2018 00:01:21 +0100 Subject: [PATCH 27/69] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 5af97851a6..2542aa564b 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.720-180322 +Version: 7.0NG.720-180323 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 827e42a56e..dd90d5e2db 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.720-180322" +pandora_version="7.0NG.720-180323" 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 130c867a06..89317fb4ca 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.720'; -use constant AGENT_BUILD => '180322'; +use constant AGENT_BUILD => '180323'; # 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 ec109b6c68..ee1c6c4ab9 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.720 -%define release 180322 +%define release 180323 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 727d3d6cba..a6b2034a8d 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.720 -%define release 180322 +%define release 180323 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 9a367e6c91..65a0472ee7 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.720" -PI_BUILD="180322" +PI_BUILD="180323" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 734cecfe42..4f76246035 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{180322} +{180323} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 188d7454c9..9e8d43d536 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.720(Build 180322)") +#define PANDORA_VERSION ("7.0NG.720(Build 180323)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 3de8f1551a..e168fe6e8c 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.720(Build 180322))" + VALUE "ProductVersion", "(7.0NG.720(Build 180323))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index aa7f25f878..0b71b11123 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.720-180322 +Version: 7.0NG.720-180323 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 2c9364762c..23bfeea631 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.720-180322" +pandora_version="7.0NG.720-180323" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 05eb0ab0e8..2fc7cb02b0 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC180322'; +$build_version = 'PC180323'; $pandora_version = 'v7.0NG.720'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 3725bf6847..2d3ec38431 100755 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 9a87ae5704..abcdb9a906 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.720 -%define release 180322 +%define release 180323 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 80a197e3b4..e22868bbe0 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.720 -%define release 180322 +%define release 180323 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 5b362ab884..01cfaf8032 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.720" -PI_BUILD="180322" +PI_BUILD="180323" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index dbf37ee39f..d94bfdf415 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -33,7 +33,7 @@ use PandoraFMS::Tools; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.720 PS180322"; +my $version = "7.0NG.720 PS180323"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 70901f77a3..ffea489ec8 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.720 PS180322"; +my $version = "7.0NG.720 PS180323"; # save program name for logging my $progname = basename($0); From f750d0f49e1d11a7bbdada6e50a31d7af309677f Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 23 Mar 2018 08:00:32 +0100 Subject: [PATCH 28/69] fixed errors in reports interfaces metaconsole --- pandora_console/include/functions_graph.php | 13 +++-- .../include/functions_reporting.php | 50 +++++++++++++------ 2 files changed, 41 insertions(+), 22 deletions(-) diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index 3462366c0d..d717115ac3 100644 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -1967,7 +1967,7 @@ function graphic_combined_module ($module_list, $weight_list, $period, } foreach ($module_list as $key => $value) { - if (is_metaconsole()) { + if (is_metaconsole() && is_array($value)) { $server = metaconsole_get_connection_by_id ($value['server']); metaconsole_connect($server); $value = $value['module']; @@ -1987,14 +1987,14 @@ function graphic_combined_module ($module_list, $weight_list, $period, $module_name_list[$key] = $alias . " / " . $module_name; } } - if (is_metaconsole()) { + if (is_metaconsole() && is_array($value)) { metaconsole_restore_db(); } } if (!is_null($percentil) && $percentil) { foreach ($module_list as $key => $value) { - if (is_metaconsole()) { + if (is_metaconsole() && is_array($value)) { $server = metaconsole_get_connection_by_id ($value['server']); metaconsole_connect($server); $value = $value['module']; @@ -2004,7 +2004,7 @@ function graphic_combined_module ($module_list, $weight_list, $period, $alias = db_get_value ("alias","tagente","nombre",$agent_name); $module_name = io_safe_output( modules_get_agentmodule_name ($value) ); - if (is_metaconsole()) { + if (is_metaconsole() && is_array($value)) { metaconsole_restore_db(); } @@ -2413,7 +2413,7 @@ function fullscale_data_combined($module_list, $period, $date, $flash_charts, $p $array_percentil = array(); } - if (is_metaconsole()) { + if (is_metaconsole() && is_array($value_module)) { $server = metaconsole_get_connection_by_id ($value_module['server']); metaconsole_connect($server); $previous_data = modules_get_previous_data ($value_module['module'], $datelimit); @@ -2428,7 +2428,6 @@ function fullscale_data_combined($module_list, $period, $date, $flash_charts, $p foreach ($data_uncompress as $key_data => $value_data) { foreach ($value_data['data'] as $k => $v) { $real_date = $v['utimestamp']; - if(!isset($v['datos'])){ $v['datos'] = $previous_data; } @@ -6464,4 +6463,4 @@ function graph_monitor_wheel ($width = 550, $height = 600, $filter = false) { return d3_sunburst_graph ($graph_data, $width, $height, true); } -?> \ No newline at end of file +?> diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index 1d53f61114..b63b7cd5b9 100755 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -2721,44 +2721,66 @@ function reporting_network_interfaces_report($report, $content, $type = 'dinamic $filter = array( 'id_grupo' => $content['id_group'], 'disabled' => 0); - $network_interfaces_by_agents = agents_get_network_interfaces(false, $filter); - + + $return['failed'] = null; + $return['data'] = array(); + + if ($config['metaconsole']) { + $server_names = metaconsole_get_connection_names(); + if(isset($server_names) && is_array($server_names)){ + foreach ($server_names as $key => $value) { + $id_meta = metaconsole_get_id_server($value); + $connection = metaconsole_get_connection_by_id ($id_meta); + if (metaconsole_connect($connection) != NOERR) { + continue; + } + else{ + $network_interfaces_by_agents = agents_get_network_interfaces(false, $filter); + $return = agents_get_network_interfaces_array($network_interfaces_by_agents, $return, $type, $content, $report); + metaconsole_restore_db(); + } + } + } + } + else{ + $network_interfaces_by_agents = agents_get_network_interfaces(false, $filter); + agents_get_network_interfaces_array($network_interfaces_by_agents, $return, $type, $content, $report); + } + + return reporting_check_structure_content($return); +} + +function agents_get_network_interfaces_array($network_interfaces_by_agents, $return, $type, $content, $report){ if (empty($network_interfaces_by_agents)) { $return['failed'] = __('The group has no agents or none of the agents has any network interface'); $return['data'] = array(); } else { - $return['failed'] = null; - $return['data'] = array(); - foreach ($network_interfaces_by_agents as $agent_id => $agent) { $row_data = array(); - $row_data['agent'] = $agent['name']; - $row_data['interfaces'] = array(); foreach ($agent['interfaces'] as $interface_name => $interface) { $row_interface = array(); - $row_interface['name'] = $interface_name; $row_interface['ip'] = $interface['ip']; $row_interface['mac'] = $interface['mac']; $row_interface['status'] = $interface['status_image']; $row_interface['chart'] = null; - + // Get chart reporting_set_conf_charts($width, $height, $only_image, $type, $content, $ttl); - + if (!empty($force_width_chart)) { $width = $force_width_chart; } - + if (!empty($force_height_chart)) { $height = $force_height_chart; } - + switch ($type) { case 'dinamic': if (!empty($interface['traffic'])) { @@ -2818,14 +2840,12 @@ function reporting_network_interfaces_report($report, $content, $type = 'dinamic } break; } - $row_data['interfaces'][] = $row_interface; } - $return['data'][] = $row_data; } } - return reporting_check_structure_content($return); + return $return; } /** From c91e71569cd106c681a7977e076c1aa0ab62675d Mon Sep 17 00:00:00 2001 From: artica Date: Sat, 24 Mar 2018 00:01:24 +0100 Subject: [PATCH 29/69] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 2542aa564b..1b51225e29 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.720-180323 +Version: 7.0NG.720-180324 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 dd90d5e2db..d7aafa760e 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.720-180323" +pandora_version="7.0NG.720-180324" 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 89317fb4ca..58792df743 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.720'; -use constant AGENT_BUILD => '180323'; +use constant AGENT_BUILD => '180324'; # 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 ee1c6c4ab9..0026f05c43 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.720 -%define release 180323 +%define release 180324 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 a6b2034a8d..840f4b5bd9 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.720 -%define release 180323 +%define release 180324 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 65a0472ee7..2777d6e21e 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.720" -PI_BUILD="180323" +PI_BUILD="180324" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 4f76246035..92e6a4911f 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{180323} +{180324} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 9e8d43d536..4fd0d48269 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.720(Build 180323)") +#define PANDORA_VERSION ("7.0NG.720(Build 180324)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index e168fe6e8c..cd8585078f 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.720(Build 180323))" + VALUE "ProductVersion", "(7.0NG.720(Build 180324))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 0b71b11123..9046e9df4f 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.720-180323 +Version: 7.0NG.720-180324 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 23bfeea631..30c83e881c 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.720-180323" +pandora_version="7.0NG.720-180324" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 2fc7cb02b0..b5d3b9776a 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC180323'; +$build_version = 'PC180324'; $pandora_version = 'v7.0NG.720'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 2d3ec38431..1e8d0bd37c 100755 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index abcdb9a906..b0c850f6b7 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.720 -%define release 180323 +%define release 180324 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index e22868bbe0..5776e90e22 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.720 -%define release 180323 +%define release 180324 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 01cfaf8032..dc357e7251 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.720" -PI_BUILD="180323" +PI_BUILD="180324" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index d94bfdf415..1803e14dd0 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -33,7 +33,7 @@ use PandoraFMS::Tools; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.720 PS180323"; +my $version = "7.0NG.720 PS180324"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index ffea489ec8..f0f615ffc7 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.720 PS180323"; +my $version = "7.0NG.720 PS180324"; # save program name for logging my $progname = basename($0); From b2ed2fbe450e58f0fecd04035053b44c0c1eb523 Mon Sep 17 00:00:00 2001 From: artica Date: Sun, 25 Mar 2018 00:01:20 +0100 Subject: [PATCH 30/69] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 1b51225e29..8a956433b8 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.720-180324 +Version: 7.0NG.720-180325 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 d7aafa760e..7b2163b94d 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.720-180324" +pandora_version="7.0NG.720-180325" 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 58792df743..160ca7c52a 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.720'; -use constant AGENT_BUILD => '180324'; +use constant AGENT_BUILD => '180325'; # 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 0026f05c43..8505665736 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.720 -%define release 180324 +%define release 180325 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 840f4b5bd9..104bf52f44 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.720 -%define release 180324 +%define release 180325 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 2777d6e21e..4980e072f4 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.720" -PI_BUILD="180324" +PI_BUILD="180325" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 92e6a4911f..972ba37f9f 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{180324} +{180325} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 4fd0d48269..3c7c42c0f5 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.720(Build 180324)") +#define PANDORA_VERSION ("7.0NG.720(Build 180325)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index cd8585078f..c7590cb96c 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.720(Build 180324))" + VALUE "ProductVersion", "(7.0NG.720(Build 180325))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 9046e9df4f..5f0f15a133 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.720-180324 +Version: 7.0NG.720-180325 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 30c83e881c..6fe8e03bbf 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.720-180324" +pandora_version="7.0NG.720-180325" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index b5d3b9776a..db97498153 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC180324'; +$build_version = 'PC180325'; $pandora_version = 'v7.0NG.720'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 1e8d0bd37c..14c9de21ad 100755 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index b0c850f6b7..b16f258072 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.720 -%define release 180324 +%define release 180325 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 5776e90e22..f3ec945c2b 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.720 -%define release 180324 +%define release 180325 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index dc357e7251..e2052ea1e3 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.720" -PI_BUILD="180324" +PI_BUILD="180325" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 1803e14dd0..ab7302cd27 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -33,7 +33,7 @@ use PandoraFMS::Tools; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.720 PS180324"; +my $version = "7.0NG.720 PS180325"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index f0f615ffc7..695673b704 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.720 PS180324"; +my $version = "7.0NG.720 PS180325"; # save program name for logging my $progname = basename($0); From 999edad7372e58f58167e9ee5bf44bbf0009b19b Mon Sep 17 00:00:00 2001 From: artica Date: Mon, 26 Mar 2018 00:01:20 +0200 Subject: [PATCH 31/69] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 8a956433b8..53bc94bc1f 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.720-180325 +Version: 7.0NG.720-180326 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 7b2163b94d..54f78c5e7c 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.720-180325" +pandora_version="7.0NG.720-180326" 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 160ca7c52a..012da61de6 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.720'; -use constant AGENT_BUILD => '180325'; +use constant AGENT_BUILD => '180326'; # 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 8505665736..f30c0f89da 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.720 -%define release 180325 +%define release 180326 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 104bf52f44..293ad5d5f6 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.720 -%define release 180325 +%define release 180326 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 4980e072f4..311499021d 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.720" -PI_BUILD="180325" +PI_BUILD="180326" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 972ba37f9f..8739161fe1 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{180325} +{180326} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 3c7c42c0f5..26ab874f89 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.720(Build 180325)") +#define PANDORA_VERSION ("7.0NG.720(Build 180326)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index c7590cb96c..974acfafaf 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.720(Build 180325))" + VALUE "ProductVersion", "(7.0NG.720(Build 180326))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 5f0f15a133..1f2bdebb73 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.720-180325 +Version: 7.0NG.720-180326 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 6fe8e03bbf..bf8af45c69 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.720-180325" +pandora_version="7.0NG.720-180326" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index db97498153..1af8ab2b0c 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC180325'; +$build_version = 'PC180326'; $pandora_version = 'v7.0NG.720'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 14c9de21ad..7984ed55c5 100755 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index b16f258072..a1089f868c 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.720 -%define release 180325 +%define release 180326 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index f3ec945c2b..7141f4df3a 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.720 -%define release 180325 +%define release 180326 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index e2052ea1e3..5aa490bb52 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.720" -PI_BUILD="180325" +PI_BUILD="180326" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index ab7302cd27..6af4ed03b2 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -33,7 +33,7 @@ use PandoraFMS::Tools; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.720 PS180325"; +my $version = "7.0NG.720 PS180326"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 695673b704..5769c5daf4 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.720 PS180325"; +my $version = "7.0NG.720 PS180326"; # save program name for logging my $progname = basename($0); From e83c3bb5aa6c272e240ef253c0cd698a1c50768e Mon Sep 17 00:00:00 2001 From: danielmaya Date: Mon, 26 Mar 2018 12:03:25 +0200 Subject: [PATCH 32/69] Added tmetaconsole_agent in function agents_get_alias --- pandora_console/include/functions_agents.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php index f4310418b3..fe43f419cd 100644 --- a/pandora_console/include/functions_agents.php +++ b/pandora_console/include/functions_agents.php @@ -1354,7 +1354,11 @@ function agents_get_name ($id_agent, $case = "none") { * @return string Alias of the given agent. */ function agents_get_alias ($id_agent, $case = 'none') { - $alias = (string) db_get_value ('alias', 'tagente', 'id_agente', (int) $id_agent); + if(is_metaconsole()){ + $alias = (string) db_get_value ('alias', 'tmetaconsole_agent', 'id_tagente', (int) $id_agent); + } else { + $alias = (string) db_get_value ('alias', 'tagente', 'id_agente', (int) $id_agent); + } switch ($case) { case 'upper': From 9bb7ba475ea9c71f460400dcb842ff55156321e1 Mon Sep 17 00:00:00 2001 From: enriquecd Date: Mon, 26 Mar 2018 18:34:52 +0200 Subject: [PATCH 33/69] Fix api collection function include - #2110 --- pandora_console/include/functions_api.php | 1 - 1 file changed, 1 deletion(-) diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php index 8778f52a03..1d800fe386 100644 --- a/pandora_console/include/functions_api.php +++ b/pandora_console/include/functions_api.php @@ -34,7 +34,6 @@ enterprise_include_once ('include/functions_local_components.php'); enterprise_include_once ('include/functions_events.php'); enterprise_include_once ('include/functions_agents.php'); enterprise_include_once ('include/functions_modules.php'); -enterprise_include_once ('include/functions_collection.php'); /** * Parse the "other" parameter. From ac2638ceea6b39423cbf5f1dbc4a056c170dfaf1 Mon Sep 17 00:00:00 2001 From: artica Date: Tue, 27 Mar 2018 00:01:22 +0200 Subject: [PATCH 34/69] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 53bc94bc1f..66cd634bc9 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.720-180326 +Version: 7.0NG.720-180327 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 54f78c5e7c..e8b9fc84f4 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.720-180326" +pandora_version="7.0NG.720-180327" 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 012da61de6..23041bc5b7 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.720'; -use constant AGENT_BUILD => '180326'; +use constant AGENT_BUILD => '180327'; # 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 f30c0f89da..2716b0a331 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.720 -%define release 180326 +%define release 180327 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 293ad5d5f6..2c8d146523 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.720 -%define release 180326 +%define release 180327 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 311499021d..3e2af104c3 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.720" -PI_BUILD="180326" +PI_BUILD="180327" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 8739161fe1..1cd3fd4413 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{180326} +{180327} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 26ab874f89..c9a98af40a 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.720(Build 180326)") +#define PANDORA_VERSION ("7.0NG.720(Build 180327)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 974acfafaf..cc0bdc0513 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.720(Build 180326))" + VALUE "ProductVersion", "(7.0NG.720(Build 180327))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 1f2bdebb73..fe18784a91 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.720-180326 +Version: 7.0NG.720-180327 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 bf8af45c69..c4b8ce4c9f 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.720-180326" +pandora_version="7.0NG.720-180327" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 1af8ab2b0c..be68cd141e 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC180326'; +$build_version = 'PC180327'; $pandora_version = 'v7.0NG.720'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 7984ed55c5..e41375a8e4 100755 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index a1089f868c..722ec04c5c 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.720 -%define release 180326 +%define release 180327 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 7141f4df3a..6fbef8ee6c 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.720 -%define release 180326 +%define release 180327 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 5aa490bb52..d8f09332d8 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.720" -PI_BUILD="180326" +PI_BUILD="180327" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 6af4ed03b2..228664bfce 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -33,7 +33,7 @@ use PandoraFMS::Tools; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.720 PS180326"; +my $version = "7.0NG.720 PS180327"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 5769c5daf4..886ac3caba 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.720 PS180326"; +my $version = "7.0NG.720 PS180327"; # save program name for logging my $progname = basename($0); From 8b3ec8146d547b3be50d371de26c99cfa7705d7a Mon Sep 17 00:00:00 2001 From: danielmaya Date: Tue, 27 Mar 2018 16:36:26 +0200 Subject: [PATCH 35/69] Fixed target and source undefined --- pandora_console/include/functions_pandora_networkmap.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/functions_pandora_networkmap.php b/pandora_console/include/functions_pandora_networkmap.php index 7f01a01090..4ff64aa0e9 100644 --- a/pandora_console/include/functions_pandora_networkmap.php +++ b/pandora_console/include/functions_pandora_networkmap.php @@ -39,7 +39,7 @@ function networkmap_process_networkmap($id = 0) { $numNodes = (int)db_get_num_rows(' SELECT * FROM titem - WHERE id_map = ' . $id . ';'); + WHERE id_map = ' . $id . ' and deleted = 0'); $networkmap = db_get_row_filter('tmap', array('id' => $id)); @@ -836,6 +836,11 @@ function networkmap_links_to_js_links($relations, $nodes_graph) { $item['source'] = $node['id']; } } + if (($item['target'] == -1) && ($item['source'] == -1) && $relation['parent_type'] == 1 && $relation['child_type'] == 1) { + continue; + } + + $return[] = $item; } return $return; From 94936a46e9f8446b999733a12472853615313d41 Mon Sep 17 00:00:00 2001 From: artica Date: Wed, 28 Mar 2018 00:01:22 +0200 Subject: [PATCH 36/69] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 66cd634bc9..2f7afc2fdf 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.720-180327 +Version: 7.0NG.720-180328 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 e8b9fc84f4..561ca06442 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.720-180327" +pandora_version="7.0NG.720-180328" 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 23041bc5b7..37c1e331e2 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.720'; -use constant AGENT_BUILD => '180327'; +use constant AGENT_BUILD => '180328'; # 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 2716b0a331..87657023d6 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.720 -%define release 180327 +%define release 180328 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 2c8d146523..4aaaaa1f88 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.720 -%define release 180327 +%define release 180328 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 3e2af104c3..69457613b6 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.720" -PI_BUILD="180327" +PI_BUILD="180328" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 1cd3fd4413..169bf5fc8d 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{180327} +{180328} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index c9a98af40a..cca7a7187c 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.720(Build 180327)") +#define PANDORA_VERSION ("7.0NG.720(Build 180328)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index cc0bdc0513..075993bc1e 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.720(Build 180327))" + VALUE "ProductVersion", "(7.0NG.720(Build 180328))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index fe18784a91..d7519f544c 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.720-180327 +Version: 7.0NG.720-180328 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 c4b8ce4c9f..71b9caf1a7 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.720-180327" +pandora_version="7.0NG.720-180328" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index be68cd141e..d8efe0e397 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC180327'; +$build_version = 'PC180328'; $pandora_version = 'v7.0NG.720'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index e41375a8e4..4c55b71a6b 100755 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 722ec04c5c..7784cf4d24 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.720 -%define release 180327 +%define release 180328 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 6fbef8ee6c..d36c3f5b5e 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.720 -%define release 180327 +%define release 180328 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index d8f09332d8..e6648a3be2 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.720" -PI_BUILD="180327" +PI_BUILD="180328" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 228664bfce..f4b3fde7d8 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -33,7 +33,7 @@ use PandoraFMS::Tools; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.720 PS180327"; +my $version = "7.0NG.720 PS180328"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 886ac3caba..3294e6cdcf 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.720 PS180327"; +my $version = "7.0NG.720 PS180328"; # save program name for logging my $progname = basename($0); From 8d39ae54fa5e9a70a2185643a49466c9e6dd71e8 Mon Sep 17 00:00:00 2001 From: enriquecd Date: Wed, 28 Mar 2018 17:07:57 +0200 Subject: [PATCH 37/69] Filter by not init agents and modules in tree view - #1454 --- pandora_console/include/class/Tree.class.php | 76 ++++++++++++++++--- .../include/javascript/tree/TreeController.js | 40 +++++----- pandora_console/operation/tree.php | 46 +++++++++-- 3 files changed, 128 insertions(+), 34 deletions(-) diff --git a/pandora_console/include/class/Tree.class.php b/pandora_console/include/class/Tree.class.php index 7fb34b4a22..dd58c87270 100644 --- a/pandora_console/include/class/Tree.class.php +++ b/pandora_console/include/class/Tree.class.php @@ -114,9 +114,17 @@ class Tree { $agents_normal_count = "($agent_table $agent_normal_filter) AS total_normal_count"; // Not init - $agent_not_init_filter = $this->getAgentStatusFilter(AGENT_STATUS_NOT_INIT); - $agents_not_init_count = "($agent_table - $agent_not_init_filter) AS total_not_init_count"; + + if($this->filter['show_not_init_agents']){ + $agent_not_init_filter = $this->getAgentStatusFilter(AGENT_STATUS_NOT_INIT); + $agents_not_init_count = "($agent_table + $agent_not_init_filter) AS total_not_init_count"; + } + else{ + $agent_not_init_filter = 0; + $agents_not_init_count = 0; + } + // Alerts fired $agents_fired_count = "($agent_table AND ta.fired_count > 0) AS total_fired_count"; @@ -287,13 +295,19 @@ class Tree { // Modules join $modules_join = ""; $module_status_join = ""; - if (!empty($module_search_filter) || !empty($module_status_filter)) { + if (!empty($module_search_filter) || !empty($module_status_filter) || !$this->filter['show_not_init_agents']) { - if (!empty($module_status_filter)) { + if (!empty($module_status_filter) || !$this->filter['show_not_init_agents']) { $module_status_join = "INNER JOIN tagente_estado tae ON tam.id_agente_modulo IS NOT NULL AND tam.id_agente_modulo = tae.id_agente_modulo $module_status_filter"; + + if(!$this->filter['show_not_init_modules'] || ($this->filter['show_not_init_modules'] && !$this->filter['show_not_init_agents'])){ + if($type != 'agent' || ($type == 'agent' && !$this->filter['show_not_init_modules'] && !$this->filter['show_not_init_agents'])){ + $module_status_join .= ' AND tae.estado <> '.AGENT_MODULE_STATUS_NO_DATA.' AND tae.estado <> '.AGENT_MODULE_STATUS_NOT_INIT.' '; + } + } } $modules_join = "INNER JOIN tagente_modulo tam @@ -304,8 +318,22 @@ class Tree { } if (empty($module_status_join)) { - $module_status_join = "LEFT JOIN tagente_estado tae - ON tam.id_agente_modulo = tae.id_agente_modulo"; + if(!$this->filter['show_not_init_modules'] || !$this->filter['show_not_init_agents']){ + if($type == "agent"){ + $module_status_join = 'INNER JOIN tagente_estado tae + ON tam.id_agente_modulo = tae.id_agente_modulo '; + } + else{ + $module_status_join = 'LEFT JOIN tagente_estado tae + ON tam.id_agente_modulo = tae.id_agente_modulo '; + } + + $module_status_join .= ' AND 1=1 AND tae.estado <> '.AGENT_MODULE_STATUS_NO_DATA.' AND tae.estado <> '.AGENT_MODULE_STATUS_NOT_INIT.' '; + } + else{ + $module_status_join = 'LEFT JOIN tagente_estado tae + ON tam.id_agente_modulo = tae.id_agente_modulo '; + } } $sql = false; @@ -407,7 +435,7 @@ class Tree { else { $agent_table = "SELECT COUNT(DISTINCT(ta.id_agente)) FROM tagente ta - INNER JOIN tagente_modulo tam + LEFT JOIN tagente_modulo tam ON tam.disabled = 0 AND ta.id_agente = tam.id_agente $module_search_filter @@ -1161,7 +1189,6 @@ class Tree { if (!empty($counters)) { $counters = array_pop($counters); } - return $counters; } @@ -2046,6 +2073,18 @@ class Tree { $items = $this->getItems(); $this->processModules($items); $processed_items = $items; + + if(!$this->filter['show_not_init_modules']){ + + foreach ($items as $key => $value) { + if($items[$key]['total_count'] != $items[$key]['notinit_count']){ + $items[$key]['total_count'] = $items[$key]['total_count'] - $items[$key]['notinit_count']; + $items[$key]['notinit_count'] = 0; + } + + } + + } } else { $items = array(); @@ -2261,6 +2300,18 @@ class Tree { // Agents else { $items = $this->getItems(); + + + if(!$this->filter['show_not_init_modules']){ + + foreach ($items as $key => $value) { + $items[$key]['total_count'] = $items[$key]['total_count'] - $items[$key]['notinit_count']; + $items[$key]['notinit_count'] = 0; + + } + + } + $this->processAgents($items); $processed_items = $items; } @@ -2733,7 +2784,12 @@ class Tree { $group_stats[$group['id_group']]['total_critical_count'] = $group['critical']; $group_stats[$group['id_group']]['total_unknown_count'] = $group['unknown']; $group_stats[$group['id_group']]['total_warning_count'] = $group['warning']; - $group_stats[$group['id_group']]['total_not_init_count'] = $group['non-init']; + if($this->filter['show_not_init_modules']){ + $group_stats[$group['id_group']]['total_not_init_count'] = $group['non-init']; + } + else{ + $group_stats[$group['id_group']]['total_not_init_count'] = 0; + } $group_stats[$group['id_group']]['total_normal_count'] = $group['normal']; $group_stats[$group['id_group']]['total_fired_count'] = $group['alerts_fired']; } diff --git a/pandora_console/include/javascript/tree/TreeController.js b/pandora_console/include/javascript/tree/TreeController.js index 0cb7f745d0..409fc517d1 100644 --- a/pandora_console/include/javascript/tree/TreeController.js +++ b/pandora_console/include/javascript/tree/TreeController.js @@ -37,6 +37,7 @@ var TreeController = { // Load branch function _processGroup (container, elements, rootGroup) { + var $group = $("
    "); // First group @@ -157,15 +158,16 @@ var TreeController = { $counters.addClass('tree-node-counters'); if (typeof counters.total != 'undefined' - && counters.total > 0) { - var $totalCounter = $("
    "); - $totalCounter - .addClass('tree-node-counter') - .addClass('total') - .html(counters.total); - - _processNodeCounterTitle($totalCounter, type, "total"); + && counters.total >= 0) { + var $totalCounter = $("
    "); + $totalCounter + .addClass('tree-node-counter') + .addClass('total') + .html(counters.total); + + _processNodeCounterTitle($totalCounter, type, "total"); + // Open the parentheses $counters.append(" ("); @@ -233,18 +235,18 @@ var TreeController = { } if (typeof counters.not_init != 'undefined' && counters.not_init > 0) { - var $notInitCounter = $("
    "); - $notInitCounter - .addClass('tree-node-counter') - .addClass('not_init') - .addClass('blue') - .html(counters.not_init); + var $notInitCounter = $("
    "); + $notInitCounter + .addClass('tree-node-counter') + .addClass('not_init') + .addClass('blue') + .html(counters.not_init); - _processNodeCounterTitle($notInitCounter, type, "not_init"); - - $counters - .append(" : ") - .append($notInitCounter); + _processNodeCounterTitle($notInitCounter, type, "not_init"); + + $counters + .append(" : ") + .append($notInitCounter); } if (typeof counters.ok != 'undefined' && counters.ok > 0) { diff --git a/pandora_console/operation/tree.php b/pandora_console/operation/tree.php index d8ac843afd..2dfbac6e0d 100755 --- a/pandora_console/operation/tree.php +++ b/pandora_console/operation/tree.php @@ -23,6 +23,8 @@ $search_agent = get_parameter('searchAgent', ''); $status_agent = get_parameter('statusAgent', AGENT_STATUS_ALL); $search_module = get_parameter('searchModule', ''); $status_module = get_parameter('statusModule', -1); +$show_not_init_agents = get_parameter('show_not_init_agents', true); +$show_not_init_modules = get_parameter('show_not_init_modules', true); $group_id = (int) get_parameter('group_id'); $tag_id = (int) get_parameter('tag_id'); $strict_acl = (bool) db_get_value("strict_acl", "tusuario", "id_user", $config['id_user']); @@ -127,9 +129,9 @@ $table->style[0] = 'font-weight: bold;'; $table->style[2] = 'font-weight: bold;'; $table->size = array(); $table->size[0] = '10%'; -$table->size[1] = '35%'; -$table->size[2] = '9%'; -$table->size[3] = '10%'; +$table->size[1] = '20%'; +$table->size[2] = '10%'; +$table->size[3] = '5%'; $table->size[4] = '10%'; // Agent filter $agent_status_arr = array(); @@ -142,19 +144,30 @@ $agent_status_arr[AGENT_STATUS_NOT_INIT] = __('Not init'); $row = array(); $row[] = __('Search group'); -$row[] = html_print_input_text("search_group", $search_group, '', is_metaconsole() ? 70 : 40, 30, true); +$row[] = html_print_input_text("search_group", $search_group, '', is_metaconsole() ? 50 : 40, 30, true); + +if (is_metaconsole()) { + $row[] = __('Show not init modules'); + $row[] = html_print_checkbox("show_not_init_modules", $show_not_init_modules, true, true); +} + + $table->data[] = $row; $row = array(); $row[] = __('Search agent'); -$row[] = html_print_input_text("search_agent", $search_agent, '', is_metaconsole() ? 70 : 40, 30, true); +$row[] = html_print_input_text("search_agent", $search_agent, '', is_metaconsole() ? 50 : 40, 30, true); + +$row[] = __('Show not init agents'); +$row[] = html_print_checkbox("show_not_init_agents", $show_not_init_agents, true, true); $row[] = __('Show full hirearchy'); $row[] = html_print_checkbox("serach_hirearchy", $serach_hirearchy, false, true); $row[] = __('Agent status'); $row[] = html_print_select($agent_status_arr, "status_agent", $status_agent, '', '', 0, true); +$row[] = html_print_input_hidden('show_not_init_modules_hidden', $show_not_init_modules, true); // Button $row[] = html_print_submit_button(__('Filter'), "uptbutton", false, 'class="sub search"', true); @@ -175,6 +188,13 @@ if (!is_metaconsole()) { $row = array(); $row[] = __('Search module'); $row[] = html_print_input_text("search_module", $search_module, '', 40, 30, true); + + $row[] = __('Show not init modules'); + $row[] = html_print_checkbox("show_not_init_modules", $show_not_init_modules, true, true); + + $row[] = ''; + $row[] = ''; + $row[] = __('Module status'); $row[] = html_print_select($module_status_arr, "status_module", $status_module, '', '', 0, true); @@ -269,6 +289,22 @@ enterprise_hook('close_meta_frame'); else{ parameters['filter']['searchHirearchy'] = 0; } + + if($("#checkbox-show_not_init_agents").is(':checked')){ + parameters['filter']['show_not_init_agents'] = 1; + } + else{ + parameters['filter']['show_not_init_agents'] = 0; + } + + if($("#checkbox-show_not_init_modules").is(':checked')){ + parameters['filter']['show_not_init_modules'] = 1; + $('#hidden-show_not_init_modules_hidden').val(1); + } + else{ + parameters['filter']['show_not_init_modules'] = 0; + $('#hidden-show_not_init_modules_hidden').val(0); + } $.ajax({ type: "POST", From 87ed7f9cf74b6bc0303a233705ae3cd20f88728a Mon Sep 17 00:00:00 2001 From: enriquecd Date: Wed, 28 Mar 2018 17:30:31 +0200 Subject: [PATCH 38/69] Not blick separator points in visual console digital clock - #2026 --- pandora_console/include/graphs/pandora.d3.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/graphs/pandora.d3.js b/pandora_console/include/graphs/pandora.d3.js index 300ff0b665..de89872da3 100644 --- a/pandora_console/include/graphs/pandora.d3.js +++ b/pandora_console/include/graphs/pandora.d3.js @@ -2334,7 +2334,7 @@ var digitPattern = [ digit.select("path:nth-child(5)").classed("lit", function(d) { return digitPattern[4][d]; }); digit.select("path:nth-child(6)").classed("lit", function(d) { return digitPattern[5][d]; }); digit.select("path:nth-child(7)").classed("lit", function(d) { return digitPattern[6][d]; }); - separator.classed("lit", seconds); + separator.classed("lit", 1); setTimeout(tick, 1000 - now % 1000); })(); From 52b61933df08867b3c58d0b425b7fde05900f0fb Mon Sep 17 00:00:00 2001 From: enriquecd Date: Wed, 28 Mar 2018 18:14:15 +0200 Subject: [PATCH 39/69] Hide password custom fields in agent view - #2030 --- .../agentes/estado_generalagente.php | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php index 8320845549..58faf3bedd 100755 --- a/pandora_console/operation/agentes/estado_generalagente.php +++ b/pandora_console/operation/agentes/estado_generalagente.php @@ -381,16 +381,23 @@ foreach ($fields as $field) { $data = array(); $data[0] = '' . $field['name'] . ui_print_help_tip (__('Custom field'), true) . ''; - $custom_value = db_get_value_filter( - 'description', 'tagent_custom_data', - array('id_field' => $field['id_field'], 'id_agent' => $id_agente)); - if ($custom_value === false || $custom_value == '') { - $custom_value = ''.__('N/A').''; + $custom_value = db_get_all_rows_sql("select tagent_custom_data.description,tagent_custom_fields.is_password_type from tagent_custom_fields + INNER JOIN tagent_custom_data ON tagent_custom_fields.id_field = tagent_custom_data.id_field where tagent_custom_fields.id_field = ".$field['id_field']." and tagent_custom_data.id_agent = ".$id_agente); + + if ($custom_value[0]['description'] === false || $custom_value[0]['description'] == '') { + $custom_value[0]['description'] = '-'.__('empty').'-'; } else { - $custom_value = ui_bbcode_to_html($custom_value); + $custom_value[0]['description'] = ui_bbcode_to_html($custom_value[0]['description']); } - $data[1] = $custom_value; + + if($custom_value[0]['is_password_type']){ + $data[1] = '••••••••'; + } + else{ + $data[1] = $custom_value[0]['description']; + } + $table_data->data[] = $data; } From 4378dc48ad3258fbb5f4df5deb0ea3fc1c5264e1 Mon Sep 17 00:00:00 2001 From: enriquecd Date: Wed, 28 Mar 2018 18:37:59 +0200 Subject: [PATCH 40/69] Fix cluster ACL - #1878 --- pandora_console/general/firts_task/cluster_builder.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pandora_console/general/firts_task/cluster_builder.php b/pandora_console/general/firts_task/cluster_builder.php index eb2e8d0e71..dc1e1a3ea3 100644 --- a/pandora_console/general/firts_task/cluster_builder.php +++ b/pandora_console/general/firts_task/cluster_builder.php @@ -49,8 +49,17 @@ ui_print_info_message ( array('no_close'=>true, 'message'=> __('There are no cl echo __('Clusters to guarantee service: these are active - passive (A/P) mode clusters. It means that one of the nodes (or machines that make up the cluster) will be running (primary) and another won\'t (secondary). When the primary goes down, the secondary must take over and give the service instead. Although many of the elements of this cluster are active-passive, it will also have active elements in both of them that indicate that the passive node is "online", so that in the case of a service failure in the master, the active node collects this information.'); ?>

    + + +
    + +
    \ No newline at end of file From 09d712d1abe65b62d82f3faddeb85c9c09e45569 Mon Sep 17 00:00:00 2001 From: enriquecd Date: Wed, 28 Mar 2018 18:42:59 +0200 Subject: [PATCH 41/69] Not blink separatos points in visual console digital clock - #2026 --- pandora_console/include/graphs/pandora.d3.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/graphs/pandora.d3.js b/pandora_console/include/graphs/pandora.d3.js index 300ff0b665..de89872da3 100644 --- a/pandora_console/include/graphs/pandora.d3.js +++ b/pandora_console/include/graphs/pandora.d3.js @@ -2334,7 +2334,7 @@ var digitPattern = [ digit.select("path:nth-child(5)").classed("lit", function(d) { return digitPattern[4][d]; }); digit.select("path:nth-child(6)").classed("lit", function(d) { return digitPattern[5][d]; }); digit.select("path:nth-child(7)").classed("lit", function(d) { return digitPattern[6][d]; }); - separator.classed("lit", seconds); + separator.classed("lit", 1); setTimeout(tick, 1000 - now % 1000); })(); From 5418bbd099194d0e9692fbd76b18504dc738f078 Mon Sep 17 00:00:00 2001 From: enriquecd Date: Wed, 28 Mar 2018 18:54:15 +0200 Subject: [PATCH 42/69] Fix reports made by wizard - #2098 --- .../godmode/reporting/reporting_builder.list_items.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pandora_console/godmode/reporting/reporting_builder.list_items.php b/pandora_console/godmode/reporting/reporting_builder.list_items.php index 877d9eac78..81bc5b7286 100755 --- a/pandora_console/godmode/reporting/reporting_builder.list_items.php +++ b/pandora_console/godmode/reporting/reporting_builder.list_items.php @@ -352,9 +352,8 @@ foreach ($items as $item) { $row[1] = get_report_name($item['type']); - $custom_graph_name = db_get_row_sql('select name from tgraph where id_graph = '.$item['id_gs']); - if($item['type'] == 'custom_graph'){ + $custom_graph_name = db_get_row_sql('select name from tgraph where id_graph = '.$item['id_gs']); $row[1] = get_report_name($item['type']).' ('.$custom_graph_name['name'].')'; } From 9ea7dc0dbb679890de7cd7d0b7f44a026ebc5233 Mon Sep 17 00:00:00 2001 From: artica Date: Thu, 29 Mar 2018 00:01:22 +0200 Subject: [PATCH 43/69] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 2f7afc2fdf..c570b973b2 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.720-180328 +Version: 7.0NG.720-180329 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 561ca06442..5670419492 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.720-180328" +pandora_version="7.0NG.720-180329" 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 37c1e331e2..11618a7f82 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.720'; -use constant AGENT_BUILD => '180328'; +use constant AGENT_BUILD => '180329'; # 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 87657023d6..3e8861b3c7 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.720 -%define release 180328 +%define release 180329 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 4aaaaa1f88..e314b2eba6 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.720 -%define release 180328 +%define release 180329 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 69457613b6..df5d91cbfd 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.720" -PI_BUILD="180328" +PI_BUILD="180329" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 169bf5fc8d..c3105fae04 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{180328} +{180329} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index cca7a7187c..aec93d1817 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.720(Build 180328)") +#define PANDORA_VERSION ("7.0NG.720(Build 180329)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 075993bc1e..17c88b7237 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.720(Build 180328))" + VALUE "ProductVersion", "(7.0NG.720(Build 180329))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index d7519f544c..099c268185 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.720-180328 +Version: 7.0NG.720-180329 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 71b9caf1a7..bd0bac1fb2 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.720-180328" +pandora_version="7.0NG.720-180329" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index d8efe0e397..f8a0b9efed 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC180328'; +$build_version = 'PC180329'; $pandora_version = 'v7.0NG.720'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 4c55b71a6b..1cd2860200 100755 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
    [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 7784cf4d24..bdb5351f8b 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.720 -%define release 180328 +%define release 180329 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index d36c3f5b5e..2677f8a5ef 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.720 -%define release 180328 +%define release 180329 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index e6648a3be2..67281cefb6 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.720" -PI_BUILD="180328" +PI_BUILD="180329" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index f4b3fde7d8..bc14ccf805 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -33,7 +33,7 @@ use PandoraFMS::Tools; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.720 PS180328"; +my $version = "7.0NG.720 PS180329"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 3294e6cdcf..0d25cc423d 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.720 PS180328"; +my $version = "7.0NG.720 PS180329"; # save program name for logging my $progname = basename($0); From 7976e0461f2ed39d130b901eb94135feba05afc5 Mon Sep 17 00:00:00 2001 From: artica Date: Fri, 30 Mar 2018 00:01:21 +0200 Subject: [PATCH 44/69] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index c570b973b2..6d5bff6b37 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.720-180329 +Version: 7.0NG.720-180330 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 5670419492..1c7af18801 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.720-180329" +pandora_version="7.0NG.720-180330" 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 11618a7f82..63091024e3 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.720'; -use constant AGENT_BUILD => '180329'; +use constant AGENT_BUILD => '180330'; # 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 3e8861b3c7..5aa8e0e756 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.720 -%define release 180329 +%define release 180330 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 e314b2eba6..6e2d61a9a7 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.720 -%define release 180329 +%define release 180330 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 df5d91cbfd..ccdfccbe17 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.720" -PI_BUILD="180329" +PI_BUILD="180330" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index c3105fae04..e0d8c59ce6 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{180329} +{180330} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index aec93d1817..8b43b1b94e 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.720(Build 180329)") +#define PANDORA_VERSION ("7.0NG.720(Build 180330)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 17c88b7237..bca50a93dd 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.720(Build 180329))" + VALUE "ProductVersion", "(7.0NG.720(Build 180330))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 099c268185..a8e57437d9 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.720-180329 +Version: 7.0NG.720-180330 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 bd0bac1fb2..2bae883e5b 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.720-180329" +pandora_version="7.0NG.720-180330" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index f8a0b9efed..2a5a66111b 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC180329'; +$build_version = 'PC180330'; $pandora_version = 'v7.0NG.720'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 1cd2860200..c58b36f535 100755 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
    [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index bdb5351f8b..2f52a92097 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.720 -%define release 180329 +%define release 180330 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 2677f8a5ef..ceae8f8cf4 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.720 -%define release 180329 +%define release 180330 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 67281cefb6..a57973614b 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.720" -PI_BUILD="180329" +PI_BUILD="180330" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index bc14ccf805..aef6c1ea62 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -33,7 +33,7 @@ use PandoraFMS::Tools; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.720 PS180329"; +my $version = "7.0NG.720 PS180330"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 0d25cc423d..7d45a0eed4 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.720 PS180329"; +my $version = "7.0NG.720 PS180330"; # save program name for logging my $progname = basename($0); From 727b69462ae1d0ca7e17ff99b1236746230df22c Mon Sep 17 00:00:00 2001 From: artica Date: Sat, 31 Mar 2018 00:01:21 +0200 Subject: [PATCH 45/69] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 6d5bff6b37..6c8c60a1d5 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.720-180330 +Version: 7.0NG.720-180331 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 1c7af18801..ebd641ba39 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.720-180330" +pandora_version="7.0NG.720-180331" 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 63091024e3..f382cb6723 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.720'; -use constant AGENT_BUILD => '180330'; +use constant AGENT_BUILD => '180331'; # 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 5aa8e0e756..29d64eaf24 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.720 -%define release 180330 +%define release 180331 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 6e2d61a9a7..235729bb8b 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.720 -%define release 180330 +%define release 180331 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 ccdfccbe17..8512030991 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.720" -PI_BUILD="180330" +PI_BUILD="180331" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index e0d8c59ce6..b98a9cd45c 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{180330} +{180331} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 8b43b1b94e..25fe5a2404 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.720(Build 180330)") +#define PANDORA_VERSION ("7.0NG.720(Build 180331)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index bca50a93dd..85bce56512 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.720(Build 180330))" + VALUE "ProductVersion", "(7.0NG.720(Build 180331))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index a8e57437d9..e5816fd7b5 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.720-180330 +Version: 7.0NG.720-180331 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 2bae883e5b..78cd317558 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.720-180330" +pandora_version="7.0NG.720-180331" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 2a5a66111b..c9132d3acf 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC180330'; +$build_version = 'PC180331'; $pandora_version = 'v7.0NG.720'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index c58b36f535..6ce60bdf6d 100755 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
    [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 2f52a92097..6d877fedae 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.720 -%define release 180330 +%define release 180331 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index ceae8f8cf4..e903e567ce 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.720 -%define release 180330 +%define release 180331 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index a57973614b..0ac131ed34 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.720" -PI_BUILD="180330" +PI_BUILD="180331" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index aef6c1ea62..bc4f0d8863 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -33,7 +33,7 @@ use PandoraFMS::Tools; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.720 PS180330"; +my $version = "7.0NG.720 PS180331"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 7d45a0eed4..e7a1e9eae0 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.720 PS180330"; +my $version = "7.0NG.720 PS180331"; # save program name for logging my $progname = basename($0); From 4e5d2477ac31c53f5f5f7c8797af31bdd9328cc0 Mon Sep 17 00:00:00 2001 From: artica Date: Sun, 1 Apr 2018 00:01:22 +0200 Subject: [PATCH 46/69] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 6c8c60a1d5..bd3556b43e 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.720-180331 +Version: 7.0NG.720-180401 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 ebd641ba39..b36987d056 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.720-180331" +pandora_version="7.0NG.720-180401" 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 f382cb6723..1b9b365302 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.720'; -use constant AGENT_BUILD => '180331'; +use constant AGENT_BUILD => '180401'; # 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 29d64eaf24..1dfbb05dee 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.720 -%define release 180331 +%define release 180401 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 235729bb8b..19fec3e04e 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.720 -%define release 180331 +%define release 180401 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 8512030991..9eb3663550 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.720" -PI_BUILD="180331" +PI_BUILD="180401" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index b98a9cd45c..d87bbf489a 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{180331} +{180401} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 25fe5a2404..8a2724fbb7 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.720(Build 180331)") +#define PANDORA_VERSION ("7.0NG.720(Build 180401)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 85bce56512..67c1106017 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.720(Build 180331))" + VALUE "ProductVersion", "(7.0NG.720(Build 180401))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index e5816fd7b5..0412b764cb 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.720-180331 +Version: 7.0NG.720-180401 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 78cd317558..e86bc3ca7a 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.720-180331" +pandora_version="7.0NG.720-180401" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index c9132d3acf..e31ae05af1 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC180331'; +$build_version = 'PC180401'; $pandora_version = 'v7.0NG.720'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 6ce60bdf6d..1e38b8e975 100755 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
    [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 6d877fedae..6ff18fef34 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.720 -%define release 180331 +%define release 180401 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index e903e567ce..70342778bd 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.720 -%define release 180331 +%define release 180401 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 0ac131ed34..e98802ff6d 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.720" -PI_BUILD="180331" +PI_BUILD="180401" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index bc4f0d8863..ca7bb80ffd 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -33,7 +33,7 @@ use PandoraFMS::Tools; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.720 PS180331"; +my $version = "7.0NG.720 PS180401"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index e7a1e9eae0..655c665f62 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.720 PS180331"; +my $version = "7.0NG.720 PS180401"; # save program name for logging my $progname = basename($0); From 1ab18d6c2de455ed9c5750b59680b961fad2bfd3 Mon Sep 17 00:00:00 2001 From: artica Date: Mon, 2 Apr 2018 00:01:21 +0200 Subject: [PATCH 47/69] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index bd3556b43e..de6ed0e626 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.720-180401 +Version: 7.0NG.720-180402 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 b36987d056..8befd08868 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.720-180401" +pandora_version="7.0NG.720-180402" 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 1b9b365302..99d9d593e0 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.720'; -use constant AGENT_BUILD => '180401'; +use constant AGENT_BUILD => '180402'; # 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 1dfbb05dee..24811784ad 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.720 -%define release 180401 +%define release 180402 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 19fec3e04e..f9118ae36f 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.720 -%define release 180401 +%define release 180402 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 9eb3663550..0ecbf2f9c3 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.720" -PI_BUILD="180401" +PI_BUILD="180402" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index d87bbf489a..7a172fa200 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{180401} +{180402} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 8a2724fbb7..63d5c8e985 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.720(Build 180401)") +#define PANDORA_VERSION ("7.0NG.720(Build 180402)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 67c1106017..a99342125c 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.720(Build 180401))" + VALUE "ProductVersion", "(7.0NG.720(Build 180402))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 0412b764cb..70b5274538 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.720-180401 +Version: 7.0NG.720-180402 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 e86bc3ca7a..96196c9f61 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.720-180401" +pandora_version="7.0NG.720-180402" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index e31ae05af1..c9df83f5d7 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC180401'; +$build_version = 'PC180402'; $pandora_version = 'v7.0NG.720'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 1e38b8e975..5d14913174 100755 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
    [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 6ff18fef34..1393afb194 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.720 -%define release 180401 +%define release 180402 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 70342778bd..b87569419e 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.720 -%define release 180401 +%define release 180402 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index e98802ff6d..28e23cffd7 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.720" -PI_BUILD="180401" +PI_BUILD="180402" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index ca7bb80ffd..53cdbfd2b8 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -33,7 +33,7 @@ use PandoraFMS::Tools; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.720 PS180401"; +my $version = "7.0NG.720 PS180402"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 655c665f62..0e78958ea6 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.720 PS180401"; +my $version = "7.0NG.720 PS180402"; # save program name for logging my $progname = basename($0); From c2ba4e20dbccf17e4d1123819f93b9f7d54c2c99 Mon Sep 17 00:00:00 2001 From: daniel Date: Mon, 2 Apr 2018 12:23:47 +0200 Subject: [PATCH 48/69] fixed minor error report network interfaces nodo --- pandora_console/include/functions_reporting.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index b63b7cd5b9..52aa90b1f5 100755 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -2736,7 +2736,7 @@ function reporting_network_interfaces_report($report, $content, $type = 'dinamic } else{ $network_interfaces_by_agents = agents_get_network_interfaces(false, $filter); - $return = agents_get_network_interfaces_array($network_interfaces_by_agents, $return, $type, $content, $report); + $return = agents_get_network_interfaces_array($network_interfaces_by_agents, $return, $type, $content, $report); metaconsole_restore_db(); } } @@ -2744,7 +2744,7 @@ function reporting_network_interfaces_report($report, $content, $type = 'dinamic } else{ $network_interfaces_by_agents = agents_get_network_interfaces(false, $filter); - agents_get_network_interfaces_array($network_interfaces_by_agents, $return, $type, $content, $report); + $return = agents_get_network_interfaces_array($network_interfaces_by_agents, $return, $type, $content, $report); } return reporting_check_structure_content($return); From 40861627055eec90b596f2791c7a55ed12c47136 Mon Sep 17 00:00:00 2001 From: daniel Date: Mon, 2 Apr 2018 12:56:50 +0200 Subject: [PATCH 49/69] fixed minor error hel manage.pl --- pandora_server/util/pandora_manage.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 0e78958ea6..0a5248c5c8 100644 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -126,8 +126,8 @@ sub help_screen{ help_screen_line('--clean_conf_file', '', "Clean a local conf of a given agent deleting all modules, \n\t policies, file collections and comments"); help_screen_line('--get_bad_conf_files', '', 'Get the files bad configured (without essential tokens)'); help_screen_line('--locate_agent', '', 'Search a agent into of nodes of metaconsole. Only Enterprise.'); - help_screen_line('--migration_agent_queue', ' []', 'Migrate agent only metaconsole'); - help_screen_line('--migration_agent', ' ', 'Is migrating the agent only metaconsole'); + help_screen_line('--migration_agent_queue', ' []', 'Migrate agent only metaconsole'); + help_screen_line('--migration_agent', ' ', 'Is migrating the agent only metaconsole'); 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 The valid data types are web_data, web_proc, web_content_data or web_content_string", 'Add web server module to agent'); From 4f57461b71b98b6b4ef84da1b60cc2f66b8af50d Mon Sep 17 00:00:00 2001 From: enriquecd Date: Mon, 2 Apr 2018 15:29:59 +0200 Subject: [PATCH 50/69] Add help to CLI - #983 --- pandora_server/util/pandora_manage.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 0a5248c5c8..ebac0eb369 100644 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -126,8 +126,9 @@ sub help_screen{ help_screen_line('--clean_conf_file', '', "Clean a local conf of a given agent deleting all modules, \n\t policies, file collections and comments"); help_screen_line('--get_bad_conf_files', '', 'Get the files bad configured (without essential tokens)'); help_screen_line('--locate_agent', '', 'Search a agent into of nodes of metaconsole. Only Enterprise.'); - help_screen_line('--migration_agent_queue', ' []', 'Migrate agent only metaconsole'); - help_screen_line('--migration_agent', ' ', 'Is migrating the agent only metaconsole'); + help_screen_line('--migration_agent_queue', ' []', 'Migrate agent only metaconsole'); + help_screen_line('--migration_agent', ' ', 'Is migrating the agent only metaconsole'); + help_screen_line('--apply_module_template', ' ', 'Apply module template to agent'); 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 The valid data types are web_data, web_proc, web_content_data or web_content_string", 'Add web server module to agent'); From 337822a608998f0928ec2a5c5f2b72163793b0e9 Mon Sep 17 00:00:00 2001 From: artica Date: Tue, 3 Apr 2018 00:01:22 +0200 Subject: [PATCH 51/69] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index de6ed0e626..4b4b70199f 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.720-180402 +Version: 7.0NG.720-180403 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 8befd08868..64e5a318a0 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.720-180402" +pandora_version="7.0NG.720-180403" 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 99d9d593e0..6ae81d09d6 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.720'; -use constant AGENT_BUILD => '180402'; +use constant AGENT_BUILD => '180403'; # 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 24811784ad..488ec0b243 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.720 -%define release 180402 +%define release 180403 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 f9118ae36f..706a25334f 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.720 -%define release 180402 +%define release 180403 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 0ecbf2f9c3..015e8b8438 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.720" -PI_BUILD="180402" +PI_BUILD="180403" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 7a172fa200..9a3ed8b7a3 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{180402} +{180403} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 63d5c8e985..c3ed30ad30 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.720(Build 180402)") +#define PANDORA_VERSION ("7.0NG.720(Build 180403)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index a99342125c..c37364d724 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.720(Build 180402))" + VALUE "ProductVersion", "(7.0NG.720(Build 180403))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 70b5274538..35b15ff516 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.720-180402 +Version: 7.0NG.720-180403 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 96196c9f61..60d1696618 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.720-180402" +pandora_version="7.0NG.720-180403" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index c9df83f5d7..ef801cbdd9 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC180402'; +$build_version = 'PC180403'; $pandora_version = 'v7.0NG.720'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 5d14913174..a90558cc13 100755 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
    [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 1393afb194..49160ecb05 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.720 -%define release 180402 +%define release 180403 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index b87569419e..1bc8993206 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.720 -%define release 180402 +%define release 180403 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 28e23cffd7..f7acff3727 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.720" -PI_BUILD="180402" +PI_BUILD="180403" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 53cdbfd2b8..0a1ed80cd1 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -33,7 +33,7 @@ use PandoraFMS::Tools; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.720 PS180402"; +my $version = "7.0NG.720 PS180403"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 0a5248c5c8..3f8c71bed9 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.720 PS180402"; +my $version = "7.0NG.720 PS180403"; # save program name for logging my $progname = basename($0); From 2380a18c6df38050b0e6ddbccee88454dbb9a219 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Tue, 3 Apr 2018 09:46:44 +0200 Subject: [PATCH 52/69] Minor changes in PluginTools for 1801 --- pandora_server/lib/PandoraFMS/PluginTools.pm | 106 +++++++++++++++---- 1 file changed, 88 insertions(+), 18 deletions(-) diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm index 0d92952026..5eba8910ca 100644 --- a/pandora_server/lib/PandoraFMS/PluginTools.pm +++ b/pandora_server/lib/PandoraFMS/PluginTools.pm @@ -605,8 +605,11 @@ sub transfer_xml { $file_name .= "_" . time() . ".data"; } - $conf->{temp} = $conf->{tmp} if (empty($conf->{temp}) && defined($conf->{tmp})); - $conf->{temp} = $conf->{temporal} if (empty($conf->{temporal}) && defined($conf->{temporal})); + logger($conf, "transfer_xml", "Failed to generate file name."); + + $conf->{temp} = $conf->{tmp} if (empty($conf->{temp}) && defined($conf->{tmp})); + $conf->{temp} = $conf->{temporal} if (empty($conf->{temp}) && defined($conf->{temporal})); + $conf->{temp} = $conf->{__system}->{tmp} if (empty($conf->{temp}) && defined($conf->{__system})) && (ref($conf->{__system}) eq "HASH"); $file_path = $conf->{temp} . "/" . $file_name; @@ -734,7 +737,7 @@ sub print_execution_result { } print_module($conf, { - name => "Plugin execution result", + name => "Plugin execution result " . $0, type => "generic_proc", value => (defined($value)?$value:0), desc => $msg, @@ -745,12 +748,12 @@ sub print_execution_result { ## Plugin devolution in case of error ################################################################################ sub print_error { - my ($conf, $msg, $value) = @_; + my ($conf, $msg, $value, $always_show) = @_; $value = 0 unless defined($value); - if (!(is_enabled($conf->{informational_modules}))) { - return 0; + if (!(is_enabled($conf->{informational_modules}) || is_enabled($always_show))) { + exit 1; } if (is_enabled($conf->{'as_server_plugin'})) { @@ -760,7 +763,7 @@ sub print_error { } print_module($conf, { - name => (empty($conf->{'global_plugin_module'})?"Plugin execution result":$conf->{'global_plugin_module'}), + name => (empty($conf->{'global_plugin_module'})?"Plugin execution result " . $0:$conf->{'global_plugin_module'}), type => "generic_proc", value => $value, desc => $msg, @@ -786,32 +789,39 @@ sub print_stderror { my $log_aux_flag = 0; sub logger { my ($conf, $tag, $message) = @_; - my $file = $conf->{log}; - print_error($conf, "Log file undefined\n") unless defined $file; + my $file = $conf->{'log'}; + + print_error($conf, "[ERROR] Log file is not defined.", 0, 1) unless defined($file); # Log rotation - if (-e $file && (stat($file))[7] > 32000000) { + if (defined($file) && -e $file && (stat($file))[7] > 32000000) { rename ($file, $file.'.old'); } my $LOGFILE; if ($log_aux_flag == 0) { # Log starts if (! open ($LOGFILE, "> $file")) { - print_error ($conf, "[ERROR] Could not open logfile '$file'"); + print_error ($conf, "[ERROR] Could not open logfile '$file'", 0, 1); } $log_aux_flag = 1; } else { if (! open ($LOGFILE, ">> $file")) { - print_error ($conf, "[ERROR] Could not open logfile '$file'"); + print_error ($conf, "[ERROR] Could not open logfile '$file'", 0, 1); } } - $message = '' if empty($message); - $message = "[" . $tag . "] " . $message if empty($tag); + if (empty($message)) { + $message = $tag; + $message = "" if empty($message); + } + else { + $message = "[" . $tag . "] " . $message unless empty($tag); + } - if (!(empty($conf->{agent_name}))){ - $message = "[" . $conf->{agent_xml_name} . "] " . $message; + + if (!(empty($conf->{'agent_name'}))){ + $message = "[" . $conf->{'agent_name'} . "] " . $message; } print $LOGFILE strftime ("%Y-%m-%d %H:%M:%S", localtime()) . " - " . $message . "\n"; @@ -824,7 +834,7 @@ sub logger { sub is_enabled { my $value = shift; - if ((defined ($value)) && ($value > 0)){ + if ((defined ($value)) && looks_like_number($value) && ($value > 0)){ # return true return 1; } @@ -931,6 +941,7 @@ sub init_system { $system{grep} = "findstr"; $system{echo} = "echo"; $system{wcl} = "wc -l"; + $system{tmp} = ".\\"; } else { $system{devnull} = "/dev/null"; @@ -940,6 +951,7 @@ sub init_system { $system{grep} = "grep"; $system{echo} = "echo"; $system{wcl} = "wc -l"; + $system{tmp} = "/tmp"; if ($^O =~ /hpux/i) { $system{os} = "HPUX"; @@ -970,6 +982,41 @@ sub get_sys_environment { ################################################################################ # Parses any configuration, from file (1st arg to program) or direct arguments +# +# Custom evals are defined in an array reference of hash references: +# +# $custom_eval = [ +# { +# 'exp' => 'regular expression to match', +# 'target' => \&target_custom_method_to_parse_line +# }, +# { +# 'exp' => 'another regular expression to search', +# 'target' => \&target_custom_method_to_parse_line2 +# }, +# ] +# +# Target is an user defined function wich will be invoked with following +# arguments: +# +# $config : The configuration read to the point the regex matches +# $exp : The matching regex which fires this action +# $line : The complete line readed from the file +# $file_pointer : A pointer to the file which is being parsed. +# $current_entity : The current_entity (optional) when regex matches +# +# E.g. +# +# sub target_custom_method_to_parse_line { +# my ($config, $exp, $line, $file_pointer, $current_entity) = @_; +# +# if ($line =~ /$exp/) { +# $config->{'my_key'} = complex_operation_on_data($1,$2,$3); +# } +# +# return $config; +# } +# ################################################################################ sub read_configuration { my ($config, $separator, $custom_eval) = @_; @@ -1034,11 +1081,16 @@ sub parse_arguments { # $current_entity : The current_entity (optional) when regex matches # ################################################################################ +sub parse_configuration; sub parse_configuration { my ($conf_file, $separator, $custom_eval, $detect_entities, $entities_list) = @_; + my @arguments = @_; + shift(@arguments); + $separator = "=" unless defined($separator); + my $_CFILE; my $_config; @@ -1124,6 +1176,24 @@ sub parse_configuration { next; } } + if ($key =~ /^include$/i) { + my $file_included = trim($value); + my $aux; + eval { + $aux = parse_configuration($file_included, @arguments); + }; + if($@) { + Carp::croak ("Failed to parse configuration"); + } + + if (empty($_config)) { + $_config = $aux; + } + elsif (!empty($aux) && (ref ($aux) eq "HASH")) { + $_config = merge_hashes($_config, $aux); + } + next; + } $_config->{trim($key)} = trim($value); } close ($_CFILE); @@ -1138,7 +1208,7 @@ sub parse_configuration { return $global_config unless empty($global_config); } - + return $_config; } From 73279989858836ac0835095e1883c587c0211e48 Mon Sep 17 00:00:00 2001 From: danielmaya Date: Tue, 3 Apr 2018 12:25:51 +0200 Subject: [PATCH 53/69] Fixed raw_text undefined in networkmap --- .../include/javascript/functions_pandora_networkmap.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pandora_console/include/javascript/functions_pandora_networkmap.js b/pandora_console/include/javascript/functions_pandora_networkmap.js index 8fc943835c..491f927cc8 100644 --- a/pandora_console/include/javascript/functions_pandora_networkmap.js +++ b/pandora_console/include/javascript/functions_pandora_networkmap.js @@ -943,11 +943,11 @@ function load_interfaces(selected_links) { } } }); - + $("#relations_table-template_row-node_source", template_relation_row) - .html(link_each.source['raw_text']); + .html(link_each.source['raw_text'] != 'undefined' ? link_each.source['text'] : link_each.source['raw_text']); $("#relations_table-template_row-node_target", template_relation_row) - .html(link_each.target['raw_text']); + .html(link_each.target['raw_text'] != 'undefined' ? link_each.target['text'] : link_each.target['raw_text']); $("#relations_table-template_row-edit", template_relation_row) .attr("align", "center"); $("#relations_table-template_row-edit .delete_icon", template_relation_row) From cac55053e3df0ad007672f9374a4c6a8875a7af4 Mon Sep 17 00:00:00 2001 From: daniel Date: Tue, 3 Apr 2018 12:42:54 +0200 Subject: [PATCH 54/69] fixed minor error fullscale in report interfaces metaconsole --- pandora_console/include/functions_reporting.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index 52aa90b1f5..5df97acf9d 100755 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -2736,7 +2736,7 @@ function reporting_network_interfaces_report($report, $content, $type = 'dinamic } else{ $network_interfaces_by_agents = agents_get_network_interfaces(false, $filter); - $return = agents_get_network_interfaces_array($network_interfaces_by_agents, $return, $type, $content, $report); + $return = agents_get_network_interfaces_array($network_interfaces_by_agents, $return, $type, $content, $report, $fullscale); metaconsole_restore_db(); } } @@ -2744,13 +2744,13 @@ function reporting_network_interfaces_report($report, $content, $type = 'dinamic } else{ $network_interfaces_by_agents = agents_get_network_interfaces(false, $filter); - $return = agents_get_network_interfaces_array($network_interfaces_by_agents, $return, $type, $content, $report); + $return = agents_get_network_interfaces_array($network_interfaces_by_agents, $return, $type, $content, $report, $fullscale); } return reporting_check_structure_content($return); } -function agents_get_network_interfaces_array($network_interfaces_by_agents, $return, $type, $content, $report){ +function agents_get_network_interfaces_array($network_interfaces_by_agents, $return, $type, $content, $report, $fullscale){ if (empty($network_interfaces_by_agents)) { $return['failed'] = __('The group has no agents or none of the agents has any network interface'); From dcaae924fcec0bc749a34f1c41f44870242cbefc Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Tue, 3 Apr 2018 16:41:21 +0200 Subject: [PATCH 55/69] Decreased limit to reduceText call in some graphs --- pandora_console/include/graphs/flot/pandora.flot.js | 8 ++++---- pandora_console/include/styles/pandora.css | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js index 400125a219..b3ea1d5f8a 100644 --- a/pandora_console/include/graphs/flot/pandora.flot.js +++ b/pandora_console/include/graphs/flot/pandora.flot.js @@ -421,8 +421,8 @@ function pandoraFlotHBars(graph_id, values, labels, water_mark, // var shortLabel = reduceText(label, 25); var title = label; var margin_top = 0; - if(label.length > 33){ - label = reduceText(label, 33); + if(label.length > 30){ + label = reduceText(label, 30); } var div_attributes = 'style="font-size:'+font_size+'pt !important;' + ' margin: 0; max-width: 150px;' @@ -432,7 +432,7 @@ function pandoraFlotHBars(graph_id, values, labels, water_mark, div_attributes += "min-height: 2.5em;"; } - div_attributes += '" title="'+title+'" class="'+font+'"'; + div_attributes += '" title="'+title+'" class="'+font+'" '+ ' style="overflow: hidden;"'; format.push([i,'
    ' + label @@ -663,7 +663,7 @@ function pandoraFlotVBars(graph_id, values, labels, labels_long, legend, colors, } format.push([i, - '
    ' + '
    ' + label + '
    ']); } diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 1b2cda24bf..9b39270e66 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -4630,7 +4630,6 @@ form ul.form_flex li ul li{ .tickLabel { white-space: nowrap; - overflow-x: hidden; line-height: 1.05em!important; } From 63e644d88a99dc478090a29117b5c564b740eefc Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Tue, 3 Apr 2018 17:12:31 +0200 Subject: [PATCH 56/69] Minor fix --- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm index 5eba8910ca..3b380737b3 100644 --- a/pandora_server/lib/PandoraFMS/PluginTools.pm +++ b/pandora_server/lib/PandoraFMS/PluginTools.pm @@ -417,9 +417,11 @@ sub print_module { $data->{value} = trim($data->{value}); } + $data->{value} = '' if empty($data->{value}); $data->{tags} = $data->{tags}?$data->{tags}:($conf->{MODULE_TAG_LIST}?$conf->{MODULE_TAG_LIST}:undef); $data->{interval} = $data->{interval}?$data->{interval}:($conf->{MODULE_INTERVAL}?$conf->{MODULE_INTERVAL}:undef); $data->{module_group} = $data->{module_group}?$data->{module_group}:($conf->{MODULE_GROUP}?$conf->{MODULE_GROUP}:undef); + # Global instructions (if defined) $data->{unknown_instructions} = $conf->{unknown_instructions} unless (defined($data->{unknown_instructions}) || (!defined($conf->{unknown_instructions}))); From 7c202cbb81d7a4d8773b5b232438b700e456b68e Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Tue, 3 Apr 2018 17:14:11 +0200 Subject: [PATCH 57/69] PluginTools minor fix in log message --- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm index 3b380737b3..4a0d2f8869 100644 --- a/pandora_server/lib/PandoraFMS/PluginTools.pm +++ b/pandora_server/lib/PandoraFMS/PluginTools.pm @@ -607,7 +607,7 @@ sub transfer_xml { $file_name .= "_" . time() . ".data"; } - logger($conf, "transfer_xml", "Failed to generate file name."); + logger($conf, "transfer_xml", "Failed to generate file name.") if empty($file_name); $conf->{temp} = $conf->{tmp} if (empty($conf->{temp}) && defined($conf->{tmp})); $conf->{temp} = $conf->{temporal} if (empty($conf->{temp}) && defined($conf->{temporal})); From 8a4ee8f28d504fcf87c167406213857fb0198df7 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Tue, 3 Apr 2018 18:22:38 +0200 Subject: [PATCH 58/69] PluginTools pseudo control for as_agent/server_plugin --- pandora_server/lib/PandoraFMS/PluginTools.pm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm index 4a0d2f8869..6cc1f282a4 100644 --- a/pandora_server/lib/PandoraFMS/PluginTools.pm +++ b/pandora_server/lib/PandoraFMS/PluginTools.pm @@ -1028,6 +1028,20 @@ sub read_configuration { } $config = merge_hashes($config, parse_arguments(\@ARGV)); + if(is_enabled($config->{'as_agent_plugin'})) { + $config->{'as_server_plugin'} = 0 if (empty($config->{'as_server_plugin'})); + } + else { + $config->{'as_server_plugin'} = 1 if (empty($config->{'as_server_plugin'})); + } + + if(is_enabled($config->{'as_server_plugin'})) { + $config->{'as_agent_plugin'} = 0 if (empty($config->{'as_agent_plugin'})); + } + else { + $config->{'as_agent_plugin'} = 1 if (empty($config->{'as_agent_plugin'})); + } + return $config; } From f8631844548f4676f01252b4995cbb03c3c3d28c Mon Sep 17 00:00:00 2001 From: artica Date: Wed, 4 Apr 2018 00:01:24 +0200 Subject: [PATCH 59/69] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 4b4b70199f..0bfc4ab0bb 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.720-180403 +Version: 7.0NG.720-180404 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 64e5a318a0..57b5d5428a 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.720-180403" +pandora_version="7.0NG.720-180404" 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 6ae81d09d6..63a0d924cf 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.720'; -use constant AGENT_BUILD => '180403'; +use constant AGENT_BUILD => '180404'; # 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 488ec0b243..d0c50b9018 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.720 -%define release 180403 +%define release 180404 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 706a25334f..b1e6d2502a 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.720 -%define release 180403 +%define release 180404 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 015e8b8438..09806d7532 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.720" -PI_BUILD="180403" +PI_BUILD="180404" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 9a3ed8b7a3..9f28cbcbd1 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{180403} +{180404} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index c3ed30ad30..92c2353070 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.720(Build 180403)") +#define PANDORA_VERSION ("7.0NG.720(Build 180404)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index c37364d724..8ba4b89c41 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.720(Build 180403))" + VALUE "ProductVersion", "(7.0NG.720(Build 180404))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 35b15ff516..a79489ad66 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.720-180403 +Version: 7.0NG.720-180404 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 60d1696618..edb0fa0826 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.720-180403" +pandora_version="7.0NG.720-180404" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index ef801cbdd9..613a7f2aa0 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC180403'; +$build_version = 'PC180404'; $pandora_version = 'v7.0NG.720'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index a90558cc13..8cd62669d7 100755 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
    [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 49160ecb05..dc7a9a3a20 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.720 -%define release 180403 +%define release 180404 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 1bc8993206..d44c53ef9e 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.720 -%define release 180403 +%define release 180404 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index f7acff3727..32e76ce165 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.720" -PI_BUILD="180403" +PI_BUILD="180404" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 0a1ed80cd1..7f59d2b02b 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -33,7 +33,7 @@ use PandoraFMS::Tools; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.720 PS180403"; +my $version = "7.0NG.720 PS180404"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 5904eb60c1..87f00101f0 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.720 PS180403"; +my $version = "7.0NG.720 PS180404"; # save program name for logging my $progname = basename($0); From 47b611469dbcb9277adfa9aa84e2c45152048c21 Mon Sep 17 00:00:00 2001 From: enriquecd Date: Wed, 4 Apr 2018 12:06:10 +0200 Subject: [PATCH 60/69] Fix create_web and create_policy_web CLI functions - #2101 --- pandora_server/util/pandora_manage.pl | 65 +++++++++++---------------- 1 file changed, 26 insertions(+), 39 deletions(-) diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 87f00101f0..1ee1212e75 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.720 PS180404"; +my $version = "7.0NG.720 PS180403"; # save program name for logging my $progname = basename($0); @@ -160,7 +160,6 @@ sub help_screen{ help_screen_line('--delete_special_day', '', 'Delete special day'); help_screen_line('--update_special_day', " ", 'Update a field of a special day'); help_screen_line('--create_data_module_from_local_component', ' ', "Create a new data \n\t module from a local component"); - help_screen_line('--create_web_module_from_local_component', ' ', "Create a new web \n\t module from a local component"); help_screen_line('--create_local_component', " [ \n\t \n\t \n\t \n\t \n\t \n\t \n\t \n\t ]", 'Create local component'); print "\nUSERS:\n\n" unless $param ne ''; @@ -1357,23 +1356,28 @@ sub cli_create_web_module($) { my $in_policy = shift; my ($policy_name, $module_name, $module_type, $agent_name, $description, $module_group, $min,$max,$post_process, $interval, $warning_min, $warning_max, $critical_min, - $critical_max, $history_data, $definition_file, $configuration_data, $warning_str, $critical_str, $enable_unknown_events, + $critical_max, $history_data, $retries, $requests, $agent_browser_id, $auth_server, $auth_realm, + $definition_file, $http_auth_login, $http_auth_password, + $proxy_url, $proxy_auth_login, $proxy_auth_password, $configuration_data, $warning_str, $critical_str, $enable_unknown_events, $ff_threshold, $each_ff, $ff_threshold_normal, $ff_threshold_warning, $ff_threshold_critical, $ff_timeout, $warning_inverse, $critical_inverse, $critical_instructions, $warning_instructions, $unknown_instructions); if ($in_policy == 0) { ($module_name, $module_type, $agent_name, $description, $module_group, $min,$max,$post_process, $interval, $warning_min, $warning_max, $critical_min, - $critical_max, $history_data, $definition_file, $warning_str, $critical_str, $enable_unknown_events, $ff_threshold, - $each_ff, $ff_threshold_normal, $ff_threshold_warning, $ff_threshold_critical, $ff_timeout, - $warning_inverse, $critical_inverse, $critical_instructions, $warning_instructions, $unknown_instructions) = @ARGV[2..30]; + $critical_max, $history_data, $retries, $requests, $agent_browser_id, $auth_server, $auth_realm, + $definition_file, $http_auth_login, $http_auth_password, + $proxy_url, $proxy_auth_login, $proxy_auth_password, $warning_str, $critical_str, + $enable_unknown_events, $ff_threshold, $each_ff, $ff_threshold_normal, $ff_threshold_warning, $ff_threshold_critical, $ff_timeout, + $warning_inverse, $critical_inverse, $critical_instructions, $warning_instructions, $unknown_instructions) = @ARGV[2..40]; } else { ($policy_name, $module_name, $module_type, $description, $module_group, $min,$max,$post_process, $interval, $warning_min, $warning_max, $critical_min, - $critical_max, $history_data, $configuration_data, $warning_str, $critical_str, $enable_unknown_events, $ff_threshold, - $each_ff, $ff_threshold_normal, $ff_threshold_warning, $ff_threshold_critical, $ff_timeout, - $warning_inverse, $critical_inverse, $critical_instructions, $warning_instructions, $unknown_instructions) = @ARGV[2..31]; + $critical_max, $history_data, $retries, $requests, $agent_browser_id, $auth_server, $auth_realm, $configuration_data, $http_auth_login, $http_auth_password, + $proxy_url, $proxy_auth_login, $proxy_auth_password, $warning_str, $critical_str, + $enable_unknown_events, $ff_threshold, $each_ff, $ff_threshold_normal, $ff_threshold_warning, $ff_threshold_critical, $ff_timeout, + $warning_inverse, $critical_inverse, $critical_instructions, $warning_instructions, $unknown_instructions) = @ARGV[2..40]; } my $module_name_def; @@ -1532,6 +1536,17 @@ sub cli_create_web_module($) { $parameters{'warning_instructions'} = $warning_instructions unless !defined ($warning_instructions); $parameters{'unknown_instructions'} = $unknown_instructions unless !defined ($unknown_instructions); + $parameters{'max_retries'} = $retries unless !defined ($retries); + $parameters{'plugin_pass'} = $requests unless !defined ($requests); + $parameters{'plugin_user'} = $agent_browser_id unless !defined ($agent_browser_id); + $parameters{'http_user'} = $http_auth_login unless !defined ($http_auth_login); + $parameters{'http_pass'} = $http_auth_password unless !defined ($http_auth_password); + $parameters{'snmp_oid'} = defined ($proxy_url) ? $proxy_url : ''; + $parameters{'tcp_send'} = $proxy_auth_login unless !defined ($proxy_auth_login); + $parameters{'tcp_rcv'} = $proxy_auth_password unless !defined ($proxy_auth_password); + $parameters{'ip_target'} = $auth_server unless !defined ($auth_server); + $parameters{'snmp_community'} = $auth_realm unless !defined ($auth_realm); + if ($in_policy == 0) { pandora_create_module_from_hash ($conf, \%parameters, $dbh); } @@ -5686,7 +5701,7 @@ sub pandora_manage_main ($$$) { cli_create_data_module(0); } elsif ($param eq '--create_web_module') { - param_check($ltotal, 30, 24); + param_check($ltotal, 40, 33); cli_create_web_module(0); } elsif ($param eq '--create_module_group') { @@ -5842,7 +5857,7 @@ sub pandora_manage_main ($$$) { cli_create_data_module(1); } elsif ($param eq '--create_policy_web_module') { - param_check($ltotal, 28, 20); + param_check($ltotal, 38, 29); cli_create_web_module(1); } elsif ($param eq '--create_policy_network_module') { @@ -5991,10 +6006,6 @@ sub pandora_manage_main ($$$) { param_check($ltotal, 2); cli_create_data_module_from_local_component(); } - elsif ($param eq '--create_web_module_from_local_component') { - param_check($ltotal, 2); - cli_create_web_module_from_local_component(); - } elsif ($param eq '--create_local_component') { param_check($ltotal, 35, 33); cli_create_local_component(); @@ -6245,30 +6256,6 @@ sub cli_create_data_module_from_local_component() { #~ pandora_create_module_from_local_component ($conf, $component, $agent_id, $dbh); enterprise_hook('pandora_create_module_from_local_component',[$conf, $component, $agent_id, $dbh]); } -############################################################################## -# Create web module from local component. -# Related option: --create_web_module_from_local_component -############################################################################## - -sub cli_create_web_module_from_local_component() { - my ($agent_name, $component_name) = @ARGV[2..3]; - - my $agent_id = get_agent_id($dbh,$agent_name); - exist_check($agent_id,'agent',$agent_name); - - my $lc_id = pandora_get_local_component_id($dbh, $component_name); - exist_check($lc_id,'local component',$component_name); - - my $module_exists = get_agent_module_id($dbh, $component_name, $agent_id); - non_exist_check($module_exists, 'module name', $component_name); - - # Get local component data - my $component = get_db_single_row ($dbh, 'SELECT * FROM tlocal_component WHERE id = ?', $lc_id); - - #~ pandora_create_module_from_local_component ($conf, $component, $agent_id, $dbh); - enterprise_hook('pandora_create_module_from_local_component',[$conf, $component, $agent_id, $dbh]); -} - ############################################################################## # Create policy data module from local component. # Related option: --create_policy_data_module_from_local_component From 18ea8e42a5768cad03dc5c99d94cec37d2c19820 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Wed, 4 Apr 2018 13:39:48 +0200 Subject: [PATCH 61/69] Pandora JMX plugin added to version control OUM --- extras/pandora_update_version.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/extras/pandora_update_version.sh b/extras/pandora_update_version.sh index 17870d36e0..c63b988988 100755 --- a/extras/pandora_update_version.sh +++ b/extras/pandora_update_version.sh @@ -65,6 +65,7 @@ $PANDHOME_ENT/pandora_plugins/MTL/pandora_mtl.pl \ $PANDHOME_ENT/pandora_plugins/Informix/informix.pl \ $PANDHOME_ENT/pandora_plugins/Ruckus/ruckus.pl \ $PANDHOME_ENT/pandora_plugins/UX/pandora_ux.pl \ +$PANDHOME_ENT/pandora_plugins/JMX/pandora_plugin_jmx.pl \ $PANDHOME_ENT/pandora_server/util/plugin/vmware-plugin.pl " PLUGIN_LIB_FILE="$CODEHOME/pandora_server/lib/PandoraFMS/PluginTools.pm" From 4b36d86e48033aafce8d368683ed8ed47671637e Mon Sep 17 00:00:00 2001 From: artica Date: Thu, 5 Apr 2018 00:01:24 +0200 Subject: [PATCH 62/69] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 0bfc4ab0bb..0c740c3618 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.720-180404 +Version: 7.0NG.720-180405 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 57b5d5428a..95eb32a41b 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.720-180404" +pandora_version="7.0NG.720-180405" 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 63a0d924cf..f3144f179d 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.720'; -use constant AGENT_BUILD => '180404'; +use constant AGENT_BUILD => '180405'; # 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 d0c50b9018..1924956814 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.720 -%define release 180404 +%define release 180405 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 b1e6d2502a..00807132c9 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.720 -%define release 180404 +%define release 180405 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 09806d7532..a9f40526c7 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.720" -PI_BUILD="180404" +PI_BUILD="180405" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 9f28cbcbd1..e7b4b1489b 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{180404} +{180405} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 92c2353070..2cc6610048 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.720(Build 180404)") +#define PANDORA_VERSION ("7.0NG.720(Build 180405)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 8ba4b89c41..9a5db69b02 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.720(Build 180404))" + VALUE "ProductVersion", "(7.0NG.720(Build 180405))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index a79489ad66..ec13a4395b 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.720-180404 +Version: 7.0NG.720-180405 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 edb0fa0826..bb21a72d34 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.720-180404" +pandora_version="7.0NG.720-180405" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 613a7f2aa0..1b6efd95c4 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC180404'; +$build_version = 'PC180405'; $pandora_version = 'v7.0NG.720'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 8cd62669d7..ce772bbd63 100755 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
    [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index dc7a9a3a20..6469904901 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.720 -%define release 180404 +%define release 180405 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index d44c53ef9e..e3a646edfc 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.720 -%define release 180404 +%define release 180405 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 32e76ce165..904d1af637 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.720" -PI_BUILD="180404" +PI_BUILD="180405" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 7f59d2b02b..e799a42d69 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -33,7 +33,7 @@ use PandoraFMS::Tools; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.720 PS180404"; +my $version = "7.0NG.720 PS180405"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 1ee1212e75..0888e36c28 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.720 PS180403"; +my $version = "7.0NG.720 PS180405"; # save program name for logging my $progname = basename($0); From fa82f45d7d22ec6eeb669f4d45e4b269d3e6b1ab Mon Sep 17 00:00:00 2001 From: enriquecd Date: Thu, 5 Apr 2018 16:11:24 +0200 Subject: [PATCH 63/69] Fix not init counters final - #1454 --- pandora_console/include/class/Tree.class.php | 27 ++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/pandora_console/include/class/Tree.class.php b/pandora_console/include/class/Tree.class.php index dd58c87270..c3f5613652 100644 --- a/pandora_console/include/class/Tree.class.php +++ b/pandora_console/include/class/Tree.class.php @@ -1174,6 +1174,23 @@ class Tree { $data = db_process_sql($sql); if (empty($data)) return array(); + + foreach ($data[0] as $key => $value) { + + if($key != 'total_count' && strpos($key, 'count')){ + $zero_counter += $value; + } + + } + + if(!$zero_counter){ + $data[0]['total_count'] = 0; + } + else{ + $data[0]['total_count'] = $zero_counter; + } + + // [26/10/2017] It seems the module hierarchy should be only available into the tree by group if ($this->rootType == 'group' && $this->type == 'agent') { @@ -2312,6 +2329,16 @@ class Tree { } + if(!$this->filter['show_not_init_agents']){ + + foreach ($items as $key => $value) { + if($items[$key]['total_count'] == $items[$key]['notinit_count']){ + unset($items[$key]); + } + } + + } + $this->processAgents($items); $processed_items = $items; } From c8c522b3570bcb16ceaac276bba3c780d90d1471 Mon Sep 17 00:00:00 2001 From: enriquecd Date: Thu, 5 Apr 2018 16:13:30 +0200 Subject: [PATCH 64/69] Fix not init counters in trre - #1454 --- pandora_console/include/class/Tree.class.php | 103 +++++++++++++++++-- 1 file changed, 93 insertions(+), 10 deletions(-) diff --git a/pandora_console/include/class/Tree.class.php b/pandora_console/include/class/Tree.class.php index 7fb34b4a22..c3f5613652 100644 --- a/pandora_console/include/class/Tree.class.php +++ b/pandora_console/include/class/Tree.class.php @@ -114,9 +114,17 @@ class Tree { $agents_normal_count = "($agent_table $agent_normal_filter) AS total_normal_count"; // Not init - $agent_not_init_filter = $this->getAgentStatusFilter(AGENT_STATUS_NOT_INIT); - $agents_not_init_count = "($agent_table - $agent_not_init_filter) AS total_not_init_count"; + + if($this->filter['show_not_init_agents']){ + $agent_not_init_filter = $this->getAgentStatusFilter(AGENT_STATUS_NOT_INIT); + $agents_not_init_count = "($agent_table + $agent_not_init_filter) AS total_not_init_count"; + } + else{ + $agent_not_init_filter = 0; + $agents_not_init_count = 0; + } + // Alerts fired $agents_fired_count = "($agent_table AND ta.fired_count > 0) AS total_fired_count"; @@ -287,13 +295,19 @@ class Tree { // Modules join $modules_join = ""; $module_status_join = ""; - if (!empty($module_search_filter) || !empty($module_status_filter)) { + if (!empty($module_search_filter) || !empty($module_status_filter) || !$this->filter['show_not_init_agents']) { - if (!empty($module_status_filter)) { + if (!empty($module_status_filter) || !$this->filter['show_not_init_agents']) { $module_status_join = "INNER JOIN tagente_estado tae ON tam.id_agente_modulo IS NOT NULL AND tam.id_agente_modulo = tae.id_agente_modulo $module_status_filter"; + + if(!$this->filter['show_not_init_modules'] || ($this->filter['show_not_init_modules'] && !$this->filter['show_not_init_agents'])){ + if($type != 'agent' || ($type == 'agent' && !$this->filter['show_not_init_modules'] && !$this->filter['show_not_init_agents'])){ + $module_status_join .= ' AND tae.estado <> '.AGENT_MODULE_STATUS_NO_DATA.' AND tae.estado <> '.AGENT_MODULE_STATUS_NOT_INIT.' '; + } + } } $modules_join = "INNER JOIN tagente_modulo tam @@ -304,8 +318,22 @@ class Tree { } if (empty($module_status_join)) { - $module_status_join = "LEFT JOIN tagente_estado tae - ON tam.id_agente_modulo = tae.id_agente_modulo"; + if(!$this->filter['show_not_init_modules'] || !$this->filter['show_not_init_agents']){ + if($type == "agent"){ + $module_status_join = 'INNER JOIN tagente_estado tae + ON tam.id_agente_modulo = tae.id_agente_modulo '; + } + else{ + $module_status_join = 'LEFT JOIN tagente_estado tae + ON tam.id_agente_modulo = tae.id_agente_modulo '; + } + + $module_status_join .= ' AND 1=1 AND tae.estado <> '.AGENT_MODULE_STATUS_NO_DATA.' AND tae.estado <> '.AGENT_MODULE_STATUS_NOT_INIT.' '; + } + else{ + $module_status_join = 'LEFT JOIN tagente_estado tae + ON tam.id_agente_modulo = tae.id_agente_modulo '; + } } $sql = false; @@ -407,7 +435,7 @@ class Tree { else { $agent_table = "SELECT COUNT(DISTINCT(ta.id_agente)) FROM tagente ta - INNER JOIN tagente_modulo tam + LEFT JOIN tagente_modulo tam ON tam.disabled = 0 AND ta.id_agente = tam.id_agente $module_search_filter @@ -1146,6 +1174,23 @@ class Tree { $data = db_process_sql($sql); if (empty($data)) return array(); + + foreach ($data[0] as $key => $value) { + + if($key != 'total_count' && strpos($key, 'count')){ + $zero_counter += $value; + } + + } + + if(!$zero_counter){ + $data[0]['total_count'] = 0; + } + else{ + $data[0]['total_count'] = $zero_counter; + } + + // [26/10/2017] It seems the module hierarchy should be only available into the tree by group if ($this->rootType == 'group' && $this->type == 'agent') { @@ -1161,7 +1206,6 @@ class Tree { if (!empty($counters)) { $counters = array_pop($counters); } - return $counters; } @@ -2046,6 +2090,18 @@ class Tree { $items = $this->getItems(); $this->processModules($items); $processed_items = $items; + + if(!$this->filter['show_not_init_modules']){ + + foreach ($items as $key => $value) { + if($items[$key]['total_count'] != $items[$key]['notinit_count']){ + $items[$key]['total_count'] = $items[$key]['total_count'] - $items[$key]['notinit_count']; + $items[$key]['notinit_count'] = 0; + } + + } + + } } else { $items = array(); @@ -2261,6 +2317,28 @@ class Tree { // Agents else { $items = $this->getItems(); + + + if(!$this->filter['show_not_init_modules']){ + + foreach ($items as $key => $value) { + $items[$key]['total_count'] = $items[$key]['total_count'] - $items[$key]['notinit_count']; + $items[$key]['notinit_count'] = 0; + + } + + } + + if(!$this->filter['show_not_init_agents']){ + + foreach ($items as $key => $value) { + if($items[$key]['total_count'] == $items[$key]['notinit_count']){ + unset($items[$key]); + } + } + + } + $this->processAgents($items); $processed_items = $items; } @@ -2733,7 +2811,12 @@ class Tree { $group_stats[$group['id_group']]['total_critical_count'] = $group['critical']; $group_stats[$group['id_group']]['total_unknown_count'] = $group['unknown']; $group_stats[$group['id_group']]['total_warning_count'] = $group['warning']; - $group_stats[$group['id_group']]['total_not_init_count'] = $group['non-init']; + if($this->filter['show_not_init_modules']){ + $group_stats[$group['id_group']]['total_not_init_count'] = $group['non-init']; + } + else{ + $group_stats[$group['id_group']]['total_not_init_count'] = 0; + } $group_stats[$group['id_group']]['total_normal_count'] = $group['normal']; $group_stats[$group['id_group']]['total_fired_count'] = $group['alerts_fired']; } From e4f24b2452433320571476477f9a3b94f68182e3 Mon Sep 17 00:00:00 2001 From: danielmaya Date: Thu, 5 Apr 2018 16:57:26 +0200 Subject: [PATCH 65/69] Fixed json in audit log --- .../godmode/alerts/alert_actions.php | 9 +- .../godmode/alerts/alert_commands.php | 2 +- .../godmode/alerts/alert_special_days.php | 6 +- .../alerts/configure_alert_command.php | 2 +- .../alerts/configure_alert_template.php | 2 - .../massive/massive_add_action_alerts.php | 11 +- .../godmode/massive/massive_copy_modules.php | 11 +- .../massive/massive_delete_action_alerts.php | 13 +- .../godmode/massive/massive_delete_agents.php | 7 +- .../godmode/massive/massive_delete_alerts.php | 9 +- .../massive/massive_delete_modules.php | 7 +- .../massive/massive_delete_profiles.php | 7 +- .../godmode/massive/massive_edit_agents.php | 8 +- .../godmode/massive/massive_edit_modules.php | 2 +- .../massive/massive_enable_disable_alerts.php | 4 +- .../massive/massive_standby_alerts.php | 4 +- .../godmode/users/profile_list.php | 117 +++++++----------- 17 files changed, 99 insertions(+), 122 deletions(-) diff --git a/pandora_console/godmode/alerts/alert_actions.php b/pandora_console/godmode/alerts/alert_actions.php index e2a061b550..b60388e6fa 100644 --- a/pandora_console/godmode/alerts/alert_actions.php +++ b/pandora_console/godmode/alerts/alert_actions.php @@ -168,9 +168,8 @@ if ($create_action) { $result = alerts_create_alert_action ($name, $id_alert_command, $values); - $info = 'Name: ' . $name . ' ID alert Command: ' . $id_alert_command . - $info_fields . ' Group: ' . $values['id_group'] . - ' Action threshold: ' . $values['action_threshold']; + $info = '{"Name":"'.$name.'", "ID alert Command":"'.$id_alert_command.'", "Field information":"'.$info_fields.'", "Group":"'.$values['id_group'].'", + "Action threshold":"'.$values['action_threshold'].'"}'; } if ($result) { @@ -245,10 +244,6 @@ if ($update_action) { } else { $result = alerts_update_alert_action ($id, $values); - - $info = 'Name: ' . $name . ' ID alert Command: ' . $id_alert_command . - $info_fields . ' Group: ' . $group . - ' Action threshold: ' . $action_threshold; } if ($result) { diff --git a/pandora_console/godmode/alerts/alert_commands.php b/pandora_console/godmode/alerts/alert_commands.php index 10edc6bead..09e868f951 100644 --- a/pandora_console/godmode/alerts/alert_commands.php +++ b/pandora_console/godmode/alerts/alert_commands.php @@ -294,7 +294,7 @@ if ($create_command) { $result = alerts_create_alert_command ($name, $command, $values); - $info = 'Name: ' . $name . ' Command: ' . $command . ' Description: ' . $description. ' ' .$info_fields; + $info = '{"Name":"'.$name.'","Command":"'.$command.'","Description":"'.$description. ' '.$info_fields.'"}'; } else { $result = ''; diff --git a/pandora_console/godmode/alerts/alert_special_days.php b/pandora_console/godmode/alerts/alert_special_days.php index 8a872267e6..c221f963af 100644 --- a/pandora_console/godmode/alerts/alert_special_days.php +++ b/pandora_console/godmode/alerts/alert_special_days.php @@ -133,7 +133,7 @@ if ($create_special_day) { } else { $result = alerts_create_alert_special_day ($date, $same_day, $values); - $info = 'Date: ' . $date . ' Same day of the week: ' . $same_day . ' Description: ' . $values['description']; + $info = '{"Date":"'.$date.'","Same day of the week":"'.$same_day.'","Description":"'.$values['description'].'"}'; } } @@ -186,12 +186,12 @@ if ($update_special_day) { } else { $result = alerts_update_alert_special_day ($id, $values); - $info = 'Date: ' . $date . ' Same day of the week: ' . $same_day . ' Description: ' . $description; + $info = '{"Date":"'.$date.'","Same day of the week":"'.$same_day.'","Description":"'.$description.'"}'; } } else { $result = alerts_update_alert_special_day ($id, $values); - $info = 'Date: ' . $date . ' Same day of the week: ' . $same_day . ' Description: ' . $description; + $info = '{"Date":"'.$date.'","Same day of the week":"'.$same_day.'","Description":"'.$description.'"}'; } } diff --git a/pandora_console/godmode/alerts/configure_alert_command.php b/pandora_console/godmode/alerts/configure_alert_command.php index ca173e4569..983b8d90ff 100644 --- a/pandora_console/godmode/alerts/configure_alert_command.php +++ b/pandora_console/godmode/alerts/configure_alert_command.php @@ -79,7 +79,7 @@ if ($update_command) { } else { $result = alerts_update_alert_command ($id, $values); - $info = 'Name: ' . $name . ' Command: ' . $command . ' Description: ' . $description. ' ' .$info_fields; + $info = '{"Name":"'.$name.'","Command":"'.$command.'","Description":"'.$description. ' '.$info_fields.'"}'; } if ($result) { diff --git a/pandora_console/godmode/alerts/configure_alert_template.php b/pandora_console/godmode/alerts/configure_alert_template.php index d2cc13a702..cdd9186946 100644 --- a/pandora_console/godmode/alerts/configure_alert_template.php +++ b/pandora_console/godmode/alerts/configure_alert_template.php @@ -418,13 +418,11 @@ if ($create_template) { $result = ''; } if ($result) { - //db_pandora_audit("Command management", "Create alert command " . $result, false, false, json_encode($values)); db_pandora_audit("Template alert management", "Create alert template #" . $result, false, false, json_encode($values)); } else { - //db_pandora_audit("Command management", "Fail try to create alert command", false, false, json_encode($values)); db_pandora_audit("Template alert management", "Fail try to create alert template", false, false, json_encode($values)); diff --git a/pandora_console/godmode/massive/massive_add_action_alerts.php b/pandora_console/godmode/massive/massive_add_action_alerts.php index ca4c33e262..faec370e12 100755 --- a/pandora_console/godmode/massive/massive_add_action_alerts.php +++ b/pandora_console/godmode/massive/massive_add_action_alerts.php @@ -104,11 +104,12 @@ if ($add) { $results = false; } } - - db_pandora_audit("Massive management", "Add alert action " . json_encode($id_agents), false, false, 'Agents: ' . - json_encode($id_agents) . ' Alerts : ' . json_encode($agent_alerts) . - ' Fires Min: ' . $fires_min . ' Fires Max: ' . $fires_max . ' Actions: ' . implode(',',$actions)); - + $info = array('Agents' => implode(',',$id_agents), + 'Alerts' => addslashes(io_json_mb_encode($agent_alerts)), + 'Fires Min' => $fires_min, + 'Fires_max' => $fires_max, + 'Actions' => implode(',',$actions)); + db_pandora_audit("Massive management", "Add alert action " . json_encode($id_agents), false, false, json_encode($info)); ui_print_result_message ($results, __('Successfully added'), __('Could not be added')); } } diff --git a/pandora_console/godmode/massive/massive_copy_modules.php b/pandora_console/godmode/massive/massive_copy_modules.php index 3d51a85a51..aae7d4e2df 100755 --- a/pandora_console/godmode/massive/massive_copy_modules.php +++ b/pandora_console/godmode/massive/massive_copy_modules.php @@ -43,15 +43,18 @@ $do_operation = (bool) get_parameter ('do_operation'); if ($do_operation) { $result = agents_process_manage_config($source_id_agent, $destiny_id_agents); + + $info = array('Source agent' => $source_id_agent, + 'Destinity agent' => implode(",",$destiny_id_agents)); if ($result) { + + db_pandora_audit("Massive management", "Copy modules", false, - false, - 'Source agent: ' . json_encode($source_id_agent) . ' Destinity agent: ' . json_encode($destiny_id_agents)); + false, json_encode($info)); } else { db_pandora_audit("Massive management", - "Fail to try copy modules", false, false, - 'Source agent: ' . json_encode($source_id_agent) . ' Destinity agent: ' . json_encode($destiny_id_agents)); + "Fail to try copy modules", false, false,json_encode($info)); } } diff --git a/pandora_console/godmode/massive/massive_delete_action_alerts.php b/pandora_console/godmode/massive/massive_delete_action_alerts.php index a36363d19f..cc80206a20 100644 --- a/pandora_console/godmode/massive/massive_delete_action_alerts.php +++ b/pandora_console/godmode/massive/massive_delete_action_alerts.php @@ -98,16 +98,15 @@ if ($delete) { } } } - + $info = array('Agents' => implode(',',$id_agents), + 'Alert templates' => implode(",",$id_alert_templates), + 'Actions' => implode(',',$actions)); + if ($results) { - db_pandora_audit("Massive management", "Delete alert action", false, false, - 'Agent: ' . json_encode($id_agents) . ' Alert templates: ' . json_encode($id_alert_templates) . - ' Actions: ' . implode(',',$actions)); + db_pandora_audit("Massive management", "Delete alert action", false, false,json_encode($info)); } else { - db_pandora_audit("Massive management", "Fail try to delete alert action", false, false, - 'Agent: ' . json_encode($id_agents) . ' Alert templates: ' . json_encode($id_alert_templates) . - ' Actions: ' . implode(',',$actions)); + db_pandora_audit("Massive management", "Fail try to delete alert action", false, false, json_encode($info)); } ui_print_result_message ($results, diff --git a/pandora_console/godmode/massive/massive_delete_agents.php b/pandora_console/godmode/massive/massive_delete_agents.php index 295411c92a..a9e8dcc08c 100755 --- a/pandora_console/godmode/massive/massive_delete_agents.php +++ b/pandora_console/godmode/massive/massive_delete_agents.php @@ -76,13 +76,12 @@ $delete = (bool) get_parameter_post ('delete'); if ($delete) { $result = process_manage_delete ($id_agents); + $info = '{"Agent":"'.implode(",",$id_agents).'"}'; if ($result) { - db_pandora_audit("Massive management", "Delete agent ", false, false, - 'Agent: ' . json_encode($id_agents)); + db_pandora_audit("Massive management", "Delete agent ", false, false,$info); } else { - db_pandora_audit("Massive management", "Fail try to delete agent", false, false, - 'Agent: ' . json_encode($id_agents)); + db_pandora_audit("Massive management", "Fail try to delete agent", false, false,$info); } } diff --git a/pandora_console/godmode/massive/massive_delete_alerts.php b/pandora_console/godmode/massive/massive_delete_alerts.php index fd7d04f860..eb0fd60dc3 100755 --- a/pandora_console/godmode/massive/massive_delete_alerts.php +++ b/pandora_console/godmode/massive/massive_delete_alerts.php @@ -170,13 +170,14 @@ $delete = (bool) get_parameter_post ('delete'); if ($delete) { $result = process_manage_delete ($id_alert_template, $id_agents, $module_names); + $info = array('Agent' => implode(",",$id_agents), + 'Template' => $id_alert_template, 'Module' => implode(",",$module_names)); + if ($result) { - db_pandora_audit("Massive management", "Delete alert ", false, false, - 'Agent: ' . json_encode($id_agents) . ' Template: ' . $id_alert_template . ' Module: ' . $module_names); + db_pandora_audit("Massive management", "Delete alert ", false, false,json_encode($info)); } else { - db_pandora_audit("Massive management", "Fail try to delete alert", false, false, - 'Agent: ' . json_encode($id_agents) . ' Template: ' . $id_alert_template . ' Module: ' . $module_names); + db_pandora_audit("Massive management", "Fail try to delete alert", false, false,json_encode($info)); } } diff --git a/pandora_console/godmode/massive/massive_delete_modules.php b/pandora_console/godmode/massive/massive_delete_modules.php index 580c86c26c..d1dd485db2 100755 --- a/pandora_console/godmode/massive/massive_delete_modules.php +++ b/pandora_console/godmode/massive/massive_delete_modules.php @@ -349,13 +349,12 @@ if ($delete) { $result = process_manage_delete ($modules_, $agents_, $modules_selection_mode); } + $info = array('Agent' => implode(",",$agents_), 'Module' => implode(",",$modules_)); if ($result) { - db_pandora_audit("Massive management", "Delete module ", false, false, - 'Agent: ' . json_encode($agents_) . ' Module: ' . $module_name); + db_pandora_audit("Massive management", "Delete module ", false, false, json_encode($info)); } else { - db_pandora_audit("Massive management", "Fail try to delete module", false, false, - 'Agent: ' . json_encode($agents_) . ' Module: ' . $module_name); + db_pandora_audit("Massive management", "Fail try to delete module", false, false, json_encode($info)); } } diff --git a/pandora_console/godmode/massive/massive_delete_profiles.php b/pandora_console/godmode/massive/massive_delete_profiles.php index daf9e91246..3d958d7a94 100644 --- a/pandora_console/godmode/massive/massive_delete_profiles.php +++ b/pandora_console/godmode/massive/massive_delete_profiles.php @@ -74,13 +74,12 @@ if ($delete_profiles) { } } + $info = array('Profiles' => implode(",",$profiles_id), 'Groups' => implode(",",$groups_id), 'Users' => implode(",",$users_id)); if ($result) { - db_pandora_audit("Massive management", "Delete profile ", false, false, - 'Profiles: ' . json_encode($profiles_id) . ' Groups: ' . $groups_id . ' Users: ' . $users_id); + db_pandora_audit("Massive management", "Delete profile ", false, false, json_encode($info)); } else { - db_pandora_audit("Massive management", "Fail try to delete profile", false, false, - 'Profiles: ' . json_encode($profiles_id) . ' Groups: ' . $groups_id . ' Users: ' . $users_id); + db_pandora_audit("Massive management", "Fail try to delete profile", false, false, json_encode($info)); } ui_print_result_message ($result, diff --git a/pandora_console/godmode/massive/massive_edit_agents.php b/pandora_console/godmode/massive/massive_edit_agents.php index 99837ca824..3918ada3be 100755 --- a/pandora_console/godmode/massive/massive_edit_agents.php +++ b/pandora_console/godmode/massive/massive_edit_agents.php @@ -197,14 +197,18 @@ if ($update_agents) { } } + $info = array(); // Update Custom Fields foreach ($fields as $field) { + $info[$field['id_field']] = $field['name']; if (get_parameter_post ('customvalue_' . $field['id_field'], '') != '') { $key = $field['id_field']; $value = get_parameter_post ('customvalue_' . $field['id_field'], ''); $old_value = db_get_all_rows_filter('tagent_custom_data', array('id_agent' => $id_agent, 'id_field' => $key)); + + if ($old_value === false) { // Create custom field if not exist $result = db_process_sql_insert ('tagent_custom_data', @@ -225,11 +229,11 @@ if ($update_agents) { if ($result !== false) { - db_pandora_audit("Massive management", "Update agent " . $id_agent, false, false, json_encode($fields)); + db_pandora_audit("Massive management", "Update agent " . $id_agent, false, false, json_encode($info)); } else { if (isset ($id_agent)) { - db_pandora_audit("Massive management", "Try to update agent " . $id_agent, false, false, json_encode($fields)); + db_pandora_audit("Massive management", "Try to update agent " . $id_agent, false, false, json_encode($info)); } } diff --git a/pandora_console/godmode/massive/massive_edit_modules.php b/pandora_console/godmode/massive/massive_edit_modules.php index b0889bd5ea..a7c8626fce 100755 --- a/pandora_console/godmode/massive/massive_edit_modules.php +++ b/pandora_console/godmode/massive/massive_edit_modules.php @@ -162,7 +162,7 @@ if ($update) { __('Successfully updated') . "(" . $success . "/" . $count . ")", $error_msg); - $info = 'Modules: ' . json_encode($modules_) . ' Agents: ' . json_encode($agents_); + $info = '{"Modules":"'.implode(",",$modules_).'","Agents":"'.implode(",",$agents_).'"}'; if ($success > 0) { db_pandora_audit("Massive management", "Edit module", false, false, $info); } diff --git a/pandora_console/godmode/massive/massive_enable_disable_alerts.php b/pandora_console/godmode/massive/massive_enable_disable_alerts.php index 7d799c1f70..aa82305865 100644 --- a/pandora_console/godmode/massive/massive_enable_disable_alerts.php +++ b/pandora_console/godmode/massive/massive_enable_disable_alerts.php @@ -77,7 +77,7 @@ switch ($action) { ui_print_result_message ($result, __('Successfully enabled'), __('Could not be enabled')); - $info = 'Alert: ' . json_encode($id_disabled_alerts); + $info = '{"Alert":"'.implode(",",$id_disabled_alerts).'"}'; if ($result) { db_pandora_audit("Massive management", "Enable alert", false, false, $info); } @@ -95,7 +95,7 @@ switch ($action) { ui_print_result_message ($result, __('Successfully disabled'), __('Could not be disabled')); - $info = 'Alert: ' . json_encode($id_enabled_alerts); + $info = '{"Alert":"'.implode(",",$id_enabled_alerts).'"}'; if ($result) { db_pandora_audit("Massive management", "Disable alert", false, false, $info); } diff --git a/pandora_console/godmode/massive/massive_standby_alerts.php b/pandora_console/godmode/massive/massive_standby_alerts.php index 6af3940680..496e72707c 100644 --- a/pandora_console/godmode/massive/massive_standby_alerts.php +++ b/pandora_console/godmode/massive/massive_standby_alerts.php @@ -77,7 +77,7 @@ switch($action) { ui_print_result_message ($result, __('Successfully set off standby'), __('Could not be set off standby')); - $info = 'Alert: ' . json_encode($id_standby_alerts); + $info = '{"Alert":"'.implode(",",$id_standby_alerts).'"}'; if ($result) { db_pandora_audit("Massive management", "Set off standby alerts", false, false, $info); } @@ -95,7 +95,7 @@ switch($action) { ui_print_result_message ($result, __('Successfully set standby'), __('Could not be set standby')); - $info = 'Alert: ' . json_encode($id_not_standby_alerts); + $info = '{"Alert":"'.implode(",",$id_not_standby_alerts).'"}'; if ($result) { db_pandora_audit("Massive management", "Set on standby alerts", false, false, $info); } diff --git a/pandora_console/godmode/users/profile_list.php b/pandora_console/godmode/users/profile_list.php index cde2fe80d9..f593be58d0 100644 --- a/pandora_console/godmode/users/profile_list.php +++ b/pandora_console/godmode/users/profile_list.php @@ -182,40 +182,30 @@ if ($update_profile) { if ($name) { $ret = db_process_sql_update('tperfil', $values, array('id_perfil' => $id_profile)); if ($ret !== false) { - $info = 'Name: ' . $name . - - ' Incident view: ' . $incident_view . - ' Incident edit: ' . $incident_edit . - ' Incident management: ' . $incident_management . - - ' Agent view: ' . $agent_view . - ' Agent edit: ' . $agent_edit . - ' Agent disable: ' . $agent_disable . - - ' Alert edit: ' . $alert_edit . - ' Alert management: ' . $alert_management . - - ' User management: ' . $user_management . - - ' DB management: ' . $db_management . - - ' Event view: ' . $event_view . - ' Event edit: ' . $event_edit . - ' Event management: ' . $event_management . - - ' Report view: ' . $report_view . - ' Report edit: ' . $report_edit . - ' Report management: ' . $report_management . - - ' Network map view: ' . $map_view . - ' Network map edit: ' . $map_edit . - ' Network map management: ' . $map_management . - - ' Visual console view: ' . $vconsole_view . - ' Visual console edit: ' . $vconsole_edit . - ' Visual console management: ' . $vconsole_management . - - ' Pandora Management: ' . $pandora_management; + $info = '{"Name":"'.$incident_view.'", + "Incident view":"'.$incident_view.'", + "Incident edit":"'.$incident_edit.'", + "Incident management":"'.$incident_management.'", + "Agent view":"'.$agent_view.'", + "Agent edit":"'.$agent_edit.'", + "Agent disable":"'.$agent_disable.'", + "Alert edit":"'.$alert_edit.'", + "Alert management":"'.$alert_management.'", + "User management":"'.$user_management.'", + "DB management":"'.$db_management.'", + "Event view":"'.$event_view.'", + "Event edit":"'.$event_edit.'", + "Event management":"'.$event_management.'", + "Report view":"'.$report_view.'", + "Report edit":"'.$report_edit.'", + "Report management":"'.$report_management.'", + "Network map view":"'.$map_view.'", + "Network map edit":"'.$map_edit.'", + "Network map management":"'.$map_management.'", + "Visual console view":"'.$vconsole_view.'", + "Visual console edit":"'.$vconsole_edit.'", + "Visual console management":"'.$vconsole_management.'", + "Pandora Management":"'.$pandora_management.'"}'; db_pandora_audit("User management", "Update profile ". $name, false, false, $info); @@ -239,41 +229,30 @@ if ($create_profile) { if ($ret !== false) { ui_print_success_message(__('Successfully created')); - - $info = 'Name: ' . $name . - - ' Incident view: ' . $incident_view . - ' Incident edit: ' . $incident_edit . - ' Incident management: ' . $incident_management . - - ' Agent view: ' . $agent_view . - ' Agent edit: ' . $agent_edit . - ' Agent disable: ' . $agent_disable . - - ' Alert edit: ' . $alert_edit . - ' Alert management: ' . $alert_management . - - ' User management: ' . $user_management . - - ' DB management: ' . $db_management . - - ' Event view: ' . $event_view . - ' Event edit: ' . $event_edit . - ' Event management: ' . $event_management . - - ' Report view: ' . $report_view . - ' Report edit: ' . $report_edit . - ' Report management: ' . $report_management . - - ' Network map view: ' . $map_view . - ' Network map edit: ' . $map_edit . - ' Network map management: ' . $map_management . - - ' Visual console view: ' . $vconsole_view . - ' Visual console edit: ' . $vconsole_edit . - ' Visual console management: ' . $vconsole_management . - - ' Pandora Management: ' . $pandora_management; + $info = '{"Name":"'.$incident_view.'", + "Incident view":"'.$incident_view.'", + "Incident edit":"'.$incident_edit.'", + "Incident management":"'.$incident_management.'", + "Agent view":"'.$agent_view.'", + "Agent edit":"'.$agent_edit.'", + "Agent disable":"'.$agent_disable.'", + "Alert edit":"'.$alert_edit.'", + "Alert management":"'.$alert_management.'", + "User management":"'.$user_management.'", + "DB management":"'.$db_management.'", + "Event view":"'.$event_view.'", + "Event edit":"'.$event_edit.'", + "Event management":"'.$event_management.'", + "Report view":"'.$report_view.'", + "Report edit":"'.$report_edit.'", + "Report management":"'.$report_management.'", + "Network map view":"'.$map_view.'", + "Network map edit":"'.$map_edit.'", + "Network map management":"'.$map_management.'", + "Visual console view":"'.$vconsole_view.'", + "Visual console edit":"'.$vconsole_edit.'", + "Visual console management":"'.$vconsole_management.'", + "Pandora Management":"'.$pandora_management.'"}'; db_pandora_audit("User management", "Created profile ". $name, false, false, $info); From f517edca1c4ea9de849615a226b4452f4983bf83 Mon Sep 17 00:00:00 2001 From: artica Date: Fri, 6 Apr 2018 00:01:25 +0200 Subject: [PATCH 66/69] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 0c740c3618..64e203ae9d 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.720-180405 +Version: 7.0NG.720-180406 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 95eb32a41b..fea25d2026 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.720-180405" +pandora_version="7.0NG.720-180406" 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 f3144f179d..4fcc6f756d 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.720'; -use constant AGENT_BUILD => '180405'; +use constant AGENT_BUILD => '180406'; # 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 1924956814..c3671e9c0b 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.720 -%define release 180405 +%define release 180406 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 00807132c9..55c45d0a0c 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.720 -%define release 180405 +%define release 180406 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 a9f40526c7..fed4c9444d 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.720" -PI_BUILD="180405" +PI_BUILD="180406" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index e7b4b1489b..606b73d6a1 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{180405} +{180406} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 2cc6610048..49ab90380c 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.720(Build 180405)") +#define PANDORA_VERSION ("7.0NG.720(Build 180406)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 9a5db69b02..b2d01d7833 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.720(Build 180405))" + VALUE "ProductVersion", "(7.0NG.720(Build 180406))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index ec13a4395b..cfaa1aa998 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.720-180405 +Version: 7.0NG.720-180406 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 bb21a72d34..394dcc1a6d 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.720-180405" +pandora_version="7.0NG.720-180406" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 1b6efd95c4..390142ae25 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC180405'; +$build_version = 'PC180406'; $pandora_version = 'v7.0NG.720'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index ce772bbd63..ea12e6ed20 100755 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
    [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 6469904901..65221abd1f 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.720 -%define release 180405 +%define release 180406 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index e3a646edfc..034742816d 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.720 -%define release 180405 +%define release 180406 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 904d1af637..c9f0bfcc86 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.720" -PI_BUILD="180405" +PI_BUILD="180406" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index e799a42d69..e699a4e05e 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -33,7 +33,7 @@ use PandoraFMS::Tools; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.720 PS180405"; +my $version = "7.0NG.720 PS180406"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 0888e36c28..59d1ca5845 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.720 PS180405"; +my $version = "7.0NG.720 PS180406"; # save program name for logging my $progname = basename($0); From dcd57a421a7a3d0ff8dac098692bd92951c956b0 Mon Sep 17 00:00:00 2001 From: artica Date: Sat, 7 Apr 2018 00:01:33 +0200 Subject: [PATCH 67/69] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 64e203ae9d..a0c68ca379 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.720-180406 +Version: 7.0NG.720-180407 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 fea25d2026..48f78c1712 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.720-180406" +pandora_version="7.0NG.720-180407" 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 4fcc6f756d..a799ca580c 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.720'; -use constant AGENT_BUILD => '180406'; +use constant AGENT_BUILD => '180407'; # 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 c3671e9c0b..ff025753c2 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.720 -%define release 180406 +%define release 180407 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 55c45d0a0c..fa0802c79b 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.720 -%define release 180406 +%define release 180407 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 fed4c9444d..8254a58af5 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.720" -PI_BUILD="180406" +PI_BUILD="180407" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 606b73d6a1..3e88279b39 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{180406} +{180407} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 49ab90380c..fe9f8d669d 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.720(Build 180406)") +#define PANDORA_VERSION ("7.0NG.720(Build 180407)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index b2d01d7833..11d50036ab 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.720(Build 180406))" + VALUE "ProductVersion", "(7.0NG.720(Build 180407))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index cfaa1aa998..a2c9293126 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.720-180406 +Version: 7.0NG.720-180407 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 394dcc1a6d..394970cea3 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.720-180406" +pandora_version="7.0NG.720-180407" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 390142ae25..348fa901ea 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC180406'; +$build_version = 'PC180407'; $pandora_version = 'v7.0NG.720'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index ea12e6ed20..3d29d15bc3 100755 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
    [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 65221abd1f..191abdbdba 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.720 -%define release 180406 +%define release 180407 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 034742816d..573d181900 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.720 -%define release 180406 +%define release 180407 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index c9f0bfcc86..0477c2f8f3 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.720" -PI_BUILD="180406" +PI_BUILD="180407" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index e699a4e05e..660f701fdf 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -33,7 +33,7 @@ use PandoraFMS::Tools; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.720 PS180406"; +my $version = "7.0NG.720 PS180407"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 59d1ca5845..96c11efc70 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.720 PS180406"; +my $version = "7.0NG.720 PS180407"; # save program name for logging my $progname = basename($0); From 77f26cf08f40d969f52f756d2a4ce3ce5518db7f Mon Sep 17 00:00:00 2001 From: artica Date: Sun, 8 Apr 2018 00:01:21 +0200 Subject: [PATCH 68/69] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index a0c68ca379..5b2bf988ac 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.720-180407 +Version: 7.0NG.720-180408 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 48f78c1712..9e8b52436e 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.720-180407" +pandora_version="7.0NG.720-180408" 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 a799ca580c..3d40cbbd34 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.720'; -use constant AGENT_BUILD => '180407'; +use constant AGENT_BUILD => '180408'; # 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 ff025753c2..c556355c27 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.720 -%define release 180407 +%define release 180408 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 fa0802c79b..bf28a97851 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.720 -%define release 180407 +%define release 180408 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 8254a58af5..faf57aefa0 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.720" -PI_BUILD="180407" +PI_BUILD="180408" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 3e88279b39..e553c5a6f9 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{180407} +{180408} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index fe9f8d669d..3418aa5d00 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.720(Build 180407)") +#define PANDORA_VERSION ("7.0NG.720(Build 180408)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 11d50036ab..85e11a41f7 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.720(Build 180407))" + VALUE "ProductVersion", "(7.0NG.720(Build 180408))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index a2c9293126..eb9769bff9 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.720-180407 +Version: 7.0NG.720-180408 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 394970cea3..9b1fca2920 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.720-180407" +pandora_version="7.0NG.720-180408" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 348fa901ea..bde498ef79 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC180407'; +$build_version = 'PC180408'; $pandora_version = 'v7.0NG.720'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 3d29d15bc3..8292ad4b2f 100755 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
    [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 191abdbdba..a834aa3a9c 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.720 -%define release 180407 +%define release 180408 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 573d181900..4a0cf156df 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.720 -%define release 180407 +%define release 180408 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 0477c2f8f3..ba48e318b2 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.720" -PI_BUILD="180407" +PI_BUILD="180408" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 660f701fdf..b258ba9e5d 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -33,7 +33,7 @@ use PandoraFMS::Tools; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.720 PS180407"; +my $version = "7.0NG.720 PS180408"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 96c11efc70..2b40bb97b2 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.720 PS180407"; +my $version = "7.0NG.720 PS180408"; # save program name for logging my $progname = basename($0); From 6bf0371a85a84d86a304dc2ad9c77d1f76ba0af3 Mon Sep 17 00:00:00 2001 From: artica Date: Mon, 9 Apr 2018 00:01:22 +0200 Subject: [PATCH 69/69] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 5b2bf988ac..9d69f670c1 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.720-180408 +Version: 7.0NG.720-180409 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 9e8b52436e..5f61bba7d0 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.720-180408" +pandora_version="7.0NG.720-180409" 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 3d40cbbd34..c22db66447 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.720'; -use constant AGENT_BUILD => '180408'; +use constant AGENT_BUILD => '180409'; # 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 c556355c27..78e9ff0050 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.720 -%define release 180408 +%define release 180409 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 bf28a97851..b2534d7c7b 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.720 -%define release 180408 +%define release 180409 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 faf57aefa0..8442751f06 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.720" -PI_BUILD="180408" +PI_BUILD="180409" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index e553c5a6f9..bddd174e98 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{180408} +{180409} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 3418aa5d00..9f7b886a0b 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.720(Build 180408)") +#define PANDORA_VERSION ("7.0NG.720(Build 180409)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 85e11a41f7..49b4d89f4a 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.720(Build 180408))" + VALUE "ProductVersion", "(7.0NG.720(Build 180409))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index eb9769bff9..50a9e11147 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.720-180408 +Version: 7.0NG.720-180409 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 9b1fca2920..2db9610740 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.720-180408" +pandora_version="7.0NG.720-180409" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index bde498ef79..87dd154a88 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC180408'; +$build_version = 'PC180409'; $pandora_version = 'v7.0NG.720'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 8292ad4b2f..50a4b8f6fc 100755 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
    [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index a834aa3a9c..4b2569e582 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.720 -%define release 180408 +%define release 180409 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 4a0cf156df..4e1012b30d 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.720 -%define release 180408 +%define release 180409 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index ba48e318b2..8314daa1a2 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.720" -PI_BUILD="180408" +PI_BUILD="180409" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index b258ba9e5d..145cad2a04 100644 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -33,7 +33,7 @@ use PandoraFMS::Tools; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.720 PS180408"; +my $version = "7.0NG.720 PS180409"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 2b40bb97b2..293d07c805 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.720 PS180408"; +my $version = "7.0NG.720 PS180409"; # save program name for logging my $progname = basename($0);