From 0ddc1929fac6b07eb06f982af0cb7ba467dec990 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Tue, 2 Feb 2021 11:25:26 +0100 Subject: [PATCH 01/10] multiple fixes --- pandora_console/godmode/tag/tag.php | 3 +++ pandora_console/godmode/users/user_list.php | 28 +++++++++++---------- pandora_console/include/ajax/events.php | 16 ++++++++---- pandora_console/include/functions.php | 6 ++++- 4 files changed, 34 insertions(+), 19 deletions(-) diff --git a/pandora_console/godmode/tag/tag.php b/pandora_console/godmode/tag/tag.php index a80c2b76bb..d5711cbab7 100644 --- a/pandora_console/godmode/tag/tag.php +++ b/pandora_console/godmode/tag/tag.php @@ -66,6 +66,7 @@ if (is_ajax()) { function ($counter, $server) use ($id_tag) { if (metaconsole_connect($server) === NOERR) { $counter += tags_get_local_modules_count($id_tag); + metaconsole_restore_db(); } return $counter; @@ -83,6 +84,7 @@ if (is_ajax()) { function ($counter, $server) use ($id_tag) { if (metaconsole_connect($server) === NOERR) { $counter += tags_get_policy_modules_count($id_tag); + metaconsole_restore_db(); } return $counter; @@ -261,6 +263,7 @@ if (!empty($result)) { function ($counter, $server) use ($tag_id) { if (metaconsole_connect($server) === NOERR) { $counter += tags_get_modules_count($tag_id); + metaconsole_restore_db(); } return $counter; diff --git a/pandora_console/godmode/users/user_list.php b/pandora_console/godmode/users/user_list.php index 5178cce690..488361b1d0 100644 --- a/pandora_console/godmode/users/user_list.php +++ b/pandora_console/godmode/users/user_list.php @@ -232,21 +232,21 @@ if (isset($_GET['user_del'])) { if (defined('METACONSOLE') && isset($_GET['delete_all'])) { $servers = metaconsole_get_servers(); foreach ($servers as $server) { - // Connect to the remote console - metaconsole_connect($server); + // Connect to the remote console. + if (metaconsole_connect($server) === NOERR) { + // Delete the user + $result = delete_user($id_user); + if ($result) { + db_pandora_audit( + 'User management', + __('Deleted user %s from metaconsole', io_safe_input($id_user)) + ); + } - // Delete the user - $result = delete_user($id_user); - if ($result) { - db_pandora_audit( - 'User management', - __('Deleted user %s from metaconsole', io_safe_input($id_user)) - ); + // Restore the db connection. + metaconsole_restore_db(); } - // Restore the db connection - metaconsole_restore_db(); - // Log to the metaconsole too if ($result) { db_pandora_audit( @@ -613,7 +613,9 @@ foreach ($info as $user_id => $user_info) { $data[6] .= ''.html_print_image('images/config.png', true, ['title' => __('Edit')]).''; if ($config['admin_can_delete_user'] && $user_info['id_user'] != $config['id_user'] && !isset($user_info['not_delete'])) { $data[6] .= "".html_print_image('images/cross.png', true, ['title' => __('Delete'), 'onclick' => "if (! confirm ('".__('Deleting User').' '.$user_info['id_user'].'. '.__('Are you sure?')."')) return false"]).''; - if (defined('METACONSOLE')) { + if ((bool) is_metaconsole() === true + && (bool) can_user_access_node() === true + ) { $data[6] .= "".html_print_image('images/cross_double.png', true, ['title' => __('Delete from all consoles'), 'onclick' => "if (! confirm ('".__('Deleting User %s from all consoles', $user_info['id_user']).'. '.__('Are you sure?')."')) return false"]).''; } } else { diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php index b47a750e85..5e14d73ae8 100644 --- a/pandora_console/include/ajax/events.php +++ b/pandora_console/include/ajax/events.php @@ -1436,15 +1436,21 @@ if ($get_extended_event) { $related = events_page_related($event, $server); } + $connected = true; if ($meta) { - metaconsole_connect($server); + if (metaconsole_connect($server) === NOERR) { + $connected = true; + } else { + $connected = false; + } } - $custom_fields = events_page_custom_fields($event); + if ($connected === true) { + $custom_fields = events_page_custom_fields($event); + $custom_data = events_page_custom_data($event); + } - $custom_data = events_page_custom_data($event); - - if ($meta) { + if ($meta && $connected === true) { metaconsole_restore_db(); } diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index 2509a67a66..0b07c16ebc 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -2850,7 +2850,11 @@ function can_user_access_node() { global $config; - $userinfo = get_user_info($config['id_user']); + static $userinfo; + + if ($userinfo === null) { + $userinfo = get_user_info($config['id_user']); + } if (is_metaconsole()) { return $userinfo['is_admin'] == 1 ? 1 : $userinfo['metaconsole_access_node']; From 2f7d0f17957d24ff6239fd63ae92d7513f79a60f Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Thu, 11 Mar 2021 16:11:06 +0100 Subject: [PATCH 02/10] fixed permissions on response --- pandora_console/include/ajax/events.php | 12 ++++++ pandora_console/include/functions_events.php | 43 +++++++++++++------- pandora_console/operation/events/events.php | 16 +++++++- 3 files changed, 55 insertions(+), 16 deletions(-) diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php index 9476b41718..aa639d1640 100644 --- a/pandora_console/include/ajax/events.php +++ b/pandora_console/include/ajax/events.php @@ -1381,6 +1381,12 @@ if ($get_extended_event) { 'EW', $event['clean_tags'], $childrens_ids + )) || (tags_checks_event_acl( + $config['id_user'], + $event['id_grupo'], + 'ER', + $event['clean_tags'], + $childrens_ids ))) ) { $tabs .= "
  • ".html_print_image( @@ -1444,6 +1450,12 @@ if ($get_extended_event) { 'EW', $event['clean_tags'], $childrens_ids + )) || (tags_checks_event_acl( + $config['id_user'], + $event['id_grupo'], + 'ER', + $event['clean_tags'], + $childrens_ids ))) ) { $responses = events_page_responses($event); diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index 543fe06a13..940a4c229f 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -3591,22 +3591,37 @@ function events_page_responses($event, $childrens_ids=[]) ); } - $table_responses->data[] = $data; + if ((tags_checks_event_acl( + $config['id_user'], + $event['id_grupo'], + 'EM', + $event['clean_tags'], + $childrens_ids + )) || (tags_checks_event_acl( + $config['id_user'], + $event['id_grupo'], + 'EW', + $event['clean_tags'], + $childrens_ids + )) + ) { + $table_responses->data[] = $data; - // Comments. - $data = []; - $data[0] = __('Comment'); - $data[1] = ''; - $data[2] = html_print_button( - __('Add comment'), - 'comment_button', - false, - '$(\'#link_comments\').trigger(\'click\');', - 'class="sub next w70p"', - true - ); + // Comments. + $data = []; + $data[0] = __('Comment'); + $data[1] = ''; + $data[2] = html_print_button( + __('Add comment'), + 'comment_button', + false, + '$(\'#link_comments\').trigger(\'click\');', + 'class="sub next w70p"', + true + ); - $table_responses->data[] = $data; + $table_responses->data[] = $data; + } if (tags_checks_event_acl( $config['id_user'], diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php index b216a3fe2f..a2e37b6b05 100644 --- a/pandora_console/operation/events/events.php +++ b/pandora_console/operation/events/events.php @@ -1603,8 +1603,20 @@ try { } // Event responses. -$sql_event_resp = "SELECT id, name FROM tevent_response WHERE type LIKE 'command'"; -$event_responses = db_get_all_rows_sql($sql_event_resp); +if (is_user_admin($config['id_user'])) { + $sql_event_resp = "SELECT id, name FROM tevent_response WHERE type LIKE 'command'"; + $event_responses = db_get_all_rows_sql($sql_event_resp); +} else { + $id_groups = array_keys(users_get_groups(false, 'EW')); + $event_responses = db_get_all_rows_filter( + 'tevent_response', + [ + 'id_group' => $id_groups, + 'type' => 'command', + ] + ); +} + if ($config['event_replication'] != 1) { if ($event_w && !$readonly) { From 11c445106cfc40ca27b34535c59aaa485fcda83f Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Tue, 16 Mar 2021 11:31:43 +0100 Subject: [PATCH 03/10] Added csv log in metaconsole --- pandora_console/include/functions_cron.php | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/pandora_console/include/functions_cron.php b/pandora_console/include/functions_cron.php index 0853b6ea6e..aebeeb7e42 100644 --- a/pandora_console/include/functions_cron.php +++ b/pandora_console/include/functions_cron.php @@ -697,6 +697,33 @@ function cron_list_table() $args = unserialize($task['args']); break; + case 'cron_task_generate_csv_log': + if ($manage_pandora) { + $data[0] = ''; + $data[0] .= html_print_image( + 'images/target.png', + true, + [ + 'title' => __('Force run'), + 'class' => 'invert_filter', + ] + ); + $data[0] .= ''; + } else { + $data[0] = ''; + } + + $data[1] = $task['id_usuario']; + $data[2] = db_get_value( + 'name', + 'tuser_task', + 'id', + $task['id_user_task'] + ); + $args = unserialize($task['args']); + break; + default: // Ignore. break; From 91d5d0c96d729a2a230b8e0d111201d97a294045 Mon Sep 17 00:00:00 2001 From: Kevin Date: Tue, 30 Mar 2021 14:17:45 +0200 Subject: [PATCH 04/10] changed systemctl check for command -v --- pandora_agents/unix/pandora_agent_installer | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index ef9b1bdf5b..e2e08b0e9d 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -166,7 +166,7 @@ uninstall () { rm -f $DESTDIR/etc/newsyslog.d/pandora_agent.conf # Remove systemd service if exists - if [ `systemctl --v 2> /dev/null | grep systemd | wc -l` != 0 ] + if [ `command -v systemctl` ] then PANDORA_AGENT_SERVICE="/etc/systemd/system/pandora_agent_daemon.service" rm -f $PANDORA_AGENT_SERVICE @@ -482,7 +482,7 @@ install () { fi # Create systemd service - if [ `systemctl --v 2> /dev/null | grep systemd | wc -l` != 0 ] + if [ `command -v systemctl` ] then echo "Creating systemd service for pandora_agent_daemon" From 89a7eb7a205e22eba693ec27a10e1716d865aabe Mon Sep 17 00:00:00 2001 From: Kevin Date: Wed, 31 Mar 2021 17:24:18 +0200 Subject: [PATCH 05/10] Prevent logrotate file to overwrite in tarball --- pandora_server/pandora_server_installer | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 7e16a9f00d..6856041a75 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -354,9 +354,14 @@ install () { if [ -d /etc/logrotate.d ] then - [ -d $DESTDIR/etc/logrotate.d ] || mkdir -p $DESTDIR/etc/logrotate.d - echo "Creating logrotate.d entry for Pandora FMS log management" - cp util/pandora_server_logrotate $DESTDIR/etc/logrotate.d/pandora_server + if [ -f $DESTDIR/etc/logrotate.d/pandora_server ] + then + echo "A logrotate.d entry for Pandora FMS log management already exists, skipping creation" + else + echo "Creating logrotate.d entry for Pandora FMS log management" + [ -d $DESTDIR/etc/logrotate.d ] || mkdir -p $DESTDIR/etc/logrotate.d + cp util/pandora_server_logrotate $DESTDIR/etc/logrotate.d/pandora_server + fi else echo "Please add a log rotation schedule manually to your log rotation daemon (if any)" fi From a935278b5dbe21c717aa9cd920d9c7dbf1bfe6d5 Mon Sep 17 00:00:00 2001 From: Kevin Date: Wed, 31 Mar 2021 18:38:14 +0200 Subject: [PATCH 06/10] Prevent RPMs from overwriting logrotate --- pandora_server/pandora_server.redhat.spec | 4 +++- pandora_server/pandora_server.spec | 7 ++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 79f207ce33..642c15c32b 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -82,7 +82,9 @@ install -m 0444 man/man1/tentacle_server.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/ rm -f $RPM_BUILD_ROOT%{prefix}/pandora_server/util/PandoraFMS rm -f $RPM_BUILD_ROOT%{prefix}/pandora_server/util/recon_scripts/PandoraFMS -install -m 0644 util/pandora_server_logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/pandora_server +if [ ! -f $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/pandora_server ] ; then + install -m 0644 util/pandora_server_logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/pandora_server +fi install -m 0640 conf/pandora_server.conf.new $RPM_BUILD_ROOT%{_sysconfdir}/pandora/pandora_server.conf.new install -m 0640 conf/tentacle_server.conf.new $RPM_BUILD_ROOT%{_sysconfdir}/tentacle/tentacle_server.conf.new diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 7299f99f84..ff5516b8c3 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -122,7 +122,12 @@ systemctl enable pandora_server.service echo "/usr/share/pandora_server/util/pandora_db.pl /etc/pandora/pandora_server.conf" > /etc/cron.hourly/pandora_db chmod 750 /etc/cron.hourly/pandora_db -cp -aRf /usr/share/pandora_server/util/pandora_server_logrotate /etc/logrotate.d/pandora_server + +if [ -d /etc/logrotate.d ] ; then + if [ ! -f /etc/logrotate.d/pandora_server ] ; then + cp -aRf /usr/share/pandora_server/util/pandora_server_logrotate /etc/logrotate.d/pandora_server + fi +fi if [ ! -d /etc/pandora ] ; then mkdir -p /etc/pandora From d4d3350c8ce746b43d335f3dee05291926e99cdd Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Wed, 7 Apr 2021 13:03:18 +0200 Subject: [PATCH 07/10] Reverted failed change --- pandora_console/include/functions_ui.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index 9511d967e6..a3fe8ff6cf 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -4235,16 +4235,16 @@ function ui_get_full_url($url='', $no_proxy=false, $add_name_php_file=false, $me } } else { if ($proxy) { - if (is_metaconsole() && $metaconsole_root) { - $fullurl .= ENTERPRISE_DIR.'/meta'; - } - $fullurl .= '/'; } else { if ($add_name_php_file) { $fullurl .= $_SERVER['SCRIPT_NAME']; } else { $fullurl .= $config['homeurl_static'].'/'; + + if (is_metaconsole() && $metaconsole_root) { + $fullurl .= ENTERPRISE_DIR.'/meta/'; + } } } } From 62264c9d0770cfb7f9b72c78757912eda4d2cd05 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Fri, 9 Apr 2021 14:05:33 +0200 Subject: [PATCH 08/10] Added boolean casting for check acl --- pandora_console/godmode/groups/group_list.php | 28 ++++++++----------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php index bbc84ce00b..15cb01edf3 100644 --- a/pandora_console/godmode/groups/group_list.php +++ b/pandora_console/godmode/groups/group_list.php @@ -46,7 +46,7 @@ if (is_metaconsole() === true) { } if (is_ajax() === true) { - if (check_acl($config['id_user'], 0, 'AR') === false) { + if ((bool) check_acl($config['id_user'], 0, 'AR') === false) { db_pandora_audit('ACL Violation', 'Trying to access Group Management'); include 'general/noaccess.php'; return; @@ -72,7 +72,7 @@ if (is_ajax() === true) { return; } - if (check_acl($config['id_user'], $id_group, 'AR') === false) { + if ((bool) check_acl($config['id_user'], $id_group, 'AR') === false) { db_pandora_audit( 'ACL Violation', 'Trying to access Alert Management' @@ -114,7 +114,7 @@ if (is_ajax() === true) { ); $force_serialized = (bool) get_parameter('force_serialized', false); - if (check_acl($config['id_user'], $id_group, 'AR') === false) { + if ((bool) check_acl($config['id_user'], $id_group, 'AR') === false) { db_pandora_audit( 'ACL Violation', 'Trying to access Alert Management' @@ -265,15 +265,9 @@ if (is_ajax() === true) { $tab = (string) get_parameter('tab', 'groups'); -if ($tab != 'credbox' && ! check_acl( - $config['id_user'], - 0, - 'PM' -) && ! check_acl( - $config['id_user'], - 0, - 'AW' -) +if ($tab !== 'credbox' + && (bool) check_acl($config['id_user'], 0, 'PM') === false + && (bool) check_acl($config['id_user'], 0, 'AW') === false ) { db_pandora_audit( 'ACL Violation', @@ -281,9 +275,9 @@ if ($tab != 'credbox' && ! check_acl( ); include 'general/noaccess.php'; return; -} else if ($tab == 'credbox' - && check_acl($config['id_user'], 0, 'UM') === false - && check_acl($config['id_user'], 0, 'PM') === false +} else if ($tab === 'credbox' + && (bool) check_acl($config['id_user'], 0, 'UM') === false + && (bool) check_acl($config['id_user'], 0, 'PM') === false ) { db_pandora_audit( 'ACL Violation', @@ -382,7 +376,7 @@ $delete_group = (bool) get_parameter('delete_group'); $pure = get_parameter('pure', 0); // Create group. -if (($create_group) && (check_acl($config['id_user'], 0, 'PM') === true)) { +if (($create_group) && ((bool) check_acl($config['id_user'], 0, 'PM') === true)) { $name = (string) get_parameter('name'); $icon = (string) get_parameter('icon'); $id_parent = (int) get_parameter('id_parent'); @@ -506,7 +500,7 @@ if ($update_group) { } // Delete group. -if (($delete_group) && (check_acl($config['id_user'], 0, 'PM') === true)) { +if (($delete_group) && ((bool) check_acl($config['id_user'], 0, 'PM') === true)) { $id_group = (int) get_parameter('id_group'); $usedGroup = groups_check_used($id_group); From 8a27517cc59249006efbd73d3130c69e7c9d3154 Mon Sep 17 00:00:00 2001 From: Daniel Maya Date: Mon, 12 Apr 2021 14:44:33 +0000 Subject: [PATCH 09/10] =?UTF-8?q?Ent=207281=20aumentar=20car=C3=A1cteres?= =?UTF-8?q?=20de=20la=20caja=20de=20consulta=20sql=20en=20informes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pandora_console/extras/mr/46.sql | 2 ++ pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql | 3 ++- pandora_console/pandoradb.sql | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pandora_console/extras/mr/46.sql b/pandora_console/extras/mr/46.sql index 9b04f79114..0e20f2af03 100644 --- a/pandora_console/extras/mr/46.sql +++ b/pandora_console/extras/mr/46.sql @@ -1,6 +1,8 @@ START TRANSACTION; ALTER TABLE `tagent_custom_fields` MODIFY COLUMN `combo_values` TEXT NOT NULL DEFAULT ''; +ALTER TABLE `treport_content` MODIFY `external_source` MEDIUMTEXT; +ALTER TABLE `treport_content_template` MODIFY `external_source` MEDIUMTEXT; UPDATE `talert_commands` SET `fields_descriptions` = '[\"Event name\",\"Event type\",\"Source\",\"Agent name or _agent_\",\"Event severity\",\"ID extra\",\"Tags separated by commas\",\"Comments\",\"\",\"\"]' WHERE `name` = "Monitoring Event"; 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 c8303640d3..e5841cc7e6 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 @@ -811,7 +811,7 @@ CREATE TABLE IF NOT EXISTS `treport_content_template` ( `description` mediumtext, `text_agent` text, `text` TEXT, - `external_source` Text, + `external_source` mediumtext, `treport_custom_sql_id` INTEGER UNSIGNED default 0, `header_definition` TinyText default NULL, `column_separator` TinyText default NULL, @@ -1741,6 +1741,7 @@ ALTER TABLE `treport_content` ADD COLUMN `landscape` tinyint(1) UNSIGNED NOT NUL ALTER TABLE `treport_content` ADD COLUMN `pagebreak` tinyint(1) UNSIGNED NOT NULL default 0; ALTER TABLE `treport_content` ADD COLUMN `compare_work_time` tinyint(1) UNSIGNED NOT NULL default 0; ALTER TABLE `treport_content` ADD COLUMN `graph_render` tinyint(1) UNSIGNED NOT NULL default 0; +ALTER TABLE `treport_content` MODIFY `external_source` MEDIUMTEXT; -- --------------------------------------------------------------------- -- Table `tmodule_relationship` diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index f6196562ee..2733dd80a1 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -1511,7 +1511,7 @@ CREATE TABLE IF NOT EXISTS `treport_content` ( `description` mediumtext, `id_agent` int(10) unsigned NOT NULL default 0, `text` TEXT, - `external_source` Text, + `external_source` mediumtext, `treport_custom_sql_id` INTEGER UNSIGNED default 0, `header_definition` TinyText, `column_separator` TinyText, @@ -3114,7 +3114,7 @@ CREATE TABLE IF NOT EXISTS `treport_content_template` ( `description` mediumtext, `text_agent` text, `text` TEXT, - `external_source` Text, + `external_source` mediumtext, `treport_custom_sql_id` INTEGER UNSIGNED default 0, `header_definition` TinyText default NULL, `column_separator` TinyText default NULL, From c33f2182ff3b45db1a7391b9e3a6c1647b8aa1c2 Mon Sep 17 00:00:00 2001 From: artica Date: Tue, 13 Apr 2021 01:00:16 +0200 Subject: [PATCH 10/10] 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 bc0d786172..e963a33c6f 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.753-210412 +Version: 7.0NG.753-210413 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 22c2c03797..37c244d375 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.753-210412" +pandora_version="7.0NG.753-210413" 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 36d131d6a7..80ed75f00e 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.753'; -use constant AGENT_BUILD => '210412'; +use constant AGENT_BUILD => '210413'; # 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 e9fe2234d3..0e09334fc1 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.753 -%define release 210412 +%define release 210413 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 bc877a3c1b..6e11e4b8a9 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.753 -%define release 210412 +%define release 210413 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 6360975bc5..b2b6cf3c48 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.753" -PI_BUILD="210412" +PI_BUILD="210413" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 9a991926ad..aba5ef5c1f 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{210412} +{210413} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index cbde9a4e71..7f71d9300f 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.753(Build 210412)") +#define PANDORA_VERSION ("7.0NG.753(Build 210413)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 694f2d9e43..81f26625ba 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.753(Build 210412))" + VALUE "ProductVersion", "(7.0NG.753(Build 210413))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 4abfac53cc..b45ca41795 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.753-210412 +Version: 7.0NG.753-210413 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 0506da0c17..6d85935138 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.753-210412" +pandora_version="7.0NG.753-210413" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 40850ddcbf..70123d109c 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 = 'PC210412'; +$build_version = 'PC210413'; $pandora_version = 'v7.0NG.753'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index fa08dfd6e2..7206b63387 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 957e39be18..6d7571f36d 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.753 -%define release 210412 +%define release 210413 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 4f4cc45fd8..b2f3c0da74 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.753 -%define release 210412 +%define release 210413 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 27fe60503c..84f100245a 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.753" -PI_BUILD="210412" +PI_BUILD="210413" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index dad150e4c8..07c45a59d7 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.753 PS210412"; +my $version = "7.0NG.753 PS210413"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 717c957148..2139e7faf0 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.753 PS210412"; +my $version = "7.0NG.753 PS210413"; # save program name for logging my $progname = basename($0);