tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-30 01:05:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into 2106-intracom-rebranding

Browse Source 
Conflicts resolved:
	pandora_console/operation/events/events_rss.php
This commit is contained in:
fermin831 2018-05-28 12:12:16 +02:00
commit 88e060893a
33 changed files with 74 additions and 44 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 package: pandorafms-agent-unix
Version: 7.0NG.722-180522 Version: 7.0NG.722-180528
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin 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 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="7.0NG.722-180522" pandora_version="7.0NG.722-180528"
echo "Test if you has the tools for to make the packages." echo "Test if you has the tools for to make the packages."
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

2
pandora_agents/unix/pandora_agent
View File

@ -42,7 +42,7 @@ my $Sem = undef;
my $ThreadSem = undef; my $ThreadSem = undef;
use constant AGENT_VERSION => '7.0NG.722'; use constant AGENT_VERSION => '7.0NG.722';
use constant AGENT_BUILD => '180522'; use constant AGENT_BUILD => '180528';
# Agent log default file size maximum and instances # Agent log default file size maximum and instances
use constant DEFAULT_MAX_LOG_SIZE => 600000; 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 name pandorafms_agent_unix
%define version 7.0NG.722 %define version 7.0NG.722
%define release 180522 %define release 180528
Summary: Pandora FMS Linux agent, PERL version Summary: Pandora FMS Linux agent, PERL version
Name: %{name} Name: %{name}

2
pandora_agents/unix/pandora_agent.spec
View File

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

2
pandora_agents/unix/pandora_agent_installer
View File

@ -10,7 +10,7 @@
# ********************************************************************** # **********************************************************************
PI_VERSION="7.0NG.722" PI_VERSION="7.0NG.722"
PI_BUILD="180522" PI_BUILD="180528"
OS_NAME=`uname -s` OS_NAME=`uname -s`
FORCE=0 FORCE=0

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

@ -186,7 +186,7 @@ UpgradeApplicationID
{} {}
Version Version
{180522} {180528}
ViewReadme ViewReadme
{Yes} {Yes}

2
pandora_agents/win32/pandora.cc
View File

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

2
pandora_agents/win32/versioninfo.rc
View File

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

2
pandora_console/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-console package: pandorafms-console
Version: 7.0NG.722-180522 Version: 7.0NG.722-180528
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin 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 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="7.0NG.722-180522" pandora_version="7.0NG.722-180528"
package_pear=0 package_pear=0
package_pandora=1 package_pandora=1

2
pandora_console/ajax.php
View File

@ -49,7 +49,7 @@ if (isset ($_GET["loginhash"])) {
$public_hash = get_parameter('hash', false); $public_hash = get_parameter('hash', false);
// Check user // Check user
if ($public_hash === false) { if ($public_hash == false) {
check_login(); check_login();
} else { } else {
enterprise_include_once('include/functions_dashboard.php'); enterprise_include_once('include/functions_dashboard.php');

1
pandora_console/extensions/insert_data.php
View File

@ -167,6 +167,7 @@ function mainInsertData() {
$params['use_hidden_input_idagent'] = true; $params['use_hidden_input_idagent'] = true;
$params['print_hidden_input_idagent'] = true; $params['print_hidden_input_idagent'] = true;
$params['hidden_input_idagent_id'] = 'hidden-autocomplete_id_agent'; $params['hidden_input_idagent_id'] = 'hidden-autocomplete_id_agent';
$params['hidden_input_idagent_value'] = $id_agente;
$table->data[0][1] = ui_print_agent_autocomplete_input($params); $table->data[0][1] = ui_print_agent_autocomplete_input($params);

2
pandora_console/extensions/plugin_registration.php
View File

@ -16,6 +16,8 @@
function pluginreg_extension_main () { function pluginreg_extension_main () {
global $config; global $config;
check_login();
if (! check_acl ($config['id_user'], 0, "PM") && ! is_user_admin ($config['id_user'])) { if (! check_acl ($config['id_user'], 0, "PM") && ! is_user_admin ($config['id_user'])) {
db_pandora_audit("ACL Violation", "Trying to access Setup Management"); db_pandora_audit("ACL Violation", "Trying to access Setup Management");

3
pandora_console/godmode/agentes/configurar_agente.php
View File

@ -284,8 +284,9 @@ if ($create_agent) {
"Url description":"' . $url_description .'", "Url description":"' . $url_description .'",
"Quiet":"' . (int)$quiet.'"}'; "Quiet":"' . (int)$quiet.'"}';
$unsafe_alias = io_safe_output($alias);
db_pandora_audit("Agent management", db_pandora_audit("Agent management",
"Created agent $alias", false, true, $info); "Created agent $unsafe_alias", false, true, $info);
} }
else { else {
$id_agente = 0; $id_agente = 0;

7
pandora_console/godmode/alerts/alert_list.php
View File

@ -90,14 +90,17 @@ if ($create_alert) {
"tagente_modulo","id_agente_modulo", $id_agent_module)); "tagente_modulo","id_agente_modulo", $id_agent_module));
// Audit the creation only when the alert creation is correct // Audit the creation only when the alert creation is correct
$unsafe_alert_template_name = io_safe_output($alert_template_name);
$unsafe_module_name = io_safe_output($module_name);
$unsafe_agent_alias = io_safe_output($agent_alias);
if ($id) { if ($id) {
db_pandora_audit("Alert management", db_pandora_audit("Alert management",
"Added alert '$alert_template_name' for module '$module_name' in agent '$agent_alias'", "Added alert '$unsafe_alert_template_name' for module '$unsafe_module_name' in agent '$unsafe_agent_alias'",
false, false, 'ID: ' . $id); false, false, 'ID: ' . $id);
} }
else { else {
db_pandora_audit("Alert management", db_pandora_audit("Alert management",
"Fail Added alert '$alert_template_name' for module '$module_name' in agent '$agent_alias'"); "Fail Added alert '$unsafe_alert_template_name' for module '$unsafe_module_name' in agent '$unsafe_agent_alias'");
} }
$messageAction = ui_print_result_message ($id, $messageAction = ui_print_result_message ($id,

2
pandora_console/include/config_process.php
View File

@ -22,7 +22,7 @@
/** /**
* Pandora build version and version * Pandora build version and version
*/ */
$build_version = 'PC180522'; $build_version = 'PC180528';
$pandora_version = 'v7.0NG.722'; $pandora_version = 'v7.0NG.722';
// Do not overwrite default timezone set if defined. // Do not overwrite default timezone set if defined.

2
pandora_console/include/functions.php
View File

@ -2368,7 +2368,7 @@ function print_audit_csv ($data) {
echo __('User') . ';' . echo __('User') . ';' .
__('Action') . ';' . __('Action') . ';' .
__('Date') . ';' . __('Date') . ';' .
__('Source ID') . ';' . __('Source IP') . ';' .
__('Comments') ."\n"; __('Comments') ."\n";
foreach ($data as $line) { foreach ($data as $line) {
echo io_safe_output($line['id_usuario']) . ';' . io_safe_output($line['accion']) . ';' . $line['fecha'] . ';' . $line['ip_origen'] . ';'. io_safe_output($line['descripcion']). "\n"; echo io_safe_output($line['id_usuario']) . ';' . io_safe_output($line['accion']) . ';' . $line['fecha'] . ';' . $line['ip_origen'] . ';'. io_safe_output($line['descripcion']). "\n";

47
pandora_console/include/graphs/flot/pandora.flot.js
View File

@ -1546,7 +1546,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
shadowSize: 0.1 shadowSize: 0.1
}, },
crosshair: { mode: 'xy' }, crosshair: { mode: 'xy' },
selection: { mode: 'x', color: '#777' }, selection: { mode: 'xy', color: '#777' },
export: { export: {
export_data: true, export_data: true,
labels_long: labels_long, labels_long: labels_long,
@ -1640,7 +1640,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
color: '' color: ''
} ], } ],
yaxis: {ticks: [], autoscaleMargin: 0.1 }, yaxis: {ticks: [], autoscaleMargin: 0.1 },
selection: {mode: 'x', color: '#777' }, selection: {mode: 'xy', color: '#777' },
legend: {show: false}, legend: {show: false},
crosshair: {mode: 'x'} crosshair: {mode: 'x'}
}); });
@ -1652,6 +1652,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
if (menu == 0) { if (menu == 0) {
return; return;
} }
dataInSelection = ranges.xaxis.to - ranges.xaxis.from; dataInSelection = ranges.xaxis.to - ranges.xaxis.from;
dataInPlot = plot.getData()[0].data.length; dataInPlot = plot.getData()[0].data.length;
@ -1660,18 +1661,36 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
new_steps = parseInt(factor * steps); new_steps = parseInt(factor * steps);
plot = $.plot($('#' + graph_id), data_base, plot = $.plot($('#' + graph_id), data_base,
$.extend(true, {}, options, { $.extend(true, {}, options, {
xaxis: { min: ranges.xaxis.from, max: ranges.xaxis.to}, yaxis: {
xaxes: [ { min: ranges.yaxis.from,
tickFormatter: xFormatter, max: ranges.yaxis.to
minTickSize: new_steps, },
color: '' yaxes: [{
} ], tickFormatter: yFormatter,
legend: { show: false } color: '',
})); alignTicksWithAxis: 1,
labelWidth: 30,
position: 'left',
font: font,
reserveSpace: true,
min: ranges.yaxis.from
}],
xaxis: {
min: ranges.xaxis.from,
max: ranges.xaxis.to
},
xaxes: [ {
tickFormatter: xFormatter,
minTickSize: new_steps,
color: ''
} ],
legend: { show: false }
}));
if (thresholded) { if (thresholded) {
var zoom_data_threshold = new Array (); var zoom_data_threshold = new Array ();
var y_recal = axis_thresholded(threshold_data, plot.getAxes().yaxis.min, plot.getAxes().yaxis.max, var y_recal = axis_thresholded(threshold_data, plot.getAxes().yaxis.min, plot.getAxes().yaxis.max,
red_threshold, extremes, red_up); red_threshold, extremes, red_up);
plot = $.plot($('#' + graph_id), data_base, plot = $.plot($('#' + graph_id), data_base,
@ -1690,7 +1709,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
plot.setData(zoom_data_threshold); plot.setData(zoom_data_threshold);
plot.draw(); plot.draw();
} }
$('#menu_cancelzoom_' + graph_id) $('#menu_cancelzoom_' + graph_id)
.attr('src', homeurl + '/images/zoom_cross_grey.png'); .attr('src', homeurl + '/images/zoom_cross_grey.png');
@ -1760,7 +1779,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
} }
else if (y < -1000) { else if (y < -1000) {
how_bigger = "K"; how_bigger = "K";
y = y / 1000; y = y / 1000;
} }
if (currentRanges == null || (currentRanges.xaxis.from < j && j < currentRanges.xaxis.to)) { if (currentRanges == null || (currentRanges.xaxis.from < j && j < currentRanges.xaxis.to)) {

3
pandora_console/include/styles/pandora.css
View File

@ -893,6 +893,9 @@ div#cont {
table, img { table, img {
border: 0px; border: 0px;
} }
table pre{
white-space: pre-wrap;
}
tr:first-child>th { tr:first-child>th {
background-color: #373737; background-color: #373737;

2
pandora_console/install.php
View File

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

3
pandora_console/operation/events/events_rss.php
View File

@ -138,7 +138,8 @@ require('events.build_query.php');
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
$sql = "SELECT * $sql = "SELECT *
FROM tevento LEFT JOIN tagent_secondary_group on id_grupo = id_group FROM tevento te LEFT JOIN tagent_secondary_group tasg
ON te.id_grupo = tasg.id_group
WHERE 1=1 " . $sql_post . " WHERE 1=1 " . $sql_post . "
ORDER BY utimestamp DESC"; ORDER BY utimestamp DESC";

2
pandora_console/pandora_console.redhat.spec
View File

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

2
pandora_console/pandora_console.spec
View File

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

2
pandora_server/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-server package: pandorafms-server
Version: 7.0NG.722-180522 Version: 7.0NG.722-180528
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin 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 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="7.0NG.722-180522" pandora_version="7.0NG.722-180528"
package_cpan=0 package_cpan=0
package_pandora=1 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 # version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.722"; my $pandora_version = "7.0NG.722";
my $pandora_build = "180522"; my $pandora_build = "180528";
our $VERSION = $pandora_version." ".$pandora_build; our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash # Setup hash

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

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

2
pandora_server/pandora_server.redhat.spec
View File

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

2
pandora_server/pandora_server.spec
View File

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

2
pandora_server/pandora_server_installer
View File

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

2
pandora_server/util/pandora_db.pl
View File

@ -33,7 +33,7 @@ use PandoraFMS::Tools;
use PandoraFMS::DB; use PandoraFMS::DB;
# version: define current version # version: define current version
my $version = "7.0NG.722 PS180522"; my $version = "7.0NG.722 PS180528";
# Pandora server configuration # Pandora server configuration
my %conf; my %conf;

2
pandora_server/util/pandora_manage.pl
View File

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