tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens

This commit is contained in:
marcos 2020-01-22 13:42:58 +01:00
parent 76ed257287 5374a06cbf
commit 823fb30db7
31 changed files with 127 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_agents/unix/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix
Version: 7.0NG.742-200121
Version: 7.0NG.742-200122
Architecture: all
Priority: optional
Section: admin

2
pandora_agents/unix/DEBIAN/make_deb_package.sh
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.742-200121"
pandora_version="7.0NG.742-200122"
echo "Test if you has the tools for to make the packages."
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

2
pandora_agents/unix/pandora_agent
View File

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

2
pandora_agents/unix/pandora_agent.redhat.spec
View File

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

2
pandora_agents/unix/pandora_agent.spec
View File

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

2
pandora_agents/unix/pandora_agent_installer
View File

@ -10,7 +10,7 @@
# **********************************************************************
PI_VERSION="7.0NG.742"
PI_BUILD="200121"
PI_BUILD="200122"
OS_NAME=`uname -s`
FORCE=0

2
pandora_agents/win32/installer/pandora.mpi
View File

@ -186,7 +186,7 @@ UpgradeApplicationID
{}
Version
{200121}
{200122}
ViewReadme
{Yes}

2
pandora_agents/win32/pandora.cc
View File

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

2
pandora_agents/win32/versioninfo.rc
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.742(Build 200121))"
VALUE "ProductVersion", "(7.0NG.742(Build 200122))"
VALUE "FileVersion", "1.0.0.0"
END
END

2
pandora_console/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-console
Version: 7.0NG.742-200121
Version: 7.0NG.742-200122
Architecture: all
Priority: optional
Section: admin

2
pandora_console/DEBIAN/make_deb_package.sh
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.742-200121"
pandora_version="7.0NG.742-200122"
package_pear=0
package_pandora=1

4
pandora_console/extensions/realtime_graphs/ajax.php
View File

@ -109,6 +109,6 @@ if (empty($data)) {
}
echo '{
"label": "'.$graph_title.'",
"data": [["'.time().'", '.$data.']]
"label": "'.htmlspecialchars($graph_title, ENT_QUOTES).'",
"data": [["'.time().'", '.htmlspecialchars($data, ENT_QUOTES).']]
}';

2
pandora_console/godmode/reporting/reporting_builder.item_editor.php
View File

@ -3318,7 +3318,7 @@ function print_General_list($width, $action, $idItem=null, $type='general')
case 'new':
?>
<tr id="general_template" style="" class="datos">
<td colspan="3">
<td colspan="4">
<?php
echo __('Please save the report to start adding items into the list.');
?>

11
pandora_console/godmode/update_manager/update_manager.offline.php
View File

@ -46,6 +46,13 @@ if (! check_acl($config['id_user'], 0, 'PM')
$baseurl = ui_get_full_url(false, false, false, false);
$current_package = db_get_value(
'value',
'tconfig',
'token',
'current_package_enterprise'
);
?>
<!-- Add the stylesheet here cause somehow the 'ui_require_css_file'
@ -90,6 +97,8 @@ is not working on the metaconsole and there is no time to fix it -->
var text1_package_file = "<?php echo __('There is a new update available'); ?>\n";
var text2_package_file = "<?php echo __('There is a new update available to apply. Do you want to start the update process?'); ?>\n";
var text1_warning = "<?php echo __('WARNING'); ?>\n";
var text2_warning = "<?php echo __('This update does not correspond to the next version of Pandora'); ?>\n";
var applying_mr = "<?php echo __('Applying DB MR'); ?>\n";
var cancel_button = "<?php echo __('Cancel'); ?>\n";
var ok_button = "<?php echo __('Ok'); ?>\n";
@ -109,5 +118,5 @@ is not working on the metaconsole and there is no time to fix it -->
<script src="<?php echo $baseurl; ?>/include/javascript/update_manager.js"></script>
<script type="text/javascript">
form_upload("<?php echo $baseurl; ?>");
form_upload("<?php echo $baseurl; ?>", "<?php echo $current_package; ?>");
</script>

2
pandora_console/include/config_process.php
View File

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

39
pandora_console/include/functions.php
View File

@ -5480,6 +5480,45 @@ function get_help_info($section_name)
} else {
$result .= 'Discovery&printable=yes';
}
case 'alert_configure':
if ($es) {
$result .= 'Alerts#Correlation_alert_creation';
} else {
$result .= 'Alerts#Correlation_alert_creation';
}
break;
case 'alert_correlation':
if ($es) {
$result .= 'Alerts#Alert_correlation:_event_and_log_alerts';
} else {
$result .= 'Alerts#Alert_correlation:_event_and_log_alerts';
}
break;
case 'alert_rules':
if ($es) {
$result .= 'Alerts#Rules_within_a_correlation_alert';
} else {
$result .= 'Alerts#Rules_within_a_correlation_alert';
}
break;
case 'alert_fields':
if ($es) {
$result .= 'Alerts#Step_3:_Advanced_fields';
} else {
$result .= 'Alerts#Step_3:_Advanced_fields';
}
break;
case 'alert_triggering':
if ($es) {
$result .= 'Alerts#Configuring_an_alert_template';
} else {
$result .= 'Alerts#Configuring_an_alert_template';
}
break;
}

3
pandora_console/include/graphs/fgraph.php
View File

@ -57,6 +57,9 @@ switch ($graph_type) {
$out_of_lim_str = io_safe_output(get_parameter('out_of_lim_str', false));
$out_of_lim_image = get_parameter('out_of_lim_image', false);
// Add relative path to avoid phar object injection.
$out_of_lim_image = '../graphs/'.$out_of_lim_image;
$title = get_parameter('title');
$mode = get_parameter('mode', 1);

50
pandora_console/include/javascript/update_manager.js
View File

@ -4,7 +4,7 @@
var correct_install_progress = true;
function form_upload(homeurl) {
function form_upload(homeurl, current_package) {
var home_url = typeof homeurl !== "undefined" ? homeurl + "/" : "";
//Thanks to: http://tutorialzine.com/2013/05/mini-ajax-file-upload-form/
@ -164,7 +164,7 @@ function form_upload(homeurl) {
.change();
// Begin the installation
install_package(res.package, homeurl);
install_package(res.package, homeurl, current_package);
});
} else {
// Something has gone wrong!
@ -214,7 +214,7 @@ function formatFileSize(bytes) {
return (bytes / 1000).toFixed(2) + " KB";
}
function install_package(package, homeurl) {
function install_package(package, homeurl, current_package) {
var home_url = typeof homeurl !== "undefined" ? homeurl + "/" : "";
$(
@ -1235,6 +1235,50 @@ function install_package(package, homeurl) {
$("#pkg_apply_dialog").html(dialog_text);
$("#pkg_apply_dialog").dialog("open");
const number_update = package.match(/package_(\d+).oum/);
if (number_update === null || number_update[1] != current_package - 0 + 1) {
$(
"<div id='warning_pkg' class='dialog ui-dialog-content' title='" +
package_available +
"'></div>"
).dialog({
resizable: true,
draggable: true,
modal: true,
overlay: {
opacity: 0.5,
background: "black"
},
width: 600,
height: 250,
buttons: [
{
text: ok_button,
click: function() {
$(this).dialog("close");
}
}
]
});
var dialog_warning = "<div class='update_popup'>";
dialog_warning =
dialog_warning +
"<div class='update_text'><h3>" +
text1_warning +
"</h3>";
dialog_warning = dialog_warning + "<p>" + text2_warning + "</p></div>";
dialog_warning =
dialog_warning +
"<div class='update_icon'><img src='" +
home_url +
"images/icono_warning_mr.png'></div>";
dialog_warning = dialog_warning + "</div>";
$("#warning_pkg").html(dialog_warning);
}
}
function check_install_package(package, homeurl) {

2
pandora_console/install.php
View File

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

2
pandora_console/pandora_console.redhat.spec
View File

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

2
pandora_console/pandora_console.rhel7.spec
View File

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

2
pandora_console/pandora_console.spec
View File

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

2
pandora_server/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-server
Version: 7.0NG.742-200121
Version: 7.0NG.742-200122
Architecture: all
Priority: optional
Section: admin

2
pandora_server/DEBIAN/make_deb_package.sh
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.742-200121"
pandora_version="7.0NG.742-200122"
package_cpan=0
package_pandora=1

2
pandora_server/lib/PandoraFMS/Config.pm
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.742";
my $pandora_build = "200121";
my $pandora_build = "200122";
our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash

2
pandora_server/lib/PandoraFMS/PluginTools.pm
View File

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

2
pandora_server/pandora_server.redhat.spec
View File

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

2
pandora_server/pandora_server.spec
View File

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

2
pandora_server/pandora_server_installer
View File

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

2
pandora_server/util/pandora_db.pl
View File

@ -34,7 +34,7 @@ use PandoraFMS::Config;
use PandoraFMS::DB;
# version: define current version
my $version = "7.0NG.742 PS200121";
my $version = "7.0NG.742 PS200122";
# Pandora server configuration
my %conf;

2
pandora_server/util/pandora_manage.pl
View File

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