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

Merge remote-tracking branch 'origin/develop' into ent-4238-eventos-csv-e-historico

Browse Source
This commit is contained in:
fbsanchez 2019-06-20 19:23:39 +02:00
commit 9fa9a346ca
34 changed files with 110 additions and 70 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.735-190618 Version: 7.0NG.735-190620
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.735-190618" pandora_version="7.0NG.735-190620"
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.735'; use constant AGENT_VERSION => '7.0NG.735';
use constant AGENT_BUILD => '190618'; use constant AGENT_BUILD => '190620';
# 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.735 %define version 7.0NG.735
%define release 190618 %define release 190620
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.735 %define version 7.0NG.735
%define release 190618 %define release 190620
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.735" PI_VERSION="7.0NG.735"
PI_BUILD="190618" PI_BUILD="190620"
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
{190618} {190620}
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.735(Build 190618)") #define PANDORA_VERSION ("7.0NG.735(Build 190620)")
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.735(Build 190618))" VALUE "ProductVersion", "(7.0NG.735(Build 190620))"
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.735-190618 Version: 7.0NG.735-190620
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.735-190618" pandora_version="7.0NG.735-190620"
package_pear=0 package_pear=0
package_pandora=1 package_pandora=1

3
pandora_console/extras/delete_files/delete_files.txt
View File

@ -1,3 +0,0 @@
/general/login_identification_wizard.php
/general/login_required.php
/godmode/update_manager/update_manager.messages.php

4
pandora_console/general/login_page.php
View File

@ -19,8 +19,8 @@ if (isset($config['homedir'])) {
ui_require_css_file('login'); ui_require_css_file('login');
require_once $homedir.'include/functions_ui.php'; require_once __DIR__.'/../include/functions_ui.php';
require_once $homedir.'include/functions.php'; require_once __DIR__.'/../include/functions.php';
require_once __DIR__.'/../include/functions_html.php'; require_once __DIR__.'/../include/functions_html.php';

3
pandora_console/godmode/modules/manage_network_components.php
View File

@ -36,6 +36,9 @@ require_once $config['homedir'].'/include/functions_component_groups.php';
if (defined('METACONSOLE')) { if (defined('METACONSOLE')) {
components_meta_print_header(); components_meta_print_header();
$sec = 'advanced'; $sec = 'advanced';
$id_modulo = (int) get_parameter('id_component_type');
$new_component = (bool) get_parameter('new_component');
} else { } else {
/* /*
Hello there! :) Hello there! :)

2
pandora_console/include/ajax/visual_console_builder.ajax.php
View File

@ -1206,6 +1206,8 @@ switch ($action) {
switch ($type) { switch ($type) {
case 'auto_sla_graph': case 'auto_sla_graph':
$elementFields['event_max_time_row'] = $elementFields['period']; $elementFields['event_max_time_row'] = $elementFields['period'];
break;
case 'percentile_item': case 'percentile_item':
case 'percentile_bar': case 'percentile_bar':
$elementFields['width_percentile'] = $elementFields['width']; $elementFields['width_percentile'] = $elementFields['width'];

2
pandora_console/include/config_process.php
View File

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

2
pandora_console/include/constants.php
View File

@ -66,7 +66,7 @@ define('ERR_NODATA', -70000);
define('ERR_CONNECTION', -80000); define('ERR_CONNECTION', -80000);
define('ERR_DISABLED', -90000); define('ERR_DISABLED', -90000);
define('ERR_WRONG', -100000); define('ERR_WRONG', -100000);
define('ERR_WRONG_NAME', -100001); define('ERR_WRONG_MR', -100001);
define('ERR_WRONG_PARAMETERS', -100002); define('ERR_WRONG_PARAMETERS', -100002);
define('ERR_ACL', -110000); define('ERR_ACL', -110000);
define('ERR_AUTH', -120000); define('ERR_AUTH', -120000);

24
pandora_console/include/functions.php
View File

@ -1516,6 +1516,13 @@ function enterprise_include($filename)
} }
/**
* Includes a file from enterprise section.
*
* @param string $filename Target file.
*
* @return mixed Result code.
*/
function enterprise_include_once($filename) function enterprise_include_once($filename)
{ {
global $config; global $config;
@ -1626,6 +1633,11 @@ function safe_sql_string($string)
} }
/**
* Verifies if current Pandora FMS installation is a Metaconsole.
*
* @return boolean True metaconsole installation, false if not.
*/
function is_metaconsole() function is_metaconsole()
{ {
global $config; global $config;
@ -1633,6 +1645,18 @@ function is_metaconsole()
} }
/**
* Check if current Pandora FMS installation has joined a Metaconsole env.
*
* @return boolean True joined, false if not.
*/
function has_metaconsole()
{
global $config;
return (bool) $config['node_metaconsole'] && (bool) $config['metaconsole_node_id'];
}
/** /**
* @brief Check if there is management operations are allowed in current context * @brief Check if there is management operations are allowed in current context
* (node // meta) * (node // meta)

4
pandora_console/include/functions_alerts.php
View File

@ -1783,12 +1783,14 @@ function alerts_validate_alert_agent_module($id_alert_agent_module, $noACLs=fals
['id' => $id] ['id' => $id]
); );
$template_name = io_safe_output(db_get_value('name', 'talert_templates', 'id', $alert['id_alert_template']));
$module_name = io_safe_output(db_get_value('nombre', 'tagente_modulo', 'id_agente_modulo', $alert['id_agent_module']));
if ($result > 0) { if ($result > 0) {
// Update fired alert count on the agent // Update fired alert count on the agent
db_process_sql(sprintf('UPDATE tagente SET update_alert_count=1 WHERE id_agente = %d', $agent_id)); db_process_sql(sprintf('UPDATE tagente SET update_alert_count=1 WHERE id_agente = %d', $agent_id));
events_create_event( events_create_event(
'Manual validation of alert for '.alerts_get_alert_template_description($alert['id_alert_template']), 'Manual validation of alert '.$template_name.' assigned to '.$module_name.'',
$group_id, $group_id,
$agent_id, $agent_id,
1, 1,

80
pandora_console/include/functions_reporting.php
View File

@ -151,11 +151,13 @@ function reporting_make_reporting_data(
$contents = $report['contents']; $contents = $report['contents'];
} else { } else {
$report = io_safe_output(db_get_row('treport', 'id_report', $id_report)); $report = io_safe_output(db_get_row('treport', 'id_report', $id_report));
$contents = db_get_all_rows_field_filter( $contents = io_safe_output(
'treport_content', db_get_all_rows_field_filter(
'id_report', 'treport_content',
$id_report, 'id_report',
db_escape_key_identifier('order') $id_report,
db_escape_key_identifier('order')
)
); );
} }
@ -326,26 +328,32 @@ function reporting_make_reporting_data(
break; break;
case 'general': case 'general':
$report['contents'][] = reporting_general( $report['contents'][] = io_safe_output(
$report, reporting_general(
$content $report,
$content
)
); );
break; break;
case 'availability': case 'availability':
$report['contents'][] = reporting_availability( $report['contents'][] = io_safe_output(
$report, reporting_availability(
$content, $report,
$date, $content,
$time $date,
$time
)
); );
break; break;
case 'availability_graph': case 'availability_graph':
$report['contents'][] = reporting_availability_graph( $report['contents'][] = io_safe_output(
$report, reporting_availability_graph(
$content, $report,
$pdf $content,
$pdf
)
); );
break; break;
@ -475,9 +483,11 @@ function reporting_make_reporting_data(
break; break;
case 'agent_configuration': case 'agent_configuration':
$report['contents'][] = reporting_agent_configuration( $report['contents'][] = io_safe_output(
$report, reporting_agent_configuration(
$content $report,
$content
)
); );
break; break;
@ -673,12 +683,14 @@ function reporting_make_reporting_data(
case 'agent_detailed_event': case 'agent_detailed_event':
case 'event_report_agent': case 'event_report_agent':
$report_control = reporting_event_report_agent( $report_control = io_safe_output(
$report, reporting_event_report_agent(
$content, $report,
$type, $content,
$force_width_chart, $type,
$force_height_chart $force_width_chart,
$force_height_chart
)
); );
if ($report_control['total_events'] == 0 && $content['hide_no_data'] == 1) { if ($report_control['total_events'] == 0 && $content['hide_no_data'] == 1) {
continue; continue;
@ -2176,7 +2188,7 @@ function reporting_agent_module($report, $content)
foreach ($agents as $agent) { foreach ($agents as $agent) {
$row = []; $row = [];
$row['agent_status'][$agent] = agents_get_status($agent); $row['agent_status'][$agent] = agents_get_status($agent);
$row['agent_name'] = agents_get_alias($agent); $row['agent_name'] = io_safe_output(agents_get_alias($agent));
$agent_modules = agents_get_modules($agent); $agent_modules = agents_get_modules($agent);
$row['modules'] = []; $row['modules'] = [];
@ -2777,7 +2789,7 @@ function reporting_event_report_agent(
} }
$return['title'] = $content['name']; $return['title'] = $content['name'];
$return['subtitle'] = agents_get_alias($content['id_agent']); $return['subtitle'] = io_safe_output(agents_get_alias($content['id_agent']));
$return['description'] = $content['description']; $return['description'] = $content['description'];
$return['date'] = reporting_get_date_text($report, $content); $return['date'] = reporting_get_date_text($report, $content);
@ -6073,7 +6085,7 @@ function reporting_advanced_sla(
// SLA. // SLA.
$return['SLA'] = reporting_sla_get_compliance_from_array($return); $return['SLA'] = reporting_sla_get_compliance_from_array($return);
$return['SLA_fixed'] = sla_truncate( $return['sla_fixed'] = sla_truncate(
$return['SLA'], $return['SLA'],
$config['graph_precision'] $config['graph_precision']
); );
@ -6396,10 +6408,12 @@ function reporting_availability_graph($report, $content, $pdf=false)
$edge_interval = 10; $edge_interval = 10;
if (empty($content['subitems'])) { if (empty($content['subitems'])) {
$slas = db_get_all_rows_field_filter( $slas = io_safe_output(
'treport_content_sla_combined', db_get_all_rows_field_filter(
'id_report_content', 'treport_content_sla_combined',
$content['id_rc'] 'id_report_content',
$content['id_rc']
)
); );
} else { } else {
$slas = $content['subitems']; $slas = $content['subitems'];

2
pandora_console/install.php
View File

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

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.735 %define version 7.0NG.735
%define release 190618 %define release 190620
# 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.rhel7.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_console %define name pandorafms_console
%define version 7.0NG.735 %define version 7.0NG.735
%define release 190618 %define release 190620
# 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.735 %define version 7.0NG.735
%define release 190618 %define release 190620
%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.735-190618 Version: 7.0NG.735-190620
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.735-190618" pandora_version="7.0NG.735-190620"
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.735"; my $pandora_version = "7.0NG.735";
my $pandora_build = "190618"; my $pandora_build = "190620";
our $VERSION = $pandora_version." ".$pandora_build; our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash # Setup hash

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

@ -4810,7 +4810,7 @@ sub pandora_process_event_replication ($) {
} }
# Get server id on metaconsole # Get server id on metaconsole
my $metaconsole_server_id = enterprise_hook('get_metaconsole_setup_server_id', [$dbh_metaconsole, safe_input($pa_config->{'servername'})]); my $metaconsole_server_id = enterprise_hook('get_metaconsole_setup_server_id', [$dbh]);
# If the server name is not found in metaconsole setup: abort # If the server name is not found in metaconsole setup: abort
if($metaconsole_server_id == -1) { if($metaconsole_server_id == -1) {

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 # version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.735"; my $pandora_version = "7.0NG.735";
my $pandora_build = "190618"; my $pandora_build = "190620";
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.735 %define version 7.0NG.735
%define release 190618 %define release 190620
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.735 %define version 7.0NG.735
%define release 190618 %define release 190620
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.735" PI_VERSION="7.0NG.735"
PI_BUILD="190618" PI_BUILD="190620"
MODE=$1 MODE=$1
if [ $# -gt 1 ]; then if [ $# -gt 1 ]; then

2
pandora_server/util/pandora_db.pl
View File

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

8
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.735 PS190618"; my $version = "7.0NG.735 PS190620";
# save program name for logging # save program name for logging
my $progname = basename($0); my $progname = basename($0);
@ -3801,9 +3801,8 @@ sub cli_get_agent_group() {
else { else {
my $id_group = get_agent_group ($dbh_metaconsole, $id_agent); my $id_group = get_agent_group ($dbh_metaconsole, $id_agent);
my $group_name = get_group_name ($dbh_metaconsole, $id_group); my $group_name = get_group_name ($dbh_metaconsole, $id_group);
my $metaconsole_name = enterprise_hook('get_metaconsole_setup_server_name',[$dbh, $server]);
$agent_name = safe_output($agent_name); $agent_name = safe_output($agent_name);
print "[INFO] Server: $metaconsole_name Agent: $agent_name Name Group: $group_name\n\n"; print "[INFO] Agent: $agent_name Name Group: $group_name\n\n";
} }
} }
} }
@ -3843,7 +3842,6 @@ sub cli_get_agent_group_id() {
foreach my $server (@servers_id) { foreach my $server (@servers_id) {
my $dbh_metaconsole = enterprise_hook('get_node_dbh',[$conf, $server, $dbh]); my $dbh_metaconsole = enterprise_hook('get_node_dbh',[$conf, $server, $dbh]);
my $metaconsole_name = enterprise_hook('get_metaconsole_setup_server_name',[$dbh, $server]);
my $id_agent = get_agent_id($dbh_metaconsole,$agent_name); my $id_agent = get_agent_id($dbh_metaconsole,$agent_name);
if ($id_agent == -1) { if ($id_agent == -1) {
@ -3852,7 +3850,7 @@ sub cli_get_agent_group_id() {
else { else {
my $id_group = get_agent_group ($dbh_metaconsole, $id_agent); my $id_group = get_agent_group ($dbh_metaconsole, $id_agent);
$agent_name = safe_output($agent_name); $agent_name = safe_output($agent_name);
print "Server: $metaconsole_name Agent: $agent_name ID Group: $id_group\n\n"; print "Agent: $agent_name ID Group: $id_group\n\n";
} }
} }
} }