From 0b1e60b8cf5bf0080020df90105c4625083f755f Mon Sep 17 00:00:00 2001 From: Calvo Date: Tue, 6 Apr 2021 18:18:17 +0200 Subject: [PATCH 1/9] Fixed view icon on report and custom graphs --- pandora_console/godmode/reporting/graph_builder.php | 2 +- pandora_console/godmode/reporting/reporting_builder.php | 2 +- pandora_console/operation/reporting/graph_viewer.php | 2 +- pandora_console/operation/reporting/reporting_viewer.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pandora_console/godmode/reporting/graph_builder.php b/pandora_console/godmode/reporting/graph_builder.php index 79fdfde250..27cbc9354d 100644 --- a/pandora_console/godmode/reporting/graph_builder.php +++ b/pandora_console/godmode/reporting/graph_builder.php @@ -319,7 +319,7 @@ if ($edit_graph) { 'view' => [ 'active' => false, 'text' => ''.html_print_image( - 'images/operation.png', + 'images/eye.png', true, [ 'title' => __('View graph'), diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index d4967be810..e758f6ac0b 100755 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -3209,7 +3209,7 @@ if ($enterpriseEnable) { $buttons['view'] = [ 'active' => false, 'text' => ''.html_print_image( - 'images/operation.png', + 'images/eye.png', true, [ 'title' => __('View report'), diff --git a/pandora_console/operation/reporting/graph_viewer.php b/pandora_console/operation/reporting/graph_viewer.php index 000179fe4e..5e2de125e0 100644 --- a/pandora_console/operation/reporting/graph_viewer.php +++ b/pandora_console/operation/reporting/graph_viewer.php @@ -196,7 +196,7 @@ if ($view_graph) { } $options['view']['text'] = ''.html_print_image( - 'images/operation.png', + 'images/eye.png', true, [ 'title' => __('View graph'), diff --git a/pandora_console/operation/reporting/reporting_viewer.php b/pandora_console/operation/reporting/reporting_viewer.php index 5434553aea..7dfecce0b9 100755 --- a/pandora_console/operation/reporting/reporting_viewer.php +++ b/pandora_console/operation/reporting/reporting_viewer.php @@ -125,7 +125,7 @@ if (check_acl_restricted_all($config['id_user'], $report_group, 'RW')) { $options['view'] = [ 'active' => true, 'text' => ''.html_print_image( - 'images/operation.png', + 'images/eye.png', true, [ 'title' => __('View report'), From b922de7a8ea46528ae53eb5def50cb1adf4c18eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= Date: Thu, 22 Apr 2021 17:10:59 +0200 Subject: [PATCH 2/9] Fixed visual issues --- pandora_console/include/styles/agent_alerts.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pandora_console/include/styles/agent_alerts.css b/pandora_console/include/styles/agent_alerts.css index 7a140a1704..8726228b33 100644 --- a/pandora_console/include/styles/agent_alerts.css +++ b/pandora_console/include/styles/agent_alerts.css @@ -26,6 +26,10 @@ justify-content: center; } +#img-full-screen { + width: 12em; +} + #full_screen_refresh_box, #slc-refresh-rate, #img-full-screen { @@ -45,6 +49,7 @@ .agent_alerts_header_pure { position: absolute; + z-index: 500; } .agents_alerts_header form > ul > li { From 4aea645735fb45c3eec63a6fe6409a695be14e8d Mon Sep 17 00:00:00 2001 From: Calvo Date: Thu, 29 Apr 2021 11:15:20 +0200 Subject: [PATCH 3/9] Fixed visual bug on user creation error --- pandora_console/godmode/users/configure_user.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php index 6948368eb1..31ca0897d0 100644 --- a/pandora_console/godmode/users/configure_user.php +++ b/pandora_console/godmode/users/configure_user.php @@ -439,6 +439,12 @@ if ($create_user) { if ($result) { $res = save_pass_history($id, $password_new); + } else { + $is_err = true; + $user_info = $values; + $password_new = ''; + $password_confirm = ''; + $new_user = true; } db_pandora_audit( From 588e06d35721f25cddabaf5403b1904d40b6b675 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Thu, 29 Apr 2021 12:45:35 +0200 Subject: [PATCH 4/9] #7344 fixed select --- pandora_console/include/styles/meta_dashboards.css | 8 ++++++++ pandora_console/views/dashboard/header.php | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pandora_console/include/styles/meta_dashboards.css b/pandora_console/include/styles/meta_dashboards.css index 1b24b3bce5..d2d7f902a3 100644 --- a/pandora_console/include/styles/meta_dashboards.css +++ b/pandora_console/include/styles/meta_dashboards.css @@ -22,3 +22,11 @@ div#page { right: 50px; top: 20px; } + +.select-dashboard-width { + width: 110%; +} + +#menu_tab li.nomn form#form-select-dashboard { + margin-top: 0px !important; +} diff --git a/pandora_console/views/dashboard/header.php b/pandora_console/views/dashboard/header.php index 64626056dd..c828740565 100644 --- a/pandora_console/views/dashboard/header.php +++ b/pandora_console/views/dashboard/header.php @@ -189,7 +189,7 @@ $combo_dashboard['text'] .= html_print_select( true, false, true, - '', + 'select-dashboard-width', false, '' ); From e6713c2f2c6abb1735c3df133d8615a17985cf6f Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Tue, 25 May 2021 09:58:18 +0000 Subject: [PATCH 5/9] #6917 metaconsole config changes --- pandora_console/extras/mr/47.sql | 10 +++++ pandora_console/include/functions_config.php | 38 +++++++++++++++---- .../include/styles/meta_dashboards.css | 2 +- .../operation/dashboard/dashboard.php | 8 ++++ 4 files changed, 49 insertions(+), 9 deletions(-) diff --git a/pandora_console/extras/mr/47.sql b/pandora_console/extras/mr/47.sql index aa07478947..9a7bf687a7 100644 --- a/pandora_console/extras/mr/47.sql +++ b/pandora_console/extras/mr/47.sql @@ -11,4 +11,14 @@ ALTER TABLE `talert_snmp_action` ADD COLUMN `al_field18` TEXT NOT NULL AFTER `al ALTER TABLE `talert_snmp_action` ADD COLUMN `al_field19` TEXT NOT NULL AFTER `al_field18`; ALTER TABLE `talert_snmp_action` ADD COLUMN `al_field20` TEXT NOT NULL AFTER `al_field19`; +SET @st_oum755 = (SELECT IF( + (SELECT COUNT(*) FROM tconfig WHERE token LIKE 'meta_custom_logo' AND value like 'logo_pandora_metaconsola.png') > 0, + "UPDATE `tconfig` set value = 'pandoraFMS_metaconsole_full.svg' WHERE token LIKE 'meta_custom_logo'", + "SELECT 1" +)); + +PREPARE pr_oum755 FROM @st_oum755; +EXECUTE pr_oum755; +DEALLOCATE PREPARE pr_oum755; + COMMIT; diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index 676a6fbeb0..3920109890 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -1032,6 +1032,14 @@ function config_update_config() $error_update[] = __('Custom subtitle header'); } + if (!config_update_value('meta_custom_title_header', (string) get_parameter('meta_custom_title_header'))) { + $error_update[] = __('Meta custom title header'); + } + + if (!config_update_value('meta_custom_subtitle_header', (string) get_parameter('meta_custom_subtitle_header'))) { + $error_update[] = __('Meta custom subtitle header'); + } + if (!config_update_value('custom_title1_login', (string) get_parameter('custom_title1_login'))) { $error_update[] = __('Custom title1 login'); } @@ -1060,10 +1068,6 @@ function config_update_config() $error_update[] = __('Copyright notice'); } - if (!config_update_value('meta_custom_logo', (string) get_parameter('meta_custom_logo'))) { - $error_update[] = __('Custom logo metaconsole'); - } - if (!config_update_value('meta_custom_logo_white_bg', (string) get_parameter('meta_custom_logo_white_bg'))) { $error_update[] = __('Custom logo metaconsole (white background)'); } @@ -2291,6 +2295,20 @@ function config_process_config() config_update_value('custom_logo_collapsed', 'pandora_logo_green_collapsed.png'); } + if (is_metaconsole()) { + if (!isset($config['meta_custom_logo'])) { + config_update_value('meta_custom_logo', 'pandoraFMS_metaconsole_full.svg'); + } + + if (!isset($config['meta_custom_logo_collapsed'])) { + config_update_value('meta_custom_logo_collapsed', 'pandoraFMS_metaconsole_collapse.svg'); + } + + if (!isset($config['meta_menu_type'])) { + config_update_value('meta_menu_type', 'classic'); + } + } + if (!isset($config['custom_logo_white_bg'])) { config_update_value('custom_logo_white_bg', 'pandora_logo_head_white_bg.png'); } @@ -2327,6 +2345,14 @@ function config_process_config() config_update_value('custom_subtitle_header', __('the Flexible Monitoring System')); } + if (!isset($config['meta_custom_title_header'])) { + config_update_value('meta_custom_title_header', __('PandoraFMS Metaconsole')); + } + + if (!isset($config['meta_custom_subtitle_header'])) { + config_update_value('meta_custom_subtitle_header', __('Centralized operation console')); + } + if (!isset($config['custom_title1_login'])) { config_update_value('custom_title1_login', __('PANDORA FMS')); } @@ -2359,10 +2385,6 @@ function config_process_config() config_update_value('meta_custom_support_url', 'https://support.pandorafms.com'); } - if (!isset($config['meta_custom_logo'])) { - config_update_value('meta_custom_logo', 'logo_pandora_metaconsola.png'); - } - if (!isset($config['meta_custom_logo_white_bg'])) { config_update_value('pandora_logo_head_white_bg', 'pandora_logo_head_white_bg.png'); } diff --git a/pandora_console/include/styles/meta_dashboards.css b/pandora_console/include/styles/meta_dashboards.css index 1b24b3bce5..a5b2736110 100644 --- a/pandora_console/include/styles/meta_dashboards.css +++ b/pandora_console/include/styles/meta_dashboards.css @@ -1,5 +1,5 @@ div#page { - width: 90% !important; + width: auto; margin: 0 auto; } diff --git a/pandora_console/operation/dashboard/dashboard.php b/pandora_console/operation/dashboard/dashboard.php index 3b081cfc7a..a3379565b7 100644 --- a/pandora_console/operation/dashboard/dashboard.php +++ b/pandora_console/operation/dashboard/dashboard.php @@ -70,6 +70,14 @@ if (is_ajax() === true) { } } } else { + if ((bool) is_metaconsole() === true) { + echo '
'; + } + // Run. $cs->run(); + + if ((bool) is_metaconsole() === true) { + echo '
'; + } } From e69f258f8a07be029e71b8e7a44b9ee3d1da4563 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= Date: Tue, 25 May 2021 12:50:25 +0200 Subject: [PATCH 6/9] Fixed issue with webserver modules --- pandora_console/include/lib/Module.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pandora_console/include/lib/Module.php b/pandora_console/include/lib/Module.php index 3e11480c3e..4a49bd5435 100644 --- a/pandora_console/include/lib/Module.php +++ b/pandora_console/include/lib/Module.php @@ -706,6 +706,13 @@ class Module extends Entity $updates = $this->fields; $updates['id_tipo_modulo'] = $this->moduleType()->id_tipo(); + // In the case of the webserver modules, debug_content special characters must be handled. + if ($updates['id_tipo_modulo'] >= MODULE_TYPE_WEB_ANALYSIS + && $updates['id_tipo_modulo'] <= MODULE_TYPE_WEB_CONTENT_STRING + ) { + $updates['debug_content'] = io_safe_input($updates['debug_content']); + } + if ($this->fields['id_agente_modulo'] > 0) { // Update. $rs = \db_process_sql_update( From 7eaaa1f37149a3bcc9a14268d894ed17ed5baf49 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Tue, 25 May 2021 13:40:33 +0000 Subject: [PATCH 7/9] =?UTF-8?q?Ent=204991=20api=20editar=20scheduled=20dow?= =?UTF-8?q?ntimes=20y=20a=C3=B1adir=20eliminar=20agentes=20de=20ellas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pandora_console/include/functions_api.php | 299 ++++++++++++++++++++++ 1 file changed, 299 insertions(+) diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php index 411b847e56..03fb8b9be2 100644 --- a/pandora_console/include/functions_api.php +++ b/pandora_console/include/functions_api.php @@ -7541,6 +7541,305 @@ function api_set_planned_downtimes_additem($id, $thrash1, $other, $thrash3) } +/** + * Edit planned Downtime. + * e.g.: api.php?op=set&op2=planned_downtimes_edit&apipass=1234&user=admin&pass=pandora&id=2&other=testing2|test2|2021/05/10|2021/06/12|19:03:03|19:55:00|0|0|0|0|0|0|0|0|1|31|quiet|once|weekly&other_mode=url_encode_separator_| + * + * @param $id id of planned downtime. + * @param $thrash1 Don't use. + * @param array $other + * The first index contains a list of agent Ids. + * The second index contains a list of module names. + * The list separator is the character ';'. + * @param $thrash3 Don't use. + */ +function api_set_planned_downtimes_edit($id, $thrash1, $other, $thrash3) +{ + global $config; + + if (defined('METACONSOLE')) { + return; + } + + if (!check_acl($config['id_user'], 0, 'PM')) { + returnError('forbidden', 'string'); + return; + } + + if ($id == '') { + returnError( + 'id cannot be left blank.' + ); + return; + } + + if (db_get_value('id', 'tplanned_downtime', 'id', $id) === false) { + returnError( + 'id does not exist' + ); + return; + } + + if ($other['data'] == '') { + returnError( + 'data cannot be left blank.' + ); + return; + } + + $values = []; + if (!empty($other['data'][0])) { + $values['name'] = io_safe_input($other['data'][0]); + } + + if (!empty($other['data'][1])) { + $values['description'] = io_safe_input($other['data'][1]); + } + + if (!empty($other['data'][2]) && !empty($other['data'][4])) { + $date_from = strtotime(html_entity_decode($other['data'][2].' '.$other['data'][4])); + $values['date_from'] = io_safe_input($date_from); + } + + if (!empty($other['data'][4])) { + $values['periodically_time_from'] = io_safe_input($other['data'][4]); + } + + if (!empty($other['data'][3]) && !empty($other['data'][5])) { + $date_to = strtotime(html_entity_decode($other['data'][3].' '.$other['data'][5])); + $values['date_to'] = io_safe_input($date_to); + } + + if (!empty($other['data'][5])) { + $values['periodically_time_to'] = io_safe_input($other['data'][5]); + } + + if ($other['data'][6] != '') { + $values['id_group'] = io_safe_input($other['data'][6]); + } + + if ($other['data'][7] != '') { + $values['monday'] = io_safe_input($other['data'][7]); + } + + if ($other['data'][8] != '') { + $values['tuesday'] = io_safe_input($other['data'][8]); + } + + if ($other['data'][9] != '') { + $values['wednesday'] = io_safe_input($other['data'][9]); + } + + if ($other['data'][10] != '') { + $values['thursday'] = io_safe_input($other['data'][10]); + } + + if ($other['data'][11] != '') { + $values['friday'] = io_safe_input($other['data'][11]); + } + + if ($other['data'][12] != '') { + $values['saturday'] = io_safe_input($other['data'][12]); + } + + if ($other['data'][13] != '') { + $values['sunday'] = io_safe_input($other['data'][13]); + } + + if (!empty($other['data'][14])) { + $values['periodically_day_from'] = io_safe_input($other['data'][14]); + } + + if (!empty($other['data'][15])) { + $values['periodically_day_to'] = io_safe_input($other['data'][15]); + } + + if (!empty($other['data'][16])) { + $values['type_downtime'] = io_safe_input($other['data'][16]); + } + + if (!empty($other['data'][17])) { + $values['type_execution'] = io_safe_input($other['data'][17]); + } + + if (!empty($other['data'][18])) { + $values['type_periodicity'] = io_safe_input($other['data'][18]); + } + + $res = db_process_sql_update('tplanned_downtime', $values, ['id' => $id]); + + if ($res === false) { + returnError('Planned downtime could not be updated'); + } else { + returnData( + 'string', + [ + 'type' => 'string', + 'data' => __('Planned downtime updated'), + ] + ); + } +} + + +/** + * Delete agents in planned Downtime. + * e.g.: pi.php?op=set&op2=planned_downtimes_delete_agents&apipass=1234&user=admin&pass=pandora&id=4&other=1;2;3&other_mode=url_encode_separator_| + * + * @param $id id of planned downtime. + * @param $thrash1 Don't use. + * @param array $other + * The first index contains a list of agent Ids. + * The list separator is the character ';'. + * @param $thrash3 Don't use. + */ +function api_set_planned_downtimes_delete_agents($id, $thrash1, $other, $thrash3) +{ + global $config; + + if (defined('METACONSOLE')) { + return; + } + + if (!check_acl($config['id_user'], 0, 'PM')) { + returnError('forbidden', 'string'); + return; + } + + if ($id == '') { + returnError( + 'id cannot be left blank.' + ); + return; + } + + if (db_get_value('id', 'tplanned_downtime', 'id', $id) === false) { + returnError( + 'id does not exist' + ); + return; + } + + if ($other['data'] == '') { + returnError( + 'data cannot be left blank.' + ); + return; + } + + if (!empty($other['data'][0])) { + $agents = io_safe_input($other['data']); + $agents = explode(';', $agents); + $results = false; + foreach ($agents as $agent) { + if (db_get_value_sql(sprintf('SELECT id from tplanned_downtime_agents WHERE id_agent = %d AND id_downtime = %d', $agent, $id)) !== false) { + $result = db_process_sql_delete('tplanned_downtime_agents', ['id_agent' => $agent]); + db_process_sql_delete('tplanned_downtime_modules', ['id_agent' => $agent]); + + if ($result == false) { + returnError(" Agent $agent could not be deleted."); + } else { + $results = true; + } + } else { + returnError(" Agent $agent is not in planned downtime."); + } + } + + if ($results) { + returnData( + 'string', + [ + 'type' => 'string', + 'data' => __(' Agents deleted'), + ] + ); + } + } +} + + +/** + * Add agents planned Downtime. + * e.g.: api.php?op=set&op2=planned_downtimes_add_agents&apipass=1234&user=admin&pass=pandora&id=4&other=1;2;3&other_mode=url_encode_separator_| + * + * @param $id id of planned downtime. + * @param $thrash1 Don't use. + * @param array $other + * The first index contains a list of agent Ids. + * The list separator is the character ';'. + * @param $thrash3 Don't use. + */ +function api_set_planned_downtimes_add_agents($id, $thrash1, $other, $thrash3) +{ + global $config; + + if (defined('METACONSOLE')) { + return; + } + + if (!check_acl($config['id_user'], 0, 'PM')) { + returnError('forbidden', 'string'); + return; + } + + if ($id == '') { + returnError( + 'id cannot be left blank.' + ); + return; + } + + if (db_get_value('id', 'tplanned_downtime', 'id', $id) === false) { + returnError( + 'id does not exist' + ); + return; + } + + if ($other['data'] == '') { + returnError( + 'data cannot be left blank.' + ); + return; + } + + if (!empty($other['data'][0])) { + $agents = io_safe_input($other['data']); + $agents = explode(';', $agents); + $results = false; + foreach ($agents as $agent) { + if (db_get_value_sql(sprintf('SELECT id from tplanned_downtime_agents tpd WHERE tpd.id_agent = %d AND id_downtime = %d', $agent, $id)) === false) { + $res = db_process_sql_insert( + 'tplanned_downtime_agents', + [ + 'id_agent' => $agent, + 'id_downtime' => $id, + 'all_modules' => 0, + 'manually_disabled' => 0, + ] + ); + if ($res) { + $results = true; + } + } else { + returnError(" Agent $agent is already at the planned downtime."); + } + } + + if ($results) { + returnData( + 'string', + [ + 'type' => 'string', + 'data' => __(' Agents added'), + ] + ); + } + } +} + + /** * Update data module in policy. And return id from new module. * From eb54ce9a62eb7d8ba93b63d5ab92d1b66815fac1 Mon Sep 17 00:00:00 2001 From: Luis Date: Tue, 25 May 2021 15:53:41 +0000 Subject: [PATCH 8/9] Ent 7492 bug visual vista agents alerts no alerts --- pandora_console/include/class/AgentsAlerts.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/class/AgentsAlerts.class.php b/pandora_console/include/class/AgentsAlerts.class.php index f566e3a4d9..3a6d35b519 100644 --- a/pandora_console/include/class/AgentsAlerts.class.php +++ b/pandora_console/include/class/AgentsAlerts.class.php @@ -488,7 +488,7 @@ class AgentsAlerts extends HTML $nagents = count(agents_get_agents($filter_count)); - if ($agents == false) { + if ($agents === false || empty($agents_with_alerts) === true) { ui_print_info_message( [ 'no_close' => true, From 22a9043378bc691511e981ca582c3be082c890b9 Mon Sep 17 00:00:00 2001 From: artica Date: Wed, 26 May 2021 01:00:45 +0200 Subject: [PATCH 9/9] 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.rhel7.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 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 1ad6b6641b..49d7fdf0be 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.754-210525 +Version: 7.0NG.754-210526 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 093a808276..7a897f8e2e 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.754-210525" +pandora_version="7.0NG.754-210526" 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 66492e4f70..d0f0215b3c 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1015,7 +1015,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.754'; -use constant AGENT_BUILD => '210525'; +use constant AGENT_BUILD => '210526'; # 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 bab69faca4..a67bab24f6 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.754 -%define release 210525 +%define release 210526 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 6c968a7eff..a4517a8991 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.754 -%define release 210525 +%define release 210526 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 95c8e48240..ad558299f3 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.754" -PI_BUILD="210525" +PI_BUILD="210526" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 756b2ebe26..aaef0fff6d 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{210525} +{210526} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index dae380d06d..0feac30278 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.754 Build 210525") +#define PANDORA_VERSION ("7.0NG.754 Build 210526") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 4a1723f4a9..0ac1fb8558 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.754(Build 210525))" + VALUE "ProductVersion", "(7.0NG.754(Build 210526))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index dd03c46298..fd079bacc4 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.754-210525 +Version: 7.0NG.754-210526 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 2ad5dbadee..4dcb761bf4 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.754-210525" +pandora_version="7.0NG.754-210526" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index a39f00aea1..47819cd94d 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -20,7 +20,7 @@ /** * Pandora build version and version */ -$build_version = 'PC210525'; +$build_version = 'PC210526'; $pandora_version = 'v7.0NG.754'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 477defe75f..55634ae415 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -129,7 +129,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index a8ecef6ff8..5ee36c080f 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.754 -%define release 210525 +%define release 210526 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 9f0ef65b3f..0bcc7953bd 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.754 -%define release 210525 +%define release 210526 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 5792617ef8..d96930aac6 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.754" -PI_BUILD="210525" +PI_BUILD="210526" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 2a78ef6e4f..f83cb1ca8e 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.754 Build 210525"; +my $version = "7.0NG.754 Build 210526"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 28d7d61b70..65f2ff75ee 100755 --- 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.754 Build 210525"; +my $version = "7.0NG.754 Build 210526"; # save program name for logging my $progname = basename($0);