Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center

This commit is contained in:
Daniel Barbero Martin 2021-05-27 08:22:43 +02:00
commit a1ca4abe8f
36 changed files with 242 additions and 120 deletions

View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix
Version: 7.0NG.754-210526
Version: 7.0NG.754-210527
Architecture: all
Priority: optional
Section: admin

View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="7.0NG.754-210526"
pandora_version="7.0NG.754-210527"
echo "Test if you has the tools for to make the packages."
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

View File

@ -1015,7 +1015,7 @@ my $Sem = undef;
my $ThreadSem = undef;
use constant AGENT_VERSION => '7.0NG.754';
use constant AGENT_BUILD => '210526';
use constant AGENT_BUILD => '210527';
# Agent log default file size maximum and instances
use constant DEFAULT_MAX_LOG_SIZE => 600000;

View File

@ -3,7 +3,7 @@
#
%define name pandorafms_agent_unix
%define version 7.0NG.754
%define release 210526
%define release 210527
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}

View File

@ -3,7 +3,7 @@
#
%define name pandorafms_agent_unix
%define version 7.0NG.754
%define release 210526
%define release 210527
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}

View File

@ -10,7 +10,7 @@
# **********************************************************************
PI_VERSION="7.0NG.754"
PI_BUILD="210526"
PI_BUILD="210527"
OS_NAME=`uname -s`
FORCE=0

View File

@ -186,7 +186,7 @@ UpgradeApplicationID
{}
Version
{210526}
{210527}
ViewReadme
{Yes}

View File

@ -30,7 +30,7 @@ using namespace Pandora;
using namespace Pandora_Strutils;
#define PATH_SIZE _MAX_PATH+1
#define PANDORA_VERSION ("7.0NG.754 Build 210526")
#define PANDORA_VERSION ("7.0NG.754 Build 210527")
string pandora_path;
string pandora_dir;

View File

@ -11,7 +11,7 @@ BEGIN
VALUE "LegalCopyright", "Artica ST"
VALUE "OriginalFilename", "PandoraAgent.exe"
VALUE "ProductName", "Pandora FMS Windows Agent"
VALUE "ProductVersion", "(7.0NG.754(Build 210526))"
VALUE "ProductVersion", "(7.0NG.754(Build 210527))"
VALUE "FileVersion", "1.0.0.0"
END
END

View File

@ -1,5 +1,5 @@
package: pandorafms-console
Version: 7.0NG.754-210526
Version: 7.0NG.754-210527
Architecture: all
Priority: optional
Section: admin

View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="7.0NG.754-210526"
pandora_version="7.0NG.754-210527"
package_pear=0
package_pandora=1

View File

@ -1019,7 +1019,7 @@ CREATE TABLE IF NOT EXISTS `tmetaconsole_event` (
-- Criticity: 5 - Minor
-- Criticity: 6 - Major
ALTER TABLE `tmetaconsole_event` ADD COLUMN `data` double(22,5) default NULL;
ALTER TABLE `tmetaconsole_event` ADD COLUMN `data` double(50,5) default NULL;
ALTER TABLE `tmetaconsole_event` ADD COLUMN `module_status` int(4) NOT NULL default '0';
ALTER TABLE `tmetaconsole_event` ADD INDEX `server_id` (`server_id`);
ALTER TABLE `tmetaconsole_event` ADD INDEX `tme_timestamp_idx` (`timestamp`);
@ -1072,7 +1072,7 @@ CREATE TABLE IF NOT EXISTS `tmetaconsole_event_history` (
-- Criticity: 5 - Minor
-- Criticity: 6 - Major
ALTER TABLE `tmetaconsole_event_history` ADD COLUMN `data` double(22,5) default NULL;
ALTER TABLE `tmetaconsole_event_history` ADD COLUMN `data` double(50,5) default NULL;
ALTER TABLE `tmetaconsole_event_history` ADD COLUMN `module_status` int(4) NOT NULL default '0';
ALTER TABLE `tmetaconsole_event_history` ADD INDEX `tmeh_estado_idx` (`estado`);
ALTER TABLE `tmetaconsole_event_history` ADD INDEX `tmeh_timestamp_idx` (`timestamp`);
@ -1556,7 +1556,7 @@ ALTER TABLE `tagente_modulo` ADD COLUMN `debug_content` varchar(200);
-- ---------------------------------------------------------------------
-- Table `tagente_datos`
-- ---------------------------------------------------------------------
ALTER TABLE tagente_datos MODIFY `datos` double(22,5);
ALTER TABLE tagente_datos MODIFY `datos` double(50,5);
ALTER TABLE `tagente_datos` DROP INDEX `data_index1`, ADD INDEX `data_index1` (`id_agente_modulo`, `utimestamp`);
-- ---------------------------------------------------------------------
@ -1567,7 +1567,7 @@ ALTER TABLE `tagente_datos_string` MODIFY COLUMN `datos` mediumtext NOT NULL, DR
-- ---------------------------------------------------------------------
-- Table `tagente_datos_inc`
-- ---------------------------------------------------------------------
ALTER TABLE tagente_datos_inc MODIFY `datos` double(22,5);
ALTER TABLE tagente_datos_inc MODIFY `datos` double(50,5);
-- ---------------------------------------------------------------------
-- Table `tnetwork_component`
@ -2341,7 +2341,7 @@ CREATE TABLE IF NOT EXISTS `tagent_custom_fields_filter` (
-- ---------------------------------------------------------------------
-- Table `tevento`
-- ---------------------------------------------------------------------
ALTER TABLE `tevento` ADD COLUMN `data` double(22,5) default NULL;
ALTER TABLE `tevento` ADD COLUMN `data` double(50,5) default NULL;
ALTER TABLE `tevento` ADD COLUMN `module_status` int(4) NOT NULL default '0';

View File

@ -108,7 +108,8 @@ if ((bool) $adopt === false) {
65,
$plugin_parameter,
$disabledTextBecauseInPolicy,
true
true,
'resizev'
);
} else {
$data[1] = html_print_textarea(

View File

@ -386,10 +386,10 @@ function check_process (id_server) {
parameters,
function (data) {
if (data['correct']) {
$("#check_exec_server img").attr("src", <?php echo 'images/dot_green.png'; ?>);
$("#check_exec_server img").attr("src", "images/dot_green.png");
}
else {
$("#check_exec_server img").attr("src", <?php echo 'images/dot_red.png'; ?>);
$("#check_exec_server img").attr("src", "images/dot_red.png");
$("#check_error_message").empty();
$("#check_error_message").append("<span>" + data['message'] + "</span>");
}

View File

@ -34,9 +34,11 @@ check_login();
if (is_ajax()) {
$test_address = get_parameter('test_address', '');
$params = get_parameter('params', '');
$res = send_test_email(
$test_address
$test_address,
$params
);
echo $res;
@ -709,12 +711,25 @@ function perform_email_test () {
$('#email_test_failure_message').hide();
var test_address = $('#text-email_test_address').val();
params = {
email_smtpServer : $('#text-email_smtpServer').val(),
email_smtpPort : $('#text-email_smtpPort').val(),
email_username : $('#text-email_username').val(),
email_password : $('#password-email_password').val(),
email_encryption : $( "#email_encryption option:selected" ).val(),
email_from_dir : $('#text-email_from_dir').val(),
email_from_name : $('#text-email_from_name').val()
};
$.ajax({
type: "POST",
url: "ajax.php",
data: "page=godmode/setup/setup_general&test_address="+test_address,
dataType: "html",
data : {
page: "godmode/setup/setup_general",
test_address: test_address,
params: params
},
dataType: "json",
success: function(data) {
if (parseInt(data) === 1) {
$('#email_test_sent_message').show();

View File

@ -2086,7 +2086,7 @@ class AgentWizard extends HTML
$tmp->id_modulo(MODULE_PLUGIN);
if ($this->wizardSection === 'snmp_interfaces_explorer'
&& empty($candidate['macros']) === true
&& empty($candidate['macros']) === false
) {
// Use definition provided.
$tmp->id_plugin($candidate['id_plugin']);

View File

@ -424,7 +424,7 @@ class OrderInterpreter extends Wizard
}
if ($iterator === 0) {
echo __('No results found');
echo __('Press enter to search');
}
echo '</div>';

View File

@ -20,7 +20,7 @@
/**
* Pandora build version and version
*/
$build_version = 'PC210526';
$build_version = 'PC210527';
$pandora_version = 'v7.0NG.754';
// Do not overwrite default timezone set if defined.

View File

@ -5946,27 +5946,57 @@ function get_data_multiplier($unit)
/**
* Send test email to check email setups.
*
* @param string $to Target email account.
* @param string $to Target email account.
* @param array $params Array with connection data.
* Available fields:
* 'email_smtpServer',
* 'email_smtpPort',
* 'email_username',
* 'email_password',
* 'email_encryption',
* 'email_from_dir',
* 'email_from_name',
*
* @return integer Status of the email send task.
*/
function send_test_email(
string $to
string $to,
array $params=null
) {
global $config;
$valid_params = [
'email_smtpServer',
'email_smtpPort',
'email_username',
'email_password',
'email_encryption',
'email_from_dir',
'email_from_name',
];
if (empty($params) === true) {
foreach ($valid_params as $token) {
$params[$token] = $config[$token];
}
} else {
if (array_diff($valid_params, array_keys($params)) === false) {
return false;
}
}
$result = false;
try {
$transport = new Swift_SmtpTransport(
$config['email_smtpServer'],
$config['email_smtpPort']
$params['email_smtpServer'],
$params['email_smtpPort']
);
$transport->setUsername($config['email_username']);
$transport->setPassword($config['email_password']);
$transport->setUsername($params['email_username']);
$transport->setPassword($params['email_password']);
if ($config['email_encryption']) {
$transport->setEncryption($config['email_encryption']);
if ($params['email_encryption']) {
$transport->setEncryption($params['email_encryption']);
}
$mailer = new Swift_Mailer($transport);
@ -5975,8 +6005,8 @@ function send_test_email(
$message->setFrom(
[
$config['email_from_dir'] => io_safe_output(
$config['email_from_name']
$params['email_from_dir'] => io_safe_output(
$params['email_from_name']
),
]
);

View File

@ -218,7 +218,16 @@ function modules_copy_agent_module_to_agent($id_agent_module, $id_destiny_agent,
$new_module = $module;
// Rewrite different values
$new_module['ip_target'] = agents_get_address($id_destiny_agent);
if ($module['id_tipo_modulo'] == MODULE_TYPE_REMOTE_CMD
|| $module['id_tipo_modulo'] == MODULE_TYPE_REMOTE_CMD_PROC
|| $module['id_tipo_modulo'] == MODULE_TYPE_REMOTE_CMD_STRING
|| $module['id_tipo_modulo'] == MODULE_TYPE_REMOTE_CMD_INC
) {
$new_module['ip_target'] = $module['ip_target'];
} else {
$new_module['ip_target'] = agents_get_address($id_destiny_agent);
}
$new_module['policy_linked'] = 0;
$new_module['id_policy_module'] = 0;

View File

@ -755,43 +755,47 @@ function newsletter_wiz_modal(
);
// Avoid to show default email.
if ($email == 'admin@example.com') {
if ($email === 'admin@example.com') {
$email = '';
}
$output .= '<div id="newsletter_wizard" title="';
$output .= __('Do you want to be up to date?');
$output .= '" class="invisible">';
$output .= '<div class="register_update_manager">';
$output .= html_print_image('images/pandora_circle_big.png', true);
$output .= '</div>';
$output .= '<div class="newsletter_div">';
$output .= __(
'Subscribe to our newsletter',
$product_name
);
$output .= '</div>';
$output .= '<div class="license_text both">';
$output .= '<p>Stay up to date with updates, upgrades and promotions by subscribing to our newsletter.</p>';
$output .= '<p>';
$output .= __(
'By subscribing to the newsletter, you accept that your email will be transferred to a database owned by %s. These data will be used only to provide you with information about %s and will not be given to third parties. You can unsubscribe from this database at any time from the newsletter subscription options.',
$product_name,
$product_name
$modalContent = html_print_div(
[
'class' => 'register_update_manager',
'content' => html_print_image(
'images/pandora_circle_big.png',
true
),
],
true
);
$output .= '</p>';
$modalContent .= html_print_div(
[
'class' => 'newsletter_div',
'content' => __('Subscribe to our newsletter'),
],
true
);
$output .= '</div>';
// Show regiter to newsletter state.
$show_newsletter = ($display_newsletter !== true) ? 'inline-block' : 'none';
$modalContent .= html_print_div(
[
'class' => 'license_text both',
'content' => sprintf(
'<p>%s</p><p>%s</p>',
__('Stay up to date with updates, upgrades and promotions by subscribing to our newsletter.'),
__(
'By subscribing to the newsletter, you accept that your email will be transferred to a database owned by %s. These data will be used only to provide you with information about %s and will not be given to third parties. You can unsubscribe from this database at any time from the newsletter subscription options.',
$product_name,
$product_name
)
),
],
true
);
$output .= '<div class="mrgn_lft_4em">';
$output .= '<div id="box_newsletter">';
$output .= '<span id="label-email-newsletter">'.__('Email').' </span>';
$output .= html_print_input_text_extended(
// Email Input case.
$emailInputCase = '<span id="label-email-newsletter">'.__('Email').' </span>'.html_print_input_text_extended(
'email-newsletter',
$email,
'text-email-newsletter',
@ -800,52 +804,110 @@ function newsletter_wiz_modal(
255,
false,
'',
['style' => 'display:'.$show_newsletter.'; width: 200px;'],
['style' => 'display: inline-block; width: 200px;'],
true
);
$output .= '</div><br /><br />';
$output .= '<div class="submit_buttons_container">';
$output .= '<div class="left">';
$output .= html_print_submit_button(
__('Cancel'),
'cancel_newsletter',
false,
'class="ui-widget ui-state-default ui-corner-all ui-button-text-only sub upd submit-cancel w100px"',
// Generate the submit buttons.
// Cancel Button.
$submitButtons = html_print_div(
[
'class' => 'left',
'content' => html_print_submit_button(
__('Cancel'),
'cancel_newsletter',
false,
'class="ui-widget ui-state-default ui-corner-all ui-button-text-only sub upd submit-cancel w100px"',
true
),
],
true
);
$output .= '</div>';
$output .= '<div class="right">';
$output .= html_print_submit_button(
__('OK!'),
'newsletter',
false,
'class="ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok submit-next w100px"',
true
);
$output .= '</div>';
$output .= '</div>';
$output .= '<div id="both"></div>';
$output .= '<br/>';
$output .= '</div>';
$output .= '</div>';
// OK Button.
$submitButtons .= html_print_div(
[
'class' => 'right',
'content' => html_print_submit_button(
__('OK!'),
'newsletter',
false,
'class="ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok submit-next w100px"',
true
),
],
true
);
$submitButtonsCase = html_print_div(
[
'class' => 'submit_buttons_container',
'content' => $submitButtons,
],
true
);
$modalContent .= html_print_div(
[
'class' => 'mrgn_lft_4em',
'content' => html_print_div(
[
'id' => 'box_newsletter',
'content' => $emailInputCase.$submitButtonsCase.'<div id="both"></div><br />',
],
true
),
],
true
);
$output .= html_print_div(
[
'id' => 'newsletter_wizard',
'style' => 'display: none;',
'title' => __('Do you want to be up to date?'),
'content' => $modalContent,
],
true
);
// Verification modal.
$output .= '<div id="news_ensure_cancel" title="Confirmation Required" class="invisible">';
$output .= '<div class="font_12_20">';
$output .= __('Are you sure you don\'t want to subscribe?');
$output .= '<p>';
$output .= __('You will miss all news about amazing features and fixes!');
$output .= '</p>';
$output .= '</div>';
$output .= '</div>';
$verificationContent = html_print_div(
[
'class' => 'font_12_20',
'content' => __('Are you sure you don\'t want to subscribe?').'<p>'.__('You will miss all news about amazing features and fixes!').'</p>',
],
true
);
$output .= html_print_div(
[
'id' => 'news_ensure_cancel',
'style' => 'display: none;',
'title' => 'Confirmation Required',
'content' => $verificationContent,
],
true
);
// Results modal.
$output .= '<div id="news_result" title="Subscription process result" class="invisible">';
$output .= '<div id="news_result_content" class="font_12_20">';
$output .= '</div>';
$output .= '</div>';
$resultsContent = html_print_div(
[
'id' => 'news_result_content',
'class' => 'font_12_20',
],
true
);
$output .= html_print_div(
[
'id' => 'news_result',
'style' => 'display: none;',
'title' => 'Subscription process result',
'content' => $resultsContent,
],
true
);
ob_start();
?>

View File

@ -2163,6 +2163,11 @@ div.loading {
div.loading img {
float: right;
}
textarea.resizev {
resize: vertical;
}
/* Tablesorter jQuery pager */
div.pager {
margin-left: 10px;

View File

@ -129,7 +129,7 @@
<div style='height: 10px'>
<?php
$version = '7.0NG.754';
$build = '210526';
$build = '210527';
$banner = "v$version Build $build";
error_reporting(0);

View File

@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.754
%define release 210526
%define release 210527
# User and Group under which Apache is running
%define httpd_name httpd

View File

@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.754
%define release 210526
%define release 210527
# User and Group under which Apache is running
%define httpd_name httpd

View File

@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.754
%define release 210526
%define release 210527
%define httpd_name httpd
# User and Group under which Apache is running
%define httpd_name apache2

View File

@ -100,7 +100,7 @@ CREATE TABLE IF NOT EXISTS `tagente` (
-- ---------------------------------------------------------------------
CREATE TABLE IF NOT EXISTS `tagente_datos` (
`id_agente_modulo` int(10) unsigned NOT NULL default '0',
`datos` double(22,5) default NULL,
`datos` double(50,5) default NULL,
`utimestamp` bigint(20) default '0',
KEY `data_index1` (`id_agente_modulo`, `utimestamp`),
KEY `idx_utimestamp` USING BTREE (`utimestamp`)
@ -111,7 +111,7 @@ CREATE TABLE IF NOT EXISTS `tagente_datos` (
-- ---------------------------------------------------------------------
CREATE TABLE IF NOT EXISTS `tagente_datos_inc` (
`id_agente_modulo` int(10) unsigned NOT NULL default '0',
`datos` double(22,5) default NULL,
`datos` double(50,5) default NULL,
`utimestamp` int(20) unsigned default '0',
KEY `data_inc_index_1` (`id_agente_modulo`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@ -681,7 +681,7 @@ CREATE TABLE IF NOT EXISTS `tevento` (
`owner_user` VARCHAR(100) NOT NULL DEFAULT '',
`ack_utimestamp` BIGINT(20) NOT NULL DEFAULT '0',
`custom_data` TEXT NOT NULL,
`data` double(22,5) default NULL,
`data` double(50,5) default NULL,
`module_status` int(4) NOT NULL default '0',
PRIMARY KEY (`id_evento`),
KEY `idx_agente` (`id_agente`),
@ -3275,7 +3275,7 @@ CREATE TABLE IF NOT EXISTS `tmetaconsole_event` (
`ack_utimestamp` BIGINT(20) NOT NULL DEFAULT '0',
`server_id` int(10) NOT NULL,
`custom_data` TEXT NOT NULL DEFAULT '',
`data` double(22,5) default NULL,
`data` double(50,5) default NULL,
`module_status` int(4) NOT NULL default '0',
PRIMARY KEY (`id_evento`),
KEY `idx_agente` (`id_agente`),
@ -3328,7 +3328,7 @@ CREATE TABLE IF NOT EXISTS `tmetaconsole_event_history` (
`ack_utimestamp` BIGINT(20) NOT NULL DEFAULT '0',
`server_id` int(10) NOT NULL,
`custom_data` TEXT NOT NULL DEFAULT '',
`data` double(22,5) default NULL,
`data` double(50,5) default NULL,
`module_status` int(4) NOT NULL default '0',
PRIMARY KEY (`id_evento`),
KEY `idx_agente` (`id_agente`),

View File

@ -1,5 +1,5 @@
package: pandorafms-server
Version: 7.0NG.754-210526
Version: 7.0NG.754-210527
Architecture: all
Priority: optional
Section: admin

View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="7.0NG.754-210526"
pandora_version="7.0NG.754-210527"
package_cpan=0
package_pandora=1

View File

@ -45,7 +45,7 @@ our @EXPORT = qw(
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.754";
my $pandora_build = "210526";
my $pandora_build = "210527";
our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash

View File

@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.754";
my $pandora_build = "210526";
my $pandora_build = "210527";
our $VERSION = $pandora_version." ".$pandora_build;
our %EXPORT_TAGS = ( 'all' => [ qw() ] );

View File

@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 7.0NG.754
%define release 210526
%define release 210527
Summary: Pandora FMS Server
Name: %{name}

View File

@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 7.0NG.754
%define release 210526
%define release 210527
Summary: Pandora FMS Server
Name: %{name}

View File

@ -9,7 +9,7 @@
# **********************************************************************
PI_VERSION="7.0NG.754"
PI_BUILD="210526"
PI_BUILD="210527"
MODE=$1
if [ $# -gt 1 ]; then

View File

@ -35,7 +35,7 @@ use PandoraFMS::Config;
use PandoraFMS::DB;
# version: define current version
my $version = "7.0NG.754 Build 210526";
my $version = "7.0NG.754 Build 210527";
# Pandora server configuration
my %conf;

View File

@ -36,7 +36,7 @@ use Encode::Locale;
Encode::Locale::decode_argv;
# version: define current version
my $version = "7.0NG.754 Build 210526";
my $version = "7.0NG.754 Build 210527";
# save program name for logging
my $progname = basename($0);