From 5e039adb26444e4c9053721ef65ea0ad4b9315b9 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Tue, 7 Jul 2020 11:05:19 +0200 Subject: [PATCH 01/22] Solve the issue for alerts, os names and tags --- .../godmode/alerts/alert_templates.php | 1 + .../alerts/configure_alert_command.php | 4 +++ .../alerts/configure_alert_template.php | 36 ++++++++----------- pandora_console/godmode/setup/os.php | 5 ++- pandora_console/godmode/tag/edit_tag.php | 4 +++ pandora_console/include/functions_alerts.php | 5 +++ 6 files changed, 32 insertions(+), 23 deletions(-) diff --git a/pandora_console/godmode/alerts/alert_templates.php b/pandora_console/godmode/alerts/alert_templates.php index 4147367379..1cf8c5b68b 100644 --- a/pandora_console/godmode/alerts/alert_templates.php +++ b/pandora_console/godmode/alerts/alert_templates.php @@ -351,6 +351,7 @@ $templates = alerts_get_alert_templates( 'description', 'type', 'id_group', + 'previous_name', ] ); if ($templates === false) { diff --git a/pandora_console/godmode/alerts/configure_alert_command.php b/pandora_console/godmode/alerts/configure_alert_command.php index 417564e5f2..cc9fcb366c 100644 --- a/pandora_console/godmode/alerts/configure_alert_command.php +++ b/pandora_console/godmode/alerts/configure_alert_command.php @@ -83,6 +83,10 @@ if ($update_command) { $values['command'] = $command; $values['description'] = $description; $values['id_group'] = $id_group; + // Only for Metaconsole. Save the previous name for synchronizing. + if (is_metaconsole()) { + $values['previous_name'] = db_get_value('name', 'talert_commands', 'id', $id); + } // Check it the new name is used in the other command. $id_check = db_get_value('id', 'talert_commands', 'name', $name); diff --git a/pandora_console/godmode/alerts/configure_alert_template.php b/pandora_console/godmode/alerts/configure_alert_template.php index 533bc32caf..eb4057cc78 100644 --- a/pandora_console/godmode/alerts/configure_alert_template.php +++ b/pandora_console/godmode/alerts/configure_alert_template.php @@ -34,6 +34,9 @@ if (! check_acl($config['id_user'], 0, 'LM')) { $duplicate_template = (bool) get_parameter('duplicate_template'); $id = (int) get_parameter('id'); $pure = get_parameter('pure', 0); +$step = (int) get_parameter('step', 1); +// We set here the number of steps. +define('LAST_STEP', 3); // If user tries to duplicate/edit a template with group=ALL then must have "PM" access privileges if ($duplicate_template) { @@ -56,7 +59,6 @@ if ($a_template !== false) { if (defined('METACONSOLE')) { alerts_meta_print_header(); } else { - $step = (int) get_parameter('step', 1); if ($step == 1) { $help_header = ''; } else if ($step == 2) { @@ -113,7 +115,6 @@ if ($a_template !== false) { if (defined('METACONSOLE')) { alerts_meta_print_header(); } else { - $step = (int) get_parameter('step', 1); if ($step == 1) { $help_header = ''; } else if ($step == 2) { @@ -252,24 +253,20 @@ function update_template($step) $wizard_level = (string) get_parameter('wizard_level'); $priority = (int) get_parameter('priority'); $id_group = get_parameter('id_group'); - - switch ($config['dbtype']) { - case 'mysql': - case 'postgresql': - $name_check = db_get_value('name', 'talert_templates', 'name', $name); - break; - - case 'oracle': - $name_check = db_get_value('name', 'talert_templates', 'to_char(name)', $name); - break; + // Only for Metaconsole. Save the previous name for synchronizing. + if (is_metaconsole()) { + $previous_name = db_get_value('name', 'talert_templates', 'id', $id); + } else { + $previous_name = ''; } $values = [ - 'name' => $name, - 'description' => $description, - 'id_group' => $id_group, - 'priority' => $priority, - 'wizard_level' => $wizard_level, + 'name' => $name, + 'description' => $description, + 'id_group' => $id_group, + 'priority' => $priority, + 'wizard_level' => $wizard_level, + 'previous_name' => $previous_name, ]; $result = alerts_update_alert_template($id, $values); @@ -363,11 +360,6 @@ function update_template($step) } -// We set here the number of steps -define('LAST_STEP', 3); - -$step = (int) get_parameter('step', 1); - $create_alert = (bool) get_parameter('create_alert'); $create_template = (bool) get_parameter('create_template'); $update_template = (bool) get_parameter('update_template'); diff --git a/pandora_console/godmode/setup/os.php b/pandora_console/godmode/setup/os.php index 1f8694aa32..73e10ecd52 100644 --- a/pandora_console/godmode/setup/os.php +++ b/pandora_console/godmode/setup/os.php @@ -88,7 +88,6 @@ switch ($action) { } else { header('Location:'.$config['homeurl'].'index.php?sec=gsetup&sec2=godmode/setup/os&tab='.$tab.'&message='.$message); } - break; case 'update': @@ -99,6 +98,10 @@ switch ($action) { $values = []; $values['name'] = $name; $values['description'] = $description; + // Only for Metaconsole. Save the previous name for synchronizing. + if (is_metaconsole()) { + $values['previous_name'] = db_get_value('name', 'tconfig_os', 'id_os', $idOS); + } if (($icon !== 0) && ($icon != '')) { $values['icon_name'] = $icon; diff --git a/pandora_console/godmode/tag/edit_tag.php b/pandora_console/godmode/tag/edit_tag.php index 96b4e158e3..0b4d78f748 100644 --- a/pandora_console/godmode/tag/edit_tag.php +++ b/pandora_console/godmode/tag/edit_tag.php @@ -79,6 +79,10 @@ if ($update_tag && $id_tag != 0) { $values['url'] = $url_tag; $values['email'] = $email_tag; $values['phone'] = $phone_tag; + // Only for Metaconsole. Save the previous name for synchronizing. + if (is_metaconsole()) { + $values['previous_name'] = db_get_value('name', 'ttag', 'id_tag', $id_tag); + } $result = false; if ($values['name'] != '') { diff --git a/pandora_console/include/functions_alerts.php b/pandora_console/include/functions_alerts.php index cc449b3445..f4bd91645e 100644 --- a/pandora_console/include/functions_alerts.php +++ b/pandora_console/include/functions_alerts.php @@ -2780,6 +2780,11 @@ function alerts_ui_update_or_create_actions($update=true) if ($update) { $values['name'] = $name; $values['id_alert_command'] = $id_alert_command; + // Only for Metaconsole, save the previous name for synchronization. + if (is_metaconsole()) { + $values['previous_name'] = db_get_value('name', 'talert_actions', 'id', $id); + } + $result = (!$name) ? '' : alerts_update_alert_action($id, $values); } else { $name_check = db_get_value('name', 'talert_actions', 'name', $name); From a1bd93bac7404fd46d1f99ee081ab4b0363581a1 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Tue, 7 Jul 2020 11:08:44 +0200 Subject: [PATCH 02/22] Add database changes --- pandora_console/extras/mr/40.sql | 9 +++++++++ .../extras/pandoradb_migrate_6.0_to_7.0.mysql.sql | 12 ++++++++++++ pandora_console/pandoradb.sql | 4 ++++ 3 files changed, 25 insertions(+) create mode 100644 pandora_console/extras/mr/40.sql diff --git a/pandora_console/extras/mr/40.sql b/pandora_console/extras/mr/40.sql new file mode 100644 index 0000000000..81a12d05cf --- /dev/null +++ b/pandora_console/extras/mr/40.sql @@ -0,0 +1,9 @@ +START TRANSACTION; + +ALTER TABLE `talert_templates` ADD COLUMN `previous_name` text; +ALTER TABLE `talert_actions` ADD COLUMN `previous_name` text; +ALTER TABLE `talert_commands` ADD COLUMN `previous_name` text; +ALTER TABLE `ttag` ADD COLUMN `previous_name` text default ''; +ALTER TABLE `tconfig_os` ADD COLUMN `previous_name` text default ''; + +COMMIT; 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 d0466b769c..35cf9f2c25 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 @@ -1311,6 +1311,8 @@ ALTER TABLE talert_actions ADD COLUMN `field12_recovery` TEXT NOT NULL DEFAULT " ALTER TABLE talert_actions ADD COLUMN `field13_recovery` TEXT NOT NULL DEFAULT ""; ALTER TABLE talert_actions ADD COLUMN `field14_recovery` TEXT NOT NULL DEFAULT ""; ALTER TABLE talert_actions ADD COLUMN `field15_recovery` TEXT NOT NULL DEFAULT ""; +ALTER TABLE `talert_actions` ADD COLUMN `previous_name` text; + ALTER TABLE `talert_actions` MODIFY COLUMN `field11` text NOT NULL, MODIFY COLUMN `field12` text NOT NULL, MODIFY COLUMN `field13` text NOT NULL, @@ -1324,6 +1326,7 @@ UPDATE `talert_commands` SET `fields_descriptions` = '[\"Integria IMS UPDATE `talert_commands` SET `description` = 'This alert send an email using internal Pandora FMS Server SMTP capabilities (defined in each server, using: _field1_ as destination email address, and _field2_ as subject for message. _field3_ as text of message. _field4_ as content type (text/plain or html/text).', `fields_descriptions` = '[\"Destination address\",\"Subject\",\"Text\",\"Content Type\",\"\",\"\",\"\",\"\",\"\",\"\"]', `fields_values` = '[\"\",\"\",\"_html_editor_\",\"_content_type_\",\"\",\"\",\"\",\"\",\"\",\"\"]' WHERE id=1; ALTER TABLE `talert_commands` ADD COLUMN `id_group` mediumint(8) unsigned NULL default 0; ALTER TABLE `talert_commands` ADD COLUMN `fields_hidden` text; +ALTER TABLE `talert_commands` ADD COLUMN `previous_name` text; UPDATE `talert_actions` SET `field4` = 'text/html', `field4_recovery` = 'text/html' WHERE id = 1; @@ -1336,6 +1339,11 @@ ALTER TABLE `talert_commands` MODIFY COLUMN `id_group` mediumint(8) unsigned NUL -- --------------------------------------------------------------------- ALTER TABLE `tmap` MODIFY COLUMN `id_user` varchar(250) NOT NULL DEFAULT ''; +-- --------------------------------------------------------------------- +-- Table `ttag` +-- --------------------------------------------------------------------- +ALTER TABLE `ttag` ADD COLUMN `previous_name` text default ''; + -- --------------------------------------------------------------------- -- Table `tconfig` -- --------------------------------------------------------------------- @@ -1380,6 +1388,8 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('cr_incident_content', ''); -- Table `tconfig_os` -- --------------------------------------------------------------------- +ALTER TABLE `tconfig_os` ADD COLUMN `previous_name` text default ''; + INSERT INTO `tconfig_os` (`id_os`, `name`, `description`, `icon_name`) VALUES (100, 'Cluster', 'Cluster agent', 'so_cluster.png'); UPDATE `tagente` SET `id_os` = 100 WHERE `id_os` = 21 and (select `id_os` from `tconfig_os` WHERE `id_os` = 21 and `name` = 'Cluster'); @@ -2451,6 +2461,8 @@ INSERT INTO `tnews` (`id_news`, `author`, `subject`, `text`, `timestamp`) VALUES -- Alter table `talert_templates` -- ---------------------------------------------------------------------- +ALTER TABLE `talert_templates` ADD COLUMN `previous_name` text; + ALTER TABLE `talert_templates` MODIFY COLUMN `type` ENUM('regex','max_min','max','min','equal','not_equal','warning','critical','onchange','unknown','always','not_normal'); ALTER TABLE `talert_templates` MODIFY COLUMN `field11` text NOT NULL, diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 31fd3136bb..c43b6d3975 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -374,6 +374,7 @@ CREATE TABLE IF NOT EXISTS `talert_snmp` ( CREATE TABLE IF NOT EXISTS `talert_commands` ( `id` int(10) unsigned NOT NULL auto_increment, `name` varchar(100) NOT NULL default '', + `previous_name` text, `command` text, `id_group` mediumint(8) unsigned NULL default 0, `description` text, @@ -390,6 +391,7 @@ CREATE TABLE IF NOT EXISTS `talert_commands` ( CREATE TABLE IF NOT EXISTS `talert_actions` ( `id` int(10) unsigned NOT NULL auto_increment, `name` text, + `previous_name` text, `id_alert_command` int(10) unsigned NULL default 0, `field1` text NOT NULL, `field2` text NOT NULL, @@ -434,6 +436,7 @@ CREATE TABLE IF NOT EXISTS `talert_actions` ( CREATE TABLE IF NOT EXISTS `talert_templates` ( `id` int(10) unsigned NOT NULL auto_increment, `name` text, + `previous_name` text, `description` mediumtext, `id_alert_action` int(10) unsigned NULL, `field1` text NOT NULL, @@ -583,6 +586,7 @@ CREATE TABLE IF NOT EXISTS `tconfig_os` ( `name` varchar(100) NOT NULL default '', `description` varchar(250) default '', `icon_name` varchar(100) default '', + `previous_name` text default '', PRIMARY KEY (`id_os`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; From 909d7cba58301b66c7d68773e3ff77c0819d13da Mon Sep 17 00:00:00 2001 From: alejandro-campos Date: Tue, 14 Jul 2020 17:12:38 +0200 Subject: [PATCH 03/22] Implemented log source status info box in agent view --- .../operation/agentes/log_sources_status.php | 101 ++++++++++++++++++ .../operation/agentes/ver_agente.php | 2 + 2 files changed, 103 insertions(+) create mode 100644 pandora_console/operation/agentes/log_sources_status.php diff --git a/pandora_console/operation/agentes/log_sources_status.php b/pandora_console/operation/agentes/log_sources_status.php new file mode 100644 index 0000000000..7d21974db1 --- /dev/null +++ b/pandora_console/operation/agentes/log_sources_status.php @@ -0,0 +1,101 @@ +width = '100%'; +$table->class = 'info_table'; +$table->cellpadding = '0'; +$table->cellspacing = '0'; +$table->head = []; +$table->align = []; + +$table->head[0] = "".__('Source').''; +$table->head[1] = "".__('Review').''; +$table->head[2] = "".__('Last contact').''; + +$table->style = []; +$table->style['source'] = 'width: 80%;'; + +$table->data = []; + +$row = []; + + +// Get most recent sources for active agent. +$sql = "select source, MAX(utimestamp) AS last_contact from tagent_module_log where id_agent=$agent_id GROUP BY source"; + +$logs = mysql_db_get_all_rows_sql($sql); + +foreach ($logs as $log) { + $row['source'] = $log['source']; + $row['review'] = ''.html_print_image('images/zoom.png', true, ['title' => __('Force remote checks'), 'alt' => '', 'onclick' => "send_form('".$log['source'].'-'.$agent_id."')"]).''; + $row['last_contact'] = human_time_comparation($log['last_contact']); + + $table->data[] = $row; +} + +ob_start(); + +if (!empty($table->data)) { + echo '
'; + html_print_table($table); + echo '
'; +} else { + ui_print_info_message(['no_close' => true, 'message' => __('No log sources found') ]); + $log_sources_defined = false; +} + +// Hidden form to perform post request to Log Viewer page when clicking on the Review field icon. +echo ''; + +$html_content = ob_get_clean(); + +// Create controlled toggle content. +ui_toggle( + $html_content, + __('Log sources status'), + 'log_sources_status', + !$log_sources_defined, + false, + '', + 'white_table_graph_content no-padding-imp' +); + +?> + + diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php index acb31f5cdc..2ddf293d44 100644 --- a/pandora_console/operation/agentes/ver_agente.php +++ b/pandora_console/operation/agentes/ver_agente.php @@ -1576,6 +1576,8 @@ switch ($tab) { include 'estado_monitores.php'; echo ""; include 'alerts_status.php'; + echo ""; + include 'log_sources_status.php'; // Check permissions to read events if (check_acl($config['id_user'], 0, 'ER')) { echo ""; From 4edef7099bdd5300ece6fe994a86d3253ad00426 Mon Sep 17 00:00:00 2001 From: alejandro-campos Date: Wed, 15 Jul 2020 09:25:39 +0200 Subject: [PATCH 04/22] added check to display log sources info box when log collector activated --- pandora_console/operation/agentes/ver_agente.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php index 2ddf293d44..e86960938a 100644 --- a/pandora_console/operation/agentes/ver_agente.php +++ b/pandora_console/operation/agentes/ver_agente.php @@ -1576,8 +1576,12 @@ switch ($tab) { include 'estado_monitores.php'; echo ""; include 'alerts_status.php'; - echo ""; - include 'log_sources_status.php'; + + if ($config['log_collector']) { + echo ""; + include 'log_sources_status.php'; + } + // Check permissions to read events if (check_acl($config['id_user'], 0, 'ER')) { echo ""; From c67d8bd005446468e64a50192888fa9390a2016d Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Fri, 7 Aug 2020 13:29:09 +0200 Subject: [PATCH 05/22] Fixed little issues --- pandora_console/extras/mr/41.sql | 5 +++++ pandora_console/pandoradb.sql | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 pandora_console/extras/mr/41.sql diff --git a/pandora_console/extras/mr/41.sql b/pandora_console/extras/mr/41.sql new file mode 100644 index 0000000000..8db5f53380 --- /dev/null +++ b/pandora_console/extras/mr/41.sql @@ -0,0 +1,5 @@ +ALTER TABLE `talert_templates` ADD COLUMN `previous_name` text; +ALTER TABLE `talert_actions` ADD COLUMN `previous_name` text; +ALTER TABLE `talert_commands` ADD COLUMN `previous_name` text; +ALTER TABLE `ttag` ADD COLUMN `previous_name` text default ''; +ALTER TABLE `tconfig_os` ADD COLUMN `previous_name` text default ''; \ No newline at end of file diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index c43b6d3975..b1217ecf05 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -2042,9 +2042,10 @@ CREATE TABLE IF NOT EXISTS `ttag` ( `id_tag` integer(10) unsigned NOT NULL auto_increment, `name` varchar(100) NOT NULL default '', `description` text NOT NULL, - `url` mediumtext NOT NULL, + `url` mediumtext NOT NULL, `email` text NULL, `phone` text NULL, + `previous_name` text default '', PRIMARY KEY (`id_tag`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; From 69410815fb45fb68d6f7b43cf61bd5f3e41fb22e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= Date: Mon, 10 Aug 2020 10:06:51 +0200 Subject: [PATCH 06/22] Update 40.sql --- pandora_console/extras/mr/40.sql | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pandora_console/extras/mr/40.sql b/pandora_console/extras/mr/40.sql index 4714f0d023..c62d6fd691 100644 --- a/pandora_console/extras/mr/40.sql +++ b/pandora_console/extras/mr/40.sql @@ -1,11 +1,5 @@ START TRANSACTION; -ALTER TABLE `talert_templates` ADD COLUMN `previous_name` text; -ALTER TABLE `talert_actions` ADD COLUMN `previous_name` text; -ALTER TABLE `talert_commands` ADD COLUMN `previous_name` text; -ALTER TABLE `ttag` ADD COLUMN `previous_name` text default ''; -ALTER TABLE `tconfig_os` ADD COLUMN `previous_name` text default ''; - UPDATE `talert_commands` SET name='Monitoring Event' WHERE name='Pandora FMS Event'; ALTER TABLE `tservice_element` ADD COLUMN `rules` text; From 0b21adf150e57275a923c1b11682d986caf29bea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= Date: Mon, 10 Aug 2020 10:18:50 +0200 Subject: [PATCH 07/22] Fix 41.sql --- pandora_console/extras/mr/41.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/extras/mr/41.sql b/pandora_console/extras/mr/41.sql index 8db5f53380..e8123a6c3c 100644 --- a/pandora_console/extras/mr/41.sql +++ b/pandora_console/extras/mr/41.sql @@ -1,5 +1,5 @@ ALTER TABLE `talert_templates` ADD COLUMN `previous_name` text; ALTER TABLE `talert_actions` ADD COLUMN `previous_name` text; ALTER TABLE `talert_commands` ADD COLUMN `previous_name` text; -ALTER TABLE `ttag` ADD COLUMN `previous_name` text default ''; -ALTER TABLE `tconfig_os` ADD COLUMN `previous_name` text default ''; \ No newline at end of file +ALTER TABLE `ttag` ADD COLUMN `previous_name` text; +ALTER TABLE `tconfig_os` ADD COLUMN `previous_name` text; \ No newline at end of file From 35644a367f7486263c14215cf7ca9ecde2233aae Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Mon, 10 Aug 2020 14:53:07 +0200 Subject: [PATCH 08/22] Added ttag modifies --- pandora_console/pandoradb.sql | 3 +-- pandora_console/pandoradb_data.sql | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index ae6fcce074..336d66c55c 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -586,7 +586,6 @@ CREATE TABLE IF NOT EXISTS `tconfig_os` ( `name` varchar(100) NOT NULL default '', `description` varchar(250) default '', `icon_name` varchar(100) default '', - `previous_name` text default '', PRIMARY KEY (`id_os`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -2045,7 +2044,7 @@ CREATE TABLE IF NOT EXISTS `ttag` ( `url` mediumtext NOT NULL, `email` text NULL, `phone` text NULL, - `previous_name` text default '', + `previous_name` text NULL, PRIMARY KEY (`id_tag`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index 1eedc9cef4..79c82802ec 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -1187,7 +1187,7 @@ INSERT INTO `tplugin` (`id`, `name`, `description`, `max_timeout`, `max_retries` INSERT INTO `tagent_custom_fields` VALUES (1,'Serial Number',0,0,''),(2,'Department',0,0,''),(3,'Additional ID',0,0,''),(4,'eHorusID',0,0,''); -INSERT INTO `ttag` VALUES (1,'network','Network equipment','http://artica.es','',''),(2,'critical','Critical modules','','',''),(3,'dmz','DMZ Network Zone','','',''),(4,'performance','Performance anda capacity modules','','',''),(5,'configuration','','','',''); +INSERT INTO `ttag` VALUES (1,'network','Network equipment','http://artica.es','','',''),(2,'critical','Critical modules','','','',''),(3,'dmz','DMZ Network Zone','','','',''),(4,'performance','Performance anda capacity modules','','','',''),(5,'configuration','','','','',''); INSERT INTO `tevent_response` VALUES (1,'Ping to host','Ping to the agent host','ping -c 5 _agent_address_','command',0,620,500,0,'',0,90),(3,'Create incident from event','Create a incident from the event with the standard incidents system of Pandora FMS','index.php?sec=workspace&sec2=operation/incidents/incident_detail&insert_form&from_event=_event_id_','url',0,0,0,1,'',0,90),(5,'Restart agent','Restart the agent with using UDP protocol. To use this response is necessary to have installed Pandora FMS server and console in the same machine.','/usr/share/pandora_server/util/udp_client.pl _agent_address_ 41122 "REFRESH AGENT"','command',0,620,500,0,'',0,90),(6,'Ping to module agent host','Ping to the module agent host','ping -c 5 _module_address_','command',0,620,500,0,'',0,90); From 3c0ea8b08a66069edecccfd282fd1215324334a4 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Mon, 10 Aug 2020 15:10:17 +0200 Subject: [PATCH 09/22] Solved issues with DB --- pandora_console/extras/mr/40.sql | 7 +--- pandora_console/extras/mr/41.sql | 8 +++- .../pandoradb_migrate_6.0_to_7.0.mysql.sql | 6 +-- pandora_console/pandoradb.sql | 7 ++-- pandora_console/pandoradb_data.sql | 42 +++++++++---------- 5 files changed, 35 insertions(+), 35 deletions(-) diff --git a/pandora_console/extras/mr/40.sql b/pandora_console/extras/mr/40.sql index 4714f0d023..fece05576f 100644 --- a/pandora_console/extras/mr/40.sql +++ b/pandora_console/extras/mr/40.sql @@ -1,11 +1,5 @@ START TRANSACTION; -ALTER TABLE `talert_templates` ADD COLUMN `previous_name` text; -ALTER TABLE `talert_actions` ADD COLUMN `previous_name` text; -ALTER TABLE `talert_commands` ADD COLUMN `previous_name` text; -ALTER TABLE `ttag` ADD COLUMN `previous_name` text default ''; -ALTER TABLE `tconfig_os` ADD COLUMN `previous_name` text default ''; - UPDATE `talert_commands` SET name='Monitoring Event' WHERE name='Pandora FMS Event'; ALTER TABLE `tservice_element` ADD COLUMN `rules` text; @@ -13,6 +7,7 @@ ALTER TABLE `tservice` ADD COLUMN `unknown_as_critical` tinyint(1) NOT NULL defa ALTER TABLE `tserver` MODIFY COLUMN `version` varchar(25) NOT NULL DEFAULT ''; UPDATE `tservice` SET `auto_calculate`=0; + UPDATE `tservice` SET `cps`= `cps` - 1 WHERE `cps` > 0; UPDATE `tagente` SET `cps`= `cps` - 1 WHERE `cps` > 0; UPDATE `tagente_modulo` SET `cps`= `cps` - 1 WHERE `cps` > 0; diff --git a/pandora_console/extras/mr/41.sql b/pandora_console/extras/mr/41.sql index 8db5f53380..58cf54f69f 100644 --- a/pandora_console/extras/mr/41.sql +++ b/pandora_console/extras/mr/41.sql @@ -1,5 +1,9 @@ +START TRANSACTION; + ALTER TABLE `talert_templates` ADD COLUMN `previous_name` text; ALTER TABLE `talert_actions` ADD COLUMN `previous_name` text; ALTER TABLE `talert_commands` ADD COLUMN `previous_name` text; -ALTER TABLE `ttag` ADD COLUMN `previous_name` text default ''; -ALTER TABLE `tconfig_os` ADD COLUMN `previous_name` text default ''; \ No newline at end of file +ALTER TABLE `ttag` ADD COLUMN `previous_name` text NULL; +ALTER TABLE `tconfig_os` ADD COLUMN `previous_name` text NULL; + +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 1297d5fa9b..d741afb9ae 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 @@ -1343,7 +1343,7 @@ ALTER TABLE `tmap` MODIFY COLUMN `id_user` varchar(250) NOT NULL DEFAULT ''; -- --------------------------------------------------------------------- -- Table `ttag` -- --------------------------------------------------------------------- -ALTER TABLE `ttag` ADD COLUMN `previous_name` text default ''; +ALTER TABLE `ttag` ADD COLUMN `previous_name` text NULL; -- --------------------------------------------------------------------- -- Table `tconfig` @@ -1389,9 +1389,9 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('cr_incident_content', ''); -- Table `tconfig_os` -- --------------------------------------------------------------------- -ALTER TABLE `tconfig_os` ADD COLUMN `previous_name` text default ''; +ALTER TABLE `tconfig_os` ADD COLUMN `previous_name` text NULL; -INSERT INTO `tconfig_os` (`id_os`, `name`, `description`, `icon_name`) VALUES (100, 'Cluster', 'Cluster agent', 'so_cluster.png'); +INSERT INTO `tconfig_os` (`id_os`, `name`, `description`, `icon_name`) VALUES (100, 'Cluster', 'Cluster agent', 'so_cluster.png', ''); UPDATE `tagente` SET `id_os` = 100 WHERE `id_os` = 21 and (select `id_os` from `tconfig_os` WHERE `id_os` = 21 and `name` = 'Cluster'); diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 336d66c55c..011e8e513f 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -374,7 +374,6 @@ CREATE TABLE IF NOT EXISTS `talert_snmp` ( CREATE TABLE IF NOT EXISTS `talert_commands` ( `id` int(10) unsigned NOT NULL auto_increment, `name` varchar(100) NOT NULL default '', - `previous_name` text, `command` text, `id_group` mediumint(8) unsigned NULL default 0, `description` text, @@ -382,6 +381,7 @@ CREATE TABLE IF NOT EXISTS `talert_commands` ( `fields_descriptions` TEXT, `fields_values` TEXT, `fields_hidden` TEXT, + `previous_name` text, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -391,7 +391,6 @@ CREATE TABLE IF NOT EXISTS `talert_commands` ( CREATE TABLE IF NOT EXISTS `talert_actions` ( `id` int(10) unsigned NOT NULL auto_increment, `name` text, - `previous_name` text, `id_alert_command` int(10) unsigned NULL default 0, `field1` text NOT NULL, `field2` text NOT NULL, @@ -425,6 +424,7 @@ CREATE TABLE IF NOT EXISTS `talert_actions` ( `field13_recovery` text NOT NULL, `field14_recovery` text NOT NULL, `field15_recovery` text NOT NULL, + `previous_name` text, PRIMARY KEY (`id`), FOREIGN KEY (`id_alert_command`) REFERENCES talert_commands(`id`) ON DELETE CASCADE ON UPDATE CASCADE @@ -436,7 +436,6 @@ CREATE TABLE IF NOT EXISTS `talert_actions` ( CREATE TABLE IF NOT EXISTS `talert_templates` ( `id` int(10) unsigned NOT NULL auto_increment, `name` text, - `previous_name` text, `description` mediumtext, `id_alert_action` int(10) unsigned NULL, `field1` text NOT NULL, @@ -493,6 +492,7 @@ CREATE TABLE IF NOT EXISTS `talert_templates` ( `wizard_level` enum('basic','advanced','nowizard') default 'nowizard', `min_alerts_reset_counter` tinyint(1) default 0, `disable_event` tinyint(1) default 0, + `previous_name` text, PRIMARY KEY (`id`), KEY `idx_template_action` (`id_alert_action`), FOREIGN KEY (`id_alert_action`) REFERENCES talert_actions(`id`) @@ -586,6 +586,7 @@ CREATE TABLE IF NOT EXISTS `tconfig_os` ( `name` varchar(100) NOT NULL default '', `description` varchar(250) default '', `icon_name` varchar(100) default '', + `previous_name` text NULL, PRIMARY KEY (`id_os`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index 79c82802ec..46c878b19f 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -150,27 +150,27 @@ UNLOCK TABLES; -- LOCK TABLES `tconfig_os` WRITE; -INSERT INTO `tconfig_os` (`id_os`, `name`, `description`, `icon_name`) VALUES -(1,'Linux','Linux: All versions','so_linux.png'), -(2,'Solaris','Sun Solaris','so_solaris.png'), -(3,'AIX','IBM AIX','so_aix.png'), -(4,'BSD','OpenBSD, FreeBSD and Others','so_bsd.png'), -(5,'HP-UX','HP-UX Unix OS','so_hpux.png'), -(7,'Cisco','CISCO IOS','so_cisco.png'), -(8,'MacOS','MAC OS','so_mac.png'), -(9,'Windows','Microsoft Windows OS','so_win.png'), -(10,'Other','Other SO','so_other.png'), -(11,'Network','Network Agent','network.png'), -(12,'Web Server','Web Server/Application','network.png'), -(13,'Sensor','Hardware Agent (Sensor)','network.png'), -(14,'Embedded','Embedded device running an agent','embedded.png'), -(15,'Android','Android agent','android.png'), -(16, 'VMware', 'VMware Architecture', 'so_vmware.png'), -(17, 'Router', 'Generic router', 'so_router.png'), -(18, 'Switch', 'Generic switch', 'so_switch.png'), -(19, 'Satellite', 'Satellite agent', 'satellite.png'), -(20, 'Mainframe', 'Mainframe agent', 'so_mainframe.png'), -(100, 'Cluster', 'Cluster agent', 'so_cluster.png'); +INSERT INTO `tconfig_os` (`id_os`, `name`, `description`, `icon_name`, `previous_name`) VALUES +(1,'Linux','Linux: All versions','so_linux.png', ''), +(2,'Solaris','Sun Solaris','so_solaris.png', ''), +(3,'AIX','IBM AIX','so_aix.png', ''), +(4,'BSD','OpenBSD, FreeBSD and Others','so_bsd.png', ''), +(5,'HP-UX','HP-UX Unix OS','so_hpux.png', ''), +(7,'Cisco','CISCO IOS','so_cisco.png', ''), +(8,'MacOS','MAC OS','so_mac.png', ''), +(9,'Windows','Microsoft Windows OS','so_win.png', ''), +(10,'Other','Other SO','so_other.png', ''), +(11,'Network','Network Agent','network.png', ''), +(12,'Web Server','Web Server/Application','network.png', ''), +(13,'Sensor','Hardware Agent (Sensor)','network.png', ''), +(14,'Embedded','Embedded device running an agent','embedded.png', ''), +(15,'Android','Android agent','android.png', ''), +(16, 'VMware', 'VMware Architecture', 'so_vmware.png', ''), +(17, 'Router', 'Generic router', 'so_router.png', ''), +(18, 'Switch', 'Generic switch', 'so_switch.png', ''), +(19, 'Satellite', 'Satellite agent', 'satellite.png', ''), +(20, 'Mainframe', 'Mainframe agent', 'so_mainframe.png', ''), +(100, 'Cluster', 'Cluster agent', 'so_cluster.png', ''); UNLOCK TABLES; From 0917a631ee48abfc2de6fadfc47da9eaf9ae1536 Mon Sep 17 00:00:00 2001 From: alejandro-campos Date: Fri, 14 Aug 2020 14:48:34 +0200 Subject: [PATCH 10/22] fix parameter macros in event responses --- pandora_console/include/ajax/events.php | 3 ++- pandora_console/include/javascript/pandora_events.js | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php index 459e9849a4..230b55a476 100644 --- a/pandora_console/include/ajax/events.php +++ b/pandora_console/include/ajax/events.php @@ -1093,7 +1093,8 @@ if ($dialogue_event_response) { } } else { echo "
"; - echo $prompt.sprintf(__('Executing command: %s', $command)); + + echo $prompt."Executing command: $command"; echo '

'; echo "'; diff --git a/pandora_console/include/javascript/pandora_events.js b/pandora_console/include/javascript/pandora_events.js index b1bb90d02b..55c8ecb74a 100644 --- a/pandora_console/include/javascript/pandora_events.js +++ b/pandora_console/include/javascript/pandora_events.js @@ -135,7 +135,7 @@ function show_response_dialog(response_id, response) { params.push("dialogue_event_response=1"); params.push("massive=0"); params.push("event_id=" + response["event_id"]); - params.push("target=" + response["target"]); + params.push("target=" + encodeURIComponent(response["target"])); params.push("response_id=" + response_id); params.push("server_id=" + response["server_id"]); @@ -397,7 +397,7 @@ function perform_response(response, response_id) { var params = []; params.push("page=include/ajax/events"); params.push("perform_event_response=1"); - params.push("target=" + response["target"]); + params.push("target=" + encodeURIComponent(response["target"])); params.push("response_id=" + response_id); params.push("event_id=" + response["event_id"]); params.push("server_id=" + response["server_id"]); From c1c2fb3b57861f2e727c92edc8fecb1be6ac92dc Mon Sep 17 00:00:00 2001 From: artica Date: Tue, 18 Aug 2020 01:00:16 +0200 Subject: [PATCH 11/22] 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 510f6e5de5..f2e936c707 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.748-200817 +Version: 7.0NG.748-200818 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 58b17371d1..d1de8624ce 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.748-200817" +pandora_version="7.0NG.748-200818" 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 ce76c6d66f..61df09cb90 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -55,7 +55,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.748'; -use constant AGENT_BUILD => '200817'; +use constant AGENT_BUILD => '200818'; # 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 63ffbb3f2c..a756014401 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.748 -%define release 200817 +%define release 200818 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 b2a4144872..e41e032167 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.748 -%define release 200817 +%define release 200818 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 d8ff9c5ba0..68240e7d34 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.748" -PI_BUILD="200817" +PI_BUILD="200818" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index f668dc85ad..5cfa8fdb8f 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{200817} +{200818} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 25fe082ef5..923f270161 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.748(Build 200817)") +#define PANDORA_VERSION ("7.0NG.748(Build 200818)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 72d707ec1c..a923e77182 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.748(Build 200817))" + VALUE "ProductVersion", "(7.0NG.748(Build 200818))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 4434c88f19..fa12a95c20 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.748-200817 +Version: 7.0NG.748-200818 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 1e29f086a2..775a4433a1 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.748-200817" +pandora_version="7.0NG.748-200818" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 560d723dee..54fb1f5f33 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 = 'PC200817'; +$build_version = 'PC200818'; $pandora_version = 'v7.0NG.748'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index ea25bc32d1..1f50d85b7a 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 5f8b43d778..f20208a1c7 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.748 -%define release 200817 +%define release 200818 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 3034a6a80e..536f377cde 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.748 -%define release 200817 +%define release 200818 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 52fc1581e0..33ee937e13 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.748" -PI_BUILD="200817" +PI_BUILD="200818" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 2315196dfe..113c434194 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.748 PS200817"; +my $version = "7.0NG.748 PS200818"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 82c3fe264f..a43207cf5a 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.748 PS200817"; +my $version = "7.0NG.748 PS200818"; # save program name for logging my $progname = basename($0); From 2231fcab728316dff509bcc87c885ad739d1ebdf Mon Sep 17 00:00:00 2001 From: artica Date: Wed, 19 Aug 2020 01:00:14 +0200 Subject: [PATCH 12/22] 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 f2e936c707..3fd04c6ecb 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.748-200818 +Version: 7.0NG.748-200819 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 d1de8624ce..94cef1a7cb 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.748-200818" +pandora_version="7.0NG.748-200819" 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 61df09cb90..71fa23b0fc 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -55,7 +55,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.748'; -use constant AGENT_BUILD => '200818'; +use constant AGENT_BUILD => '200819'; # 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 a756014401..6ea6a6bc00 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.748 -%define release 200818 +%define release 200819 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 e41e032167..7c3cd35ee9 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.748 -%define release 200818 +%define release 200819 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 68240e7d34..3455413772 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.748" -PI_BUILD="200818" +PI_BUILD="200819" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 5cfa8fdb8f..c8123b3ec5 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{200818} +{200819} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 923f270161..3487d8083b 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.748(Build 200818)") +#define PANDORA_VERSION ("7.0NG.748(Build 200819)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index a923e77182..4218ee12eb 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.748(Build 200818))" + VALUE "ProductVersion", "(7.0NG.748(Build 200819))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index fa12a95c20..f67f6b0462 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.748-200818 +Version: 7.0NG.748-200819 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 775a4433a1..40f48f6faf 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.748-200818" +pandora_version="7.0NG.748-200819" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 54fb1f5f33..60546c8cc0 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 = 'PC200818'; +$build_version = 'PC200819'; $pandora_version = 'v7.0NG.748'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 1f50d85b7a..611f226b82 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 f20208a1c7..a7d103711e 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.748 -%define release 200818 +%define release 200819 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 536f377cde..102a7df6b0 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.748 -%define release 200818 +%define release 200819 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 33ee937e13..cbeb23a99e 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.748" -PI_BUILD="200818" +PI_BUILD="200819" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 113c434194..e7b248269c 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.748 PS200818"; +my $version = "7.0NG.748 PS200819"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index a43207cf5a..7456604bd8 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.748 PS200818"; +my $version = "7.0NG.748 PS200819"; # save program name for logging my $progname = basename($0); From 29026ef3bed70995f1547a53fb41381ddc3ef368 Mon Sep 17 00:00:00 2001 From: alejandro-campos Date: Wed, 19 Aug 2020 09:10:17 +0200 Subject: [PATCH 13/22] changed tooltip --- pandora_console/operation/agentes/log_sources_status.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/operation/agentes/log_sources_status.php b/pandora_console/operation/agentes/log_sources_status.php index 7d21974db1..35a4c2c949 100644 --- a/pandora_console/operation/agentes/log_sources_status.php +++ b/pandora_console/operation/agentes/log_sources_status.php @@ -45,7 +45,7 @@ $logs = mysql_db_get_all_rows_sql($sql); foreach ($logs as $log) { $row['source'] = $log['source']; - $row['review'] = ''.html_print_image('images/zoom.png', true, ['title' => __('Force remote checks'), 'alt' => '', 'onclick' => "send_form('".$log['source'].'-'.$agent_id."')"]).''; + $row['review'] = ''.html_print_image('images/zoom.png', true, ['title' => __('Review in log viewer'), 'alt' => '', 'onclick' => "send_form('".$log['source'].'-'.$agent_id."')"]).''; $row['last_contact'] = human_time_comparation($log['last_contact']); $table->data[] = $row; From 06f17b5d0b76f7079e84e99c7a25aa8f100e1a66 Mon Sep 17 00:00:00 2001 From: artica Date: Thu, 20 Aug 2020 01:00:18 +0200 Subject: [PATCH 14/22] 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 3fd04c6ecb..bbd6871a3f 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.748-200819 +Version: 7.0NG.748-200820 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 94cef1a7cb..e77840575e 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.748-200819" +pandora_version="7.0NG.748-200820" 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 71fa23b0fc..0070c42baf 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -55,7 +55,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.748'; -use constant AGENT_BUILD => '200819'; +use constant AGENT_BUILD => '200820'; # 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 6ea6a6bc00..76cbf3c102 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.748 -%define release 200819 +%define release 200820 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 7c3cd35ee9..3692013c2b 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.748 -%define release 200819 +%define release 200820 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 3455413772..faaedf45c5 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.748" -PI_BUILD="200819" +PI_BUILD="200820" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index c8123b3ec5..9f12cd79b7 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{200819} +{200820} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 3487d8083b..8b6b6679e5 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.748(Build 200819)") +#define PANDORA_VERSION ("7.0NG.748(Build 200820)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 4218ee12eb..906173fcc3 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.748(Build 200819))" + VALUE "ProductVersion", "(7.0NG.748(Build 200820))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index f67f6b0462..8cd3235f09 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.748-200819 +Version: 7.0NG.748-200820 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 40f48f6faf..0e26581d1c 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.748-200819" +pandora_version="7.0NG.748-200820" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 60546c8cc0..79574d711a 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 = 'PC200819'; +$build_version = 'PC200820'; $pandora_version = 'v7.0NG.748'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 611f226b82..e4a753c34d 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 a7d103711e..b7edfed4ad 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.748 -%define release 200819 +%define release 200820 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 102a7df6b0..450c34a6fd 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.748 -%define release 200819 +%define release 200820 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index cbeb23a99e..8ffe6e17f7 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.748" -PI_BUILD="200819" +PI_BUILD="200820" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index e7b248269c..44f6158a43 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.748 PS200819"; +my $version = "7.0NG.748 PS200820"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 7456604bd8..be5bdc6056 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.748 PS200819"; +my $version = "7.0NG.748 PS200820"; # save program name for logging my $progname = basename($0); From f0a91cce564b0c1b2d8ac169eb42836211829785 Mon Sep 17 00:00:00 2001 From: artica Date: Fri, 21 Aug 2020 01:00:18 +0200 Subject: [PATCH 15/22] 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 bbd6871a3f..e5ff00e0a8 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.748-200820 +Version: 7.0NG.748-200821 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 e77840575e..7c55520a6c 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.748-200820" +pandora_version="7.0NG.748-200821" 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 0070c42baf..1b56be4714 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -55,7 +55,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.748'; -use constant AGENT_BUILD => '200820'; +use constant AGENT_BUILD => '200821'; # 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 76cbf3c102..bb7a1e84b9 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.748 -%define release 200820 +%define release 200821 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 3692013c2b..bc40238f7f 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.748 -%define release 200820 +%define release 200821 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 faaedf45c5..a9b68d909b 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.748" -PI_BUILD="200820" +PI_BUILD="200821" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 9f12cd79b7..276c995c06 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{200820} +{200821} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 8b6b6679e5..03d5b2110b 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.748(Build 200820)") +#define PANDORA_VERSION ("7.0NG.748(Build 200821)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 906173fcc3..2b2c03d524 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.748(Build 200820))" + VALUE "ProductVersion", "(7.0NG.748(Build 200821))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 8cd3235f09..8549080fc1 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.748-200820 +Version: 7.0NG.748-200821 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 0e26581d1c..43b1a6dbaf 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.748-200820" +pandora_version="7.0NG.748-200821" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 79574d711a..e8eb9a0857 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 = 'PC200820'; +$build_version = 'PC200821'; $pandora_version = 'v7.0NG.748'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index e4a753c34d..45f949e7d1 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 b7edfed4ad..8ac8d5760e 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.748 -%define release 200820 +%define release 200821 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 450c34a6fd..0a50fbdf8b 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.748 -%define release 200820 +%define release 200821 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 8ffe6e17f7..07e0933a47 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.748" -PI_BUILD="200820" +PI_BUILD="200821" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 44f6158a43..897a191c91 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.748 PS200820"; +my $version = "7.0NG.748 PS200821"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index be5bdc6056..36bb379b36 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.748 PS200820"; +my $version = "7.0NG.748 PS200821"; # save program name for logging my $progname = basename($0); From 195f09a7cfbe87756a11014a4cc5b3e8c9b99f10 Mon Sep 17 00:00:00 2001 From: marcos Date: Fri, 21 Aug 2020 09:40:24 +0200 Subject: [PATCH 16/22] fixed error on delete agent api --- pandora_console/include/functions_api.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php index 328848fc7e..5a184c352e 100644 --- a/pandora_console/include/functions_api.php +++ b/pandora_console/include/functions_api.php @@ -1861,13 +1861,13 @@ function api_set_delete_agent($id, $thrash1, $other, $thrash3) foreach ($servers as $server) { if (metaconsole_connect($server) == NOERR) { if ($other['data'][0] === '1') { - $idAgent[0] = agents_get_agent_id_by_alias($id); + $idAgent = agents_get_agent_id_by_alias($id); } else { $idAgent[0] = agents_get_agent_id($id, true); } - if ($idAgent[0]) { - $result = agents_delete_agent($idAgent, true); + if (!empty($idAgent)) { + $result = agents_delete_agent($idAgent[0], true); } metaconsole_restore_db(); From b5752f1b2df77b17eeac664d24e57f05291e47bb Mon Sep 17 00:00:00 2001 From: artica Date: Sat, 22 Aug 2020 01:00:41 +0200 Subject: [PATCH 17/22] 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 e5ff00e0a8..c30aac5eb7 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.748-200821 +Version: 7.0NG.748-200822 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 7c55520a6c..a0c5dc0ef3 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.748-200821" +pandora_version="7.0NG.748-200822" 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 1b56be4714..117201478c 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -55,7 +55,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.748'; -use constant AGENT_BUILD => '200821'; +use constant AGENT_BUILD => '200822'; # 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 bb7a1e84b9..02cd167b9b 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.748 -%define release 200821 +%define release 200822 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 bc40238f7f..e4f3d9e571 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.748 -%define release 200821 +%define release 200822 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 a9b68d909b..f1c861abf1 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.748" -PI_BUILD="200821" +PI_BUILD="200822" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 276c995c06..261df58cac 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{200821} +{200822} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 03d5b2110b..67f9d0896e 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.748(Build 200821)") +#define PANDORA_VERSION ("7.0NG.748(Build 200822)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 2b2c03d524..f72cd21a67 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.748(Build 200821))" + VALUE "ProductVersion", "(7.0NG.748(Build 200822))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 8549080fc1..8cf4304c4f 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.748-200821 +Version: 7.0NG.748-200822 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 43b1a6dbaf..b3070a2acc 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.748-200821" +pandora_version="7.0NG.748-200822" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index e8eb9a0857..ed25abac1d 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 = 'PC200821'; +$build_version = 'PC200822'; $pandora_version = 'v7.0NG.748'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 45f949e7d1..3d7cb99364 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 8ac8d5760e..6bfb451e56 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.748 -%define release 200821 +%define release 200822 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 0a50fbdf8b..f0b7a97339 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.748 -%define release 200821 +%define release 200822 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 07e0933a47..9e44bbded0 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.748" -PI_BUILD="200821" +PI_BUILD="200822" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 897a191c91..aeaf0ac2bc 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.748 PS200821"; +my $version = "7.0NG.748 PS200822"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 36bb379b36..98e5bc156a 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.748 PS200821"; +my $version = "7.0NG.748 PS200822"; # save program name for logging my $progname = basename($0); From 07c7d917c8bf056756be2d3ad2014a020d530a5d Mon Sep 17 00:00:00 2001 From: artica Date: Sun, 23 Aug 2020 01:00:14 +0200 Subject: [PATCH 18/22] 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 c30aac5eb7..ad074a6356 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.748-200822 +Version: 7.0NG.748-200823 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 a0c5dc0ef3..d7ad88dae5 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.748-200822" +pandora_version="7.0NG.748-200823" 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 117201478c..7994d74e4a 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -55,7 +55,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.748'; -use constant AGENT_BUILD => '200822'; +use constant AGENT_BUILD => '200823'; # 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 02cd167b9b..6e7183b506 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.748 -%define release 200822 +%define release 200823 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 e4f3d9e571..36191d62fe 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.748 -%define release 200822 +%define release 200823 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 f1c861abf1..426ae5522b 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.748" -PI_BUILD="200822" +PI_BUILD="200823" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 261df58cac..f5f91d60f7 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{200822} +{200823} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index 67f9d0896e..edf5da6c02 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.748(Build 200822)") +#define PANDORA_VERSION ("7.0NG.748(Build 200823)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index f72cd21a67..ddb94909d3 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.748(Build 200822))" + VALUE "ProductVersion", "(7.0NG.748(Build 200823))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 8cf4304c4f..05e5fb2446 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.748-200822 +Version: 7.0NG.748-200823 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 b3070a2acc..bbba99be8a 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.748-200822" +pandora_version="7.0NG.748-200823" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index ed25abac1d..4431918718 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 = 'PC200822'; +$build_version = 'PC200823'; $pandora_version = 'v7.0NG.748'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 3d7cb99364..dc26f8a76e 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 6bfb451e56..9f32319723 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.748 -%define release 200822 +%define release 200823 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index f0b7a97339..39ef41e429 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.748 -%define release 200822 +%define release 200823 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 9e44bbded0..cd6776908f 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.748" -PI_BUILD="200822" +PI_BUILD="200823" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index aeaf0ac2bc..8d6d5a7e45 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.748 PS200822"; +my $version = "7.0NG.748 PS200823"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 98e5bc156a..392b7f98a0 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.748 PS200822"; +my $version = "7.0NG.748 PS200823"; # save program name for logging my $progname = basename($0); From 022167fa9c3ad2bebb155999bd137f15bcb74778 Mon Sep 17 00:00:00 2001 From: artica Date: Mon, 24 Aug 2020 01:00:14 +0200 Subject: [PATCH 19/22] 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 ad074a6356..a6f9eeae36 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.748-200823 +Version: 7.0NG.748-200824 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 d7ad88dae5..73df305d68 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.748-200823" +pandora_version="7.0NG.748-200824" 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 7994d74e4a..4ec8c5717b 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -55,7 +55,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.748'; -use constant AGENT_BUILD => '200823'; +use constant AGENT_BUILD => '200824'; # 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 6e7183b506..873c9688a0 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.748 -%define release 200823 +%define release 200824 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 36191d62fe..f80e4806ad 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.748 -%define release 200823 +%define release 200824 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 426ae5522b..0636db8041 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.748" -PI_BUILD="200823" +PI_BUILD="200824" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index f5f91d60f7..13e4970abc 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{200823} +{200824} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index edf5da6c02..e16cdcd382 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.748(Build 200823)") +#define PANDORA_VERSION ("7.0NG.748(Build 200824)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index ddb94909d3..2bcf260805 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.748(Build 200823))" + VALUE "ProductVersion", "(7.0NG.748(Build 200824))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 05e5fb2446..abe62b57ab 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.748-200823 +Version: 7.0NG.748-200824 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 bbba99be8a..367de1a2e8 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.748-200823" +pandora_version="7.0NG.748-200824" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 4431918718..ba52270e40 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 = 'PC200823'; +$build_version = 'PC200824'; $pandora_version = 'v7.0NG.748'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index dc26f8a76e..db7ef7a39c 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 9f32319723..8f0144850a 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.748 -%define release 200823 +%define release 200824 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 39ef41e429..fc77fc503d 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.748 -%define release 200823 +%define release 200824 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index cd6776908f..0e605e5a96 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.748" -PI_BUILD="200823" +PI_BUILD="200824" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 8d6d5a7e45..69a78810b3 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.748 PS200823"; +my $version = "7.0NG.748 PS200824"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 392b7f98a0..8b4ee3c905 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.748 PS200823"; +my $version = "7.0NG.748 PS200824"; # save program name for logging my $progname = basename($0); From 0d27296b7985732718e0c0c980238ea3e39dce3a Mon Sep 17 00:00:00 2001 From: Luis Date: Mon, 24 Aug 2020 10:16:25 +0200 Subject: [PATCH 20/22] Fixed acl enterprise acl gextensions --- pandora_console/index.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pandora_console/index.php b/pandora_console/index.php index 71ae09e76c..af8671ded7 100755 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -1088,6 +1088,9 @@ if ($searchPage) { } } else if ($sec == 'gextensions') { $main_sec = get_parameter('extension_in_menu'); + if (empty($main_sec) === true) { + $main_sec = $sec; + } } else { $main_sec = $sec; } From 223774875c2950700ce92c419f1400ad18d03514 Mon Sep 17 00:00:00 2001 From: artica Date: Tue, 25 Aug 2020 01:00:17 +0200 Subject: [PATCH 21/22] 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 a6f9eeae36..b11e2c58ac 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.748-200824 +Version: 7.0NG.748-200825 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 73df305d68..c77f95f0eb 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.748-200824" +pandora_version="7.0NG.748-200825" 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 4ec8c5717b..caf6b9ceed 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -55,7 +55,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.748'; -use constant AGENT_BUILD => '200824'; +use constant AGENT_BUILD => '200825'; # 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 873c9688a0..3ff419f564 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.748 -%define release 200824 +%define release 200825 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 f80e4806ad..8efcb60d54 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.748 -%define release 200824 +%define release 200825 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 0636db8041..6ff09cd833 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.748" -PI_BUILD="200824" +PI_BUILD="200825" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 13e4970abc..0162158953 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{200824} +{200825} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index e16cdcd382..d1752ced83 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.748(Build 200824)") +#define PANDORA_VERSION ("7.0NG.748(Build 200825)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 2bcf260805..5553f5970e 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.748(Build 200824))" + VALUE "ProductVersion", "(7.0NG.748(Build 200825))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index abe62b57ab..e7a88f3553 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.748-200824 +Version: 7.0NG.748-200825 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 367de1a2e8..c039544d86 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.748-200824" +pandora_version="7.0NG.748-200825" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index ba52270e40..08ddd30ca0 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 = 'PC200824'; +$build_version = 'PC200825'; $pandora_version = 'v7.0NG.748'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index db7ef7a39c..2b2e996035 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 8f0144850a..b4b06686e2 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.748 -%define release 200824 +%define release 200825 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index fc77fc503d..fbdf5c82b6 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.748 -%define release 200824 +%define release 200825 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 0e605e5a96..732d25ac58 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.748" -PI_BUILD="200824" +PI_BUILD="200825" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 69a78810b3..862df9d825 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.748 PS200824"; +my $version = "7.0NG.748 PS200825"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 8b4ee3c905..10011ef41c 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.748 PS200824"; +my $version = "7.0NG.748 PS200825"; # save program name for logging my $progname = basename($0); From 24eeebd6be6d9319f80161fdda6e93323d350a16 Mon Sep 17 00:00:00 2001 From: artica Date: Wed, 26 Aug 2020 01:00:18 +0200 Subject: [PATCH 22/22] 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 b11e2c58ac..2029b2fbd5 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.748-200825 +Version: 7.0NG.748-200826 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 c77f95f0eb..9628188e25 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.748-200825" +pandora_version="7.0NG.748-200826" 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 caf6b9ceed..ba978f6e27 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -55,7 +55,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.748'; -use constant AGENT_BUILD => '200825'; +use constant AGENT_BUILD => '200826'; # 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 3ff419f564..3c0e329156 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.748 -%define release 200825 +%define release 200826 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 8efcb60d54..e2ddd2d12b 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.748 -%define release 200825 +%define release 200826 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 6ff09cd833..ffaba2c469 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.748" -PI_BUILD="200825" +PI_BUILD="200826" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 0162158953..2b4ec6de1e 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{200825} +{200826} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index d1752ced83..9c80bb0274 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.748(Build 200825)") +#define PANDORA_VERSION ("7.0NG.748(Build 200826)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 5553f5970e..54929f97ff 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.748(Build 200825))" + VALUE "ProductVersion", "(7.0NG.748(Build 200826))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index e7a88f3553..533ba97aca 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.748-200825 +Version: 7.0NG.748-200826 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 c039544d86..a047d27b00 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.748-200825" +pandora_version="7.0NG.748-200826" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 08ddd30ca0..3286ec9cb1 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 = 'PC200825'; +$build_version = 'PC200826'; $pandora_version = 'v7.0NG.748'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 2b2e996035..ef16f8ca9e 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 b4b06686e2..4a192cb9c3 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.748 -%define release 200825 +%define release 200826 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index fbdf5c82b6..9f92a377dc 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.748 -%define release 200825 +%define release 200826 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 732d25ac58..967935574a 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.748" -PI_BUILD="200825" +PI_BUILD="200826" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 862df9d825..ad37189d6b 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.748 PS200825"; +my $version = "7.0NG.748 PS200826"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 10011ef41c..482f8195dc 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.748 PS200825"; +my $version = "7.0NG.748 PS200826"; # save program name for logging my $progname = basename($0);