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-5408-consola-visual-nueva-bugs

This commit is contained in:
Daniel Barbero Martin 2020-02-11 07:57:42 +01:00
parent 0042f390ef 0db7abbe9e
commit 1d2ad47507
34 changed files with 63 additions and 40 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.743-200210
Version: 7.0NG.743-200211
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.743-200210"
pandora_version="7.0NG.743-200211"
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.743';
use constant AGENT_BUILD => '200210';
use constant AGENT_BUILD => '200211';
# 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.743
%define release 200210
%define release 200211
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.743
%define release 200210
%define release 200211
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.743"
PI_BUILD="200210"
PI_BUILD="200211"
OS_NAME=`uname -s`
FORCE=0

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

@ -186,7 +186,7 @@ UpgradeApplicationID
{}
Version
{200210}
{200211}
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.743(Build 200210)")
#define PANDORA_VERSION ("7.0NG.743(Build 200211)")
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.743(Build 200210))"
VALUE "ProductVersion", "(7.0NG.743(Build 200211))"
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.743-200210
Version: 7.0NG.743-200211
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.743-200210"
pandora_version="7.0NG.743-200211"
package_pear=0
package_pandora=1

9
pandora_console/godmode/agentes/module_manager.php
View File

@ -830,7 +830,14 @@ foreach ($modules as $module) {
$data[4] .= ui_print_help_tip(__('The policy modules of data type will only update their intervals when policy is applied.'), true);
}
$data[5] = ui_print_truncate_text($module['descripcion'], 'description', false);
if ($module['id_modulo'] == MODULE_DATA && $module['id_policy_module'] != 0) {
$module_description = utf8_decode($module['descripcion']);
} else {
$module_description = $module['descripcion'];
}
$data[5] = ui_print_truncate_text($module_description, 'description', false);
$data[6] = ui_print_status_image($status, htmlspecialchars($title), true);

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

@ -191,12 +191,8 @@ switch ($action) {
case 'top_n':
case 'exception':
case 'general':
case 'network_interfaces_report':
case 'availability':
case 'event_report_log':
case 'increment':
case 'availability_graph':
case 'agent_module':
$get_data_editor = true;
break;
@ -3857,6 +3853,7 @@ $(document).ready (function () {
case 'historical_data':
case 'agent_configuration':
case 'module_histogram_graph':
case 'event_report_log':
case 'increment':
if ($("#hidden-id_agent").val() == 0) {
dialog_message('#message_no_agent');

8
pandora_console/include/ajax/module.php
View File

@ -1004,8 +1004,14 @@ if (check_login()) {
$data[3] .= ' <a class="relations_details" href="ajax.php?page=operation/agentes/estado_monitores&get_relations_tooltip=1&id_agente_modulo='.$module['id_agente_modulo'].'">'.html_print_image('images/link2.png', true, ['id' => 'relations-details-'.$module['id_agente_modulo'], 'class' => 'img_help']).'</a> ';
}
$module_description = '';
if ($module['id_modulo'] == MODULE_DATA && $module['id_policy_module'] != 0) {
$module_description = utf8_decode($module['descripcion']);
} else {
$module_description = $module['descripcion'];
}
$data[4] = ui_print_string_substr($module['descripcion'], 60, true, 8);
$data[4] = ui_print_string_substr($module_description, 60, true, 8);
if ($module['datos'] != strip_tags($module['datos'])) {

3
pandora_console/include/chart_generator.php
View File

@ -293,7 +293,8 @@ if (file_exists('languages/'.$user_language.'.mo') === true) {
$params['not_interactive'],
$params['ttl'],
$params['widgets'],
$params['show']
$params['show'],
$params['date_to']
);
break;

2
pandora_console/include/class/WelcomeWindow.class.php
View File

@ -154,7 +154,7 @@ class WelcomeWindow extends Wizard
target: $('#welcome_modal_window'),
url: '<?php echo ui_get_full_url('ajax.php', false, false, false); ?>',
modal: {
title: "<?php echo __('Welcome to Pandora FMS'); ?>",
title: "<?php echo __('Welcome to').' '.io_safe_output(get_product_name()); ?>",
cancel: '<?php echo __('Do not show anymore'); ?>',
ok: '<?php echo __('Close'); ?>'
},

2
pandora_console/include/config_process.php
View File

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

1
pandora_console/include/functions.php
View File

@ -3888,7 +3888,6 @@ function generator_chart_to_pdf($type_graph_pdf, $params, $params_combined=false
$height_img = 70;
}
} else {
$width_img = $params['width'];
$height_img = $params['height'];
}

3
pandora_console/include/functions_graph.php
View File

@ -2840,7 +2840,8 @@ function graph_sla_slicebar(
true,
$ttl,
false,
false
false,
$date
);
}

11
pandora_console/include/functions_treeview.php
View File

@ -95,7 +95,7 @@ function treeview_printModuleTable($id_module, $server_data=false, $no_head=fals
$row = [];
$row['title'] = __('Warning status');
$row['data'] = $warning_status_str;
$table->data['watning_status'] = $row;
$table->data['warning_status'] = $row;
// Critical Min/Max
if (modules_is_string_type($module['id_tipo_modulo'])) {
@ -124,9 +124,16 @@ function treeview_printModuleTable($id_module, $server_data=false, $no_head=fals
$table->data['module_group'] = $row;
// Description
$module_description = '';
if ($module['id_modulo'] == MODULE_DATA && $module['id_policy_module'] != 0) {
$module_description = utf8_decode($module['descripcion']);
} else {
$module_description = $module['descripcion'];
}
$row = [];
$row['title'] = __('Description');
$row['data'] = ui_print_truncate_text($module['descripcion'], 'description', true, true, true, '[&hellip;]');
$row['data'] = ui_print_truncate_text($module_description, 'description', true, true, true, '[&hellip;]');
$table->data['description'] = $row;
// Tags

11
pandora_console/include/graphs/functions_flot.php
View File

@ -739,7 +739,8 @@ function flot_slicesbar_graph(
$not_interactive=0,
$ttl=1,
$widgets=false,
$show=true
$show=true,
$date_to=false
) {
global $config;
@ -764,6 +765,7 @@ function flot_slicesbar_graph(
'widgets' => $widgets,
'show' => $show,
'return_img_base_64' => true,
'date_to' => $date_to,
];
$graph = '<img src="data:image/jpg;base64,';
@ -860,8 +862,11 @@ function flot_slicesbar_graph(
$full_legend_date = false;
}
$date = get_system_time();
$datelimit = (($date - $period));
if (!$date_to) {
$date_to = get_system_time();
}
$datelimit = (($date_to - $period));
$i = 0;
$values2 = [];

2
pandora_console/install.php
View File

@ -129,7 +129,7 @@
<div style='height: 10px'>
<?php
$version = '7.0NG.743';
$build = '200210';
$build = '200211';
$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.743
%define release 200210
%define release 200211
# 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.743
%define release 200210
%define release 200211
# 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.743
%define release 200210
%define release 200211
%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.743-200210
Version: 7.0NG.743-200211
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.743-200210"
pandora_version="7.0NG.743-200211"
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.743";
my $pandora_build = "200210";
my $pandora_build = "200211";
our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash

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

@ -33,7 +33,7 @@ our @ISA = qw(Exporter);
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.743";
my $pandora_build = "200210";
my $pandora_build = "200211";
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.743
%define release 200210
%define release 200211
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.743
%define release 200210
%define release 200211
Summary: Pandora FMS Server
Name: %{name}

2
pandora_server/pandora_server_installer
View File

@ -9,7 +9,7 @@
# **********************************************************************
PI_VERSION="7.0NG.743"
PI_BUILD="200210"
PI_BUILD="200211"
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.743 PS200210";
my $version = "7.0NG.743 PS200211";
# 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.743 PS200210";
my $version = "7.0NG.743 PS200211";
# save program name for logging
my $progname = basename($0);