Merge remote-tracking branch 'origin/develop' into ent-6099-bug-al-duplicar-modulo

This commit is contained in:
marcos 2020-08-07 08:47:11 +02:00
commit bb2fb0c631
155 changed files with 65903 additions and 61670 deletions

View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents # Base config file for Pandora FMS agents
# Version 7.0NG.747, AIX version # Version 7.0NG.748, AIX version
# Licensed under GPL license v2, # Licensed under GPL license v2,
# Copyright (c) 2003-2010 Artica Soluciones Tecnologicas # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
# http://www.pandorafms.com # http://www.pandorafms.com

View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents # Base config file for Pandora FMS agents
# Version 7.0NG.747, FreeBSD Version # Version 7.0NG.748, FreeBSD Version
# Licensed under GPL license v2, # Licensed under GPL license v2,
# Copyright (c) 2003-2010 Artica Soluciones Tecnologicas # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
# http://www.pandorafms.com # http://www.pandorafms.com

View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents # Base config file for Pandora FMS agents
# Version 7.0NG.747, HP-UX Version # Version 7.0NG.748, HP-UX Version
# Licensed under GPL license v2, # Licensed under GPL license v2,
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
# http://www.pandorafms.com # http://www.pandorafms.com

View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents # Base config file for Pandora FMS agents
# Version 7.0NG.747, GNU/Linux # Version 7.0NG.748, GNU/Linux
# Licensed under GPL license v2, # Licensed under GPL license v2,
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
# http://www.pandorafms.com # http://www.pandorafms.com

View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents # Base config file for Pandora FMS agents
# Version 7.0NG.747, GNU/Linux # Version 7.0NG.748, GNU/Linux
# Licensed under GPL license v2, # Licensed under GPL license v2,
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
# http://www.pandorafms.com # http://www.pandorafms.com

View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents # Base config file for Pandora FMS agents
# Version 7.0NG.747, Solaris Version # Version 7.0NG.748, Solaris Version
# Licensed under GPL license v2, # Licensed under GPL license v2,
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
# http://www.pandorafms.com # http://www.pandorafms.com

View File

@ -1,6 +1,6 @@
# Base config file for Pandora FMS Windows Agent # Base config file for Pandora FMS Windows Agent
# (c) 2006-2010 Artica Soluciones Tecnologicas # (c) 2006-2010 Artica Soluciones Tecnologicas
# Version 7.0NG.747 # Version 7.0NG.748
# This program is Free Software, you can redistribute it and/or modify it # This program is Free Software, you can redistribute it and/or modify it
# under the terms of the GNU General Public Licence as published by the Free Software # under the terms of the GNU General Public Licence as published by the Free Software

View File

@ -1,6 +1,6 @@
# Fichero de configuracion base de agentes de Pandora # Fichero de configuracion base de agentes de Pandora
# Base config file for Pandora agents # Base config file for Pandora agents
# Version 7.0NG.747, AIX version # Version 7.0NG.748, AIX version
# General Parameters # General Parameters
# ================== # ==================

View File

@ -1,6 +1,6 @@
# Fichero de configuracion base de agentes de Pandora # Fichero de configuracion base de agentes de Pandora
# Base config file for Pandora agents # Base config file for Pandora agents
# Version 7.0NG.747 # Version 7.0NG.748
# FreeBSD/IPSO version # FreeBSD/IPSO version
# Licenced under GPL licence, 2003-2007 Sancho Lerena # Licenced under GPL licence, 2003-2007 Sancho Lerena

View File

@ -1,6 +1,6 @@
# Fichero de configuracion base de agentes de Pandora # Fichero de configuracion base de agentes de Pandora
# Base config file for Pandora agents # Base config file for Pandora agents
# Version 7.0NG.747, HPUX Version # Version 7.0NG.748, HPUX Version
# General Parameters # General Parameters
# ================== # ==================

View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents # Base config file for Pandora FMS agents
# Version 7.0NG.747 # Version 7.0NG.748
# Licensed under GPL license v2, # Licensed under GPL license v2,
# (c) 2003-2010 Artica Soluciones Tecnologicas # (c) 2003-2010 Artica Soluciones Tecnologicas
# please visit http://pandora.sourceforge.net # please visit http://pandora.sourceforge.net

View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents # Base config file for Pandora FMS agents
# Version 7.0NG.747 # Version 7.0NG.748
# Licensed under GPL license v2, # Licensed under GPL license v2,
# (c) 2003-2009 Artica Soluciones Tecnologicas # (c) 2003-2009 Artica Soluciones Tecnologicas
# please visit http://pandora.sourceforge.net # please visit http://pandora.sourceforge.net

View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents # Base config file for Pandora FMS agents
# Version 7.0NG.747 # Version 7.0NG.748
# Licensed under GPL license v2, # Licensed under GPL license v2,
# please visit http://pandora.sourceforge.net # please visit http://pandora.sourceforge.net

View File

@ -1,6 +1,6 @@
# Fichero de configuracion base de agentes de Pandora # Fichero de configuracion base de agentes de Pandora
# Base config file for Pandora agents # Base config file for Pandora agents
# Version 7.0NG.747, Solaris version # Version 7.0NG.748, Solaris version
# General Parameters # General Parameters
# ================== # ==================

View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents # Base config file for Pandora FMS agents
# Version 7.0NG.747, AIX version # Version 7.0NG.748, AIX version
# Licensed under GPL license v2, # Licensed under GPL license v2,
# Copyright (c) 2003-2010 Artica Soluciones Tecnologicas # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
# http://www.pandorafms.com # http://www.pandorafms.com

View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix package: pandorafms-agent-unix
Version: 7.0NG.747-200706 Version: 7.0NG.748-200807
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

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.747-200706" pandora_version="7.0NG.748-200807"
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

View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents # Base config file for Pandora FMS agents
# Version 7.0NG.747, GNU/Linux # Version 7.0NG.748, GNU/Linux
# Licensed under GPL license v2, # Licensed under GPL license v2,
# Copyright (c) 2003-2012 Artica Soluciones Tecnologicas # Copyright (c) 2003-2012 Artica Soluciones Tecnologicas
# http://www.pandorafms.com # http://www.pandorafms.com

View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents # Base config file for Pandora FMS agents
# Version 7.0NG.747, FreeBSD Version # Version 7.0NG.748, FreeBSD Version
# Licensed under GPL license v2, # Licensed under GPL license v2,
# Copyright (c) 2003-2016 Artica Soluciones Tecnologicas # Copyright (c) 2003-2016 Artica Soluciones Tecnologicas
# http://www.pandorafms.com # http://www.pandorafms.com

View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents # Base config file for Pandora FMS agents
# Version 7.0NG.747, HP-UX Version # Version 7.0NG.748, HP-UX Version
# Licensed under GPL license v2, # Licensed under GPL license v2,
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
# http://www.pandorafms.com # http://www.pandorafms.com

View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents # Base config file for Pandora FMS agents
# Version 7.0NG.747, GNU/Linux # Version 7.0NG.748, GNU/Linux
# Licensed under GPL license v2, # Licensed under GPL license v2,
# Copyright (c) 2003-2014 Artica Soluciones Tecnologicas # Copyright (c) 2003-2014 Artica Soluciones Tecnologicas
# http://www.pandorafms.com # http://www.pandorafms.com

View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents # Base config file for Pandora FMS agents
# Version 7.0NG.747, GNU/Linux # Version 7.0NG.748, GNU/Linux
# Licensed under GPL license v2, # Licensed under GPL license v2,
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
# http://www.pandorafms.com # http://www.pandorafms.com

View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents # Base config file for Pandora FMS agents
# Version 7.0NG.747, NetBSD Version # Version 7.0NG.748, NetBSD Version
# Licensed under GPL license v2, # Licensed under GPL license v2,
# Copyright (c) 2003-2010 Artica Soluciones Tecnologicas # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
# http://www.pandorafms.com # http://www.pandorafms.com

View File

@ -1,5 +1,5 @@
# Base config file for Pandora FMS agents # Base config file for Pandora FMS agents
# Version 7.0NG.747, Solaris Version # Version 7.0NG.748, Solaris Version
# Licensed under GPL license v2, # Licensed under GPL license v2,
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
# http://www.pandorafms.com # http://www.pandorafms.com

View File

@ -54,8 +54,8 @@ my $Sem = undef;
# Semaphore used to control the number of threads # Semaphore used to control the number of threads
my $ThreadSem = undef; my $ThreadSem = undef;
use constant AGENT_VERSION => '7.0NG.747'; use constant AGENT_VERSION => '7.0NG.748';
use constant AGENT_BUILD => '200706'; use constant AGENT_BUILD => '200807';
# 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;

View File

@ -2,8 +2,8 @@
#Pandora FMS Linux Agent #Pandora FMS Linux Agent
# #
%define name pandorafms_agent_unix %define name pandorafms_agent_unix
%define version 7.0NG.747 %define version 7.0NG.748
%define release 200706 %define release 200807
Summary: Pandora FMS Linux agent, PERL version Summary: Pandora FMS Linux agent, PERL version
Name: %{name} Name: %{name}

View File

@ -2,8 +2,8 @@
#Pandora FMS Linux Agent #Pandora FMS Linux Agent
# #
%define name pandorafms_agent_unix %define name pandorafms_agent_unix
%define version 7.0NG.747 %define version 7.0NG.748
%define release 200706 %define release 200807
Summary: Pandora FMS Linux agent, PERL version Summary: Pandora FMS Linux agent, PERL version
Name: %{name} Name: %{name}

View File

@ -9,8 +9,8 @@
# Please see http://www.pandorafms.org. This code is licensed under GPL 2.0 license. # Please see http://www.pandorafms.org. This code is licensed under GPL 2.0 license.
# ********************************************************************** # **********************************************************************
PI_VERSION="7.0NG.747" PI_VERSION="7.0NG.748"
PI_BUILD="200706" PI_BUILD="200807"
OS_NAME=`uname -s` OS_NAME=`uname -s`
FORCE=0 FORCE=0

View File

@ -1,6 +1,6 @@
# Base config file for Pandora FMS Windows Agent # Base config file for Pandora FMS Windows Agent
# (c) 2006-2017 Artica Soluciones Tecnologicas # (c) 2006-2017 Artica Soluciones Tecnologicas
# Version 7.0NG.747 # Version 7.0NG.748
# This program is Free Software, you can redistribute it and/or modify it # This program is Free Software, you can redistribute it and/or modify it
# under the terms of the GNU General Public Licence as published by the Free Software # under the terms of the GNU General Public Licence as published by the Free Software

View File

@ -3,7 +3,7 @@ AllowLanguageSelection
{Yes} {Yes}
AppName AppName
{Pandora FMS Windows Agent v7.0NG.747} {Pandora FMS Windows Agent v7.0NG.748}
ApplicationID ApplicationID
{17E3D2CF-CA02-406B-8A80-9D31C17BD08F} {17E3D2CF-CA02-406B-8A80-9D31C17BD08F}
@ -186,7 +186,7 @@ UpgradeApplicationID
{} {}
Version Version
{200706} {200807}
ViewReadme ViewReadme
{Yes} {Yes}

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.747(Build 200706)") #define PANDORA_VERSION ("7.0NG.748(Build 200807)")
string pandora_path; string pandora_path;
string pandora_dir; string pandora_dir;

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.747(Build 200706))" VALUE "ProductVersion", "(7.0NG.748(Build 200807))"
VALUE "FileVersion", "1.0.0.0" VALUE "FileVersion", "1.0.0.0"
END END
END END

View File

@ -1,5 +1,5 @@
package: pandorafms-console package: pandorafms-console
Version: 7.0NG.747-200706 Version: 7.0NG.748-200807
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

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.747-200706" pandora_version="7.0NG.748-200807"
package_pear=0 package_pear=0
package_pandora=1 package_pandora=1

View File

@ -27,6 +27,8 @@
*/ */
// Begin. // Begin.
require 'vendor/autoload.php';
define('AJAX', true); define('AJAX', true);
if (!defined('__PAN_XHPROF__')) { if (!defined('__PAN_XHPROF__')) {
@ -39,7 +41,9 @@ if (__PAN_XHPROF__ === 1) {
} }
} }
if ((! file_exists('include/config.php')) || (! is_readable('include/config.php'))) { if ((! file_exists('include/config.php'))
|| (! is_readable('include/config.php'))
) {
exit; exit;
} }
@ -50,13 +54,25 @@ require_once 'include/functions.php';
require_once 'include/functions_db.php'; require_once 'include/functions_db.php';
require_once 'include/auth/mysql.php'; require_once 'include/auth/mysql.php';
// Hash login process if (isset($config['console_log_enabled']) === true
if (isset($_GET['loginhash'])) { && $config['console_log_enabled'] == 1
) {
ini_set('log_errors', 1);
ini_set('error_log', $config['homedir'].'/log/console.log');
} else {
ini_set('log_errors', 0);
ini_set('error_log', 0);
}
// Hash login process.
if (isset($_GET['loginhash']) === true) {
$loginhash_data = get_parameter('loginhash_data', ''); $loginhash_data = get_parameter('loginhash_data', '');
$loginhash_user = str_rot13(get_parameter('loginhash_user', '')); $loginhash_user = str_rot13(get_parameter('loginhash_user', ''));
if ($config['loginhash_pwd'] != '' if ($config['loginhash_pwd'] != ''
&& $loginhash_data == md5($loginhash_user.io_output_password($config['loginhash_pwd'])) && $loginhash_data == md5(
$loginhash_user.io_output_password($config['loginhash_pwd'])
)
) { ) {
db_logon($loginhash_user, $_SERVER['REMOTE_ADDR']); db_logon($loginhash_user, $_SERVER['REMOTE_ADDR']);
$_SESSION['id_usuario'] = $loginhash_user; $_SESSION['id_usuario'] = $loginhash_user;
@ -65,14 +81,38 @@ if (isset($_GET['loginhash'])) {
include_once 'general/login_page.php'; include_once 'general/login_page.php';
db_pandora_audit('Logon Failed (loginhash', '', 'system'); db_pandora_audit('Logon Failed (loginhash', '', 'system');
while (@ob_end_flush()) { while (@ob_end_flush()) {
// Dumping...
continue;
} }
exit('</html>'); exit('</html>');
} }
} }
$auth_class = io_safe_output(
get_parameter('auth_class', 'PandoraFMS\Dashboard\Manager')
);
$public_hash = get_parameter('auth_hash', false);
$public_login = false;
// Check user. // Check user.
check_login(); if (class_exists($auth_class) === false || $public_hash === false) {
check_login();
} else {
if ($auth_class::validatePublicHash($public_hash) === false) {
db_pandora_audit(
'Invalid public hash',
'Trying to access public dashboard'
);
include 'general/noaccess.php';
exit;
}
// OK. Simulated user log in. If you want to use your own auth_class
// remember to set $config['force_instant_logout'] to true to avoid
// persistent user login.
}
ob_start();
// Enterprise support. // Enterprise support.
if (file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) { if (file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) {
@ -87,7 +127,10 @@ $page .= '.php';
$config['id_user'] = $_SESSION['id_usuario']; $config['id_user'] = $_SESSION['id_usuario'];
$isFunctionSkins = enterprise_include_once('include/functions_skins.php'); $isFunctionSkins = enterprise_include_once('include/functions_skins.php');
if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK) { if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK) {
$config['relative_path'] = enterprise_hook('skins_set_image_skin_path', [$config['id_user']]); $config['relative_path'] = enterprise_hook(
'skins_set_image_skin_path',
[$config['id_user']]
);
} }
if (is_metaconsole()) { if (is_metaconsole()) {
@ -104,3 +147,29 @@ if (file_exists($page)) {
if (__PAN_XHPROF__ === 1) { if (__PAN_XHPROF__ === 1) {
pandora_xhprof_display_result('ajax', 'console'); pandora_xhprof_display_result('ajax', 'console');
} }
if ($config['force_instant_logout'] === true) {
// Force user logout.
if (session_status() !== PHP_SESSION_ACTIVE) {
session_start();
}
$iduser = $_SESSION['id_usuario'];
$_SESSION = [];
session_destroy();
header_remove('Set-Cookie');
setcookie(session_name(), $_COOKIE[session_name()], (time() - 4800), '/');
if ($config['auth'] == 'saml') {
include_once $config['saml_path'].'simplesamlphp/lib/_autoload.php';
$as = new SimpleSAML_Auth_Simple('PandoraFMS');
$as->logout();
}
}
while (@ob_end_flush()) {
// Dumping...
continue;
}

View File

@ -0,0 +1,15 @@
START TRANSACTION;
UPDATE `talert_commands` SET name='Monitoring&#x20;Event' WHERE name='Pandora FMS Event';
ALTER TABLE `tservice_element` ADD COLUMN `rules` text;
ALTER TABLE `tservice` ADD COLUMN `unknown_as_critical` tinyint(1) NOT NULL default 0 AFTER `warning`;
ALTER TABLE `tserver` MODIFY COLUMN `version` varchar(25) NOT NULL DEFAULT '';
UPDATE `tservice` SET `auto_calculate`=0;
UPDATE `tservice` SET `cps`= `cps` - 1 WHERE `cps` > 0;
UPDATE `tagente` SET `cps`= `cps` - 1 WHERE `cps` > 0;
UPDATE `tagente_modulo` SET `cps`= `cps` - 1 WHERE `cps` > 0;
COMMIT;

View File

@ -1271,6 +1271,7 @@ ALTER TABLE talert_snmp_action ADD COLUMN `al_field15` TEXT NOT NULL DEFAULT "";
-- ---------------------------------------------------------------------- -- ----------------------------------------------------------------------
ALTER TABLE tserver ADD COLUMN `server_keepalive` int(11) DEFAULT 0; ALTER TABLE tserver ADD COLUMN `server_keepalive` int(11) DEFAULT 0;
ALTER TABLE `tserver` MODIFY COLUMN `server_keepalive` int(11) NOT NULL DEFAULT '0'; ALTER TABLE `tserver` MODIFY COLUMN `server_keepalive` int(11) NOT NULL DEFAULT '0';
ALTER TABLE `tserver` MODIFY COLUMN `version` varchar(25) NOT NULL DEFAULT '';
-- ---------------------------------------------------------------------- -- ----------------------------------------------------------------------
-- Table `tagente_estado` -- Table `tagente_estado`
@ -1342,13 +1343,13 @@ ALTER TABLE `tmap` MODIFY COLUMN `id_user` varchar(250) NOT NULL DEFAULT '';
INSERT INTO `tconfig` (`token`, `value`) VALUES ('big_operation_step_datos_purge', '100'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('big_operation_step_datos_purge', '100');
INSERT INTO `tconfig` (`token`, `value`) VALUES ('small_operation_step_datos_purge', '1000'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('small_operation_step_datos_purge', '1000');
INSERT INTO `tconfig` (`token`, `value`) VALUES ('days_autodisable_deletion', '30'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('days_autodisable_deletion', '30');
INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 39); INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 40);
INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_docs_logo', 'default_docs.png'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_docs_logo', 'default_docs.png');
INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_support_logo', 'default_support.png'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_support_logo', 'default_support.png');
INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_logo_white_bg_preview', 'pandora_logo_head_white_bg.png'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_logo_white_bg_preview', 'pandora_logo_head_white_bg.png');
UPDATE tconfig SET value = 'https://licensing.artica.es/pandoraupdate7/server.php' WHERE token='url_update_manager'; UPDATE tconfig SET value = 'https://licensing.artica.es/pandoraupdate7/server.php' WHERE token='url_update_manager';
DELETE FROM `tconfig` WHERE `token` = 'current_package_enterprise'; DELETE FROM `tconfig` WHERE `token` = 'current_package_enterprise';
INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '747'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '748');
INSERT INTO `tconfig` (`token`, `value`) VALUES ('status_monitor_fields', 'policy,agent,data_type,module_name,server_type,interval,status,graph,warn,data,timestamp'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('status_monitor_fields', 'policy,agent,data_type,module_name,server_type,interval,status,graph,warn,data,timestamp');
UPDATE `tconfig` SET `value` = 'mini_severity,evento,id_agente,estado,timestamp' WHERE `token` LIKE 'event_fields'; UPDATE `tconfig` SET `value` = 'mini_severity,evento,id_agente,estado,timestamp' WHERE `token` LIKE 'event_fields';
DELETE FROM `tconfig` WHERE `token` LIKE 'integria_api_password'; DELETE FROM `tconfig` WHERE `token` LIKE 'integria_api_password';
@ -1540,7 +1541,16 @@ ALTER TABLE `tservice` ADD COLUMN `cps` int NOT NULL default 0;
ALTER TABLE `tservice` ADD COLUMN `cascade_protection` tinyint(1) NOT NULL default 0; ALTER TABLE `tservice` ADD COLUMN `cascade_protection` tinyint(1) NOT NULL default 0;
ALTER TABLE `tservice` ADD COLUMN `evaluate_sla` int(1) NOT NULL default 0; ALTER TABLE `tservice` ADD COLUMN `evaluate_sla` int(1) NOT NULL default 0;
ALTER TABLE `tservice` ADD COLUMN `is_favourite` tinyint(1) NOT NULL default 0; ALTER TABLE `tservice` ADD COLUMN `is_favourite` tinyint(1) NOT NULL default 0;
ALTER TABLE `tservice` ADD COLUMN `unknown_as_critical` tinyint(1) NOT NULL default 0 AFTER `warning`;
UPDATE tservice SET `is_favourite` = 1 WHERE `name` REGEXP '^[_|.|\[|\(]'; UPDATE tservice SET `is_favourite` = 1 WHERE `name` REGEXP '^[_|.|\[|\(]';
-- ALl previous services are manual now.
UPDATE `tservice` SET `auto_calculate` = 0;
-- ---------------------------------------------------------------------
-- Table `tservice_element`
-- ---------------------------------------------------------------------
ALTER TABLE `tservice_element` ADD COLUMN `rules` text;
-- --------------------------------------------------------------------- -- ---------------------------------------------------------------------
-- Table `tlayout` -- Table `tlayout`

View File

@ -53,8 +53,8 @@ ui_print_info_message(['no_close' => true, 'message' => __('There are no HA clus
<?php <?php
if (check_acl($config['id_user'], 0, 'PM')) { if (check_acl($config['id_user'], 0, 'PM')) {
echo "<div id='create_master_window'></div>"; echo "<div id='create_master_window' style='display:none;'></div>";
echo "<div id='msg'></div>"; echo "<div id='msg' style='display:none;'></div>";
?> ?>
<input style="margin-bottom:20px;" onclick="show_create_ha_cluster();" type="submit" class="button_task" value="<?php echo __('Add new node'); ?>" /> <input style="margin-bottom:20px;" onclick="show_create_ha_cluster();" type="submit" class="button_task" value="<?php echo __('Add new node'); ?>" />
<?php <?php

View File

@ -106,7 +106,7 @@ img.modalclose {
<span class='modalheadertex'> <span class='modalheadertex'>
<?php echo __('Database error'); ?> <?php echo __('Database error'); ?>
</span> </span>
<img class='modalclose' src='<?php echo $config['homeurl']; ?>images/icono_cerrar.png'> <img class='modalclose' src='<?php echo $config['homeurl']; ?>/images/icono_cerrar.png'>
</div> </div>
<div class='modalconten'> <div class='modalconten'>

View File

@ -1290,7 +1290,7 @@ ui_require_jquery_file('json');
<script type="text/javascript"> <script type="text/javascript">
/* <![CDATA[ */ /* <![CDATA[ */
$(document).ready (function () { $(document).ready (function () {
var disabledBecauseInPolicy = '<?php echo $disabledBecauseInPolicy; ?>'; var disabledBecauseInPolicy = <?php echo '\''.(empty($disabledBecauseInPolicy) === true ? '0' : '1').'\''; ?>;
$("#right").click (function () { $("#right").click (function () {
jQuery.each($("select[name='id_tag_available[]'] option:selected"), function (key, value) { jQuery.each($("select[name='id_tag_available[]'] option:selected"), function (key, value) {
tag_name = $(value).html(); tag_name = $(value).html();
@ -1551,7 +1551,10 @@ $(document).ready (function () {
//readonly and add class input //readonly and add class input
function disabled_status (disabledBecauseInPolicy) { function disabled_status (disabledBecauseInPolicy) {
if($('#dynamic_interval_select').val() != 0 && $('#dynamic_interval').val() != 0){ var dynamic_interval_select_value = $('#dynamic_interval_select').val();
var dynamic_interval_value = $('#dynamic_interval_select').val();
if(typeof dynamic_interval_select_value != "undefined" && typeof dynamic_interval_value != "undefined"
&& dynamic_interval_select_value != 0 && dynamic_interval_value != 0){
$('#text-min_warning').prop('readonly', true); $('#text-min_warning').prop('readonly', true);
$('#text-min_warning').addClass('readonly'); $('#text-min_warning').addClass('readonly');
$('#text-max_warning').prop('readonly', true); $('#text-max_warning').prop('readonly', true);

View File

@ -171,6 +171,11 @@ if ($delete_action) {
); );
} }
if (is_central_policies_on_node() === true) {
ui_print_warning_message(
__('This node is configured with centralized mode. All alerts templates information is read only. Go to metaconsole to manage it.')
);
}
$search_string = (string) get_parameter('search_string', ''); $search_string = (string) get_parameter('search_string', '');
$group = (int) get_parameter('group', 0); $group = (int) get_parameter('group', 0);
@ -224,8 +229,11 @@ $table->data = [];
$table->head = []; $table->head = [];
$table->head[0] = __('Name'); $table->head[0] = __('Name');
$table->head[1] = __('Group'); $table->head[1] = __('Group');
$table->head[2] = __('Copy'); if (is_central_policies_on_node() === false) {
$table->head[3] = __('Delete'); $table->head[2] = __('Copy');
$table->head[3] = __('Delete');
}
$table->style = []; $table->style = [];
$table->style[0] = 'font-weight: bold'; $table->style[0] = 'font-weight: bold';
$table->size = []; $table->size = [];
@ -292,7 +300,9 @@ foreach ($actions as $action) {
); );
} }
if (check_acl($config['id_user'], $action['id_group'], 'LM')) { if (is_central_policies_on_node() === false
&& check_acl($config['id_user'], $action['id_group'], 'LM')
) {
$table->cellclass[] = [ $table->cellclass[] = [
2 => 'action_buttons', 2 => 'action_buttons',
3 => 'action_buttons', 3 => 'action_buttons',
@ -318,12 +328,14 @@ if (isset($data)) {
ui_print_info_message(['no_close' => true, 'message' => __('No alert actions configured') ]); ui_print_info_message(['no_close' => true, 'message' => __('No alert actions configured') ]);
} }
echo '<div class="action-buttons" style="width: '.$table->width.'">'; if (is_central_policies_on_node() === false) {
echo '<form method="post" action="index.php?sec='.$sec.'&sec2=godmode/alerts/configure_alert_action&pure='.$pure.'">'; echo '<div class="action-buttons" style="width: '.$table->width.'">';
html_print_submit_button(__('Create'), 'create', false, 'class="sub next"'); echo '<form method="post" action="index.php?sec='.$sec.'&sec2=godmode/alerts/configure_alert_action&pure='.$pure.'">';
html_print_input_hidden('create_alert', 1); html_print_submit_button(__('Create'), 'create', false, 'class="sub next"');
echo '</form>'; html_print_input_hidden('create_alert', 1);
echo '</div>'; echo '</form>';
echo '</div>';
}
enterprise_hook('close_meta_frame'); enterprise_hook('close_meta_frame');
?> ?>

View File

@ -46,6 +46,8 @@ if (is_ajax()) {
$id = (int) get_parameter('id', 0); $id = (int) get_parameter('id', 0);
$get_recovery_fields = (int) get_parameter('get_recovery_fields', 1); $get_recovery_fields = (int) get_parameter('get_recovery_fields', 1);
$is_central_policies_on_node = is_central_policies_on_node();
// If command ID is not provided, check for action id. // If command ID is not provided, check for action id.
if ($id == 0) { if ($id == 0) {
$id_action = (int) get_parameter('id_action'); $id_action = (int) get_parameter('id_action');
@ -124,40 +126,142 @@ if (is_ajax()) {
// HTML type. // HTML type.
if (preg_match('/^_html_editor_$/i', $field_value)) { if (preg_match('/^_html_editor_$/i', $field_value)) {
$editor_type_chkbx = '<div style="padding: 4px 0px;"><b><small>'; $editor_type_chkbx = '<div style="padding: 4px 0px;"><b><small>';
$editor_type_chkbx .= __('Basic').ui_print_help_tip(__('For sending emails, text must be HTML format, if you want to use plain text, type it between the following labels: <pre></pre>'), true); $editor_type_chkbx .= __('Basic');
$editor_type_chkbx .= html_print_radio_button_extended('editor_type_value_'.$i, 0, '', false, false, "removeTinyMCE('textarea_field".$i."_value')", '', true); $editor_type_chkbx .= ui_print_help_tip(
__('For sending emails, text must be HTML format, if you want to use plain text, type it between the following labels: <pre></pre>'),
true
);
$editor_type_chkbx .= html_print_radio_button_extended(
'editor_type_value_'.$i,
0,
'',
false,
$is_central_policies_on_node,
"removeTinyMCE('textarea_field".$i."_value')",
'',
true
);
$editor_type_chkbx .= '&nbsp;&nbsp;&nbsp;&nbsp;'; $editor_type_chkbx .= '&nbsp;&nbsp;&nbsp;&nbsp;';
$editor_type_chkbx .= __('Advanced').'&nbsp;&nbsp;'; $editor_type_chkbx .= __('Advanced').'&nbsp;&nbsp;';
$editor_type_chkbx .= html_print_radio_button_extended('editor_type_value_'.$i, 0, '', true, false, "addTinyMCE('textarea_field".$i."_value')", '', true); $editor_type_chkbx .= html_print_radio_button_extended(
'editor_type_value_'.$i,
0,
'',
true,
$is_central_policies_on_node,
"addTinyMCE('textarea_field".$i."_value')",
'',
true
);
$editor_type_chkbx .= '</small></b></div>'; $editor_type_chkbx .= '</small></b></div>';
$ffield = $editor_type_chkbx; $ffield = $editor_type_chkbx;
$ffield .= html_print_textarea('field'.$i.'_value', 1, 1, '', 'class="fields"', true); $ffield .= html_print_textarea(
'field'.$i.'_value',
1,
1,
'',
'class="fields"',
true,
'',
$is_central_policies_on_node
);
$editor_type_chkbx = '<div style="padding: 4px 0px;"><b><small>'; $editor_type_chkbx = '<div style="padding: 4px 0px;"><b><small>';
$editor_type_chkbx .= __('Basic').'&nbsp;&nbsp;'; $editor_type_chkbx .= __('Basic').'&nbsp;&nbsp;';
$editor_type_chkbx .= html_print_radio_button_extended('editor_type_recovery_value_'.$i, 0, '', false, false, "removeTinyMCE('textarea_field".$i."_recovery_value')", '', true); $editor_type_chkbx .= html_print_radio_button_extended(
'editor_type_recovery_value_'.$i,
0,
'',
false,
$is_central_policies_on_node,
"removeTinyMCE('textarea_field".$i."_recovery_value')",
'',
true
);
$editor_type_chkbx .= '&nbsp;&nbsp;&nbsp;&nbsp;'; $editor_type_chkbx .= '&nbsp;&nbsp;&nbsp;&nbsp;';
$editor_type_chkbx .= __('Advanced').'&nbsp;&nbsp;'; $editor_type_chkbx .= __('Advanced').'&nbsp;&nbsp;';
$editor_type_chkbx .= html_print_radio_button_extended('editor_type_recovery_value_'.$i, 0, '', true, false, "addTinyMCE('textarea_field".$i."_recovery_value')", '', true); $editor_type_chkbx .= html_print_radio_button_extended(
'editor_type_recovery_value_'.$i,
0,
'',
true,
$is_central_policies_on_node,
"addTinyMCE('textarea_field".$i."_recovery_value')",
'',
true
);
$editor_type_chkbx .= '</small></b></div>'; $editor_type_chkbx .= '</small></b></div>';
$rfield = $editor_type_chkbx; $rfield = $editor_type_chkbx;
$rfield .= html_print_textarea('field'.$i.'_recovery_value', 1, 1, '', 'class="fields_recovery"', true); $rfield .= html_print_textarea(
'field'.$i.'_recovery_value',
1,
1,
'',
'class="fields_recovery"',
true,
'',
$is_central_policies_on_node
);
} else if (preg_match('/^_content_type_$/i', $field_value)) { } else if (preg_match('/^_content_type_$/i', $field_value)) {
$editor_type_chkbx = '<div style="padding: 4px 0px;"><b><small>'; $editor_type_chkbx = '<div style="padding: 4px 0px;"><b><small>';
$editor_type_chkbx .= __('Text/plain').ui_print_help_tip(__('For sending emails only text plain'), true); $editor_type_chkbx .= __('Text/plain');
$editor_type_chkbx .= html_print_radio_button_extended('field'.$i.'_value', 'text/plain', '', '', false, '', '', true); $editor_type_chkbx .= ui_print_help_tip(
__('For sending emails only text plain'),
true
);
$editor_type_chkbx .= html_print_radio_button_extended(
'field'.$i.'_value',
'text/plain',
'',
'',
$is_central_policies_on_node,
'',
'',
true
);
$editor_type_chkbx .= '&nbsp;&nbsp;&nbsp;&nbsp;'; $editor_type_chkbx .= '&nbsp;&nbsp;&nbsp;&nbsp;';
$editor_type_chkbx .= __('Text/html').'&nbsp;&nbsp;'; $editor_type_chkbx .= __('Text/html').'&nbsp;&nbsp;';
$editor_type_chkbx .= html_print_radio_button_extended('field'.$i.'_value', 'text/html', '', 'text/html', false, '', '', true); $editor_type_chkbx .= html_print_radio_button_extended(
'field'.$i.'_value',
'text/html',
'',
'text/html',
$is_central_policies_on_node,
'',
'',
true
);
$editor_type_chkbx .= '</small></b></div>'; $editor_type_chkbx .= '</small></b></div>';
$ffield = $editor_type_chkbx; $ffield = $editor_type_chkbx;
$editor_type_chkbx = '<div style="padding: 4px 0px;"><b><small>'; $editor_type_chkbx = '<div style="padding: 4px 0px;"><b><small>';
$editor_type_chkbx .= __('Text/plain').ui_print_help_tip(__('For sending emails only text plain'), true); $editor_type_chkbx .= __('Text/plain');
$editor_type_chkbx .= html_print_radio_button_extended('field'.$i.'_recovery_value', 'text/plain', '', '', false, '', '', true); $editor_type_chkbx .= ui_print_help_tip(
__('For sending emails only text plain'),
true
);
$editor_type_chkbx .= html_print_radio_button_extended(
'field'.$i.'_recovery_value',
'text/plain',
'',
'',
$is_central_policies_on_node,
'',
'',
true
);
$editor_type_chkbx .= '&nbsp;&nbsp;&nbsp;&nbsp;'; $editor_type_chkbx .= '&nbsp;&nbsp;&nbsp;&nbsp;';
$editor_type_chkbx .= __('Text/html').'&nbsp;&nbsp;'; $editor_type_chkbx .= __('Text/html').'&nbsp;&nbsp;';
$editor_type_chkbx .= html_print_radio_button_extended('field'.$i.'_recovery_value', 'text/html', '', 'text/html', false, '', '', true); $editor_type_chkbx .= html_print_radio_button_extended(
'field'.$i.'_recovery_value',
'text/html',
'',
'text/html',
$is_central_policies_on_node,
'',
'',
true
);
$editor_type_chkbx .= '</small></b></div>'; $editor_type_chkbx .= '</small></b></div>';
$rfield = $editor_type_chkbx; $rfield = $editor_type_chkbx;
// Select type. // Select type.
@ -192,7 +296,8 @@ if (is_ajax()) {
true, true,
false, false,
false, false,
'fields' 'fields',
$is_central_policies_on_node
); );
$rfield = html_print_select( $rfield = html_print_select(
$fields_value_select, $fields_value_select,
@ -204,7 +309,8 @@ if (is_ajax()) {
true, true,
false, false,
false, false,
'fields_recovery' 'fields_recovery',
$is_central_policies_on_node
); );
} else { } else {
$ffield = html_print_textarea( $ffield = html_print_textarea(
@ -213,7 +319,9 @@ if (is_ajax()) {
1, 1,
$fv[0], $fv[0],
'style="min-height:40px; '.$style.'" class="fields"', 'style="min-height:40px; '.$style.'" class="fields"',
true true,
'',
$is_central_policies_on_node
); );
$rfield = html_print_textarea( $rfield = html_print_textarea(
'field'.$i.'_recovery_value', 'field'.$i.'_recovery_value',
@ -221,7 +329,9 @@ if (is_ajax()) {
1, 1,
$fv[0], $fv[0],
'style="min-height:40px; '.$style.'" class="fields_recovery', 'style="min-height:40px; '.$style.'" class="fields_recovery',
true true,
'',
$is_central_policies_on_node
); );
} }
} }
@ -232,7 +342,9 @@ if (is_ajax()) {
1, 1,
'', '',
'style="min-height:40px; '.$style.'" class="fields"', 'style="min-height:40px; '.$style.'" class="fields"',
true true,
'',
$is_central_policies_on_node
); );
$rfield = html_print_textarea( $rfield = html_print_textarea(
'field'.$i.'_recovery_value', 'field'.$i.'_recovery_value',
@ -240,7 +352,9 @@ if (is_ajax()) {
1, 1,
'', '',
'style="min-height:40px; '.$style.'" class="fields_recovery"', 'style="min-height:40px; '.$style.'" class="fields_recovery"',
true true,
'',
$is_central_policies_on_node
); );
} }
@ -404,6 +518,15 @@ if ($copy_command) {
} }
} }
$is_central_policies_on_node = is_central_policies_on_node();
if ($is_central_policies_on_node === true) {
ui_print_warning_message(
__('This node is configured with centralized mode. All alerts templates information is read only. Go to metaconsole to manage it.')
);
}
$table = new stdClass;
$table->width = '100%'; $table->width = '100%';
$table->class = 'info_table'; $table->class = 'info_table';
@ -457,7 +580,7 @@ foreach ($commands as $command) {
); );
$data['action'] = ''; $data['action'] = '';
$table->cellclass[]['action'] = 'action_buttons'; $table->cellclass[]['action'] = 'action_buttons';
if (! $command['internal']) { if ($is_central_policies_on_node === false && !$command['internal']) {
$data['action'] = '<span style="display: inline-flex">'; $data['action'] = '<span style="display: inline-flex">';
$data['action'] .= '<a href="index.php?sec='.$sec.'&sec2=godmode/alerts/alert_commands&amp;copy_command=1&id='.$command['id'].'&pure='.$pure.'" $data['action'] .= '<a href="index.php?sec='.$sec.'&sec2=godmode/alerts/alert_commands&amp;copy_command=1&id='.$command['id'].'&pure='.$pure.'"
onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/copy.png', true).'</a>'; onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/copy.png', true).'</a>';
@ -475,11 +598,13 @@ if (count($table->data) > 0) {
ui_print_info_message(['no_close' => true, 'message' => __('No alert commands configured') ]); ui_print_info_message(['no_close' => true, 'message' => __('No alert commands configured') ]);
} }
echo '<div class="action-buttons" style="width: '.$table->width.'">'; if ($is_central_policies_on_node === false) {
echo '<form method="post" action="index.php?sec='.$sec.'&sec2=godmode/alerts/configure_alert_command&pure='.$pure.'">'; echo '<div class="action-buttons" style="width: '.$table->width.'">';
html_print_submit_button(__('Create'), 'create', false, 'class="sub next"'); echo '<form method="post" action="index.php?sec='.$sec.'&sec2=godmode/alerts/configure_alert_command&pure='.$pure.'">';
html_print_input_hidden('create_alert', 1); html_print_submit_button(__('Create'), 'create', false, 'class="sub next"');
echo '</form>'; html_print_input_hidden('create_alert', 1);
echo '</div>'; echo '</form>';
echo '</div>';
}
enterprise_hook('close_meta_frame'); enterprise_hook('close_meta_frame');

View File

@ -203,7 +203,7 @@ if ($searchFlag) {
} }
if ($actionID != -1 && $actionID != '') { if ($actionID != -1 && $actionID != '') {
$where .= ' AND talert_template_modules.id IN (SELECT id_alert_template_module FROM talert_template_module_actions WHERE id_alert_action = '.$actionID.')'; $where .= ' AND talert_template_modules.id IN (SELECT id_alert_template_module FROM talert_template_module_actions WHERE id_alert_action = '.$actionID.') OR talert_template_modules.id IN (SELECT id FROM talert_template_modules ttm WHERE ttm.id_alert_template IN (SELECT tat.id FROM talert_templates tat WHERE tat.id_alert_action = '.$actionID.'))';
} }
if ($enabledisable != -1 && $enabledisable != '') { if ($enabledisable != -1 && $enabledisable != '') {

View File

@ -125,13 +125,13 @@ if (defined('METACONSOLE')) {
$sec = 'galertas'; $sec = 'galertas';
} }
// This prevents to duplicate the header in case delete_templete action is performed // This prevents to duplicate the header in
// case delete_templete action is performed.
if (!$delete_template) { if (!$delete_template) {
// Header // Header.
if (defined('METACONSOLE')) { if (defined('METACONSOLE')) {
alerts_meta_print_header(); alerts_meta_print_header();
} else { } else {
// ~ ui_print_page_header (__('Alerts')." &raquo; ". __('Alert templates'), "images/gm_alerts.png", false, "alerts_config", true);
ui_print_page_header( ui_print_page_header(
__('Alerts').' &raquo; '.__('Alert templates'), __('Alerts').' &raquo; '.__('Alert templates'),
'images/gm_alerts.png', 'images/gm_alerts.png',
@ -142,7 +142,6 @@ if (!$delete_template) {
} }
} }
if ($update_template) { if ($update_template) {
$id = (int) get_parameter('id'); $id = (int) get_parameter('id');
@ -151,7 +150,7 @@ if ($update_template) {
$fields_recovery = []; $fields_recovery = [];
for ($i = 1; $i <= 10; $i++) { for ($i = 1; $i <= 10; $i++) {
$values['field'.$i] = (string) get_parameter('field'.$i); $values['field'.$i] = (string) get_parameter('field'.$i);
$values['field'.$i.'_recovery'] = $recovery_notify ? (string) get_parameter('field'.$i.'_recovery') : ''; $values['field'.$i.'_recovery'] = ($recovery_notify) ? (string) get_parameter('field'.$i.'_recovery') : '';
} }
$values['recovery_notify'] = $recovery_notify; $values['recovery_notify'] = $recovery_notify;
@ -164,13 +163,15 @@ if ($update_template) {
); );
} }
// If user tries to delete a template with group=ALL then must have "PM" access privileges // If user tries to delete a template with group=ALL
// then must have "PM" access privileges.
if ($delete_template) { if ($delete_template) {
$id = get_parameter('id'); $id = get_parameter('id');
$al_template = alerts_get_alert_template($id); $al_template = alerts_get_alert_template($id);
if ($al_template !== false) { if ($al_template !== false) {
// If user tries to delete a template with group=ALL then must have "PM" access privileges // If user tries to delete a template with group=ALL
// then must have "PM" access privileges.
if ($al_template['id_group'] == 0) { if ($al_template['id_group'] == 0) {
if (! check_acl($config['id_user'], 0, 'PM')) { if (! check_acl($config['id_user'], 0, 'PM')) {
db_pandora_audit( db_pandora_audit(
@ -192,8 +193,7 @@ if ($delete_template) {
); );
} }
} }
} //end if } else {
else {
$own_info = get_user_info($config['id_user']); $own_info = get_user_info($config['id_user']);
if ($own_info['is_admin'] || check_acl($config['id_user'], 0, 'PM')) { if ($own_info['is_admin'] || check_acl($config['id_user'], 0, 'PM')) {
$own_groups = array_keys(users_get_groups($config['id_user'], 'LM')); $own_groups = array_keys(users_get_groups($config['id_user'], 'LM'));
@ -202,7 +202,7 @@ if ($delete_template) {
} }
$is_in_group = in_array($al_template['id_group'], $own_groups); $is_in_group = in_array($al_template['id_group'], $own_groups);
// Then template group have to be is his own groups // Then template group have to be is his own groups.
if ($is_in_group) { if ($is_in_group) {
if (defined('METACONSOLE')) { if (defined('METACONSOLE')) {
alerts_meta_print_header(); alerts_meta_print_header();
@ -241,9 +241,15 @@ if ($delete_template) {
$result = alerts_delete_alert_template($id); $result = alerts_delete_alert_template($id);
if ($result) { if ($result) {
db_pandora_audit('Template alert management', 'Delete alert template #'.$id); db_pandora_audit(
'Template alert management',
'Delete alert template #'.$id
);
} else { } else {
db_pandora_audit('Template alert management', 'Fail try to delete alert template #'.$id); db_pandora_audit(
'Template alert management',
'Fail try to delete alert template #'.$id
);
} }
ui_print_result_message( ui_print_result_message(
@ -253,6 +259,11 @@ if ($delete_template) {
); );
} }
if (is_central_policies_on_node() === true) {
ui_print_warning_message(
__('This node is configured with centralized mode. All alerts templates information is read only. Go to metaconsole to manage it.')
);
}
$search_string = (string) get_parameter('search_string'); $search_string = (string) get_parameter('search_string');
$search_type = (string) get_parameter('search_type'); $search_type = (string) get_parameter('search_type');
@ -269,7 +280,7 @@ $url = ui_get_url_refresh(
$table = new stdClass(); $table = new stdClass();
$table->width = '100%'; $table->width = '100%';
$table->class = 'databox filters'; $table->class = 'databox filters';
if (defined('METACONSOLE')) { if (is_metaconsole() === true) {
$table->cellspacing = 0; $table->cellspacing = 0;
$table->cellpadding = 0; $table->cellpadding = 0;
} }
@ -313,7 +324,7 @@ $table->data[0][4] .= html_print_submit_button(
); );
$table->data[0][4] .= '</div>'; $table->data[0][4] .= '</div>';
if (defined('METACONSOLE')) { if (is_metaconsole() === true) {
$filter = '<form class="" method="post" action="'.$url.'">'; $filter = '<form class="" method="post" action="'.$url.'">';
$filter .= html_print_table($table, true); $filter .= html_print_table($table, true);
$filter .= '</form>'; $filter .= '</form>';
@ -394,18 +405,34 @@ foreach ($templates as $template) {
$data[1] = ui_print_group_icon($template['id_group'], true); $data[1] = ui_print_group_icon($template['id_group'], true);
$data[3] = alerts_get_alert_templates_type_name($template['type']); $data[3] = alerts_get_alert_templates_type_name($template['type']);
if (check_acl($config['id_user'], $template['id_group'], 'LM')) { if (is_central_policies_on_node() === false
&& check_acl($config['id_user'], $template['id_group'], 'LM')
) {
$table->cellclass[][4] = 'action_buttons'; $table->cellclass[][4] = 'action_buttons';
$data[4] = '<form method="post" action="index.php?sec='.$sec.'&sec2=godmode/alerts/configure_alert_template&pure='.$pure.'" style="display: inline; float: left">'; $data[4] = '<form method="post" action="index.php?sec='.$sec.'&sec2=godmode/alerts/configure_alert_template&pure='.$pure.'" style="display: inline; float: left">';
$data[4] .= html_print_input_hidden('duplicate_template', 1, true); $data[4] .= html_print_input_hidden('duplicate_template', 1, true);
$data[4] .= html_print_input_hidden('source_id', $template['id'], true); $data[4] .= html_print_input_hidden('source_id', $template['id'], true);
$data[4] .= html_print_input_image('dup', 'images/copy.png', 1, '', true, ['title' => __('Duplicate')]); $data[4] .= html_print_input_image(
'dup',
'images/copy.png',
1,
'',
true,
['title' => __('Duplicate')]
);
$data[4] .= '</form> '; $data[4] .= '</form> ';
$data[4] .= '<form method="post" style="display: inline; float: right" onsubmit="if (!confirm(\''.__('Are you sure?').'\')) return false;">'; $data[4] .= '<form method="post" style="display: inline; float: right" onsubmit="if (!confirm(\''.__('Are you sure?').'\')) return false;">';
$data[4] .= html_print_input_hidden('delete_template', 1, true); $data[4] .= html_print_input_hidden('delete_template', 1, true);
$data[4] .= html_print_input_hidden('id', $template['id'], true); $data[4] .= html_print_input_hidden('id', $template['id'], true);
$data[4] .= html_print_input_image('del', 'images/cross.png', 1, '', true, ['title' => __('Delete')]); $data[4] .= html_print_input_image(
'del',
'images/cross.png',
1,
'',
true,
['title' => __('Delete')]
);
$data[4] .= '</form> '; $data[4] .= '</form> ';
} else { } else {
$data[4] = ''; $data[4] = '';
@ -415,18 +442,34 @@ foreach ($templates as $template) {
} }
ui_pagination($total_templates, $url); ui_pagination($total_templates, $url);
if (isset($data)) { if (isset($data) === true) {
html_print_table($table); html_print_table($table);
ui_pagination($total_templates, $url, 0, 0, false, 'offset', true, 'pagination-bottom'); ui_pagination(
$total_templates,
$url,
0,
0,
false,
'offset',
true,
'pagination-bottom'
);
} else { } else {
ui_print_info_message(['no_close' => true, 'message' => __('No alert templates defined') ]); ui_print_info_message(
[
'no_close' => true,
'message' => __('No alert templates defined'),
]
);
} }
echo '<div class="action-buttons" style="width: '.$table->width.'">'; if (is_central_policies_on_node() === false) {
echo '<form method="post" action="index.php?sec='.$sec.'&sec2=godmode/alerts/configure_alert_template&pure='.$pure.'">'; echo '<div class="action-buttons" style="width: '.$table->width.'">';
html_print_submit_button(__('Create'), 'create', false, 'class="sub next"'); echo '<form method="post" action="index.php?sec='.$sec.'&sec2=godmode/alerts/configure_alert_template&pure='.$pure.'">';
html_print_input_hidden('create_alert', 1); html_print_submit_button(__('Create'), 'create', false, 'class="sub next"');
echo '</form>'; html_print_input_hidden('create_alert', 1);
echo '</div>'; echo '</form>';
echo '</div>';
}
enterprise_hook('close_meta_frame'); enterprise_hook('close_meta_frame');

View File

@ -80,12 +80,20 @@ if ($al_action !== false) {
} }
$is_central_policies_on_node = is_central_policies_on_node();
if ($is_central_policies_on_node === true) {
ui_print_warning_message(
__('This node is configured with centralized mode. All alerts templates information is read only. Go to metaconsole to manage it.')
);
}
$name = ''; $name = '';
$id_command = ''; $id_command = '';
$group = 0; $group = 0;
// All group is 0
$action_threshold = 0; $action_threshold = 0;
// All group is 0 // All group is 0.
if ($id) { if ($id) {
$action = alerts_get_alert_action($id); $action = alerts_get_alert_action($id);
$name = $action['name']; $name = $action['name'];
@ -95,7 +103,7 @@ if ($id) {
$action_threshold = $action['action_threshold']; $action_threshold = $action['action_threshold'];
} }
// Hidden div with help hint to fill with javascript // Hidden div with help hint to fill with javascript.
html_print_div( html_print_div(
[ [
'id' => 'help_alert_macros_hint', 'id' => 'help_alert_macros_hint',
@ -126,7 +134,26 @@ $table->size = [];
$table->size[0] = '20%'; $table->size[0] = '20%';
$table->data = []; $table->data = [];
$table->data[0][0] = __('Name'); $table->data[0][0] = __('Name');
$table->data[0][1] = html_print_input_text('name', $name, '', 35, 255, true); $table->data[0][1] = html_print_input_text(
'name',
$name,
'',
35,
255,
true,
false,
false,
'',
'',
'',
'',
false,
'',
'',
'',
$is_central_policies_on_node
);
if (io_safe_output($name) == 'Monitoring Event') { if (io_safe_output($name) == 'Monitoring Event') {
$table->data[0][1] .= '&nbsp;&nbsp;'.ui_print_help_tip( $table->data[0][1] .= '&nbsp;&nbsp;'.ui_print_help_tip(
__('This action may stop working, if you change its name.'), __('This action may stop working, if you change its name.'),
@ -141,7 +168,21 @@ $table->data[1][0] = __('Group');
$own_info = get_user_info($config['id_user']); $own_info = get_user_info($config['id_user']);
$table->data[1][1] = html_print_select_groups(false, 'LW', true, 'group', $group, '', '', 0, true); $table->data[1][1] = html_print_select_groups(
false,
'LW',
true,
'group',
$group,
'',
'',
0,
true,
false,
true,
'',
$is_central_policies_on_node
);
$table->colspan[1][1] = 2; $table->colspan[1][1] = 2;
$table->data[2][0] = __('Command'); $table->data[2][0] = __('Command');
@ -163,10 +204,15 @@ $table->data[2][1] = html_print_select_from_sql(
'', '',
__('None'), __('None'),
0, 0,
true true,
false,
false,
$is_central_policies_on_node
); );
$table->data[2][1] .= ' '; $table->data[2][1] .= ' ';
if (check_acl($config['id_user'], 0, 'PM')) { if ($is_central_policies_on_node === false
&& check_acl($config['id_user'], 0, 'PM')
) {
$table->data[2][1] .= __('Create Command'); $table->data[2][1] .= __('Create Command');
$table->data[2][1] .= '<a href="index.php?sec='.$sec.'&sec2=godmode/alerts/configure_alert_command&pure='.$pure.'">'; $table->data[2][1] .= '<a href="index.php?sec='.$sec.'&sec2=godmode/alerts/configure_alert_command&pure='.$pure.'">';
$table->data[2][1] .= html_print_image('images/add.png', true); $table->data[2][1] .= html_print_image('images/add.png', true);
@ -188,7 +234,7 @@ $table->data[3][1] = html_print_extended_select_for_time(
false, false,
true, true,
'', '',
false, $is_central_policies_on_node,
false, false,
'', '',
false, false,
@ -251,46 +297,44 @@ for ($i = 1; $i <= $config['max_macro_fields']; $i++) {
echo '<form method="post" action="'.'index.php?sec='.$sec.'&'.'sec2=godmode/alerts/alert_actions&'.'pure='.$pure.'">'; echo '<form method="post" action="'.'index.php?sec='.$sec.'&'.'sec2=godmode/alerts/alert_actions&'.'pure='.$pure.'">';
$table_html = html_print_table($table, true); $table_html = html_print_table($table, true);
//
// Hack to hook the bubble dialog of clippy in any place, the intro.js
// fails with new elements in the dom from javascript code
// ----------------------------------------------------------------------
/*
$table_html = str_replace(
"</table>",
"</div>",
$table_html);
$table_html = str_replace(
'<tr id="table_macros-field1" style="" class="datos2">',
"</tbody></table>
<div id=\"clippy_fields\">
<table>
<tbody>
<tr id=\"table_macros-field1\" class=\"datos\">",
$table_html);
*/
//
echo $table_html; echo $table_html;
if ($is_central_policies_on_node === false) {
echo '<div class="action-buttons" style="width: '.$table->width.'">'; echo '<div class="action-buttons" style="width: '.$table->width.'">';
if ($id) { if ($id) {
html_print_input_hidden('id', $id); html_print_input_hidden('id', $id);
if ($al_action['id_group'] == 0) { if ($al_action['id_group'] == 0) {
// then must have "PM" access privileges // Then must have "PM" access privileges.
if (check_acl($config['id_user'], 0, 'PM')) { if (check_acl($config['id_user'], 0, 'PM')) {
html_print_input_hidden('update_action', 1);
html_print_submit_button(
__('Update'),
'create',
false,
'class="sub upd"'
);
}
} else {
html_print_input_hidden('update_action', 1); html_print_input_hidden('update_action', 1);
html_print_submit_button(__('Update'), 'create', false, 'class="sub upd"'); html_print_submit_button(
__('Update'),
'create',
false,
'class="sub upd"'
);
} }
} else { } else {
html_print_input_hidden('update_action', 1); html_print_input_hidden('create_action', 1);
html_print_submit_button(__('Update'), 'create', false, 'class="sub upd"'); html_print_submit_button(
__('Create'),
'create',
false,
'class="sub wand"'
);
} }
} else {
html_print_input_hidden('create_action', 1); echo '</div>';
html_print_submit_button(__('Create'), 'create', false, 'class="sub wand"');
} }
echo '</div>';
echo '</form>'; echo '</form>';
enterprise_hook('close_meta_frame'); enterprise_hook('close_meta_frame');

View File

@ -36,7 +36,7 @@ $pure = get_parameter('pure', 0);
$alert = []; $alert = [];
// Header. // Header.
if (defined('METACONSOLE')) { if (is_metaconsole() === true) {
alerts_meta_print_header(); alerts_meta_print_header();
} else { } else {
ui_print_page_header( ui_print_page_header(
@ -135,30 +135,39 @@ if ($id) {
$fields_hidden = $alert['fields_hidden']; $fields_hidden = $alert['fields_hidden'];
} }
if (!empty($fields_descriptions)) { if (empty($fields_descriptions) === false) {
$fields_descriptions = json_decode($fields_descriptions, true); $fields_descriptions = json_decode($fields_descriptions, true);
} }
if (!empty($fields_values)) { if (empty($fields_values) === false) {
$fields_values = json_decode($fields_values, true); $fields_values = json_decode($fields_values, true);
} }
if (!empty($fields_hidden)) { if (empty($fields_hidden) === false) {
$fields_hidden = json_decode($fields_hidden, true); $fields_hidden = json_decode($fields_hidden, true);
} }
$is_central_policies_on_node = is_central_policies_on_node();
if ($is_central_policies_on_node === true) {
ui_print_warning_message(
__('This node is configured with centralized mode. All alerts templates information is read only. Go to metaconsole to manage it.')
);
}
$table = new stdClass(); $table = new stdClass();
$table->width = '100%'; $table->width = '100%';
$table->class = 'databox filters'; $table->class = 'databox filters';
if (defined('METACONSOLE')) { if (is_metaconsole() === true) {
$table->head[0] = ($id) ? __('Update Command') : __('Create Command'); $table->head[0] = ($id) ? __('Update Command') : __('Create Command');
$table->head_colspan[0] = 4; $table->head_colspan[0] = 4;
$table->headstyle[0] = 'text-align: center'; $table->headstyle[0] = 'text-align: center';
} }
$table->style = []; $table->style = [];
if (!defined('METACONSOLE')) { if (is_metaconsole() === false) {
$table->style[0] = 'font-weight: bold'; $table->style[0] = 'font-weight: bold';
$table->style[2] = 'font-weight: bold'; $table->style[2] = 'font-weight: bold';
$table->style[4] = 'font-weight: bold'; $table->style[4] = 'font-weight: bold';
@ -170,11 +179,38 @@ $table->data = [];
$table->colspan['name'][1] = 3; $table->colspan['name'][1] = 3;
$table->data['name'][0] = __('Name'); $table->data['name'][0] = __('Name');
$table->data['name'][2] = html_print_input_text('name', $name, '', 35, 255, true); $table->data['name'][2] = html_print_input_text(
'name',
$name,
'',
35,
255,
true,
false,
false,
'',
'',
'',
'',
false,
'',
'',
'',
$is_central_policies_on_node
);
$table->colspan['command'][1] = 3; $table->colspan['command'][1] = 3;
$table->data['command'][0] = __('Command'); $table->data['command'][0] = __('Command');
$table->data['command'][1] = html_print_textarea('command', 8, 30, $command, '', true); $table->data['command'][1] = html_print_textarea(
'command',
8,
30,
$command,
'',
true,
'',
$is_central_policies_on_node
);
$table->colspan['group'][1] = 3; $table->colspan['group'][1] = 3;
$table->data['group'][0] = __('Group'); $table->data['group'][0] = __('Group');
@ -187,60 +223,124 @@ $table->data['group'][1] = html_print_select_groups(
false, false,
'', '',
0, 0,
true true,
false,
true,
'',
$is_central_policies_on_node
); );
$table->colspan['description'][1] = 3; $table->colspan['description'][1] = 3;
$table->data['description'][0] = __('Description'); $table->data['description'][0] = __('Description');
$table->data['description'][1] = html_print_textarea('description', 10, 30, $description, '', true); $table->data['description'][1] = html_print_textarea(
'description',
10,
30,
$description,
'',
true,
'',
$is_central_policies_on_node
);
for ($i = 1; $i <= $config['max_macro_fields']; $i++) { for ($i = 1; $i <= $config['max_macro_fields']; $i++) {
$table->data['field'.$i][0] = sprintf(__('Field %s description'), $i); $table->data['field'.$i][0] = sprintf(__('Field %s description'), $i);
if (!empty($fields_descriptions)) { if (empty($fields_descriptions) === false) {
$field_description = $fields_descriptions[($i - 1)]; $field_description = $fields_descriptions[($i - 1)];
} else { } else {
$field_description = ''; $field_description = '';
} }
$table->data['field'.$i][1] = html_print_input_text('field'.$i.'_description', $field_description, '', 30, 255, true); $table->data['field'.$i][1] = html_print_input_text(
'field'.$i.'_description',
$field_description,
'',
30,
255,
true,
false,
false,
'',
'',
'',
'',
false,
'',
'',
'',
$is_central_policies_on_node
);
$table->data['field'.$i][2] = sprintf(__('Field %s values'), $i).ui_print_help_tip(__('value1,tag1;value2,tag2;value3,tag3'), true); $table->data['field'.$i][2] = sprintf(__('Field %s values'), $i);
$table->data['field'.$i][2] .= ui_print_help_tip(
__('value1,tag1;value2,tag2;value3,tag3'),
true
);
if (!empty($fields_values)) { if (empty($fields_values) === false) {
$field_values = $fields_values[($i - 1)]; $field_values = $fields_values[($i - 1)];
} else { } else {
$field_values = ''; $field_values = '';
} }
if (!empty($fields_hidden)) { if (empty($fields_hidden) === false) {
$selected = (bool) $fields_hidden[($i - 1)]; $selected = (bool) $fields_hidden[($i - 1)];
} else { } else {
$selected = false; $selected = false;
} }
$table->data['field'.$i][3] = html_print_input_text('field'.$i.'_values', $field_values, '', 55, 255, true, false, false, '', 'field_value'); $table->data['field'.$i][3] = html_print_input_text(
'field'.$i.'_values',
$field_values,
'',
55,
255,
true,
false,
false,
'',
'field_value',
'',
'',
false,
'',
'',
'',
$is_central_policies_on_node
);
$table->data['field'.$i][4] = __('Hide'); $table->data['field'.$i][4] = __('Hide');
$table->data['field'.$i][5] = html_print_checkbox_extended('field'.$i.'_hide', 1, $selected, false, 'cursor: \'pointer\'', 'class="hide_inputs"', true); $table->data['field'.$i][5] = html_print_checkbox_extended(
'field'.$i.'_hide',
1,
$selected,
$is_central_policies_on_node,
'cursor: \'pointer\'',
'class="hide_inputs"',
true
);
} }
echo '<form method="post" action="index.php?sec=galertas&sec2=godmode/alerts/alert_commands&pure='.$pure.'">'; echo '<form method="post" action="index.php?sec=galertas&sec2=godmode/alerts/alert_commands&pure='.$pure.'">';
html_print_table($table); html_print_table($table);
echo '<div class="action-buttons" style="width: '.$table->width.'">'; if ($is_central_policies_on_node === false) {
if ($id) { echo '<div class="action-buttons" style="width: '.$table->width.'">';
html_print_input_hidden('id', $id); if ($id) {
html_print_input_hidden('update_command', 1); html_print_input_hidden('id', $id);
html_print_submit_button(__('Update'), 'create', false, 'class="sub upd"'); html_print_input_hidden('update_command', 1);
} else { html_print_submit_button(__('Update'), 'create', false, 'class="sub upd"');
html_print_input_hidden('create_command', 1); } else {
html_print_submit_button(__('Create'), 'create', false, 'class="sub wand"'); html_print_input_hidden('create_command', 1);
html_print_submit_button(__('Create'), 'create', false, 'class="sub wand"');
}
echo '</div>';
} }
echo '</div>';
echo '</form>'; echo '</form>';
enterprise_hook('close_meta_frame'); enterprise_hook('close_meta_frame');
@ -251,20 +351,20 @@ $(document).ready (function () {
$(".hide_inputs").each(function(index) { $(".hide_inputs").each(function(index) {
var $input_in_row = $(this).closest('tr').find('.field_value'); var $input_in_row = $(this).closest('tr').find('.field_value');
if($(this).is(':checked')) { if($(this).is(':checked')) {
$input_in_row.prop('style', '-webkit-text-security: disc;'); $input_in_row.prop('style', '-webkit-text-security: disc;');
} else { } else {
$input_in_row.prop('style', ''); $input_in_row.prop('style', '');
} }
}); });
$(".hide_inputs").click(function() { $(".hide_inputs").click(function() {
var $input_in_row = $(this).closest('tr').find('.field_value'); var $input_in_row = $(this).closest('tr').find('.field_value');
if($(this).is(':checked')) { if($(this).is(':checked')) {
$input_in_row.prop('style', '-webkit-text-security: disc;'); $input_in_row.prop('style', '-webkit-text-security: disc;');
} else { } else {
$input_in_row.prop('style', ''); $input_in_row.prop('style', '');
} }
}); });
}); });
</script> </script>

View File

@ -363,7 +363,15 @@ function update_template($step)
} }
// We set here the number of steps $is_central_policies_on_node = is_central_policies_on_node();
if ($is_central_policies_on_node === true) {
ui_print_warning_message(
__('This node is configured with centralized mode. All alerts templates information is read only. Go to metaconsole to manage it.')
);
}
// We set here the number of steps.
define('LAST_STEP', 3); define('LAST_STEP', 3);
$step = (int) get_parameter('step', 1); $step = (int) get_parameter('step', 1);
@ -579,27 +587,74 @@ if ($step == 2) {
$show_matches = false; $show_matches = false;
} }
// Firing conditions and events // Firing conditions and events.
$table->colspan = []; $table->colspan = [];
// $table->colspan[4][1] = 1;
$table->data[0][0] = __('Days of week'); $table->data[0][0] = __('Days of week');
$table->data[0][1] = __('Mon'); $table->data[0][1] = __('Mon');
$table->data[0][1] .= html_print_checkbox('monday', 1, $monday, true); $table->data[0][1] .= html_print_checkbox(
'monday',
1,
$monday,
true,
$is_central_policies_on_node
);
$table->data[0][1] .= __('Tue'); $table->data[0][1] .= __('Tue');
$table->data[0][1] .= html_print_checkbox('tuesday', 1, $tuesday, true); $table->data[0][1] .= html_print_checkbox(
'tuesday',
1,
$tuesday,
true,
$is_central_policies_on_node
);
$table->data[0][1] .= __('Wed'); $table->data[0][1] .= __('Wed');
$table->data[0][1] .= html_print_checkbox('wednesday', 1, $wednesday, true); $table->data[0][1] .= html_print_checkbox(
'wednesday',
1,
$wednesday,
true,
$is_central_policies_on_node
);
$table->data[0][1] .= __('Thu'); $table->data[0][1] .= __('Thu');
$table->data[0][1] .= html_print_checkbox('thursday', 1, $thursday, true); $table->data[0][1] .= html_print_checkbox(
'thursday',
1,
$thursday,
true,
$is_central_policies_on_node
);
$table->data[0][1] .= __('Fri'); $table->data[0][1] .= __('Fri');
$table->data[0][1] .= html_print_checkbox('friday', 1, $friday, true); $table->data[0][1] .= html_print_checkbox(
'friday',
1,
$friday,
true,
$is_central_policies_on_node
);
$table->data[0][1] .= __('Sat'); $table->data[0][1] .= __('Sat');
$table->data[0][1] .= html_print_checkbox('saturday', 1, $saturday, true); $table->data[0][1] .= html_print_checkbox(
'saturday',
1,
$saturday,
true,
$is_central_policies_on_node
);
$table->data[0][1] .= __('Sun'); $table->data[0][1] .= __('Sun');
$table->data[0][1] .= html_print_checkbox('sunday', 1, $sunday, true); $table->data[0][1] .= html_print_checkbox(
'sunday',
1,
$sunday,
true,
$is_central_policies_on_node
);
$table->data[0][2] = __('Use special days list'); $table->data[0][2] = __('Use special days list');
$table->data[0][3] = html_print_checkbox('special_day', 1, $special_day, true); $table->data[0][3] = html_print_checkbox(
'special_day',
1,
$special_day,
true,
$is_central_policies_on_node
);
$table->data[1][0] = __('Time from'); $table->data[1][0] = __('Time from');
$table->data[1][1] = html_print_input_text( $table->data[1][1] = html_print_input_text(
@ -608,7 +663,18 @@ if ($step == 2) {
'', '',
7, 7,
8, 8,
true true,
false,
false,
'',
'',
'',
'',
false,
'',
'',
'',
$is_central_policies_on_node
); );
$table->data[1][2] = __('Time to'); $table->data[1][2] = __('Time to');
$table->data[1][3] = html_print_input_text( $table->data[1][3] = html_print_input_text(
@ -617,7 +683,18 @@ if ($step == 2) {
'', '',
7, 7,
8, 8,
true true,
false,
false,
'',
'',
'',
'',
false,
'',
'',
'',
$is_central_policies_on_node
); );
$table->colspan['threshold'][1] = 3; $table->colspan['threshold'][1] = 3;
@ -629,7 +706,11 @@ if ($step == 2) {
'', '',
'', '',
false, false,
true true,
false,
true,
'',
$is_central_policies_on_node
); );
$table->data[3][0] = __('Min. number of alerts'); $table->data[3][0] = __('Min. number of alerts');
@ -639,11 +720,32 @@ if ($step == 2) {
'', '',
5, 5,
7, 7,
true true,
false,
false,
'',
'',
'',
'',
false,
'',
'',
'',
$is_central_policies_on_node
); );
$table->data[3][2] = __('Reset counter for non-sustained alerts').ui_print_help_tip(__('Enable this option if you want the counter to be reset when the alert is not being fired consecutively, even if it\'s within the time threshold'), true); $table->data[3][2] = __('Reset counter for non-sustained alerts');
$table->data[3][3] = html_print_checkbox('min_alerts_reset_counter', 1, $min_alerts_reset_counter, true); $table->data[3][2] .= ui_print_help_tip(
__('Enable this option if you want the counter to be reset when the alert is not being fired consecutively, even if it\'s within the time threshold'),
true
);
$table->data[3][3] = html_print_checkbox(
'min_alerts_reset_counter',
1,
$min_alerts_reset_counter,
true,
$is_central_policies_on_node
);
$table->data[4][0] = __('Max. number of alerts'); $table->data[4][0] = __('Max. number of alerts');
$table->data[4][1] = html_print_input_text( $table->data[4][1] = html_print_input_text(
@ -652,39 +754,43 @@ if ($step == 2) {
'', '',
5, 5,
7, 7,
true true,
false,
false,
'',
'',
'',
'',
false,
'',
'',
'',
$is_central_policies_on_node
); );
$table->data[4][2] = __('Disable event'); $table->data[4][2] = __('Disable event');
$table->data[4][3] = html_print_checkbox('disable_event', 1, $disable_event, true); $table->data[4][3] = html_print_checkbox(
'disable_event',
1,
$disable_event,
true,
$is_central_policies_on_node
);
$table->data[5][0] = __('Default action'); $table->data[5][0] = __('Default action');
$usr_groups = implode(',', array_keys(users_get_groups($config['id_user'], 'LM', true))); $usr_groups = implode(
switch ($config['dbtype']) { ',',
case 'mysql': array_keys(users_get_groups($config['id_user'], 'LM', true))
case 'postgresql': );
$sql_query = sprintf(
'
SELECT id, name
FROM talert_actions
WHERE id_group IN (%s)
ORDER BY name',
$usr_groups
);
break;
case 'oracle': $sql_query = sprintf(
$sql_query = sprintf( '
' SELECT id, name
SELECT id, FROM talert_actions
dbms_lob.substr(name,4000,1) AS nombre WHERE id_group IN (%s)
FROM talert_actions ORDER BY name',
WHERE id_group IN (%s) $usr_groups
ORDER BY dbms_lob.substr(name,4000,1)', );
$usr_groups
);
break;
}
$table->data[5][1] = html_print_select_from_sql( $table->data[5][1] = html_print_select_from_sql(
$sql_query, $sql_query,
@ -696,11 +802,12 @@ if ($step == 2) {
true, true,
false, false,
false, false,
false, $is_central_policies_on_node,
false, false,
false, false,
0 0
).ui_print_help_tip( );
$table->data[5][1] .= ui_print_help_tip(
__('Unless they\'re left blank, the fields from the action will override those set on the template.'), __('Unless they\'re left blank, the fields from the action will override those set on the template.'),
true true
); );
@ -715,7 +822,9 @@ if ($step == 2) {
0, 0,
true, true,
false, false,
false false,
'',
$is_central_policies_on_node
); );
$table->data[6][1] .= '<span id="matches_value" '.($show_matches ? '' : 'style="display: none"').'>'; $table->data[6][1] .= '<span id="matches_value" '.($show_matches ? '' : 'style="display: none"').'>';
$table->data[6][1] .= '&nbsp;'.html_print_checkbox('matches_value', 1, $matches, true); $table->data[6][1] .= '&nbsp;'.html_print_checkbox('matches_value', 1, $matches, true);
@ -760,7 +869,7 @@ if ($step == 2) {
$table->data['value'][1] .= '</span>'; $table->data['value'][1] .= '</span>';
$table->colspan['value'][1] = 3; $table->colspan['value'][1] = 3;
// Min first, then max, that's more logical // Min first, then max, that's more logical.
$table->data['min'][0] = __('Min.'); $table->data['min'][0] = __('Min.');
$table->data['min'][1] = html_print_input_text( $table->data['min'][1] = html_print_input_text(
'min', 'min',
@ -798,25 +907,12 @@ if ($step == 2) {
$table->size[1] = '45%'; $table->size[1] = '45%';
$table->size[2] = '45%'; $table->size[2] = '45%';
// Alert recover // Alert recover.
if (! $recovery_notify) { if (! $recovery_notify) {
$table->cellstyle['label_fields'][2] = 'display:none;'; $table->cellstyle['label_fields'][2] = 'display:none;';
for ($i = 1; $i <= $config['max_macro_fields']; $i++) { for ($i = 1; $i <= $config['max_macro_fields']; $i++) {
$table->cellstyle['field'.$i][2] = 'display:none;'; $table->cellstyle['field'.$i][2] = 'display:none;';
} }
/*
$table->cellstyle['field1'][2] = 'display:none;';
$table->cellstyle['field2'][2] = 'display:none;';
$table->cellstyle['field3'][2] = 'display:none;';
$table->cellstyle['field4'][2] = 'display:none;';
$table->cellstyle['field5'][2] = 'display:none;';
$table->cellstyle['field6'][2] = 'display:none;';
$table->cellstyle['field7'][2] = 'display:none;';
$table->cellstyle['field8'][2] = 'display:none;';
$table->cellstyle['field9'][2] = 'display:none;';
$table->cellstyle['field10'][2] = 'display:none;';
*/
} }
$table->data[0][0] = __('Alert recovery'); $table->data[0][0] = __('Alert recovery');
@ -833,7 +929,9 @@ if ($step == 2) {
'', '',
true, true,
false, false,
false false,
'',
$is_central_policies_on_node
); );
$table->colspan[0][1] = 2; $table->colspan[0][1] = 2;
@ -842,45 +940,98 @@ if ($step == 2) {
$table->data['label_fields'][2] = __('Recovery fields'); $table->data['label_fields'][2] = __('Recovery fields');
for ($i = 1; $i <= $config['max_macro_fields']; $i++) { for ($i = 1; $i <= $config['max_macro_fields']; $i++) {
if (isset($template[$name])) { if (isset($template[$name]) === true) {
$value = $template[$name]; $value = $template[$name];
} else { } else {
$value = ''; $value = '';
} }
// $table->rowclass['field'.$i] = 'row_field';
$table->data['field'.$i][0] = sprintf(__('Field %s'), $i); $table->data['field'.$i][0] = sprintf(__('Field %s'), $i);
// TinyMCE // TinyMCE.
// triggering fields // triggering fields.
// basic // Basic.
$table->data['field'.$i][1] = '<div style="padding: 4px 0px;"><b><small>'; $table->data['field'.$i][1] = '<div style="padding: 4px 0px;"><b><small>';
$table->data['field'.$i][1] .= __('Basic').'&nbsp;&nbsp;'; $table->data['field'.$i][1] .= __('Basic').'&nbsp;&nbsp;';
$table->data['field'.$i][1] .= html_print_radio_button_extended('editor_type_value_'.$i, 0, '', false, false, "removeTinyMCE('textarea_field".$i."')", '', true); $table->data['field'.$i][1] .= html_print_radio_button_extended(
// Advanced 'editor_type_value_'.$i,
$table->data['field'.$i][1] .= '&nbsp;&nbsp;&nbsp;&nbsp;'; 0,
$table->data['field'.$i][1] .= __('Advanced').'&nbsp;&nbsp;'; '',
$table->data['field'.$i][1] .= html_print_radio_button_extended('editor_type_value_'.$i, 0, '', true, false, "addTinyMCE('textarea_field".$i."')", '', true); false,
$table->data['field'.$i][1] .= '</small></b></div>'; $is_central_policies_on_node,
"removeTinyMCE('textarea_field".$i."')",
'',
true
);
// Advanced.
$table->data['field'.$i][1] .= '&nbsp;&nbsp;&nbsp;&nbsp;';
$table->data['field'.$i][1] .= __('Advanced').'&nbsp;&nbsp;';
$table->data['field'.$i][1] .= html_print_radio_button_extended(
'editor_type_value_'.$i,
0,
'',
true,
$is_central_policies_on_node,
"addTinyMCE('textarea_field".$i."')",
'',
true
);
$table->data['field'.$i][1] .= '</small></b></div>';
// Texarea // Texarea.
$table->data['field'.$i][1] .= html_print_textarea('field'.$i, 1, 1, isset($fields[$i]) ? $fields[$i] : '', 'style="min-height:40px;" class="fields"', true); $table->data['field'.$i][1] .= html_print_textarea(
'field'.$i,
1,
1,
isset($fields[$i]) ? $fields[$i] : '',
'style="min-height:40px;" class="fields"',
true,
'',
$is_central_policies_on_node
);
// Recovery // Recovery.
// basic // Basic.
$table->data['field'.$i][2] = '<div style="padding: 4px 0px;"><b><small>'; $table->data['field'.$i][2] = '<div style="padding: 4px 0px;"><b><small>';
$table->data['field'.$i][2] .= __('Basic').'&nbsp;&nbsp;'; $table->data['field'.$i][2] .= __('Basic').'&nbsp;&nbsp;';
$table->data['field'.$i][2] .= html_print_radio_button_extended('editor_type_recovery_value_'.$i, 0, '', false, false, "removeTinyMCE('textarea_field".$i."_recovery')", '', true); $table->data['field'.$i][2] .= html_print_radio_button_extended(
// advanced 'editor_type_recovery_value_'.$i,
$table->data['field'.$i][2] .= '&nbsp;&nbsp;&nbsp;&nbsp;'; 0,
$table->data['field'.$i][2] .= __('Advanced').'&nbsp;&nbsp;'; '',
$table->data['field'.$i][2] .= html_print_radio_button_extended('editor_type_recovery_value_'.$i, 0, '', true, false, "addTinyMCE('textarea_field".$i."_recovery')", '', true); false,
$table->data['field'.$i][2] .= '</small></b></div>'; $is_central_policies_on_node,
"removeTinyMCE('textarea_field".$i."_recovery')",
'',
true
);
// Advanced.
$table->data['field'.$i][2] .= '&nbsp;&nbsp;&nbsp;&nbsp;';
$table->data['field'.$i][2] .= __('Advanced').'&nbsp;&nbsp;';
$table->data['field'.$i][2] .= html_print_radio_button_extended(
'editor_type_recovery_value_'.$i,
0,
'',
true,
$is_central_policies_on_node,
"addTinyMCE('textarea_field".$i."_recovery')",
'',
true
);
$table->data['field'.$i][2] .= '</small></b></div>';
// Texarea // Texarea.
$table->data['field'.$i][2] .= html_print_textarea('field'.$i.'_recovery', 1, 1, isset($fields_recovery[$i]) ? $fields_recovery[$i] : '', 'style="min-height:40px" class="fields"', true); $table->data['field'.$i][2] .= html_print_textarea(
'field'.$i.'_recovery',
1,
1,
isset($fields_recovery[$i]) ? $fields_recovery[$i] : '',
'style="min-height:40px" class="fields"',
true,
'',
$is_central_policies_on_node
);
} }
} else { } else {
// Step 1 by default // Step 1 by default.
$table->size = []; $table->size = [];
$table->size[0] = '20%'; $table->size[0] = '20%';
$table->data = []; $table->data = [];
@ -916,20 +1067,53 @@ if ($step == 2) {
} }
$table->data[0][0] = __('Name'); $table->data[0][0] = __('Name');
$table->data[0][1] = html_print_input_text('name', $name, '', 35, 255, true); $table->data[0][1] = html_print_input_text(
'name',
$name,
'',
35,
255,
true,
false,
false,
'',
'',
'',
'',
false,
'',
'',
'',
$is_central_policies_on_node
);
$table->data[0][1] .= '&nbsp;&nbsp;'.__('Group'); $table->data[0][1] .= '&nbsp;&nbsp;'.__('Group');
$groups = users_get_groups(); $groups = users_get_groups();
$own_info = get_user_info($config['id_user']); $own_info = get_user_info($config['id_user']);
// Only display group "All" if user is administrator or has "PM" privileges // Only display group "All" if user is administrator or has "PM" privileges.
if ($own_info['is_admin'] || check_acl($config['id_user'], 0, 'PM')) { if ($own_info['is_admin'] || check_acl($config['id_user'], 0, 'PM')) {
$display_all_group = true; $display_all_group = true;
} else { } else {
$display_all_group = false; $display_all_group = false;
} }
$table->data[0][1] .= '&nbsp;'.html_print_select_groups(false, 'AR', $display_all_group, 'id_group', $id_group, '', '', 0, true); $table->data[0][1] .= '&nbsp;';
$table->data[0][1] .= html_print_select_groups(
false,
'AR',
$display_all_group,
'id_group',
$id_group,
'',
'',
0,
true,
false,
true,
'',
$is_central_policies_on_node
);
$table->data[1][0] = __('Description'); $table->data[1][0] = __('Description');
@ -939,7 +1123,9 @@ if ($step == 2) {
30, 30,
$description, $description,
'', '',
true true,
'',
$is_central_policies_on_node
); );
$table->data[2][0] = __('Priority'); $table->data[2][0] = __('Priority');
@ -952,7 +1138,9 @@ if ($step == 2) {
0, 0,
true, true,
false, false,
false false,
'',
$is_central_policies_on_node
); );
if (defined('METACONSOLE')) { if (defined('METACONSOLE')) {
@ -1000,25 +1188,32 @@ if (!$create_alert && !$create_template) {
} }
if (!$disabled) { if (!$disabled) {
if ($step >= LAST_STEP) { if ($is_central_policies_on_node === false) {
html_print_submit_button(__('Finish'), 'finish', false, 'class="sub upd"'); if ($step >= LAST_STEP) {
} else {
html_print_input_hidden('step', ($step + 1));
if ($step == 2) {
// Javascript onsubmit to avoid min = 0 and max = 0
html_print_submit_button( html_print_submit_button(
__('Next'), __('Finish'),
'next', 'finish',
false, false,
'class="sub next" onclick="return check_fields_step2();"' 'class="sub upd"'
); );
} else { } else {
html_print_submit_button( html_print_input_hidden('step', ($step + 1));
__('Next'), if ($step == 2) {
'next', // Javascript onsubmit to avoid min = 0 and max = 0
false, html_print_submit_button(
'class="sub next"' __('Next'),
); 'next',
false,
'class="sub next" onclick="return check_fields_step2();"'
);
} else {
html_print_submit_button(
__('Next'),
'next',
false,
'class="sub next"'
);
}
} }
} }
} }
@ -1041,7 +1236,7 @@ var matches_not = <?php echo '"'.__("The alert would fire when the value doesn\'
var is = <?php echo "'".__('The alert would fire when the value is <span id="value"></span>')."'"; ?>; var is = <?php echo "'".__('The alert would fire when the value is <span id="value"></span>')."'"; ?>;
var is_not = <?php echo "'".__('The alert would fire when the value is not <span id="value"></span>')."'"; ?>; var is_not = <?php echo "'".__('The alert would fire when the value is not <span id="value"></span>')."'"; ?>;
var between = <?php echo "'".__('The alert would fire when the value is between <span id="min"></span> and <span id="max"></span>')."'"; ?>; var between = <?php echo "'".__('The alert would fire when the value is between <span id="min"></span> and <span id="max"></span>')."'"; ?>;
var between_not = <?php echo '"'.__("The alert would fire when the value is not between <span id=\'min\'></span> and <span id=\'max\'></span>").'"'; ?>; var between_not = <?php echo '"'.__('The alert would fire when the value is not between <span id=min></span> and <span id=max></span>').'"'; ?>;
var under = <?php echo "'".__('The alert would fire when the value is below <span id="min"></span>')."'"; ?>; var under = <?php echo "'".__('The alert would fire when the value is below <span id="min"></span>')."'"; ?>;
var over = <?php echo "'".__('The alert would fire when the value is above <span id="max"></span>')."'"; ?>; var over = <?php echo "'".__('The alert would fire when the value is above <span id="max"></span>')."'"; ?>;
var warning = <?php echo "'".__('The alert would fire when the module is in warning status')."'"; ?>; var warning = <?php echo "'".__('The alert would fire when the module is in warning status')."'"; ?>;

View File

@ -92,6 +92,12 @@ if ($satellite_options != ENTERPRISE_NOT_HOOK) {
$options_satellite = array_merge($options_satellite, $satellite_options); $options_satellite = array_merge($options_satellite, $satellite_options);
} }
$options_services = enterprise_hook('massive_services_options');
if ($options_services === ENTERPRISE_NOT_HOOK) {
$options_services = [];
}
if (in_array($option, array_keys($options_alerts))) { if (in_array($option, array_keys($options_alerts))) {
$tab = 'massive_alerts'; $tab = 'massive_alerts';
} else if (in_array($option, array_keys($options_agents))) { } else if (in_array($option, array_keys($options_agents))) {
@ -108,6 +114,8 @@ if (in_array($option, array_keys($options_alerts))) {
$tab = 'massive_satellite'; $tab = 'massive_satellite';
} else if (in_array($option, array_keys($options_plugins))) { } else if (in_array($option, array_keys($options_plugins))) {
$tab = 'massive_plugins'; $tab = 'massive_plugins';
} else if (in_array($option, array_keys($options_services))) {
$tab = 'massive_services';
} }
if ($tab == 'massive_agents' && $option == '') { if ($tab == 'massive_agents' && $option == '') {
@ -173,6 +181,10 @@ switch ($tab) {
$options = $options_plugins; $options = $options_plugins;
break; break;
case 'massive_services':
$options = $options_services;
break;
default: default:
// Default. // Default.
break; break;
@ -241,6 +253,11 @@ if ($satellitetab == ENTERPRISE_NOT_HOOK) {
$satellitetab = ''; $satellitetab = '';
} }
$servicestab = enterprise_hook('massive_services_tab');
if ($servicestab == ENTERPRISE_NOT_HOOK) {
$servicestab = '';
}
$onheader = []; $onheader = [];
$onheader['massive_agents'] = $agentstab; $onheader['massive_agents'] = $agentstab;
@ -254,6 +271,7 @@ $onheader['massive_alerts'] = $alertstab;
$onheader['policies'] = $policiestab; $onheader['policies'] = $policiestab;
$onheader['snmp'] = $snmptab; $onheader['snmp'] = $snmptab;
$onheader['satellite'] = $satellitetab; $onheader['satellite'] = $satellitetab;
$onheader['services'] = $servicestab;
/* /*
Hello there! :) Hello there! :)

View File

@ -189,6 +189,7 @@ if (check_acl($config['id_user'], 0, 'AW')) {
enterprise_hook('massivepolicies_submenu'); enterprise_hook('massivepolicies_submenu');
enterprise_hook('massivesnmp_submenu'); enterprise_hook('massivesnmp_submenu');
enterprise_hook('massivesatellite_submenu'); enterprise_hook('massivesatellite_submenu');
enterprise_hook('massiveservices_submenu');
$sub['gmassive']['sub2'] = $sub2; $sub['gmassive']['sub2'] = $sub2;
} }

View File

@ -46,14 +46,15 @@ if (defined('METACONSOLE')) {
$sec = 'gmodules'; $sec = 'gmodules';
} }
if (is_management_allowed() === true) {
$create = (bool) get_parameter('create'); $create = (bool) get_parameter('create');
$update = (bool) get_parameter('update'); $update = (bool) get_parameter('update');
$delete = (bool) get_parameter('delete'); $delete = (bool) get_parameter('delete');
$new = (bool) get_parameter('new'); $new = (bool) get_parameter('new');
$id = (int) get_parameter('id'); $id = (int) get_parameter('id');
$multiple_delete = (bool) get_parameter('multiple_delete', 0); $multiple_delete = (bool) get_parameter('multiple_delete', 0);
$pure = get_parameter('pure', 0); $pure = get_parameter('pure', 0);
}
if ($create) { if ($create) {
$name = (string) get_parameter('name'); $name = (string) get_parameter('name');
@ -186,7 +187,7 @@ if ($multiple_delete) {
); );
} }
if (($id || $new) && !$delete && !$multiple_delete) { if (($id || $new) && !$delete && !$multiple_delete && is_management_allowed() === true) {
include_once 'manage_nc_groups_form.php'; include_once 'manage_nc_groups_form.php';
return; return;
} }
@ -229,7 +230,10 @@ $table->class = 'info_table';
$table->head = []; $table->head = [];
$table->head['checkbox'] = html_print_checkbox('all_delete', 0, false, true, false); $table->head['checkbox'] = html_print_checkbox('all_delete', 0, false, true, false);
$table->head[0] = __('Name'); $table->head[0] = __('Name');
$table->head[1] = __('Action'); if (is_management_allowed() === true) {
$table->head[1] = __('Action');
}
$table->style = []; $table->style = [];
$table->style[0] = 'font-weight: bold'; $table->style[0] = 'font-weight: bold';
$table->align = []; $table->align = [];
@ -258,31 +262,42 @@ foreach ($groups as $group) {
} }
$table->cellclass[][1] = 'action_buttons'; $table->cellclass[][1] = 'action_buttons';
$data[1] = "<a onclick='if(confirm(\"".__('Are you sure?')."\")) return true; else return false;' if (is_management_allowed() === true) {
$data[1] = "<a onclick='if(confirm(\"".__('Are you sure?')."\")) return true; else return false;'
href='index.php?sec=".$sec.'&sec2=godmode/modules/manage_nc_groups&delete=1&id='.$group['id_sg']."&offset=0'>".html_print_image('images/cross.png', true, ['title' => __('Delete')]).'</a>'; href='index.php?sec=".$sec.'&sec2=godmode/modules/manage_nc_groups&delete=1&id='.$group['id_sg']."&offset=0'>".html_print_image('images/cross.png', true, ['title' => __('Delete')]).'</a>';
}
array_push($table->data, $data); array_push($table->data, $data);
} }
if (is_management_allowed() === false) {
ui_print_warning_message(__('This node is configured with centralized mode. This page is for read only. Go to metaconsole to manage the component groups.'));
}
if (isset($data)) { if (isset($data)) {
echo "<form method='post' action='index.php?sec=".$sec."&sec2=godmode/modules/manage_nc_groups'>"; echo "<form method='post' action='index.php?sec=".$sec."&sec2=godmode/modules/manage_nc_groups'>";
html_print_input_hidden('multiple_delete', 1); html_print_input_hidden('multiple_delete', 1);
html_print_table($table); html_print_table($table);
echo "<div style='padding-left: 10px; float: right;'>"; if (is_management_allowed() === true) {
html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete"'); echo "<div style='padding-left: 10px; float: right;'>";
echo '</div>'; html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete"');
echo '</div>';
}
echo '</form>'; echo '</form>';
} else { } else {
ui_print_info_message(['no_close' => true, 'message' => __('There are no defined component groups') ]); ui_print_info_message(['no_close' => true, 'message' => __('There are no defined component groups') ]);
} }
if (is_management_allowed() === true) {
echo '<form method="post" action='.$url.'>';
echo '<div class="" style="float:right;">';
html_print_input_hidden('new', 1);
html_print_submit_button(__('Create'), 'crt', false, 'class="sub next"');
echo '</div>';
echo '</form>';
}
echo '<form method="post" action='.$url.'>';
echo '<div class="" style="float:right;">';
html_print_input_hidden('new', 1);
html_print_submit_button(__('Create'), 'crt', false, 'class="sub next"');
echo '</div>';
echo '</form>';
enterprise_hook('close_meta_frame'); enterprise_hook('close_meta_frame');
?> ?>

View File

@ -180,7 +180,7 @@ $data[1] = html_print_extended_select_for_post_process(
'post_process', 'post_process',
$post_process, $post_process,
'', '',
__('Empty'), '',
'0', '0',
false, false,
true, true,

View File

@ -190,8 +190,20 @@ if ($editGraph) {
$weights = implode(',', $weight_array); $weights = implode(',', $weight_array);
} }
$count_module_array = count($module_array);
if ($count_module_array > 10) {
ui_print_warning_message(
__(
'The maximum number of items in a chart is 10. You have %s elements, only first 10 will be displayed.',
$count_module_array
)
);
}
// Modules table. // Modules table.
if (count($module_array) > 0) { if ($count_module_array > 0) {
echo "<table width='100%' cellpadding=4 cellpadding=4 class='databox filters'>"; echo "<table width='100%' cellpadding=4 cellpadding=4 class='databox filters'>";
echo '<tr> echo '<tr>
<th>'.__('P.').'</th> <th>'.__('P.').'</th>
@ -202,7 +214,7 @@ if (count($module_array) > 0) {
<th>'.__('Delete').'</th> <th>'.__('Delete').'</th>
<th>'.__('Sort').'</th>'; <th>'.__('Sort').'</th>';
$color = 0; $color = 0;
for ($a = 0; $a < count($module_array); $a++) { for ($a = 0; $a < $count_module_array; $a++) {
// Calculate table line color. // Calculate table line color.
if ($color == 1) { if ($color == 1) {
$tdcolor = 'datos'; $tdcolor = 'datos';

View File

@ -71,12 +71,6 @@ if ($is_enterprise !== ENTERPRISE_NOT_HOOK && $vconsoles_manage) {
'active' => false, 'active' => false,
'text' => '<a href="'.$url_visual_console_template_wizard.'">'.html_print_image('images/wand.png', true, ['title' => __('Visual Console Template Wizard')]).'</a>', 'text' => '<a href="'.$url_visual_console_template_wizard.'">'.html_print_image('images/wand.png', true, ['title' => __('Visual Console Template Wizard')]).'</a>',
]; ];
if ($is_metaconsole) {
$buttons['visual_console_manager'] = [
'active' => false,
'text' => '<a href="'.$url_visual_console_manager.'">'.html_print_image('images/builder.png', true, ['title' => __('Visual Console Manager')]).'</a>',
];
}
} }
if (!$is_metaconsole) { if (!$is_metaconsole) {

View File

@ -64,13 +64,6 @@ if ($is_enterprise !== ENTERPRISE_NOT_HOOK && $vconsoles_manage) {
'active' => false, 'active' => false,
'text' => '<a href="'.$url_visual_console_template_wizard.'">'.html_print_image('images/wand.png', true, ['title' => __('Visual Console Template Wizard')]).'</a>', 'text' => '<a href="'.$url_visual_console_template_wizard.'">'.html_print_image('images/wand.png', true, ['title' => __('Visual Console Template Wizard')]).'</a>',
]; ];
if ($is_metaconsole) {
$buttons['visual_console_manager'] = [
'active' => false,
'text' => '<a href="'.$url_visual_console_manager.'">'.html_print_image('images/builder.png', true, ['title' => __('Visual Console Manager')]).'</a>',
];
}
} }
if (!$is_metaconsole) { if (!$is_metaconsole) {

View File

@ -140,8 +140,8 @@ if (isset($_GET['server'])) {
ui_print_error_message(__('There was a problem deleting the server')); ui_print_error_message(__('There was a problem deleting the server'));
} }
} else if (isset($_GET['update'])) { } else if (isset($_GET['update'])) {
$address = get_parameter_post('address'); $address = trim(get_parameter_post('address'), '&#x20;');
$description = get_parameter_post('description'); $description = trim(get_parameter_post('description'), '&#x20;');
$id_server = get_parameter_post('server'); $id_server = get_parameter_post('server');
$exec_proxy = get_parameter_post('exec_proxy'); $exec_proxy = get_parameter_post('exec_proxy');
$port = get_parameter_post('port'); $port = get_parameter_post('port');

View File

@ -88,7 +88,6 @@ switch ($action) {
} else { } else {
header('Location:'.$config['homeurl'].'index.php?sec=gsetup&sec2=godmode/setup/os&tab='.$tab.'&message='.$message); header('Location:'.$config['homeurl'].'index.php?sec=gsetup&sec2=godmode/setup/os&tab='.$tab.'&message='.$message);
} }
break; break;
case 'update': case 'update':

View File

@ -870,8 +870,8 @@ $row++;
$table_chars->data[$row][0] = __('Show only average'); $table_chars->data[$row][0] = __('Show only average');
$options_soft_graphs = []; $options_soft_graphs = [];
$options_soft_graphs[0] = __('Standard mode'); $options_soft_graphs[0] = __('Show only average by default');
$options_soft_graphs[1] = __('Classic mode'); $options_soft_graphs[1] = __('Show MAX/AVG/MIN by default');
$table_chars->data[$row][1] = html_print_select($options_soft_graphs, 'type_mode_graph', $config['type_mode_graph'], '', '', 0, true, false, false); $table_chars->data[$row][1] = html_print_select($options_soft_graphs, 'type_mode_graph', $config['type_mode_graph'], '', '', 0, true, false, false);
$row++; $row++;
@ -1342,6 +1342,15 @@ $row++;
$row++; $row++;
$decimal_separator = [
'.' => '.',
',' => ',',
];
$table_other->data[$row][0] = __('CSV decimal separator').ui_print_help_tip(__('Only for csv reports'), true);
$table_other->data[$row][1] = html_print_select($decimal_separator, 'csv_decimal_separator', $config['csv_decimal_separator'], '', '', '', true, false, false);
$row++;
$table_other->data[$row][0] = __('Data multiplier to use in graphs/data'); $table_other->data[$row][0] = __('Data multiplier to use in graphs/data');
$options_data_multiplier = []; $options_data_multiplier = [];
$options_data_multiplier[0] = __('Use 1024 when module unit are bytes'); $options_data_multiplier[0] = __('Use 1024 when module unit are bytes');

View File

@ -117,7 +117,7 @@ if ($save_alert || $modify_alert) {
$al_field7 = (string) get_parameter_post('field7_value'); $al_field7 = (string) get_parameter_post('field7_value');
$al_field8 = (string) get_parameter_post('field8_value'); $al_field8 = (string) get_parameter_post('field8_value');
$al_field9 = (string) get_parameter_post('field9_value'); $al_field9 = (string) get_parameter_post('field9_value');
$al_field10 = (string) get_parameter_post('al_field10'); $al_field10 = (string) get_parameter_post('field10_value');
$al_field11 = (string) get_parameter_post('field11_value'); $al_field11 = (string) get_parameter_post('field11_value');
$al_field12 = (string) get_parameter_post('field12_value'); $al_field12 = (string) get_parameter_post('field12_value');
$al_field13 = (string) get_parameter_post('field13_value'); $al_field13 = (string) get_parameter_post('field13_value');

View File

@ -35,6 +35,10 @@ if ($delete != 0 && is_metaconsole()) {
open_meta_frame(); open_meta_frame();
} }
if ($tag_name != '' && is_metaconsole()) {
open_meta_frame();
}
// Metaconsole nodes // Metaconsole nodes
$servers = false; $servers = false;
if (is_metaconsole()) { if (is_metaconsole()) {
@ -182,7 +186,7 @@ $row[] = $filter_button;
$table->data[] = $row; $table->data[] = $row;
$filter_form = '<form method="POST" action="index.php?sec='.$sec.'&sec2=godmode/tag/tag&delete_tag=0">'; $filter_form = '<form method="POST" action="index.php?sec='.$sec.'&sec2=godmode/tag/tag&tag_name="'.$tag_name.'>';
$filter_form .= html_print_table($table, true); $filter_form .= html_print_table($table, true);
$filter_form .= '</form>'; $filter_form .= '</form>';
// End of filter form // End of filter form

View File

@ -112,14 +112,88 @@ if (! check_acl($config['id_user'], 0, 'UM')) {
return; return;
} }
/* if (is_ajax()) {
* Disabled at the moment. $delete_profile = (bool) get_parameter('delete_profile');
if (!check_referer()) { if ($delete_profile) {
require ("general/noaccess.php"); $id2 = (string) get_parameter('id_user');
$id_up = (int) get_parameter('id_user_profile');
return; $perfilUser = db_get_row('tusuario_perfil', 'id_up', $id_up);
$id_perfil = $perfilUser['id_perfil'];
$perfil = db_get_row('tperfil', 'id_perfil', $id_perfil);
db_pandora_audit(
'User management',
'Deleted profile for user '.io_safe_input($id2),
false,
false,
'The profile with id '.$id_perfil.' in the group '.$perfilUser['id_grupo']
);
$return = profile_delete_user_profile($id2, $id_up);
ui_print_result_message(
$return,
__('Successfully deleted'),
__('Could not be deleted')
);
$has_profile = db_get_row('tusuario_perfil', 'id_usuario', $id2);
if ($has_profile == false) {
$result = delete_user($id2);
if ($result) {
db_pandora_audit(
'User management',
__('Deleted user %s', io_safe_input($id_user))
);
}
ui_print_result_message(
$result,
__('Successfully deleted'),
__('There was a problem deleting the user')
);
// Delete the user in all the consoles
if (defined('METACONSOLE')) {
$servers = metaconsole_get_servers();
foreach ($servers as $server) {
// Connect to the remote console
metaconsole_connect($server);
// Delete the user
$result = delete_user($id_user);
if ($result) {
db_pandora_audit(
'User management',
__('Deleted user %s from metaconsole', io_safe_input($id_user))
);
}
// Restore the db connection
metaconsole_restore_db();
// Log to the metaconsole too
if ($result) {
db_pandora_audit(
'User management',
__('Deleted user %s from %s', io_safe_input($id_user), io_safe_input($server['server_name']))
);
}
ui_print_result_message(
$result,
__('Successfully deleted from %s', io_safe_input($server['server_name'])),
__('There was a problem deleting the user from %s', io_safe_input($server['server_name']))
);
}
}
}
return;
} }
*/ }
$tab = get_parameter('tab', 'user'); $tab = get_parameter('tab', 'user');
@ -168,9 +242,9 @@ if ($config['user_can_update_info']) {
$new_user = (bool) get_parameter('new_user'); $new_user = (bool) get_parameter('new_user');
$create_user = (bool) get_parameter('create_user'); $create_user = (bool) get_parameter('create_user');
$add_profile = (bool) get_parameter('add_profile'); $add_profile = (bool) get_parameter('add_profile');
$delete_profile = (bool) get_parameter('delete_profile');
$update_user = (bool) get_parameter('update_user'); $update_user = (bool) get_parameter('update_user');
$status = get_parameter('status', -1); $status = get_parameter('status', -1);
$json_profile = get_parameter('json_profile', '');
// Reset status var if current action is not update_user // Reset status var if current action is not update_user
if ($new_user || $create_user || $add_profile if ($new_user || $create_user || $add_profile
@ -372,6 +446,41 @@ if ($create_user) {
$user_info = get_user_info($id); $user_info = get_user_info($id);
$new_user = false; $new_user = false;
if (!empty($json_profile)) {
$json_profile = json_decode(io_safe_output($json_profile), true);
foreach ($json_profile as $key => $profile) {
if (!empty($profile)) {
$group2 = $profile['group'];
$profile2 = $profile['profile'];
$tags = $profile['tags'];
foreach ($tags as $k => $tag) {
if (empty($tag)) {
unset($tags[$k]);
}
}
$tags = implode(',', $tags);
$no_hierarchy = $profile['hierarchy'];
db_pandora_audit(
'User management',
'Added profile for user '.io_safe_input($id2),
false,
false,
'Profile: '.$profile2.' Group: '.$group2.' Tags: '.$tags
);
$result_profile = profile_create_user_profile($id, $profile2, $group2, false, $tags, $no_hierarchy);
ui_print_result_message(
$result_profile,
__('Profile added successfully'),
__('Profile cannot be added')
);
}
}
}
} else { } else {
$user_info = $values; $user_info = $values;
$new_user = true; $new_user = true;
@ -598,7 +707,7 @@ if ($status != -1) {
); );
} }
if ($add_profile) { if ($add_profile && empty($json_profile)) {
$id2 = (string) get_parameter('id'); $id2 = (string) get_parameter('id');
$group2 = (int) get_parameter('assign_group'); $group2 = (int) get_parameter('assign_group');
$profile2 = (int) get_parameter('assign_profile'); $profile2 = (int) get_parameter('assign_profile');
@ -628,34 +737,38 @@ if ($add_profile) {
); );
} }
if ($delete_profile) {
$id2 = (string) get_parameter('id_user');
$id_up = (int) get_parameter('id_user_profile');
$perfilUser = db_get_row('tusuario_perfil', 'id_up', $id_up);
$id_perfil = $perfilUser['id_perfil'];
$perfil = db_get_row('tperfil', 'id_perfil', $id_perfil);
db_pandora_audit(
'User management',
'Deleted profile for user '.io_safe_input($id2),
false,
false,
'The profile with id '.$id_perfil.' in the group '.$perfilUser['id_grupo']
);
$return = profile_delete_user_profile($id2, $id_up);
ui_print_result_message(
$return,
__('Successfully deleted'),
__('Could not be deleted')
);
}
if ($values) { if ($values) {
$user_info = $values; $user_info = $values;
} }
if (!users_is_admin() && $config['id_user'] != $id && !$new_user) {
$group_um = users_get_groups_UM($config['id_user']);
if (isset($group_um[0])) {
$group_um_string = implode(',', array_keys(users_get_groups($config['id_user'], 'um', true)));
} else {
$group_um_string = implode(',', array_keys($group_um));
}
$sql = sprintf(
"SELECT tusuario_perfil.* FROM tusuario_perfil
INNER JOIN tperfil ON tperfil.id_perfil = tusuario_perfil.id_perfil
WHERE id_usuario like '%s' AND id_grupo IN (%s) AND user_management = 0",
$id,
$group_um_string
);
$result = db_get_all_rows_sql($sql);
if ($result == false || $user_info['is_admin']) {
db_pandora_audit(
'ACL Violation',
'Trying to access User Management'
);
include 'general/noaccess.php';
return;
}
}
if (defined('METACONSOLE')) { if (defined('METACONSOLE')) {
if ($id) { if ($id) {
echo '<div class="user_form_title">'.__('Update User').'</div>'; echo '<div class="user_form_title">'.__('Update User').'</div>';
@ -762,19 +875,22 @@ if ($config['user_can_update_password']) {
$own_info = get_user_info($config['id_user']); $own_info = get_user_info($config['id_user']);
$global_profile = '<div class="label_select_simple user_global_profile" ><span class="input_label" style="margin:0;">'.__('Global Profile').'</span>'; $global_profile = '<div class="label_select_simple user_global_profile" ><span class="input_label" style="margin:0;">'.__('Global Profile').'</span>';
$global_profile .= '<div class="switch_radio_button">'; $global_profile .= '<div class="switch_radio_button">';
$global_profile .= html_print_radio_button_extended( if (users_is_admin()) {
'is_admin', $global_profile .= html_print_radio_button_extended(
1, 'is_admin',
[ 1,
'label' => __('Administrator'), [
'help_tip' => __('This user has permissions to manage all. An admin user should not requiere additional group permissions, except for using Enterprise ACL.'), 'label' => __('Administrator'),
], 'help_tip' => __('This user has permissions to manage all. An admin user should not requiere additional group permissions, except for using Enterprise ACL.'),
$user_info['is_admin'], ],
false, $user_info['is_admin'],
'', false,
'', '',
true '',
); true
);
}
$global_profile .= html_print_radio_button_extended( $global_profile .= html_print_radio_button_extended(
'is_admin', 'is_admin',
0, 0,
@ -1027,7 +1143,7 @@ if ($meta) {
$metaconsole_access_node .= html_print_checkbox('metaconsole_access_node', 1, $user_info['metaconsole_access_node'], true).'</div>'; $metaconsole_access_node .= html_print_checkbox('metaconsole_access_node', 1, $user_info['metaconsole_access_node'], true).'</div>';
} }
echo '<form method="post" autocomplete="off">'; echo '<form id="user_profile_form" method="post" autocomplete="off">';
if (!$id) { if (!$id) {
@ -1067,14 +1183,19 @@ if (!is_metaconsole()) {
echo $search_custom_fields_view.$metaconsole_agents_manager.$metaconsole_assigned_server.$metaconsole_access_node; echo $search_custom_fields_view.$metaconsole_agents_manager.$metaconsole_assigned_server.$metaconsole_access_node;
} }
echo '</div> echo '</div>
</div> </div>
<div class="user_edit_third_row white_box"> <div class="user_edit_third_row white_box">
<div class="edit_user_comments">'.$comments.'</div> <div class="edit_user_comments">'.$comments.'</div>
</div>
<div class="user_edit_third_row white_box">'.$ehorus.'</div>
</div>'; </div>';
if (!empty($ehorus)) {
echo '<div class="user_edit_third_row white_box">'.$ehorus.'</div>';
}
echo '</div>';
profile_print_profile_table($id);
echo '<div style="width: 100%" class="action-buttons">'; echo '<div style="width: 100%" class="action-buttons">';
if ($config['admin_can_add_user']) { if ($config['admin_can_add_user']) {
@ -1088,16 +1209,15 @@ if ($config['admin_can_add_user']) {
} }
} }
html_print_input_hidden('json_profile', '');
echo '</div>'; echo '</div>';
echo '</form>'; echo '</form>';
echo '<br />'; echo '<br />';
// Don't show anything else if we're creating an user
if (!empty($id) && !$new_user) {
profile_print_profile_table($id);
}
enterprise_hook('close_meta_frame'); enterprise_hook('close_meta_frame');
$delete_image = html_print_input_image('del', 'images/cross.png', 1, '', true, ['onclick' => 'delete_profile(event, this)']);
if (!is_metaconsole()) { if (!is_metaconsole()) {
?> ?>
@ -1132,13 +1252,14 @@ if (!is_metaconsole()) {
?> ?>
<script type="text/javascript"> <script type="text/javascript">
var json_profile = $('#hidden-json_profile');
/* <![CDATA[ */ /* <![CDATA[ */
$(document).ready (function () { $(document).ready (function () {
$('input:radio[name="is_admin"]').change(function() { $('input:radio[name="is_admin"]').change(function() {
if($('#radiobtn0002').prop('checked')) { if($('#radiobtn0002').prop('checked')) {
$('#metaconsole_agents_manager_div').show(); $('#metaconsole_agents_manager_div').show();
$('#metaconsole_access_node_div').show(); $('#metaconsole_access_node_div').show();
if($('#checkbox-metaconsole_agents_manager').prop('checked')) { if($('#checkbox-metaconsole_agents_manager').prop('checked')) {
$('#metaconsole_assigned_server_div').show(); $('#metaconsole_assigned_server_div').show();
} }
} }
@ -1167,8 +1288,105 @@ $(document).ready (function () {
}); });
$('#checkbox-ehorus_user_level_enabled').trigger('change'); $('#checkbox-ehorus_user_level_enabled').trigger('change');
var img_delete = '<?php echo $delete_image; ?>';
var id_user = '<?php echo $id; ?>';
var data = [];
$('input:image[name="add"]').click(function (e) {
e.preventDefault();
var profile = $('#assign_profile').val();
var profile_text = $('#assign_profile option:selected').text();
var group = $('#assign_group').val();
var group_text = $('#assign_group option:selected').text();
var tags = $('#assign_tags').val();
var tags_text = $('#assign_tags option:selected').toArray().map(item => item.text).join();
if ( $('#checkbox-no_hierarchy').is(':checked')) {
var hierarchy = 1;
var hierarchy_text = '<?php echo __('yes'); ?>';
} else {
var hierarchy = 0;
var hierarchy_text = '<?php echo __('no'); ?>';
}
if (profile === '0' || group === '-1') {
alert('<?php echo __('please select profile and group'); ?>');
return;
}
if (id_user === '') {
let new_json = `{"profile":${profile},"group":${group},"tags":[${tags}],"hierarchy":${hierarchy}}`;
data.push(new_json);
json_profile.val('['+data+']');
$('#table_profiles tr:last').before(
`<tr>
<td>${profile_text}</td>
<td>${group_text}</td>
<td>${tags_text}</td>
<td>${hierarchy_text}</td>
<td>${img_delete}</td>
</tr>`
);
} else {
this.form.submit();
}
});
$('input:image[name="del"]').click(function (e) {
e.preventDefault();
var rows = $("#table_profiles tr").length;
if (rows <= 3) {
if (!confirm('<?php echo __('Deleting last profile'); ?>' + '. ' + '<?php echo __('Are you sure?'); ?>')) {
return;
}
}
var id_user_profile = $(this).siblings();
id_user_profile = id_user_profile[1].value;
var row = $(this).closest('tr');
var params = [];
params.push("delete_profile=1");
params.push("id_user=" + id_user);
params.push("id_user_profile=" + id_user_profile);
params.push("page=godmode/users/configure_user");
jQuery.ajax ({
data: params.join ("&"),
type: 'POST',
url: action="<?php echo ui_get_full_url('ajax.php', false, false, false); ?>",
success: function (data) {
row.remove();
var rows = $("#table_profiles tr").length;
if (rows <= 2) {
window.location.replace("<?php echo ui_get_full_url('index.php?sec=gusuarios&sec2=godmode/users/user_list&tab=user&pure=0', false, false, false); ?>");
}
}
});
});
$('#submit-crtbutton').click(function (e) {
e.preventDefault();
var rows = $("#table_profiles tr").length;
if (rows <= 2) {
alert('<?php echo __('please add a profile'); ?>');
} else {
this.form.submit();
}
});
}); });
function delete_profile(event, btn) {
event.preventDefault();
var row = btn.parentNode.parentNode;
var position = row.rowIndex;
row.parentNode.removeChild(row);
var json = json_profile.val();
var test = JSON.parse(json);
delete test[position-1];
json_profile.val(JSON.stringify(test));
}
function show_data_section () { function show_data_section () {
section = $("#section").val(); section = $("#section").val();

View File

@ -356,10 +356,23 @@ if (!defined('METACONSOLE')) {
$table->valign[6] = 'top'; $table->valign[6] = 'top';
} }
$group_um = users_get_groups_UM($config['id_user']);
if (isset($group_um[0])) {
$group_um_string = implode(',', array_keys(users_get_groups($config['id_user'], 'um', true)));
} else {
$group_um_string = implode(',', array_keys($group_um));
}
$info1 = []; $info1 = [];
// Is admin or has group permissions all.
$info1 = get_users($order); if (users_is_admin() || isset($group_um[0])) {
$info1 = get_users($order);
} else {
foreach ($group_um as $group => $value) {
$info1 = array_merge($info1, users_get_users_by_group($group, $value));
}
}
// Filter the users // Filter the users
if ($search) { if ($search) {
@ -400,33 +413,7 @@ if ($search) {
} }
} }
// ~ $info = $info1;
// ~ $filter_group
// ~ $filter_search
// ~
$info = [];
$own_info = get_user_info($config['id_user']);
$own_groups = users_get_groups($config['id_user'], 'AR', $own_info['is_admin']);
if ($own_info['is_admin']) {
$info = $info1;
}
// If user is not admin then don't display admin users and user of others groups.
else {
foreach ($info1 as $key => $usr) {
$u = get_user_info($key);
$g = users_get_groups($key, false, $u['is_admin']);
$result = array_intersect($g, $own_groups);
// Show users without profile too.
if (!empty($result) || (db_get_all_rows_field_filter('tusuario_perfil', 'id_usuario', $usr['id_user']) === false)) {
$info[$key] = $usr;
}
unset($u);
unset($g);
}
}
// Prepare pagination // Prepare pagination
ui_pagination(count($info)); ui_pagination(count($info));
@ -438,9 +425,41 @@ $rowPair = true;
$iterator = 0; $iterator = 0;
$cont = 0; $cont = 0;
foreach ($info as $user_id => $user_info) { foreach ($info as $user_id => $user_info) {
if (!users_is_admin() && $user_info['is_admin']) {
// If user is not admin then don't display admin users.
continue;
}
// User profiles.
if (users_is_admin() || $user_id == $config['id_user']) {
$user_profiles = db_get_all_rows_field_filter('tusuario_perfil', 'id_usuario', $user_id);
} else {
$user_profiles_aux = users_get_user_profile($user_id);
$user_profiles = [];
foreach ($group_um as $key => $value) {
if (isset($user_profiles_aux[$key])) {
$user_profiles[$key] = $user_profiles_aux[$key];
if ($user_profiles_aux[$key]['user_management'] == 1) {
$user_info['edit'] = 0;
} else {
$user_info['edit'] = 1;
}
unset($user_profiles_aux[$key]);
}
}
if (!empty($user_profiles_aux)) {
$user_info['not_delete'] = 1;
}
if ($user_profiles == false) {
continue;
}
}
$cont++; $cont++;
//
// Manual pagination due the complicated process of the ACL data // Manual pagination due the complicated process of the ACL data
if ($cont <= $offset) { if ($cont <= $offset) {
continue; continue;
@ -464,12 +483,14 @@ foreach ($info as $user_id => $user_info) {
$iterator++; $iterator++;
$data[0] = '<a href="index.php?sec='.$sec.'&amp;sec2=godmode/users/configure_user&pure='.$pure.'&amp;id='.$user_id.'">'.$user_id.'</a>'; if (users_is_admin() || $config['id_user'] == $user_info['id_user'] || (!$user_info['is_admin'] && (!isset($user_info['edit']) || (isset($user_info['edit']) && $user_info['edit'])))) {
$data[0] = '<a href="index.php?sec='.$sec.'&amp;sec2=godmode/users/configure_user&pure='.$pure.'&amp;id='.$user_id.'">'.$user_id.'</a>';
} else {
$data[0] = $user_id;
}
$data[1] = '<ul style="margin-top: 0 !important; margin-left: auto !important; padding-left: 10px !important; list-style-type: none !important;">'; $data[1] = '<ul style="margin-top: 0 !important; margin-left: auto !important; padding-left: 10px !important; list-style-type: none !important;">';
$data[1] .= '<li>'.$user_info['fullname'].'</li>'; $data[1] .= '<li>'.$user_info['fullname'].'</li>';
/*
$data[1] .= '<li><b>' . __('First name') . ':</b> ' . $user_info["firstname"] . '</li>';
$data[1] .= '<li><b>' . __('Last name') . ':</b> ' . $user_info["lastname"] . '</li>';*/
$data[1] .= '<li>'.$user_info['phone'].'</li>'; $data[1] .= '<li>'.$user_info['phone'].'</li>';
$data[1] .= '<li>'.$user_info['email'].'</li>'; $data[1] .= '<li>'.$user_info['email'].'</li>';
$data[1] .= '</ul>'; $data[1] .= '</ul>';
@ -485,20 +506,14 @@ foreach ($info as $user_id => $user_info) {
] ]
).'&nbsp;'; ).'&nbsp;';
} else { } else {
/*
$data[3] = html_print_image ("images/user_green.png", true,
array ("alt" => __('User'),
"title" => __('Standard User'))) . '&nbsp;';
*/
$data[3] = ''; $data[3] = '';
} }
$data[4] = ''; $data[4] = '';
$result = db_get_all_rows_field_filter('tusuario_perfil', 'id_usuario', $user_id); if ($user_profiles !== false) {
if ($result !== false) {
if (defined('METACONSOLE')) { if (defined('METACONSOLE')) {
$data[4] .= "<div width='100%'>"; $data[4] .= "<div width='100%'>";
foreach ($result as $row) { foreach ($user_profiles as $row) {
$data[4] .= "<div style='float:left;'>"; $data[4] .= "<div style='float:left;'>";
$data[4] .= profile_get_name($row['id_perfil']); $data[4] .= profile_get_name($row['id_perfil']);
$data[4] .= ' / </div>'; $data[4] .= ' / </div>';
@ -512,7 +527,7 @@ foreach ($info as $user_id => $user_info) {
$data[4] .= '</div>'; $data[4] .= '</div>';
} else { } else {
$data[4] .= "<table width='100%'>"; $data[4] .= "<table width='100%'>";
foreach ($result as $row) { foreach ($user_profiles as $row) {
$data[4] .= '<tr>'; $data[4] .= '<tr>';
$data[4] .= '<td>'; $data[4] .= '<td>';
$data[4] .= profile_get_name($row['id_perfil']); $data[4] .= profile_get_name($row['id_perfil']);
@ -531,21 +546,26 @@ foreach ($info as $user_id => $user_info) {
$data[5] = ui_print_string_substr($user_info['comments'], 24, true); $data[5] = ui_print_string_substr($user_info['comments'], 24, true);
$table->cellclass[][6] = 'action_buttons'; $table->cellclass[][6] = 'action_buttons';
if ($user_info['disabled'] == 0) { $data[6] = '';
$data[6] = '<a href="index.php?sec='.$sec.'&amp;sec2=godmode/users/user_list&amp;disable_user=1&pure='.$pure.'&amp;id='.$user_info['id_user'].'">'.html_print_image('images/lightbulb.png', true, ['title' => __('Disable')]).'</a>'; if (users_is_admin() || $config['id_user'] == $user_info['id_user'] || (!$user_info['is_admin'] && (!isset($user_info['edit']) || (isset($user_info['edit']) && $user_info['edit'])))) {
} else { if (!isset($user_info['not_delete'])) {
$data[6] = '<a href="index.php?sec='.$sec.'&amp;sec2=godmode/users/user_list&amp;disable_user=0&pure='.$pure.'&amp;id='.$user_info['id_user'].'">'.html_print_image('images/lightbulb_off.png', true, ['title' => __('Enable')]).'</a>'; if ($user_info['disabled'] == 0) {
} $data[6] = '<a href="index.php?sec='.$sec.'&amp;sec2=godmode/users/user_list&amp;disable_user=1&pure='.$pure.'&amp;id='.$user_info['id_user'].'">'.html_print_image('images/lightbulb.png', true, ['title' => __('Disable')]).'</a>';
} else {
$data[6] .= '<a href="index.php?sec='.$sec.'&amp;sec2=godmode/users/configure_user&pure='.$pure.'&amp;id='.$user_id.'">'.html_print_image('images/config.png', true, ['title' => __('Edit')]).'</a>'; $data[6] = '<a href="index.php?sec='.$sec.'&amp;sec2=godmode/users/user_list&amp;disable_user=0&pure='.$pure.'&amp;id='.$user_info['id_user'].'">'.html_print_image('images/lightbulb_off.png', true, ['title' => __('Enable')]).'</a>';
if ($config['admin_can_delete_user'] && $user_info['id_user'] != $config['id_user']) { }
$data[6] .= "<a href='index.php?sec=".$sec.'&sec2=godmode/users/user_list&user_del=1&pure='.$pure.'&delete_user='.$user_info['id_user']."'>".html_print_image('images/cross.png', true, ['title' => __('Delete'), 'onclick' => "if (! confirm ('".__('Deleting User').' '.$user_info['id_user'].'. '.__('Are you sure?')."')) return false"]).'</a>'; }
if (defined('METACONSOLE')) {
$data[6] .= "<a href='index.php?sec=".$sec.'&sec2=godmode/users/user_list&user_del=1&pure='.$pure.'&delete_user='.$user_info['id_user']."&delete_all=1'>".html_print_image('images/cross_double.png', true, ['title' => __('Delete from all consoles'), 'onclick' => "if (! confirm ('".__('Deleting User %s from all consoles', $user_info['id_user']).'. '.__('Are you sure?')."')) return false"]).'</a>'; $data[6] .= '<a href="index.php?sec='.$sec.'&amp;sec2=godmode/users/configure_user&pure='.$pure.'&amp;id='.$user_id.'">'.html_print_image('images/config.png', true, ['title' => __('Edit')]).'</a>';
if ($config['admin_can_delete_user'] && $user_info['id_user'] != $config['id_user'] && !isset($user_info['not_delete'])) {
$data[6] .= "<a href='index.php?sec=".$sec.'&sec2=godmode/users/user_list&user_del=1&pure='.$pure.'&delete_user='.$user_info['id_user']."'>".html_print_image('images/cross.png', true, ['title' => __('Delete'), 'onclick' => "if (! confirm ('".__('Deleting User').' '.$user_info['id_user'].'. '.__('Are you sure?')."')) return false"]).'</a>';
if (defined('METACONSOLE')) {
$data[6] .= "<a href='index.php?sec=".$sec.'&sec2=godmode/users/user_list&user_del=1&pure='.$pure.'&delete_user='.$user_info['id_user']."&delete_all=1'>".html_print_image('images/cross_double.png', true, ['title' => __('Delete from all consoles'), 'onclick' => "if (! confirm ('".__('Deleting User %s from all consoles', $user_info['id_user']).'. '.__('Are you sure?')."')) return false"]).'</a>';
}
} else {
$data[6] .= '';
// Delete button not in this mode
} }
} else {
$data[6] .= '';
// Delete button not in this mode
} }
array_push($table->data, $data); array_push($table->data, $data);

View File

@ -871,6 +871,11 @@ if ($get_response_description) {
} }
if ($get_response_params) { if ($get_response_params) {
if (! check_acl($config['id_user'], 0, 'EW')) {
echo 'unauthorized';
return;
}
$response_id = get_parameter('response_id'); $response_id = get_parameter('response_id');
$params = db_get_value('params', 'tevent_response', 'id', $response_id); $params = db_get_value('params', 'tevent_response', 'id', $response_id);
@ -885,6 +890,11 @@ if ($get_response_params) {
} }
if ($get_response_target) { if ($get_response_target) {
if (! check_acl($config['id_user'], 0, 'EW')) {
echo 'unauthorized';
return;
}
$response_id = (int) get_parameter('response_id'); $response_id = (int) get_parameter('response_id');
$event_id = (int) get_parameter('event_id'); $event_id = (int) get_parameter('event_id');
$server_id = (int) get_parameter('server_id'); $server_id = (int) get_parameter('server_id');
@ -901,6 +911,11 @@ if ($get_response_target) {
} }
if ($get_response) { if ($get_response) {
if (! check_acl($config['id_user'], 0, 'EW')) {
echo 'unauthorized';
return;
}
$response_id = get_parameter('response_id'); $response_id = get_parameter('response_id');
$event_response = db_get_row('tevent_response', 'id', $response_id); $event_response = db_get_row('tevent_response', 'id', $response_id);
@ -917,6 +932,11 @@ if ($get_response) {
if ($perform_event_response) { if ($perform_event_response) {
global $config; global $config;
if (! check_acl($config['id_user'], 0, 'EW')) {
echo 'unauthorized';
return;
}
$response_id = get_parameter('response_id'); $response_id = get_parameter('response_id');
$event_id = (int) get_parameter('event_id'); $event_id = (int) get_parameter('event_id');
$server_id = (int) get_parameter('server_id', 0); $server_id = (int) get_parameter('server_id', 0);
@ -1011,6 +1031,11 @@ if ($perform_event_response) {
if ($dialogue_event_response) { if ($dialogue_event_response) {
global $config; global $config;
if (! check_acl($config['id_user'], 0, 'EW')) {
echo 'unauthorized';
return;
}
$event_id = get_parameter('event_id'); $event_id = get_parameter('event_id');
$response_id = get_parameter('response_id'); $response_id = get_parameter('response_id');
$command = get_parameter('target'); $command = get_parameter('target');

View File

@ -40,6 +40,7 @@ if (is_ajax()) {
$id = get_parameter('id', -1); $id = get_parameter('id', -1);
$rootID = get_parameter('rootID', -1); $rootID = get_parameter('rootID', -1);
$serverID = get_parameter('serverID', false); $serverID = get_parameter('serverID', false);
$metaID = (int) get_parameter('metaID', 0);
$childrenMethod = get_parameter('childrenMethod', 'on_demand'); $childrenMethod = get_parameter('childrenMethod', 'on_demand');
$default_filters = [ $default_filters = [
@ -98,7 +99,16 @@ if (is_ajax()) {
break; break;
case 'services': case 'services':
$tree = new TreeService($type, $rootType, $id, $rootID, $serverID, $childrenMethod, $access); $tree = new TreeService(
$type,
$rootType,
$id,
$rootID,
$serverID,
$childrenMethod,
$access,
$metaID
);
break; break;
default: default:

View File

@ -29,7 +29,7 @@
// Begin. // Begin.
require_once 'config.php'; require_once 'config.php';
require_once 'functions_api.php'; require_once 'functions_api.php';
require '../vendor/autoload.php';
global $config; global $config;
define('DEBUG', 0); define('DEBUG', 0);

View File

@ -189,6 +189,7 @@ if (file_exists('languages/'.$user_language.'.mo') === true) {
echo '<div>'; echo '<div>';
switch ($type_graph_pdf) { switch ($type_graph_pdf) {
case 'combined': case 'combined':
$params['pdf'] = true;
echo graphic_combined_module( echo graphic_combined_module(
$module_list, $module_list,
$params, $params,

View File

@ -1221,6 +1221,9 @@ class ConsoleSupervisor
// At this point there's no servers with issues. // At this point there's no servers with issues.
$this->cleanNotifications('NOTIF.SERVER.STATUS%'); $this->cleanNotifications('NOTIF.SERVER.STATUS%');
return; return;
} else {
// Clean notifications. Only show notif for down servers.
$this->cleanNotifications('NOTIF.SERVER.STATUS%');
} }
foreach ($servers as $server) { foreach ($servers as $server) {

View File

@ -764,8 +764,10 @@ class HTML
$output_head .= $data['pre-content']; $output_head .= $data['pre-content'];
} }
$output_head .= '<form id="'.$form['id'].'" class="discovery '.$form['class'].'" onsubmit="'.$form['onsubmit'].'" enctype="'.$form['enctype'].'" action="'.$form['action'].'" method="'.$form['method']; if (isset($data['form']) === true) {
$output_head .= '" '.$form['extra'].'>'; $output_head .= '<form name="'.$form['name'].'" id="'.$form['id'].'" class="discovery '.$form['class'].'" onsubmit="'.$form['onsubmit'].'" enctype="'.$form['enctype'].'" action="'.$form['action'].'" method="'.$form['method'];
$output_head .= '" '.$form['extra'].'>';
}
if ($return === false) { if ($return === false) {
echo $output_head; echo $output_head;

View File

@ -64,14 +64,22 @@ class Tree
const TV_DEFAULT_AGENT_STATUS = -1; const TV_DEFAULT_AGENT_STATUS = -1;
public function __construct($type, $rootType='', $id=-1, $rootID=-1, $serverID=false, $childrenMethod='on_demand', $access='AR') public function __construct(
{ $type,
$rootType='',
$id=-1,
$rootID=-1,
$serverID=false,
$childrenMethod='on_demand',
$access='AR',
$id_meta_server=0
) {
$this->type = $type; $this->type = $type;
$this->rootType = !empty($rootType) ? $rootType : $type; $this->rootType = !empty($rootType) ? $rootType : $type;
$this->id = $id; $this->id = $id;
$this->rootID = !empty($rootID) ? $rootID : $id; $this->rootID = !empty($rootID) ? $rootID : $id;
$this->serverID = $serverID; $this->serverID = $serverID;
if (is_metaconsole()) { if (is_metaconsole() && $id_meta_server == 0) {
$this->serverName = metaconsole_get_server_by_id($serverID); $this->serverName = metaconsole_get_server_by_id($serverID);
} }
@ -90,7 +98,7 @@ class Tree
include_once $config['homedir'].'/include/functions_tags.php'; include_once $config['homedir'].'/include/functions_tags.php';
enterprise_include_once('include/functions_agents.php'); enterprise_include_once('include/functions_agents.php');
if (is_metaconsole()) { if (is_metaconsole() && $id_meta_server == 0) {
enterprise_include_once('meta/include/functions_ui_meta.php'); enterprise_include_once('meta/include/functions_ui_meta.php');
} }
} }

View File

@ -1,32 +1,112 @@
<?php <?php
// Pandora FMS- http://pandorafms.com /**
// ================================================== * Service tree view.
// Copyright (c) 2005-2018 Artica Soluciones Tecnologicas *
// Please see http://pandorafms.org for full contribution list * @category Class
// This program is free software; you can redistribute it and/or * @package Pandora FMS
// modify it under the terms of the GNU Lesser General Public License * @subpackage Enterprise
// as published by the Free Software Foundation; version 2 * @version 1.0.0
// This program is distributed in the hope that it will be useful, * @license See below
// but WITHOUT ANY WARRANTY; without even the implied warranty of *
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * ______ ___ _______ _______ ________
// GNU General Public License for more details. * | __ \.-----.--.--.--| |.-----.----.-----. | ___| | | __|
* | __/| _ | | _ || _ | _| _ | | ___| |__ |
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
*
* ============================================================================
* Copyright (c) 2005-2019 Artica Soluciones Tecnologicas
* Please see http://pandorafms.org for full contribution list
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation for version 2.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* ============================================================================
*/
// Begin.
global $config; global $config;
require_once $config['homedir'].'/include/class/Tree.class.php'; require_once $config['homedir'].'/include/class/Tree.class.php';
use PandoraFMS\Enterprise\Service;
/**
* Class to handle service tree view.
*/
class TreeService extends Tree class TreeService extends Tree
{ {
/**
* Some definitions.
*
* @var boolean
*/
protected $propagateCounters = true; protected $propagateCounters = true;
/**
* Some definitions.
*
* @var boolean
*/
protected $displayAllGroups = false; protected $displayAllGroups = false;
/**
* If element is stored on remote node, this value will be greater than 0.
*
* @var integer
*/
public $metaID = 0;
public function __construct($type, $rootType='', $id=-1, $rootID=-1, $serverID=false, $childrenMethod='on_demand', $access='AR') /**
{ * Flag to avoid double connection to node.
*
* @var boolean
*/
private $connectedToNode = false;
/**
* Builder.
*
* @param mixed $type Type.
* @param string $rootType RootType.
* @param integer $id Id.
* @param integer $rootID RootID.
* @param boolean $serverID ServerID.
* @param string $childrenMethod ChildrenMethod.
* @param string $access Access.
* @param integer $id_server_meta Id_server_meta.
*/
public function __construct(
$type,
$rootType='',
$id=-1,
$rootID=-1,
$serverID=false,
$childrenMethod='on_demand',
$access='AR',
$id_server_meta=0
) {
global $config; global $config;
parent::__construct($type, $rootType, $id, $rootID, $serverID, $childrenMethod, $access); if ($id_server_meta > 0) {
$this->metaID = $id_server_meta;
$this->serverID = $id_server_meta;
}
parent::__construct(
$type,
$rootType,
$id,
$rootID,
$serverID,
$childrenMethod,
$access,
$id_server_meta
);
$this->L1fieldName = 'id_group'; $this->L1fieldName = 'id_group';
$this->L1extraFields = [ $this->L1extraFields = [
@ -41,25 +121,60 @@ class TreeService extends Tree
$this->L2inner = 'LEFT JOIN tservice_element tse $this->L2inner = 'LEFT JOIN tservice_element tse
ON tse.id_agent = ta.id_agente'; ON tse.id_agent = ta.id_agente';
$this->L2condition = 'AND tse.id_service='.$this->id; $this->L2condition = sprintf(
' AND tse.id_service=%d AND tse.id_server_meta=0 ',
$this->id
);
} }
/**
* Setter (propagate counters).
*
* @param boolean $value Set.
*
* @return void
*/
public function setPropagateCounters($value) public function setPropagateCounters($value)
{ {
$this->propagateCounters = (bool) $value; $this->propagateCounters = (bool) $value;
} }
/**
* Set display all groups.
*
* @param boolean $value Set.
*
* @return void
*/
public function setDisplayAllGroups($value) public function setDisplayAllGroups($value)
{ {
$this->displayAllGroups = (bool) $value; $this->displayAllGroups = (bool) $value;
} }
/**
* Generates tree data.
*
* @return void
*/
protected function getData() protected function getData()
{ {
if (is_metaconsole() === true && $this->metaID > 0) {
// Impersonate node.
\enterprise_include_once('include/functions_metaconsole.php');
\enterprise_hook(
'metaconsole_connect',
[
null,
$this->metaID,
]
);
$this->connectedToNode = true;
}
if ($this->id == -1) { if ($this->id == -1) {
$this->getFirstLevel(); $this->getFirstLevel();
} else if ($this->type == 'services') { } else if ($this->type == 'services') {
@ -67,9 +182,19 @@ class TreeService extends Tree
} else if ($this->type == 'agent') { } else if ($this->type == 'agent') {
$this->getThirdLevel(); $this->getThirdLevel();
} }
if (is_metaconsole() === true && $this->metaID > 0) {
// Restore connection.
\enterprise_hook('metaconsole_restore_db');
}
} }
/**
* Generates first level data.
*
* @return void
*/
protected function getFirstLevel() protected function getFirstLevel()
{ {
global $config; global $config;
@ -118,10 +243,13 @@ class TreeService extends Tree
} }
/**
* Retrieve root services.
*
* @return array Of root services.
*/
protected function getProcessedServices() protected function getProcessedServices()
{ {
$fields = $this->getFirstLevelFields();
$is_favourite = $this->getServiceFavouriteFilter(); $is_favourite = $this->getServiceFavouriteFilter();
if (users_can_manage_group_all('AR')) { if (users_can_manage_group_all('AR')) {
@ -131,29 +259,32 @@ class TreeService extends Tree
} }
$sql = sprintf( $sql = sprintf(
"SELECT t1.* 'SELECT
FROM tservice_element tss ts.id,
RIGHT JOIN ts.id_agent_module,
(SELECT ts.id, ts.id_agent_module, ts.name, ts.name AS `alias`, ts.id AS `rootID`, ts.name,
'services' AS rootType, 'services' AS type, ts.name as `alias`,
0 AS quiet, ts.id as `rootID`,
SUM(if((tse.id_agent<>0), 1, 0)) AS `total_agents`, "services" as `rootType`,
SUM(if((tse.id_agente_modulo<>0), 1, 0)) AS `total_modules`, "services" as `type`,
SUM(if((tse.id_service_child<>0), 1, 0)) AS `total_services` ts.quiet,
FROM tservice ts SUM(if((tse.id_agent<>0), 1, 0)) AS `total_agents`,
LEFT JOIN tservice_element tse SUM(if((tse.id_agente_modulo<>0), 1, 0)) AS `total_modules`,
ON ts.id=tse.id_service SUM(if((tse.id_service_child<>0), 1, 0)) AS `total_services`,
WHERE SUM(if((tse.rules != ""), 1, 0)) AS `total_dynamic`
1=1 FROM tservice ts
%s LEFT JOIN tservice_element tse
%s ON tse.id_service = ts.id
GROUP BY id WHERE ts.id NOT IN (
) as t1 SELECT DISTINCT id_service_child
ON tss.id_service_child = t1.id FROM tservice_element
WHERE tss.id_service_child IS NULL WHERE id_server_meta = 0
", )
$groups_acl, %s
$is_favourite %s
GROUP BY ts.id',
$is_favourite,
$groups_acl
); );
$stats = db_get_all_rows_sql($sql); $stats = db_get_all_rows_sql($sql);
@ -161,8 +292,13 @@ class TreeService extends Tree
$services = []; $services = [];
foreach ($stats as $service) { foreach ($stats as $service) {
$services[$service['id']] = $this->getProcessedItem($services[$service['id']]); $services[$service['id']] = $this->getProcessedItem(
if (($service['total_services'] + $service['total_agents'] + $service['total_modules']) > 0) { $services[$service['id']]
);
$n_items = ($service['total_services'] + $service['total_agents']);
$n_items += ($service['total_modules'] + $service['total_dynamic']);
if ($n_items > 0) {
$services[$service['id']]['searchChildren'] = 1; $services[$service['id']]['searchChildren'] = 1;
} else { } else {
$services[$service['id']]['searchChildren'] = 0; $services[$service['id']]['searchChildren'] = 0;
@ -182,6 +318,13 @@ class TreeService extends Tree
} }
/**
* Retrieve first level fields.
*
* @deprecated 746.
*
* @return string With a first level fields.
*/
protected function getFirstLevelFields() protected function getFirstLevelFields()
{ {
$fields = []; $fields = [];
@ -190,187 +333,349 @@ class TreeService extends Tree
} }
/**
* Retrieves elements (second level) from selected rootID.
*
* @return void
*/
protected function getSecondLevel() protected function getSecondLevel()
{ {
$data = []; $service = new Service($this->id, true);
$data_agents = [];
$data_modules = [];
$data_services = [];
$sql = $this->getSecondLevelSql(); $output = [];
$data_agents = db_process_sql($sql); foreach ($service->children() as $item) {
$tmp = [];
if (empty($data_agents)) { if ($this->metaID > 0) {
$data_agents = []; $tmp['metaID'] = $this->metaID;
} } else if ($item->id_server_meta() !== 0) {
$tmp['metaID'] = $item->id_server_meta();
$this->processAgents($data_agents);
foreach ($data_agents as $key => $agent) {
$data_agents[$key]['showEventsBtn'] = 1;
$data_agents[$key]['eventAgent'] = $agent['id'];
}
$sql = $this->getSecondLevelModulesSql();
$data_modules = db_process_sql($sql);
if (empty($data_modules)) {
$data_modules = [];
} else {
foreach ($data_modules as $key => $module) {
switch ($module['estado']) {
case '0':
$module_status = 'ok';
$module_title = 'NORMAL';
break;
case '1':
$module_status = 'critical';
$module_title = 'CRITICAL';
break;
case '2':
$module_status = 'warning';
$module_title = 'WARNING';
break;
case '3':
$module_status = 'down';
$module_title = 'UNKNOWN';
break;
case '4':
$module_status = 'no_data';
$module_title = 'NOT INITIALIZED';
break;
default:
$module_status = 'down';
$module_title = 'UNKNOWN';
break;
}
$data_modules[$key]['statusImageHTML'] = '<img src="images/status_sets/default/agent_'.$module_status.'_ball.png" data-title="'.$module_title.' status." data-use_title_for_force_title="1" class="forced_title" alt="'.$module_title.' status." />';
$data_modules[$key]['showEventsBtn'] = 1;
$data_modules[$key]['eventModule'] = $module['id_agente_modulo'];
}
}
$sql = $this->getSecondLevelServicesSql();
$data_services = db_process_sql($sql);
$service_stats = [];
foreach ($data_services as $service) {
$service_stats[$service['id']]['id'] = (int) $service['id'];
$service_stats[$service['id']]['name'] = $service['name'];
$service_stats[$service['id']]['alias'] = $service['name'];
if (($service['total_services'] + $service['total_agents'] + $service['total_modules']) > 0) {
$service_stats[$service['id']]['searchChildren'] = 1;
} else {
$services[$service['id']]['searchChildren'] = 0;
} }
$service_stats[$service['id']]['rootID'] = $service['rootID']; $tmp['serverID'] = $tmp['metaID'];
$service_stats[$service['id']]['rootType'] = $service['rootType'];
$service_stats[$service['id']]['type'] = 'services';
$service_stats[$service['id']]['children'] = [];
$service_stats[$service['id']]['serviceDetail'] = 'index.php?sec=network&sec2=enterprise/operation/services/services&tab=service_map&id_service='.(int) $service['id'];
$service_stats[$service['id']]['counters'] = [
'total_services' => $service['total_services'],
'total_agents' => $service['total_agents'],
'total_modules' => $service['total_modules'],
];
}
$own_info = get_user_info($config['id_user']); switch ($item->type()) {
case SERVICE_ELEMENT_AGENT:
if ($item->agent() === null) {
// Skip item.
continue 2;
}
if ($own_info['is_admin'] || check_acl($config['id_user'], 0, 'PM')) { $tmp['id'] = $item->agent()->id_agente();
$display_all_services = true; $tmp['name'] = $item->agent()->nombre();
} else { $tmp['alias'] = $item->agent()->alias();
$display_all_services = false; $tmp['fired_count'] = $item->agent()->fired_count();
} $tmp['normal_count'] = $item->agent()->normal_count();
$tmp['warning_count'] = $item->agent()->warning_count();
$tmp['critical_count'] = $item->agent()->critical_count();
$tmp['unknown_count'] = $item->agent()->unknown_count();
$tmp['notinit_count'] = $item->agent()->notinit_count();
$tmp['total_count'] = $item->agent()->total_count();
$services = services_get_services($filter, false, $display_all_services); if ($item->agent()->quiet() > 0
|| $item->agent()->cps() > 0
) {
$tmp['quiet'] = 1;
} else {
$tmp['quiet'] = 0;
}
foreach ($services as $row) { $tmp['state_critical'] = $tmp['critical_count'];
if (!array_key_exists($row['id'], $service_stats)) { $tmp['state_warning'] = $tmp['warning_count'];
continue; $tmp['state_unknown'] = $tmp['unknown_count'];
} $tmp['state_notinit'] = $tmp['notinit_count'];
$tmp['state_normal'] = $tmp['normal_count'];
$tmp['state_total'] = $tmp['total_count'];
$tmp['type'] = SERVICE_ELEMENT_AGENT;
$tmp['rootID'] = $this->rootID;
$tmp['rootType'] = $this->rootType;
$tmp['counters'] = [
'alerts' => $item->agent()->fired_count(),
'ok' => $item->agent()->normal_count(),
'warning' => $item->agent()->warning_count(),
'critical' => $item->agent()->critical_count(),
'unknown' => $item->agent()->unknown_count(),
'not_init' => $item->agent()->notinit_count(),
'total' => $item->agent()->total_count(),
];
$status = services_get_status($row, true); switch ($item->agent()->lastStatus()) {
case AGENT_STATUS_NORMAL:
$tmp['statusImageHTML'] = '<img src="images/status_sets/default/agent_ok_ball.png" data-title="NORMAL status." data-use_title_for_force_title="1" class="forced_title" alt="NORMAL status." />';
break;
switch ($status) { case AGENT_STATUS_CRITICAL:
case SERVICE_STATUS_NORMAL: case AGENT_STATUS_ALERT_FIRED:
$service_stats[$row['id']]['statusImageHTML'] = '<img src="images/status_sets/default/agent_ok_ball.png" data-title="NORMAL status." data-use_title_for_force_title="1" class="forced_title" alt="NORMAL status." />'; $tmp['statusImageHTML'] = '<img src="images/status_sets/default/agent_critical_ball.png" data-title="CRITICAL status." data-use_title_for_force_title="1" class="forced_title" alt="CRITICAL status." />';
break;
case AGENT_STATUS_WARNING:
$tmp['statusImageHTML'] = '<img src="images/status_sets/default/agent_warning_ball.png" data-title="WARNING status." data-use_title_for_force_title="1" class="forced_title" alt="WARNING status." />';
break;
case AGENT_STATUS_UNKNOWN:
default:
$tmp['statusImageHTML'] = '<img src="images/status_sets/default/agent_no_data_ball.png" data-title="UNKNOWN status." data-use_title_for_force_title="1" class="forced_title" alt="UNKNOWN status." />';
break;
}
$tmp['children'] = [];
$tmp['searchChildren'] = 1;
$tmp['showEventsBtn'] = 1;
$tmp['eventAgent'] = $item->agent()->id_agente();
break; break;
case SERVICE_STATUS_CRITICAL: case SERVICE_ELEMENT_MODULE:
$service_stats[$row['id']]['statusImageHTML'] = '<img src="images/status_sets/default/agent_critical_ball.png" data-title="CRITICAL status." data-use_title_for_force_title="1" class="forced_title" alt="CRITICAL status." />'; if ($item->module() === null) {
// Skip item.
continue 2;
}
$tmp['id'] = $item->module()->id_agente_modulo();
$tmp['name'] = $item->module()->nombre();
$tmp['id_tipo_modulo'] = $item->module()->id_tipo_modulo();
$tmp['id_modulo'] = $item->module()->id_modulo();
$tmp['estado'] = $item->module()->lastStatus();
$tmp['datos'] = $item->module()->lastValue();
$tmp['parent'] = $item->module()->parent_module_id();
$alerts = alerts_get_alerts_module_name(
$item->module()->id_agente_modulo()
);
if ($alerts !== false) {
// Seems to be used as 'flag'.
$tmp['alerts'] = $alerts[0]['id'];
}
$tmp['unit'] = $item->module()->unit();
$tmp['type'] = SERVICE_ELEMENT_MODULE;
$tmp['id_module_type'] = $item->module()->id_tipo_modulo();
$tmp['server_type'] = $tmp['id_module_type'];
$tmp['status'] = $item->module()->lastStatus();
$tmp['value'] = modules_get_agentmodule_data_for_humans(
array_merge(
$item->module()->toArray(),
[ 'datos' => $item->module()->lastValue() ]
)
);
$title = $item->module()->lastStatusTitle();
if (is_numeric($item->module()->lastValue())) {
$divisor = get_data_multiplier($item->module()->unit());
$title .= ' : '.format_for_graph(
$item->module()->lastValue(),
1,
'.',
',',
$divisor
);
} else {
$title .= ' : '.substr(
io_safe_output(
$item->module()->lastValue()
),
0,
42
);
}
$tmp['serverName'] = $item->module()->agent()->server_name();
$tmp['serverID'] = $tmp['metaID'];
$tmp['statusText'] = $item->module()->lastStatusText();
$tmp['showGraphs'] = 1;
$tmp['showEventsBtn'] = 1;
$tmp['eventAgent'] = $item->module()->id_agente();
$html = '<img src="';
$html .= ui_get_full_url(
'/images/status_sets/default/'.$item->module()->lastStatusImage()
);
$html .= '" data-title="'.$title;
$html .= '" data-use_title_for_force_title="1" ';
$html .= 'class="forced_title" alt="';
$html .= $item->module()->lastStatusTitle().'" />';
$tmp['statusImageHTML'] = $html;
$tmp = array_merge(
$tmp,
$this->getModuleGraphLinks(
$tmp
)
);
break; break;
case SERVICE_STATUS_WARNING: case SERVICE_ELEMENT_SERVICE:
$service_stats[$row['id']][$key]['statusImageHTML'] = '<img src="images/status_sets/default/agent_warning_ball.png" data-title="WARNING status." data-use_title_for_force_title="1" class="forced_title" alt="WARNING status." />'; if ($item->service() === null) {
// Skip item.
continue 2;
}
$tmp['id'] = (int) $item->service()->id();
$tmp['name'] = $item->service()->name();
$tmp['alias'] = $item->service()->name();
if ($this->connectedToNode === false
&& is_metaconsole() === true
&& $tmp['metaID'] > 0
) {
// Impersonate node.
\enterprise_include_once('include/functions_metaconsole.php');
\enterprise_hook(
'metaconsole_connect',
[
null,
$tmp['metaID'],
]
);
}
$grandchildren = $item->service()->children();
if ($this->connectedToNode === false
&& is_metaconsole() === true
&& $tmp['metaID'] > 0
) {
// Restore connection.
\enterprise_hook('metaconsole_restore_db');
}
$counters = [
'total_modules' => 0,
'total_agents' => 0,
'total_services' => 0,
'total_dynamic' => 0,
'total' => 0,
];
if (is_array($grandchildren) === true) {
$counters = array_reduce(
$grandchildren,
function ($carry, $item) {
if ($item->type() === SERVICE_ELEMENT_MODULE) {
$carry['total_modules']++;
} else if ($item->type() === SERVICE_ELEMENT_AGENT) {
$carry['total_agents']++;
} else if ($item->type() === SERVICE_ELEMENT_SERVICE) {
$carry['total_services']++;
} else if ($item->type() === SERVICE_ELEMENT_DYNAMIC) {
$carry['total_dynamic']++;
}
$carry['total']++;
return $carry;
},
$counters
);
}
if ($counters['total'] > 0) {
$tmp['searchChildren'] = 1;
}
$tmp['type'] = 'services';
$tmp['rootType'] = 'services';
$tmp['children'] = [];
$tmp['serviceDetail'] = ui_get_full_url(
'index.php?sec=network&sec2=enterprise/operation/services/services&tab=service_map&id_service='.$item->service()->id()
);
$tmp['counters'] = $counters;
$tmp['rootID'] = $this->rootID;
switch ($item->service()->lastStatus()) {
case SERVICE_STATUS_NORMAL:
$tmp['statusImageHTML'] = '<img src="';
$tmp['statusImageHTML'] .= ui_get_full_url(
'images/status_sets/default/agent_ok_ball.png'
);
$tmp['statusImageHTML'] .= '" data-title="NORMAL status." data-use_title_for_force_title="1" class="forced_title" alt="NORMAL status." />';
break;
case SERVICE_STATUS_CRITICAL:
$tmp['statusImageHTML'] = '<img src="';
$tmp['statusImageHTML'] .= ui_get_full_url(
'images/status_sets/default/agent_critical_ball.png'
);
$tmp['statusImageHTML'] .= '" data-title="CRITICAL status." data-use_title_for_force_title="1" class="forced_title" alt="CRITICAL status." />';
break;
case SERVICE_STATUS_WARNING:
$tmp['statusImageHTML'] = '<img src="';
$tmp['statusImageHTML'] .= ui_get_full_url(
'images/status_sets/default/agent_warning_ball.png'
);
$tmp['statusImageHTML'] .= '" data-title="WARNING status." data-use_title_for_force_title="1" class="forced_title" alt="WARNING status." />';
break;
case SERVICE_STATUS_UNKNOWN:
default:
$tmp['statusImageHTML'] = '<img src="';
$tmp['statusImageHTML'] .= ui_get_full_url(
'images/status_sets/default/agent_no_data_ball.png'
);
$tmp['statusImageHTML'] .= '" data-title="UNKNOWN status." data-use_title_for_force_title="1" class="forced_title" alt="UNKNOWN status." />';
break;
}
break; break;
case SERVICE_STATUS_UNKNOWN:
default: default:
$service_stats[$row['id']]['statusImageHTML'] = '<img src="images/status_sets/default/agent_no_data_ball.png" data-title="UNKNOWN status." data-use_title_for_force_title="1" class="forced_title" alt="UNKNOWN status." />'; // Unknown type.
break; continue 2;
} }
$output[] = $tmp;
} }
$data_services = array_values($service_stats); $this->tree = $output;
$data = array_merge($data_services, $data_agents, $data_modules);
if (empty($data)) {
$this->tree = [];
return;
}
$this->tree = $data;
} }
/**
* SQL query to retrieve second level items.
*
* @return string SQL.
*/
protected function getSecondLevelServicesSql() protected function getSecondLevelServicesSql()
{ {
$group_acl = $this->getGroupAclCondition(); $group_acl = $this->getGroupAclCondition();
$sql = "SELECT ts.id, ts.name, tse1.id_service AS `rootID`, 'services' AS rootType, 'services' AS type, 0 AS quiet, SUM(if((tse2.id_agent<>0), 1, 0)) AS `total_agents`, SUM(if((tse2.id_agente_modulo<>0), 1, 0)) AS `total_modules`, SUM(if((tse2.id_service_child<>0), 1, 0)) AS `total_services`, 0 AS fired_count, 0 AS normal_count, 0 AS warning_count, 0 AS critical_count, 0 AS unknown_count, 0 AS notinit_count, 0 AS state_critical, 0 AS state_warning, 0 AS state_unknown, 0 AS state_notinit, 0 AS state_normal, 0 AS state_total, '' AS statusImageHTML, '' AS alertImageHTML $sql = sprintf(
FROM tservice_element tse1 'SELECT
LEFT JOIN tservice_element tse2 ON tse1.id_service_child=tse2.id_service ts.id,
LEFT JOIN tservice ts ON tse1.id_service_child=ts.id ts.id_agent_module,
WHERE tse1.id_service=$this->id AND tse1.id_service_child<>0 ts.name,
GROUP BY tse1.id_service_child ts.name as `alias`,
"; tse.id_service as `rootID`,
"services" as `rootType`,
"services" as `type`,
ts.quiet,
tse.id_server_meta,
SUM(if((tse.id_agent<>0), 1, 0)) AS `total_agents`,
SUM(if((tse.id_agente_modulo<>0), 1, 0)) AS `total_modules`,
SUM(if((tse.id_service_child<>0), 1, 0)) AS `total_services`
FROM tservice ts
INNER JOIN tservice_element tse
ON tse.id_service_child = ts.id
WHERE
tse.id_service = %d
%s
GROUP BY ts.id',
$this->id,
$group_acl
);
return $sql; return $sql;
} }
protected function getSecondLevelModulesSql() /**
{ * Retrieve SQL filter for current filte.r
$sql = "SELECT tse.id_agente_modulo, nombre AS `name`, nombre AS `alias`, tse.id_service AS `rootID`, 'services' AS `rootType`, 'modules' AS `type`, estado *
FROM tservice_element tse * @return string SQL filter.
INNER JOIN tagente_modulo tam ON tse.id_agente_modulo=tam.id_agente_modulo */
INNER JOIN tagente_estado tae ON tam.id_agente_modulo=tae.id_agente_estado
WHERE tse.id_service=$this->id AND tse.id_agente_modulo<>0
";
return $sql;
}
protected function getAgentStatusFilter($status=self::TV_DEFAULT_AGENT_STATUS)
{
return '';
}
protected function getServiceFavouriteFilter() protected function getServiceFavouriteFilter()
{ {
if (isset($this->filter['is_favourite']) && !empty($this->filter['is_favourite'])) { if (isset($this->filter['is_favourite']) === true
&& empty($this->filter['is_favourite']) === false
) {
return ' AND is_favourite = 1'; return ' AND is_favourite = 1';
} }
@ -378,4 +683,70 @@ class TreeService extends Tree
} }
/**
* Overwrites partial functionality of general Tree.class.
*
* @param array $module Data of given module.
*
* @return array Complementary information.
*/
protected function getModuleGraphLinks(array $module)
{
$graphType = return_graphtype($module['id_module_type']);
$url = ui_get_full_url(
'operation/agentes/stat_win.php',
false,
false,
false
);
$winHandle = dechex(crc32($module['id'].$module['name']));
$graph_params = [
'type' => $graphType,
'period' => SECONDS_1DAY,
'id' => $module['id'],
'refresh' => SECONDS_10MINUTES,
];
if (is_metaconsole() === true) {
// Set the server id.
$graph_params['server'] = $module['serverID'];
}
$graph_params_str = http_build_query($graph_params);
$moduleGraphURL = $url.'?'.$graph_params_str;
return [
'moduleGraph' => [
'url' => $moduleGraphURL,
'handle' => $winHandle,
],
'snapshot' => ui_get_snapshot_link(
[
'id_module' => $module['id'],
'interval' => $module['current_interval'],
'module_name' => $module['name'],
'id_node' => (($module['serverID'] > 0) ? $module['serverID'] : 0),
],
true
),
];
}
/**
* Needs to be defined to maintain Tree view functionality.
*
* @param integer $status Status.
*
* @return string Fixed string.
*/
protected function getAgentStatusFilter(
$status=self::TV_DEFAULT_AGENT_STATUS
) {
return '';
}
} }

View File

@ -20,8 +20,8 @@
/** /**
* Pandora build version and version * Pandora build version and version
*/ */
$build_version = 'PC200706'; $build_version = 'PC200807';
$pandora_version = 'v7.0NG.747'; $pandora_version = 'v7.0NG.748';
// Do not overwrite default timezone set if defined. // Do not overwrite default timezone set if defined.
$script_tz = @date_default_timezone_get(); $script_tz = @date_default_timezone_get();

View File

@ -261,17 +261,27 @@ define('SERVICE_STATUS_NORMAL', 0);
define('SERVICE_STATUS_CRITICAL', 1); define('SERVICE_STATUS_CRITICAL', 1);
define('SERVICE_STATUS_WARNING', 2); define('SERVICE_STATUS_WARNING', 2);
define('SERVICE_STATUS_ALERT', 4); define('SERVICE_STATUS_ALERT', 4);
// Default weights. // Default service weights.
define('SERVICE_WEIGHT_CRITICAL', 1); define('SERVICE_WEIGHT_CRITICAL', 1);
define('SERVICE_WEIGHT_WARNING', 0.5); define('SERVICE_WEIGHT_WARNING', 0.5);
define('SERVICE_SMART_WEIGHT_CRITICAL', 50);
define('SERVICE_SMART_WEIGHT_WARNING', 30);
// Default service element weights.
define('SERVICE_ELEMENT_WEIGHT_CRITICAL', 1); define('SERVICE_ELEMENT_WEIGHT_CRITICAL', 1);
define('SERVICE_ELEMENT_WEIGHT_WARNING', 0.5); define('SERVICE_ELEMENT_WEIGHT_WARNING', 0.5);
define('SERVICE_ELEMENT_WEIGHT_OK', 0); define('SERVICE_ELEMENT_WEIGHT_OK', 0);
define('SERVICE_ELEMENT_WEIGHT_UNKNOWN', 0); define('SERVICE_ELEMENT_WEIGHT_UNKNOWN', 0);
define('SERVICE_ELEMENT_SMART_CRITICAL', 100);
define('SERVICE_ELEMENT_SMART_WARNING', 50);
// Service element types.
define('SERVICE_ELEMENT_AGENT', 'agent');
define('SERVICE_ELEMENT_MODULE', 'module');
define('SERVICE_ELEMENT_SERVICE', 'service');
define('SERVICE_ELEMENT_DYNAMIC', 'dynamic');
// Modes. // Modes.
define('SERVICE_MODE_MANUAL', 0); define('SERVICE_MODE_MANUAL', 0);
define('SERVICE_MODE_AUTO', 1); define('SERVICE_MODE_SMART', 1);
define('SERVICE_MODE_SIMPLE', 2);

View File

@ -3209,7 +3209,7 @@ function get_refresh_time_array()
} }
function date2strftime_format($date_format) function date2strftime_format($date_format, $timestamp=null)
{ {
$replaces_list = [ $replaces_list = [
'D' => '%a', 'D' => '%a',
@ -3232,11 +3232,14 @@ function date2strftime_format($date_format)
'A' => '%p', 'A' => '%p',
'i' => '%M', 'i' => '%M',
's' => '%S', 's' => '%S',
'u' => '%s',
'O' => '%z', 'O' => '%z',
'T' => '%Z', 'T' => '%Z',
'%' => '%%', '%' => '%%',
'G' => '%k', 'G' => '%k',
'z' => '%j',
'U' => '%s',
'c' => '%FT%T%z',
'r' => '%d %b %Y %H:%M:%S %z',
]; ];
$return = ''; $return = '';
@ -3249,7 +3252,30 @@ function date2strftime_format($date_format)
if (isset($replaces_list[$c])) { if (isset($replaces_list[$c])) {
$return .= $replaces_list[$c]; $return .= $replaces_list[$c];
} else { } else {
$return .= $c; // Check extra formats.
switch ($date_format) {
default: $return .= date($date_format, $timestamp);
break;
case 'n':
if (stristr(PHP_OS, 'win')) {
$return .= '%#m';
} else {
$return .= '%-m';
}
case 'u':
if (preg_match('/^[0-9]*\\.([0-9]+)$/', $timestamp, $reg)) {
$decimal = substr(str_pad($reg[1], 6, '0'), 0, 6);
} else {
$decimal = '000000';
}
$return .= $decimal;
break;
break;
}
} }
} }
@ -3623,6 +3649,14 @@ function color_graph_array()
} }
/**
* Label graph Sparse.
*
* @param array $data Data chart.
* @param array $show_elements_graph Data visual styles chart.
*
* @return array Array label.
*/
function series_type_graph_array($data, $show_elements_graph) function series_type_graph_array($data, $show_elements_graph)
{ {
global $config; global $config;
@ -3645,7 +3679,13 @@ function series_type_graph_array($data, $show_elements_graph)
$color_series = color_graph_array(); $color_series = color_graph_array();
if ($show_elements_graph['id_widget_dashboard']) { if ($show_elements_graph['id_widget_dashboard']) {
$opcion = unserialize(db_get_value_filter('options', 'twidget_dashboard', ['id' => $show_elements_graph['id_widget_dashboard']])); $opcion = unserialize(
db_get_value_filter(
'options',
'twidget_dashboard',
['id' => $show_elements_graph['id_widget_dashboard']]
)
);
if ($show_elements_graph['graph_combined']) { if ($show_elements_graph['graph_combined']) {
foreach ($show_elements_graph['modules_id'] as $key => $value) { foreach ($show_elements_graph['modules_id'] as $key => $value) {
$color_series[$key] = [ $color_series[$key] = [
@ -3674,13 +3714,15 @@ function series_type_graph_array($data, $show_elements_graph)
if (strpos($key, 'summatory') !== false) { if (strpos($key, 'summatory') !== false) {
$data_return['series_type'][$key] = $type_graph; $data_return['series_type'][$key] = $type_graph;
$data_return['legend'][$key] = __('Summatory series').' '.$str; $data_return['legend'][$key] = __('Summatory series').' '.$str;
$data_return['color'][$key] = $color_series['summatory']; $data_return['color'][$key] = $color_series['summatory'];
} else if (strpos($key, 'average') !== false) { } else if (strpos($key, 'average') !== false) {
$data_return['series_type'][$key] = $type_graph; $data_return['series_type'][$key] = $type_graph;
$data_return['legend'][$key] = __('Average series').' '.$str; $data_return['legend'][$key] = __('Average series').' '.$str;
$data_return['color'][$key] = $color_series['average']; $data_return['color'][$key] = $color_series['average'];
} else if (strpos($key, 'sum') !== false || strpos($key, 'baseline') !== false) { } else if (strpos($key, 'sum') !== false
|| strpos($key, 'baseline') !== false
) {
switch ($value['id_module_type']) { switch ($value['id_module_type']) {
case 21: case 21:
case 2: case 2:
@ -3702,28 +3744,56 @@ function series_type_graph_array($data, $show_elements_graph)
&& (count($show_elements_graph['labels']) > 0) && (count($show_elements_graph['labels']) > 0)
) { ) {
if ($show_elements_graph['unit']) { if ($show_elements_graph['unit']) {
$name_legend = $show_elements_graph['labels'][$value['agent_module_id']].' / '.__('Unit ').' '.$show_elements_graph['unit'].': '; $name_legend = $show_elements_graph['labels'][$value['agent_module_id']];
$data_return['legend'][$key] = $show_elements_graph['labels'][$value['agent_module_id']].' / '.__('Unit ').' '.$show_elements_graph['unit'].': '; $name_legend .= ' / ';
$name_legend .= __('Unit ').' ';
$name_legend .= $show_elements_graph['unit'].': ';
} else { } else {
$name_legend = $show_elements_graph['labels'][$value['agent_module_id']].': '; $name_legend = $show_elements_graph['labels'][$value['agent_module_id']].': ';
$data_return['legend'][$key] = $show_elements_graph['labels'][$value['agent_module_id']].': ';
} }
} else { } else {
if (strpos($key, 'baseline') !== false) { if (strpos($key, 'baseline') !== false) {
if ($value['unit']) { if ($value['unit']) {
$name_legend = $data_return['legend'][$key] = $value['agent_alias'].' / '.$value['module_name'].' / '.__('Unit ').' '.$value['unit'].'Baseline '; $name_legend = $value['agent_alias'];
$name_legend .= ' / ';
$name_legend .= $value['module_name'];
$name_legend .= ' / ';
$name_legend .= __('Unit ').' ';
$name_legend .= $value['unit'].'Baseline ';
} else { } else {
$name_legend = $data_return['legend'][$key] = $value['agent_alias'].' / '.$value['module_name'].'Baseline '; $name_legend = $value['agent_alias'];
$name_legend .= ' / ';
$name_legend .= $value['module_name'].'Baseline ';
} }
} else { } else {
$name_legend = '';
if ((int) $config['type_mode_graph'] === 1) {
$name_legend .= 'Avg: ';
}
if ($value['unit']) { if ($value['unit']) {
$name_legend = $data_return['legend'][$key] = $value['agent_alias'].' / '.$value['module_name'].' / '.__('Unit ').' '.$value['unit'].': '; $name_legend .= $value['agent_alias'];
$name_legend .= ' / ';
$name_legend .= $value['module_name'];
$name_legend .= ' / ';
$name_legend .= __('Unit ').' ';
$name_legend .= $value['unit'].': ';
} else { } else {
$name_legend = $data_return['legend'][$key] = $value['agent_alias'].' / '.$value['module_name'].': '; $name_legend .= $value['agent_alias'];
$name_legend .= ' / ';
$name_legend .= $value['module_name'].': ';
} }
} }
} }
if (isset($value['weight']) === true
&& empty($value['weight']) === false
) {
$name_legend .= ' ('.__('Weight');
$name_legend .= ' * '.$value['weight'].') ';
}
$data_return['legend'][$key] = $name_legend;
if ((int) $value['min'] === PHP_INT_MAX) { if ((int) $value['min'] === PHP_INT_MAX) {
$value['min'] = 0; $value['min'] = 0;
} }
@ -3749,36 +3819,63 @@ function series_type_graph_array($data, $show_elements_graph)
) )
).' '.$str; ).' '.$str;
if ($show_elements_graph['compare'] == 'overlapped' && $key == 'sum2') { if ($show_elements_graph['compare'] == 'overlapped'
&& $key == 'sum2'
) {
$data_return['color'][$key] = $color_series['overlapped']; $data_return['color'][$key] = $color_series['overlapped'];
} else { } else {
$data_return['color'][$key] = $color_series[$i]; $data_return['color'][$key] = $color_series[$i];
$i++; $i++;
} }
} else if (!$show_elements_graph['fullscale'] && strpos($key, 'min') !== false } else if (!$show_elements_graph['fullscale']
|| !$show_elements_graph['fullscale'] && strpos($key, 'max') !== false && strpos($key, 'min') !== false
|| !$show_elements_graph['fullscale']
&& strpos($key, 'max') !== false
) { ) {
$data_return['series_type'][$key] = $type_graph; $data_return['series_type'][$key] = $type_graph;
$name_legend = '';
if ((int) $config['type_mode_graph'] === 1) {
if (strpos($key, 'min') !== false) {
$name_legend .= 'Min: ';
}
if (strpos($key, 'max') !== false) {
$name_legend .= 'Max: ';
}
}
if ($show_elements_graph['unit']) { if ($show_elements_graph['unit']) {
$name_legend = $data_return['legend'][$key] = $value['agent_alias'].' / '.$value['module_name'].' / '.__('Unit ').' '.$show_elements_graph['unit'].': '; $name_legend .= $value['agent_alias'];
$name_legend .= ' / ';
$name_legend .= $value['module_name'];
$name_legend .= ' / ';
$name_legend .= __('Unit ').' ';
$name_legend .= $show_elements_graph['unit'].': ';
} else { } else {
$name_legend = $data_return['legend'][$key] = $value['agent_alias'].' / '.$value['module_name'].': '; $name_legend .= $value['agent_alias'];
$name_legend .= ' / ';
$name_legend .= $value['module_name'].': ';
} }
$data_return['legend'][$key] = $name_legend; $data_return['legend'][$key] = $name_legend;
if ($show_elements_graph['type_mode_graph']) { if ($show_elements_graph['type_mode_graph']) {
$data_return['legend'][$key] .= __('Min:').remove_right_zeros( $data_return['legend'][$key] .= __('Min:');
$data_return['legend'][$key] .= remove_right_zeros(
number_format( number_format(
$value['min'], $value['min'],
$config['graph_precision'] $config['graph_precision']
) )
).' '.__('Max:').remove_right_zeros( );
$data_return['legend'][$key] .= ' '.__('Max:');
$data_return['legend'][$key] .= remove_right_zeros(
number_format( number_format(
$value['max'], $value['max'],
$config['graph_precision'] $config['graph_precision']
) )
).' '._('Avg:').remove_right_zeros( );
$data_return['legend'][$key] .= ' '._('Avg:');
$data_return['legend'][$key] .= remove_right_zeros(
number_format( number_format(
$value['avg'], $value['avg'],
$config['graph_precision'] $config['graph_precision']
@ -3786,7 +3883,9 @@ function series_type_graph_array($data, $show_elements_graph)
).' '.$str; ).' '.$str;
} }
if ($show_elements_graph['compare'] == 'overlapped' && $key == 'sum2') { if ($show_elements_graph['compare'] == 'overlapped'
&& $key == 'sum2'
) {
$data_return['color'][$key] = $color_series['overlapped']; $data_return['color'][$key] = $color_series['overlapped'];
} else { } else {
$data_return['color'][$key] = $color_series[$i]; $data_return['color'][$key] = $color_series[$i];

View File

@ -2067,36 +2067,33 @@ function agents_get_addresses($id_agent)
function agents_get_status_from_counts($agent) function agents_get_status_from_counts($agent)
{ {
// Check if in the data there are all the necessary values // Check if in the data there are all the necessary values
if (!isset($agent['normal_count']) if (isset($agent['normal_count']) === false
&& !isset($agent['warning_count']) && isset($agent['warning_count']) === false
&& !isset($agent['critical_count']) && isset($agent['critical_count']) === false
&& !isset($agent['unknown_count']) && isset($agent['unknown_count']) === false
&& !isset($agent['notinit_count']) && isset($agent['notinit_count']) === false
&& !isset($agent['total_count']) && isset($agent['total_count']) === false
) { ) {
return -1; return -1;
} }
// Juanma (05/05/2014) Fix: This status is not init! 0 modules or all not init // Juanma (05/05/2014) Fix: This status is not init! 0 modules or all not init.
if ($agent['notinit_count'] == $agent['total_count']) { if ($agent['notinit_count'] == $agent['total_count']) {
return AGENT_MODULE_STATUS_NOT_INIT; return AGENT_STATUS_NOT_INIT;
} }
if ($agent['critical_count'] > 0) { if ($agent['critical_count'] > 0) {
return AGENT_MODULE_STATUS_CRITICAL_BAD; return AGENT_STATUS_CRITICAL;
} else if ($agent['warning_count'] > 0) { } else if ($agent['warning_count'] > 0) {
return AGENT_MODULE_STATUS_WARNING; return AGENT_STATUS_WARNING;
} else if ($agent['unknown_count'] > 0) { } else if ($agent['unknown_count'] > 0) {
return AGENT_MODULE_STATUS_UNKNOWN; return AGENT_STATUS_UNKNOWN;
} else if ($agent['normal_count'] == $agent['total_count']) { } else if ($agent['normal_count'] == $agent['total_count']) {
return AGENT_MODULE_STATUS_NORMAL; return AGENT_STATUS_NORMAL;
} else if (($agent['normal_count'] + $agent['notinit_count']) == $agent['total_count']) { } else if (($agent['normal_count'] + $agent['notinit_count']) == $agent['total_count']) {
return AGENT_MODULE_STATUS_NORMAL; return AGENT_STATUS_NORMAL;
} }
// ~ else if($agent['notinit_count'] == $agent['total_count']) {
// ~ return AGENT_MODULE_STATUS_NORMAL;
// ~ }
return -1; return -1;
} }

View File

@ -12286,12 +12286,29 @@ function api_set_create_event($id, $trash1, $other, $returnType)
return; return;
} }
if (!empty($other['data'][17]) && is_metaconsole()) {
$id_server = db_get_row_filter('tmetaconsole_setup', ['id' => $other['data'][17]]);
if ($id_server === false) {
returnError('error_create_event', __('Server id does not exist in database.'));
return;
}
$values['server_id'] = $other['data'][17];
} else {
$values['server_id'] = 0;
}
$error_msg = ''; $error_msg = '';
if ($other['data'][2] != '') { if ($other['data'][2] != '') {
$id_agent = $other['data'][2]; $id_agent = $other['data'][2];
if (is_metaconsole()) { if (is_metaconsole()) {
// On metaconsole, connect with the node to check the permissions // On metaconsole, connect with the node to check the permissions
$agent_cache = db_get_row('tmetaconsole_agent', 'id_tagente', $id_agent); if (empty($values['server_id'])) {
$agent_cache = db_get_row('tmetaconsole_agent', 'id_tagente', $id_agent);
} else {
$agent_cache = db_get_row_filter('tmetaconsole_agent', ['id_tagente' => $id_agent, 'id_tmetaconsole_setup' => $values['server_id']]);
}
if ($agent_cache === false) { if ($agent_cache === false) {
returnError('id_not_found', 'string'); returnError('id_not_found', 'string');
return; return;
@ -12420,12 +12437,6 @@ function api_set_create_event($id, $trash1, $other, $returnType)
$values['custom_data'] = ''; $values['custom_data'] = '';
} }
if ($other['data'][17] != '') {
$values['server_id'] = $other['data'][17];
} else {
$values['server_id'] = 0;
}
if ($other['data'][18] != '') { if ($other['data'][18] != '') {
$values['id_extra'] = $other['data'][18]; $values['id_extra'] = $other['data'][18];
$sql_validation = 'SELECT id_evento FROM tevento where estado IN (0,2) and id_extra ="'.$other['data'][18].'";'; $sql_validation = 'SELECT id_evento FROM tevento where estado IN (0,2) and id_extra ="'.$other['data'][18].'";';
@ -13123,6 +13134,9 @@ function api_set_create_service($thrash1, $thrash2, $other, $thrash3)
$quiet = $other['data'][11]; $quiet = $other['data'][11];
$cascade_protection = $other['data'][12]; $cascade_protection = $other['data'][12];
$evaluate_sla = $other['data'][13]; $evaluate_sla = $other['data'][13];
$is_favourite = $other['data'][14];
$unknown_as_critical = $other['data'][15];
$server_name = $other['data'][16];
if (empty($name)) { if (empty($name)) {
returnError('error_create_service', __('Error in creation service. No name')); returnError('error_create_service', __('Error in creation service. No name'));
@ -13189,24 +13203,40 @@ function api_set_create_service($thrash1, $thrash2, $other, $thrash3)
$evaluate_sla = 0; $evaluate_sla = 0;
} }
$result = services_create_service( if (empty($is_favourite)) {
$name, $is_favourite = false;
$description, }
$id_group,
$critical, if (empty($unknown_as_critical)) {
$warning, $unknown_as_critical = false;
SECONDS_5MINUTES, }
$mode,
$id_agent, if (empty($server_name)) {
$sla_interval, $server_name = null;
$sla_limit, }
$id_warning_module_template,
$id_critical_module_template, $result = enterprise_hook(
$id_unknown_module_template, 'services_create_service',
$id_critical_module_sla, [
$quiet, $name,
$cascade_protection, $description,
$evaluate_sla $id_group,
$critical,
$warning,
false,
SECONDS_5MINUTES,
$mode,
$id_agent,
$sla_interval,
$sla_limit,
$id_warning_module_template,
$id_critical_module_template,
$id_unknown_module_template,
$id_critical_module_sla,
$quiet,
$cascade_protection,
$evaluate_sla,
]
); );
if ($result) { if ($result) {
@ -13225,7 +13255,7 @@ function api_set_create_service($thrash1, $thrash2, $other, $thrash3)
* @param array $other it's array, $other as param is <name>;<description>;<id_group>;<critical>; * @param array $other it's array, $other as param is <name>;<description>;<id_group>;<critical>;
* <warning>;<id_agent>;<sla_interval>;<sla_limit>;<id_warning_module_template_alert>; * <warning>;<id_agent>;<sla_interval>;<sla_limit>;<id_warning_module_template_alert>;
* <id_critical_module_template_alert>;<id_critical_module_sla_template_alert>;<quiet>; * <id_critical_module_template_alert>;<id_critical_module_sla_template_alert>;<quiet>;
* <cascade_protection>;<evaluate_sla>; * <cascade_protection>;<evaluate_sla>;<is_favourite>;<unknown_as_critical>;<server_name>;
* in this order and separator char (after text ; ) and separator * in this order and separator char (after text ; ) and separator
* (pass in param othermode as othermode=url_encode_separator_<separator>) * (pass in param othermode as othermode=url_encode_separator_<separator>)
* @param $thrash3 Don't use * @param $thrash3 Don't use
@ -13342,25 +13372,46 @@ function api_set_update_service($thrash1, $thrash2, $other, $thrash3)
$evaluate_sla = $service['evaluate_sla']; $evaluate_sla = $service['evaluate_sla'];
} }
$result = services_update_service( $is_favourite = $other['data'][14];
$id_service, if (empty($is_favourite)) {
$name, $is_favourite = $service['is_favourite'];
$description, }
$id_group,
$critical, $unknown_as_critical = $other['data'][15];
$warning, if (empty($unknown_as_critical)) {
SECONDS_5MINUTES, $unknown_as_critical = $service['unknown_as_critical'];
$mode, }
$id_agent,
$sla_interval, $server_name = $other['data'][16];
$sla_limit, if (empty($server_name)) {
$id_warning_module_template, $server_name = $service['server_name'];
$id_critical_module_template, }
$id_unknown_module_template,
$id_critical_module_sla, $result = enterprise_hook(
$quiet, 'services_update_service',
$cascade_protection, [
$evaluate_sla $id_service,
$name,
$description,
$id_group,
$critical,
$warning,
SECONDS_5MINUTES,
$mode,
$id_agent,
$sla_interval,
$sla_limit,
$id_warning_module_template,
$id_critical_module_template,
$id_unknown_module_template,
$id_critical_module_sla,
$quiet,
$cascade_protection,
$evaluate_sla,
$is_favourite,
$unknown_as_critical,
$server_name,
]
); );
if ($result) { if ($result) {
@ -16111,3 +16162,38 @@ function api_get_event_mcid($server_id, $console_event_id, $trash2, $returnType)
return; return;
} }
} }
/**
* Function to set events in progress status.
*
* @param [int] $event_id Id event (Node or Meta).
* @param [string] $trash2 don't use.
* @param [string] $returnType
*
* Example
* http://127.0.0.1/pandora_console/include/api.php?op=set&op2=event_in_progress&return_type=json&id=0&apipass=1234&user=admin&pass=pandora
*
* @return void
*/
function api_set_event_in_progress($event_id, $trash2, $returnType)
{
global $config;
if (is_metaconsole()) {
$table = 'tmetaconsole_event';
} else {
$table = 'tevento';
}
$event = db_process_sql_update(
$table,
['estado' => 2],
['id_evento' => $event_id]
);
if ($event !== false) {
returnData('string', ['data' => $event]);
} else {
returnError('id_not_found', 'string');
}
}

View File

@ -1340,6 +1340,10 @@ function config_update_config()
$error_update[] = __('CSV divider'); $error_update[] = __('CSV divider');
} }
if (!config_update_value('csv_decimal_separator', (string) get_parameter('csv_decimal_separator', '.'))) {
$error_update[] = __('CSV decimal separator');
}
if (!config_update_value('use_data_multiplier', get_parameter('use_data_multiplier', '1'))) { if (!config_update_value('use_data_multiplier', get_parameter('use_data_multiplier', '1'))) {
$error_update[] = __('Use data multiplier'); $error_update[] = __('Use data multiplier');
} }
@ -2875,6 +2879,10 @@ function config_process_config()
config_update_value('csv_divider', ';'); config_update_value('csv_divider', ';');
} }
if (!isset($config['csv_decimal_separator'])) {
config_update_value('csv_decimal_separator', '.');
}
if (!isset($config['use_data_multiplier'])) { if (!isset($config['use_data_multiplier'])) {
config_update_value('use_data_multiplier', '1'); config_update_value('use_data_multiplier', '1');
} }

View File

@ -2118,7 +2118,7 @@ function events_comment(
switch ($comments_format) { switch ($comments_format) {
case 'new': case 'new':
$comment_for_json['comment'] = $comment; $comment_for_json['comment'] = io_safe_input($comment);
$comment_for_json['action'] = $action; $comment_for_json['action'] = $action;
$comment_for_json['id_user'] = $config['id_user']; $comment_for_json['id_user'] = $config['id_user'];
$comment_for_json['utimestamp'] = time(); $comment_for_json['utimestamp'] = time();
@ -2141,7 +2141,7 @@ function events_comment(
$comment = str_replace(["\r\n", "\r", "\n"], '<br>', $comment); $comment = str_replace(["\r\n", "\r", "\n"], '<br>', $comment);
if ($comment != '') { if ($comment != '') {
$commentbox = '<div style="border:1px dotted #CCC; min-height: 10px;">'.$comment.'</div>'; $commentbox = '<div style="border:1px dotted #CCC; min-height: 10px;">'.io_safe_input($comment).'</div>';
} else { } else {
$commentbox = ''; $commentbox = '';
} }
@ -3377,7 +3377,7 @@ function events_page_responses($event, $childrens_ids=[])
); );
if ($strict_user) { if ($strict_user) {
$user_name = db_get_value( $user_name = db_get_value(
'fullname', 'id_user',
'tusuario', 'tusuario',
'id_user', 'id_user',
$config['id_user'] $config['id_user']
@ -3395,14 +3395,14 @@ function events_page_responses($event, $childrens_ids=[])
} }
foreach ($users as $u) { foreach ($users as $u) {
$owners[$u['id_user']] = $u['fullname']; $owners[$u['id_user']] = $u['id_user'];
} }
if ($event['owner_user'] == '') { if ($event['owner_user'] == '') {
$owner_name = __('None'); $owner_name = __('None');
} else { } else {
$owner_name = db_get_value( $owner_name = db_get_value(
'fullname', 'id_user',
'tusuario', 'tusuario',
'id_user', 'id_user',
$event['owner_user'] $event['owner_user']
@ -3424,7 +3424,7 @@ function events_page_responses($event, $childrens_ids=[])
'owner_button', 'owner_button',
false, false,
'event_change_owner();', 'event_change_owner();',
'class="sub next"', 'class="sub next w70p"',
true true
); );
@ -3504,7 +3504,7 @@ function events_page_responses($event, $childrens_ids=[])
'status_button', 'status_button',
false, false,
'event_change_status(\''.$event['similar_ids'].'\');', 'event_change_status(\''.$event['similar_ids'].'\');',
'class="sub next"', 'class="sub next w70p"',
true true
); );
} }
@ -3520,7 +3520,7 @@ function events_page_responses($event, $childrens_ids=[])
'comment_button', 'comment_button',
false, false,
'$(\'#link_comments\').trigger(\'click\');', '$(\'#link_comments\').trigger(\'click\');',
'class="sub next"', 'class="sub next w70p"',
true true
); );
@ -3544,7 +3544,7 @@ function events_page_responses($event, $childrens_ids=[])
'delete_button', 'delete_button',
false, false,
'if(!confirm(\''.__('Are you sure?').'\')) { return false; } this.form.submit();', 'if(!confirm(\''.__('Are you sure?').'\')) { return false; } this.form.submit();',
'class="sub cancel"', 'class="sub cancel w70p"',
true true
); );
$data[2] .= html_print_input_hidden('delete', 1, true); $data[2] .= html_print_input_hidden('delete', 1, true);
@ -3599,7 +3599,7 @@ function events_page_responses($event, $childrens_ids=[])
'custom_response_button', 'custom_response_button',
false, false,
'execute_response('.$event['id_evento'].','.$server_id.')', 'execute_response('.$event['id_evento'].','.$server_id.')',
"class='sub next'", "class='sub next w70p'",
true true
); );
} }

View File

@ -36,7 +36,8 @@ function forecast_projection_graph(
$prediction_period, $prediction_period,
$max_value=false, $max_value=false,
$min_value=false, $min_value=false,
$csv=false $csv=false,
$server_name=''
) { ) {
global $config; global $config;
@ -55,7 +56,7 @@ function forecast_projection_graph(
'projection' => true, 'projection' => true,
]; ];
$module_data = grafico_modulo_sparse($params); $module_data = grafico_modulo_sparse($params, $server_name);
if (empty($module_data)) { if (empty($module_data)) {
return []; return [];
@ -252,12 +253,13 @@ function forecast_prediction_date(
$module_id, $module_id,
$period=SECONDS_2MONTHS, $period=SECONDS_2MONTHS,
$max_value=0, $max_value=0,
$min_value=0 $min_value=0,
$server_name=''
) { ) {
// Checks interval // Checks interval
if ($min_value > $max_value) { if ($min_value > $max_value) {
return false; return false;
} }
return forecast_projection_graph($module_id, $period, false, $max_value, $min_value); return forecast_projection_graph($module_id, $period, false, $max_value, $min_value, false, $server_name);
} }

View File

@ -616,7 +616,7 @@ function grafico_modulo_sparse_data(
* *
* @return string html Content graphs. * @return string html Content graphs.
*/ */
function grafico_modulo_sparse($params) function grafico_modulo_sparse($params, $server_name='')
{ {
global $config; global $config;
@ -812,6 +812,12 @@ function grafico_modulo_sparse($params)
$date_array['final_date'] = $params['date']; $date_array['final_date'] = $params['date'];
$date_array['start_date'] = ($params['date'] - $params['period']); $date_array['start_date'] = ($params['date'] - $params['period']);
if (is_metaconsole()) {
$id_meta = metaconsole_get_id_server($server_name);
$server = metaconsole_get_connection_by_id($id_meta);
metaconsole_connect($server);
}
if ($agent_module_id) { if ($agent_module_id) {
$module_data = db_get_row_sql( $module_data = db_get_row_sql(
'SELECT * FROM tagente_modulo 'SELECT * FROM tagente_modulo
@ -1022,6 +1028,10 @@ function grafico_modulo_sparse($params)
} }
} }
if (is_metaconsole()) {
metaconsole_restore_db();
}
return $return; return $return;
} }
@ -1275,9 +1285,22 @@ function graphic_combined_module(
} }
if ($count_modules > 0) { if ($count_modules > 0) {
$sources = true; foreach ($module_list as $key => $value) {
$sources[$key]['id_server'] = $value['server'];
$sources[$key]['id_agent_module'] = $value['module'];
$sources[$key]['weight'] = $weights[$key];
$sources[$key]['label'] = $params_combined['labels'];
}
} }
} else { } else {
if (is_metaconsole()) {
metaconsole_restore_db();
$server = metaconsole_get_connection_by_id($params['server_id']);
if (metaconsole_connect($server) != NOERR) {
return false;
}
}
$sources = db_get_all_rows_field_filter( $sources = db_get_all_rows_field_filter(
'tgraph_source', 'tgraph_source',
'id_graph', 'id_graph',
@ -1285,8 +1308,18 @@ function graphic_combined_module(
'field_order' 'field_order'
); );
if (is_metaconsole()) {
if (isset($sources) && is_array($sources)) {
foreach ($sources as $key => $value) {
$sources[$key]['id_server'] = $params['server_id'];
}
}
}
$series = db_get_all_rows_sql( $series = db_get_all_rows_sql(
'SELECT summatory_series,average_series, modules_series 'SELECT summatory_series,
average_series,
modules_series
FROM tgraph FROM tgraph
WHERE id_graph = '.$params_combined['id_graph'] WHERE id_graph = '.$params_combined['id_graph']
); );
@ -1295,45 +1328,76 @@ function graphic_combined_module(
$average = $series[0]['average_series']; $average = $series[0]['average_series'];
$modules_series = $series[0]['modules_series']; $modules_series = $series[0]['modules_series'];
if (is_metaconsole()) {
metaconsole_restore_db();
}
}
if (isset($sources) && is_array($sources)) {
$weights = []; $weights = [];
$labels = []; $labels = [];
$modules = []; $modules = [];
foreach ($sources as $source) {
if (isset($sources) && is_array($sources)) { if (is_metaconsole() === true) {
foreach ($sources as $source) { $server = metaconsole_get_connection_by_id($source['id_server']);
array_push($modules, $source['id_agent_module']); if (metaconsole_connect($server) != NOERR) {
array_push($weights, $source['weight']); continue;
if ($source['label'] != '' || $params_combined['labels']) {
$id_agent = agents_get_module_id(
$source['id_agent_module']
);
$agent_description = agents_get_description($id_agent);
$agent_group = agents_get_agent_group($id_agent);
$agent_address = agents_get_address($id_agent);
$agent_alias = agents_get_alias($id_agent);
$module_name = modules_get_agentmodule_name(
$source['id_agent_module']
);
$module_description = modules_get_agentmodule_descripcion(
$source['id_agent_module']
);
$items_label = [
'type' => 'custom_graph',
'id_agent' => $id_agent,
'id_agent_module' => $source['id_agent_module'],
'agent_description' => $agent_description,
'agent_group' => $agent_group,
'agent_address' => $agent_address,
'agent_alias' => $agent_alias,
'module_name' => $module_name,
'module_description' => $module_description,
];
$labels[$source['id_agent_module']] = ($source['label'] != '') ? reporting_label_macro($items_label, $source['label']) : reporting_label_macro($item, $params_combined['labels']);
} }
} }
$modulepush = [
'server' => (isset($source['id_server']) === true) ? $source['id_server'] : 0,
'module' => $source['id_agent_module'],
];
array_push($modules, $modulepush);
array_push($weights, $source['weight']);
if ($source['label'] != '' || $params_combined['labels']) {
$id_agent = agents_get_module_id(
$source['id_agent_module']
);
$agent_description = agents_get_description($id_agent);
$agent_group = agents_get_agent_group($id_agent);
$agent_address = agents_get_address($id_agent);
$agent_alias = agents_get_alias($id_agent);
$module_name = modules_get_agentmodule_name(
$source['id_agent_module']
);
$module_description = modules_get_agentmodule_descripcion(
$source['id_agent_module']
);
$items_label = [
'type' => 'custom_graph',
'id_agent' => $id_agent,
'id_agent_module' => $source['id_agent_module'],
'agent_description' => $agent_description,
'agent_group' => $agent_group,
'agent_address' => $agent_address,
'agent_alias' => $agent_alias,
'module_name' => $module_name,
'module_description' => $module_description,
];
if ($source['label'] != '') {
$lab = reporting_label_macro(
$items_label,
$source['label']
);
} else {
$lab = reporting_label_macro(
$items_label,
$params_combined['labels']
);
}
$labels[$source['id_agent_module']] = $lab;
}
if (is_metaconsole() === true) {
metaconsole_restore_db();
}
} }
} }
@ -1429,15 +1493,22 @@ function graphic_combined_module(
continue; continue;
} }
if (is_metaconsole() && $params_combined['type_report'] == 'automatic_graph') { // Only 10 item for chart.
$server = metaconsole_get_connection_by_id($agent_module_id['server']); if ($i > 9) {
break;
}
if (is_metaconsole()) {
$server = metaconsole_get_connection_by_id(
$agent_module_id['server']
);
if (metaconsole_connect($server) != NOERR) { if (metaconsole_connect($server) != NOERR) {
continue; continue;
} }
$agent_module_id = $agent_module_id['module'];
} }
$agent_module_id = $agent_module_id['module'];
$module_data = db_get_row_sql( $module_data = db_get_row_sql(
'SELECT * FROM tagente_modulo 'SELECT * FROM tagente_modulo
WHERE id_agente_modulo = '.$agent_module_id WHERE id_agente_modulo = '.$agent_module_id
@ -1504,19 +1575,28 @@ function graphic_combined_module(
foreach ($value['data'] as $k => $v) { foreach ($value['data'] as $k => $v) {
if ($v[1] != false) { if ($v[1] != false) {
$array_data[$key]['data'][$k][1] = ($v[1] * $params_combined['weight_list'][$i]); $array_data[$key]['data'][$k][1] = ($v[1] * $params_combined['weight_list'][$i]);
$array_data[$key]['slice_data'][$v[0]]['avg'] *= $params_combined['weight_list'][$i];
$array_data[$key]['slice_data'][$v[0]]['min'] *= $params_combined['weight_list'][$i];
$array_data[$key]['slice_data'][$v[0]]['max'] *= $params_combined['weight_list'][$i];
} }
} }
$array_data[$key]['max'] *= $params_combined['weight_list'][$i];
$array_data[$key]['min'] *= $params_combined['weight_list'][$i];
$array_data[$key]['avg'] *= $params_combined['weight_list'][$i];
$array_data[$key]['weight'] = $params_combined['weight_list'][$i];
} }
} }
$max = $array_data['sum'.$i]['max'];
$min = $array_data['sum'.$i]['min'];
$avg = $array_data['sum'.$i]['avg'];
if ($config['fixed_graph'] == false) { if ($config['fixed_graph'] == false) {
$water_mark = [ $water_mark = [
'file' => $config['homedir'].'/images/logo_vertical_water.png', 'file' => $config['homedir'].'/images/logo_vertical_water.png',
'url' => ui_get_full_url('images/logo_vertical_water.png', false, false, false), 'url' => ui_get_full_url(
'images/logo_vertical_water.png',
false,
false,
false
),
]; ];
} }
@ -1525,9 +1605,7 @@ function graphic_combined_module(
$i++; $i++;
if (is_metaconsole() if (is_metaconsole()) {
&& $params_combined['type_report'] == 'automatic_graph'
) {
metaconsole_restore_db(); metaconsole_restore_db();
} }
} }
@ -1763,28 +1841,23 @@ function graphic_combined_module(
} }
foreach ($module_list as $module_item) { foreach ($module_list as $module_item) {
$automatic_custom_graph_meta = false; if (is_metaconsole() === true) {
if ($config['metaconsole']) {
// Automatic custom graph from the report // Automatic custom graph from the report
// template in metaconsole. // template in metaconsole.
if (is_array($module_list[$i])) { $server = metaconsole_get_connection_by_id(
$server = metaconsole_get_connection_by_id( $module_item['server']
$module_item['server'] );
);
metaconsole_connect($server); metaconsole_connect($server);
$automatic_custom_graph_meta = true;
}
}
if ($automatic_custom_graph_meta) {
$module = $module_item['module'];
} else {
$module = $module_item;
} }
$module = $module_item['module'];
$search_in_history_db = db_search_in_history_db($datelimit); $search_in_history_db = db_search_in_history_db($datelimit);
$temp[$module] = io_safe_output(modules_get_agentmodule($module)); $temp[$module] = io_safe_output(
modules_get_agentmodule($module)
);
$query_last_value = sprintf( $query_last_value = sprintf(
' '
SELECT datos SELECT datos
@ -1849,12 +1922,8 @@ function graphic_combined_module(
$temp[$module]['min'] = ($temp_min === false) ? 0 : $temp_min; $temp[$module]['min'] = ($temp_min === false) ? 0 : $temp_min;
if ($config['metaconsole']) { if (is_metaconsole() === true) {
// Automatic custom graph from the metaconsole_restore_db();
// report template in metaconsole.
if (is_array($module_list[0])) {
metaconsole_restore_db();
}
} }
} }
@ -1899,25 +1968,15 @@ function graphic_combined_module(
$i = 0; $i = 0;
$number_elements = count($module_list); $number_elements = count($module_list);
foreach ($module_list as $module_item) { foreach ($module_list as $module_item) {
$automatic_custom_graph_meta = false; if (is_metaconsole() === true) {
if ($config['metaconsole']) { $server = metaconsole_get_connection_by_id(
// Automatic custom graph from $module_item['server']
// the report template in metaconsole. );
if (is_array($module_list[$i])) {
$server = metaconsole_get_connection_by_id( metaconsole_connect($server);
$module_item['server']
);
metaconsole_connect($server);
$automatic_custom_graph_meta = true;
}
}
if ($automatic_custom_graph_meta) {
$module = $module_item['module'];
} else {
$module = $module_item;
} }
$module = $module_item['module'];
$temp[$module] = modules_get_agentmodule($module); $temp[$module] = modules_get_agentmodule($module);
$query_last_value = sprintf( $query_last_value = sprintf(
' '
@ -1973,12 +2032,8 @@ function graphic_combined_module(
$temp[$module]['gauge'] = uniqid('gauge_'); $temp[$module]['gauge'] = uniqid('gauge_');
if ($config['metaconsole']) { if (is_metaconsole() === true) {
// Automatic custom graph from the report metaconsole_restore_db();
// template in metaconsole.
if (is_array($module_list[0])) {
metaconsole_restore_db();
}
} }
$i++; $i++;
@ -2003,6 +2058,12 @@ function graphic_combined_module(
} }
} }
if (isset($params['pdf']) === true && $params['pdf'] === true) {
$transitionDuration = 0;
} else {
$transitionDuration = 500;
}
$output = stacked_gauge( $output = stacked_gauge(
$graph_values, $graph_values,
$new_width, $new_width,
@ -2018,7 +2079,8 @@ function graphic_combined_module(
$config['fontpath'], $config['fontpath'],
$fixed_font_size, $fixed_font_size,
'', '',
$homeurl $homeurl,
$transitionDuration
); );
break; break;
@ -2026,25 +2088,15 @@ function graphic_combined_module(
case CUSTOM_GRAPH_VBARS: case CUSTOM_GRAPH_VBARS:
$label = ''; $label = '';
foreach ($module_list as $module_item) { foreach ($module_list as $module_item) {
$automatic_custom_graph_meta = false;
if (is_metaconsole() === true) { if (is_metaconsole() === true) {
// Automatic custom graph from the report $server = metaconsole_get_connection_by_id(
// template in metaconsole. $module_item['server']
if (is_array($module_list[$i]) === true) { );
$server = metaconsole_get_connection_by_id(
$module_item['server'] metaconsole_connect($server);
);
metaconsole_connect($server);
$automatic_custom_graph_meta = true;
}
}
if ($automatic_custom_graph_meta === true) {
$module = $module_item['module'];
} else {
$module = $module_item;
} }
$module = $module_item['module'];
$module_data = modules_get_agentmodule($module); $module_data = modules_get_agentmodule($module);
$query_last_value = sprintf( $query_last_value = sprintf(
'SELECT datos 'SELECT datos
@ -2093,11 +2145,7 @@ function graphic_combined_module(
} }
if (is_metaconsole() === true) { if (is_metaconsole() === true) {
// Automatic custom graph from the report metaconsole_restore_db();
// template in metaconsole.
if (is_array($module_list[0]) === true) {
metaconsole_restore_db();
}
} }
} }
@ -2167,29 +2215,18 @@ function graphic_combined_module(
case CUSTOM_GRAPH_PIE: case CUSTOM_GRAPH_PIE:
$total_modules = 0; $total_modules = 0;
foreach ($module_list as $module_item) { foreach ($module_list as $module_item) {
$automatic_custom_graph_meta = false; if (is_metaconsole() === true) {
if ($config['metaconsole']) { $server = metaconsole_get_connection_by_id(
// Automatic custom graph from the report $module_item['server']
// template in metaconsole. );
if (is_array($module_list[$i])) {
$server = metaconsole_get_connection_by_id( metaconsole_connect($server);
$module_item['server']
);
metaconsole_connect($server);
$automatic_custom_graph_meta = true;
}
}
if ($automatic_custom_graph_meta) {
$module = $module_item['module'];
} else {
$module = $module_item;
} }
$module = $module_item['module'];
$data_module = modules_get_agentmodule($module); $data_module = modules_get_agentmodule($module);
$query_last_value = sprintf( $query_last_value = sprintf(
' 'SELECT datos
SELECT datos
FROM tagente_datos FROM tagente_datos
WHERE id_agente_modulo = %d WHERE id_agente_modulo = %d
AND utimestamp > %d AND utimestamp > %d
@ -2234,12 +2271,9 @@ function graphic_combined_module(
'value' => $value, 'value' => $value,
'unit' => $data_module['unit'], 'unit' => $data_module['unit'],
]; ];
if ($config['metaconsole']) {
// Automatic custom graph from the report if (is_metaconsole() === true) {
// template in metaconsole. metaconsole_restore_db();
if (is_array($module_list[0])) {
metaconsole_restore_db();
}
} }
} }

View File

@ -737,7 +737,11 @@ function html_print_select_multiple_filtered(
array $sections=[] array $sections=[]
) { ) {
ui_require_css_file('multiselect_filtered'); ui_require_css_file('multiselect_filtered');
ui_require_javascript_file('multiselect_filtered'); if (is_ajax() === true) {
ui_require_javascript_file('multiselect_filtered', 'include/javascript/', true);
} else {
ui_require_javascript_file('multiselect_filtered');
}
if (empty($name) === true) { if (empty($name) === true) {
$rid = uniqid(); $rid = uniqid();
@ -794,7 +798,7 @@ function html_print_select_multiple_filtered(
} }
// Main container. // Main container.
$output .= '<div class="multi-select flex-row-vcenter '.$class.'">'; $output = '<div class="multi-select flex-row-vcenter '.$class.'">';
// Left box. // Left box.
$output .= '<div class="multi-select-container flex-column">'; $output .= '<div class="multi-select-container flex-column">';
@ -941,7 +945,7 @@ function html_print_select_multiple_filtered(
$output .= '</div>'; $output .= '</div>';
// Left box. // Right box.
$output .= '<div class="multi-select-container flex-column">'; $output .= '<div class="multi-select-container flex-column">';
// Filtering. // Filtering.
@ -1062,6 +1066,151 @@ function html_print_select_multiple_filtered(
} }
/**
* Form multiple inputs for slect groups.
*
* @param array $data Data inputs.
*
* @return string Html output.
*/
function html_print_select_multiple_modules_filtered(array $data):string
{
if (is_ajax() === true) {
ui_require_javascript_file(
'multiselect_filtered',
'include/javascript/',
true
);
} else {
ui_require_javascript_file('multiselect_filtered');
}
$uniqId = $data['uniqId'];
// Group.
$output = '<div>';
$output .= html_print_input(
[
'label' => __('Group'),
'name' => 'filtered-module-group-'.$uniqId,
'returnAllGroup' => true,
'privilege' => 'AR',
'type' => 'select_groups',
'return' => true,
'script' => 'fmAgentChange(\''.$uniqId.'\')',
'selected' => $data['mGroup'],
]
);
// Recursion.
$output .= html_print_input(
[
'label' => __('Recursion'),
'type' => 'switch',
'name' => 'filtered-module-recursion-'.$uniqId,
'value' => (empty($data['mRecursion']) === true) ? false : true,
'checked' => (empty($data['mRecursion']) === true) ? false : true,
'return' => true,
'id' => 'filtered-module-recursion-'.$uniqId,
'onchange' => 'fmAgentChange(\''.$uniqId.'\')',
]
);
// Groups module.
$module_groups = db_get_all_rows_sql(
'SELECT * FROM tmodule_group ORDER BY name'
);
$module_groups = array_reduce(
$module_groups,
function ($carry, $item) {
$carry[$item['id_mg']] = $item['name'];
return $carry;
}
);
$output .= html_print_input(
[
'label' => __('Module group'),
'type' => 'select',
'fields' => $module_groups,
'name' => 'filtered-module-module-group-'.$uniqId,
'selected' => $data['mModuleGroup'],
'return' => true,
'nothing' => __('All'),
'nothing_value' => 0,
'script' => 'fmModuleChange(\''.$uniqId.'\')',
]
);
$output .= '</div>';
$output .= '<div>';
// Agent.
$agents = agents_get_group_agents($data['mGroup']);
if ((empty($agents)) === true || $agents == -1) {
$agents = [];
}
$output .= html_print_input(
[
'label' => __('Agents'),
'type' => 'select',
'fields' => $agents,
'name' => 'filtered-module-agents-'.$uniqId,
'selected' => explode(',', $data['mAgents']),
'return' => true,
'multiple' => true,
'style' => 'min-width: 200px;max-width:200px;',
'script' => 'fmModuleChange(\''.$uniqId.'\')',
]
);
// Show common modules.
$selection = [
0 => __('Show common modules'),
1 => __('Show all modules'),
];
$output .= html_print_input(
[
'label' => __('Show common modules'),
'type' => 'select',
'fields' => $selection,
'name' => 'filtered-module-show-common-modules-'.$uniqId,
'selected' => $data['mShowCommonModules'],
'return' => true,
'script' => 'fmModuleChange(\''.$uniqId.'\')',
]
);
$all_modules = select_modules_for_agent_group(
$data['mModuleGroup'],
explode(',', $data['mAgents']),
$data['mShowCommonModules'],
false
);
$output .= html_print_input(
[
'label' => __('Modules'),
'type' => 'select',
'fields' => $all_modules,
'name' => 'filtered-module-modules-'.$uniqId,
'selected' => explode(',', $data['mModules']),
'return' => true,
'multiple' => true,
'style' => 'min-width: 200px;max-width:200px;',
]
);
$output .= '</div>';
if ($data['return'] === false) {
echo $output;
}
return $output;
}
/** /**
* Prints an array of fields in a popup menu of a form based on a SQL query. * Prints an array of fields in a popup menu of a form based on a SQL query.
* The first and second columns of the query will be used. * The first and second columns of the query will be used.
@ -1615,6 +1764,55 @@ function html_print_extended_select_for_cron($hour='*', $minute='*', $mday='*',
} }
/**
* Prints an input slide.
*
* @param string $name Name.
* @param integer $value Value.
* @param string $id Id.
* @param boolean $return Return.
* @param integer $min Min.
* @param integer $max Max.
* @param integer $step Step.
* @param string $class Class.
* @param string $oninput Oninput.
*
* @return string HTML code for input.
*/
function html_print_input_range(
$name,
$value,
$id='',
$return=true,
$min=0,
$max=100,
$step=1,
$class='',
$oninput=''
) {
$output = '<input type="range" ';
if (isset($value) === true) {
$output .= ' value="'.$value.'" ';
}
$output .= ' name="'.$name.'" ';
$output .= ' id="'.$id.'" ';
$output .= ' min="'.$min.'" ';
$output .= ' max="'.$max.'" ';
$output .= ' step="'.$step.'" ';
$output .= ' class="'.$class.'" ';
$output .= ' oninput="'.$oninput.'" ';
$output .= ' />';
if ($return === false) {
echo $return;
}
return $output;
}
/** /**
* Render an input text element. Extended version, use html_print_input_text() to simplify. * Render an input text element. Extended version, use html_print_input_text() to simplify.
* *
@ -1639,13 +1837,14 @@ function html_print_input_text_extended(
$alt, $alt,
$size, $size,
$maxlength, $maxlength,
$disabled, $readonly,
$script, $script,
$attributes, $attributes,
$return=false, $return=false,
$password=false, $password=false,
$function='', $function='',
$autocomplete='off' $autocomplete='off',
$disabled=false
) { ) {
static $idcounter = 0; static $idcounter = 0;
@ -1701,10 +1900,14 @@ function html_print_input_text_extended(
$output = '<input '.($password ? 'type="password" autocomplete="'.$autocomplete.'" ' : 'type="text" '); $output = '<input '.($password ? 'type="password" autocomplete="'.$autocomplete.'" ' : 'type="text" ');
if ($disabled && (!is_array($attributes) || !array_key_exists('disabled', $attributes))) { if ($readonly && (!is_array($attributes) || !array_key_exists('readonly', $attributes))) {
$output .= 'readonly="readonly" '; $output .= 'readonly="readonly" ';
} }
if ($disabled && (!is_array($attributes) || !array_key_exists('disabled', $attributes))) {
$output .= 'disabled="disabled" ';
}
if (is_array($attributes)) { if (is_array($attributes)) {
foreach ($attributes as $attribute => $attr_value) { foreach ($attributes as $attribute => $attr_value) {
if (! in_array($attribute, $valid_attrs)) { if (! in_array($attribute, $valid_attrs)) {
@ -1908,7 +2111,7 @@ function html_print_input_text(
$size=50, $size=50,
$maxlength=255, $maxlength=255,
$return=false, $return=false,
$disabled=false, $readonly=false,
$required=false, $required=false,
$function='', $function='',
$class='', $class='',
@ -1917,7 +2120,8 @@ function html_print_input_text(
$autofocus=false, $autofocus=false,
$onKeyDown='', $onKeyDown='',
$formTo='', $formTo='',
$onKeyUp='' $onKeyUp='',
$disabled=false
) { ) {
if ($maxlength == 0) { if ($maxlength == 0) {
$maxlength = 255; $maxlength = 255;
@ -1969,12 +2173,14 @@ function html_print_input_text(
$alt, $alt,
$size, $size,
$maxlength, $maxlength,
$disabled, $readonly,
'', '',
$attr, $attr,
$return, $return,
false, false,
$function $function,
'off',
$disabled
); );
} }
@ -2467,8 +2673,16 @@ function html_print_button($label='OK', $name='', $disabled=false, $script='', $
* *
* @return string HTML code if return parameter is true. * @return string HTML code if return parameter is true.
*/ */
function html_print_textarea($name, $rows, $columns, $value='', $attributes='', $return=false, $class='', $disable=false) function html_print_textarea(
{ $name,
$rows,
$columns,
$value='',
$attributes='',
$return=false,
$class='',
$disable=false
) {
$disabled = ($disable) ? 'disabled' : ''; $disabled = ($disable) ? 'disabled' : '';
$output = '<textarea id="textarea_'.$name.'" name="'.$name.'" cols="'.$columns.'" rows="'.$rows.'" '.$attributes.' class="'.$class.'" '.$disabled.'>'; $output = '<textarea id="textarea_'.$name.'" name="'.$name.'" cols="'.$columns.'" rows="'.$rows.'" '.$attributes.' class="'.$class.'" '.$disabled.'>';
$output .= ($value); $output .= ($value);
@ -2829,7 +3043,11 @@ function html_print_table(&$table, $return=false)
$style[$key] = ''; $style[$key] = '';
} }
$output .= '<td id="'.$tableid.'-'.$keyrow.'-'.$key.'" style="'.$cellstyle[$keyrow][$key].$style[$key].$valign[$key].$align[$key].$size[$key].$wrap[$key].'" '.$colspan[$keyrow][$key].' '.$rowspan[$keyrow][$key].' class="'.$class.' '.$cellclass[$keyrow][$key].'">'.$item.'</td>'."\n"; if ($class === 'datos5' && $key === 1) {
$output .= '<td id="'.$tableid.'-'.$keyrow.'-'.$key.'" style="'.$cellstyle[$keyrow][$key].$style[$key].$valign[$key].$align[$key].$size[$key].$wrap[$key].$colspan[$keyrow][$key].' '.$rowspan[$keyrow][$key].' class="'.$class.' '.$cellclass[$keyrow][$key].'">'.$item.'</td>'."\n";
} else {
$output .= '<td id="'.$tableid.'-'.$keyrow.'-'.$key.'" style="'.$cellstyle[$keyrow][$key].$style[$key].$valign[$key].$align[$key].$size[$key].$wrap[$key].'" '.$colspan[$keyrow][$key].' '.$rowspan[$keyrow][$key].' class="'.$class.' '.$cellclass[$keyrow][$key].'">'.$item.'</td>'."\n";
}
} }
$output .= '</tr>'."\n"; $output .= '</tr>'."\n";
@ -3661,21 +3879,16 @@ function html_print_timezone_select($name, $selected='')
* Enclose a text into a result_div * Enclose a text into a result_div
* *
* @param string Text to enclose * @param string Text to enclose
* @param boolean Return formatted text without html tags.
* *
* @return string Text inside the result_div * @return string Text inside the result_div
*/ */
function html_print_result_div($text, $text_only) function html_print_result_div($text)
{ {
$text = preg_replace('/</', '&lt;', $text); $text = preg_replace('/</', '&lt;', $text);
$text = preg_replace('/>/', '&gt;', $text); $text = preg_replace('/>/', '&gt;', $text);
$text = preg_replace('/\n/i', '<br>', $text); $text = preg_replace('/\n/i', '<br>', $text);
$text = preg_replace('/\s/i', '&nbsp;', $text); $text = preg_replace('/\s/i', '&nbsp;', $text);
if ($text_only) {
return $text;
}
$enclose = "<div id='result_div' style='width: 100%; height: 100%; overflow: auto; padding: 10px; font-size: 14px; line-height: 16px; font-family: mono,monospace; text-align: left'>"; $enclose = "<div id='result_div' style='width: 100%; height: 100%; overflow: auto; padding: 10px; font-size: 14px; line-height: 16px; font-family: mono,monospace; text-align: left'>";
$enclose .= $text; $enclose .= $text;
$enclose .= '</div>'; $enclose .= '</div>';
@ -3746,6 +3959,8 @@ function html_print_csrf_error()
* disabled: Disabled. Cannot be pressed. * disabled: Disabled. Cannot be pressed.
* id: Optional id for the switch. * id: Optional id for the switch.
* class: Additional classes (string). * class: Additional classes (string).
* value: Check or not (boolean).
* disabled: Enabled or disabled (boolean).
* *
* @return string with HTML of button. * @return string with HTML of button.
*/ */
@ -3887,6 +4102,20 @@ function html_print_input($data, $wrapper='div', $input_only=false)
); );
break; break;
case 'range':
$output .= html_print_input_range(
$data['name'],
$data['value'],
(isset($data['id']) ? $data['id'] : ''),
(isset($data['return']) ? $data['return'] : true),
(isset($data['min']) ? $data['min'] : 0),
(isset($data['max']) ? $data['max'] : 100),
(isset($data['step']) ? $data['step'] : 1),
(isset($data['class']) ? $data['class'] : ''),
(isset($data['oninput']) ? $data['oninput'] : '')
);
break;
case 'image': case 'image':
$output .= html_print_input_image( $output .= html_print_input_image(
$data['name'], $data['name'],
@ -4046,6 +4275,25 @@ function html_print_input($data, $wrapper='div', $input_only=false)
); );
break; break;
case 'select_metaconsole_nodes':
$output .= html_print_select_from_sql(
'SELECT `id`, `server_name` FROM `tmetaconsole_setup`',
$data['name'],
((isset($data['selected']) === true) ? $data['selected'] : ''),
((isset($data['script']) === true) ? $data['script'] : ''),
((isset($data['nothing']) === true) ? $data['nothing'] : ''),
((isset($data['nothing_value']) === true) ? $data['nothing_value'] : '0'),
((isset($data['return']) === true) ? $data['return'] : false),
((isset($data['multiple']) === true) ? $data['multiple'] : false),
((isset($data['sort']) === true) ? $data['sort'] : true),
((isset($data['disabled']) === true) ? $data['disabled'] : false),
((isset($data['style']) === true) ? $data['style'] : false),
((isset($data['size']) === true) ? $data['size'] : false),
((isset($data['trucate_size']) === true) ? $data['trucate_size'] : GENERIC_SIZE_TEXT),
((isset($data['class']) === true) ? $data['class'] : '')
);
break;
case 'select_for_unit': case 'select_for_unit':
$output .= html_print_extended_select_for_unit( $output .= html_print_extended_select_for_unit(
$data['name'], $data['name'],
@ -4058,7 +4306,7 @@ function html_print_input($data, $wrapper='div', $input_only=false)
((isset($data['select_style']) === true) ? $data['select_style'] : false), ((isset($data['select_style']) === true) ? $data['select_style'] : false),
((isset($data['unique_name']) === true) ? $data['unique_name'] : true), ((isset($data['unique_name']) === true) ? $data['unique_name'] : true),
((isset($data['disabled']) === true) ? $data['disabled'] : false), ((isset($data['disabled']) === true) ? $data['disabled'] : false),
((isset($data['disabled']) === true) ? $data['disabled'] : 0) ((isset($data['no_change']) === true) ? $data['no_change'] : 0)
); );
case 'submit': case 'submit':
@ -4093,7 +4341,7 @@ function html_print_input($data, $wrapper='div', $input_only=false)
case 'interval': case 'interval':
$output .= html_print_extended_select_for_time( $output .= html_print_extended_select_for_time(
$data['name'], $data['name'],
$data['value'], ((isset($data['value']) === true) ? $data['value'] : $data['selected']),
((isset($data['script']) === true) ? $data['script'] : ''), ((isset($data['script']) === true) ? $data['script'] : ''),
((isset($data['nothing']) === true) ? $data['nothing'] : ''), ((isset($data['nothing']) === true) ? $data['nothing'] : ''),
((isset($data['nothing_value']) === true) ? $data['nothing_value'] : 0), ((isset($data['nothing_value']) === true) ? $data['nothing_value'] : 0),
@ -4154,6 +4402,11 @@ function html_print_input($data, $wrapper='div', $input_only=false)
$output .= html_print_input_multicheck($data); $output .= html_print_input_multicheck($data);
break; break;
case 'agent_autocomplete':
// Direct assignment of parameters.
$output .= ui_print_agent_autocomplete_input($data);
break;
case 'autocomplete_agent': case 'autocomplete_agent':
$agent_name = ''; $agent_name = '';
if (isset($data['id_agent_hidden']) === true if (isset($data['id_agent_hidden']) === true
@ -4186,6 +4439,7 @@ function html_print_input($data, $wrapper='div', $input_only=false)
} }
$params = []; $params = [];
$params['disabled'] = $data['disabled'];
$params['return'] = $data['return']; $params['return'] = $data['return'];
$params['show_helptip'] = false; $params['show_helptip'] = false;
$params['input_name'] = $data['name']; $params['input_name'] = $data['name'];
@ -4249,7 +4503,7 @@ function html_print_input($data, $wrapper='div', $input_only=false)
0 => __('Select an Agent first'), 0 => __('Select an Agent first'),
]; ];
} else { } else {
$string_filter .= ''; $string_filter = '';
if ($data['get_only_string_modules'] === true) { if ($data['get_only_string_modules'] === true) {
$string_filter = 'AND id_tipo_modulo IN (17,23,3,10,33,36)'; $string_filter = 'AND id_tipo_modulo IN (17,23,3,10,33,36)';
} }
@ -4335,6 +4589,10 @@ function html_print_input($data, $wrapper='div', $input_only=false)
); );
break; break;
case 'select_multiple_modules_filtered':
$output .= html_print_select_multiple_modules_filtered($data);
break;
default: default:
// Ignore. // Ignore.
break; break;

View File

@ -188,6 +188,7 @@ function profile_print_profile_table($id)
$title = __('Profiles/Groups assigned to this user'); $title = __('Profiles/Groups assigned to this user');
$table = new stdClass(); $table = new stdClass();
$table->id = 'table_profiles';
$table->width = '100%'; $table->width = '100%';
$table->class = 'info_table'; $table->class = 'info_table';
if (defined('METACONSOLE')) { if (defined('METACONSOLE')) {
@ -216,10 +217,30 @@ function profile_print_profile_table($id)
$table->head['actions'] = __('Action'); $table->head['actions'] = __('Action');
$table->align['actions'] = 'center'; $table->align['actions'] = 'center';
$result = db_get_all_rows_filter( if (users_is_admin()) {
'tusuario_perfil', $result = db_get_all_rows_filter(
['id_usuario' => $id] 'tusuario_perfil',
); ['id_usuario' => $id]
);
} else {
// Only profiles that can be viewed by the user.
$group_um = users_get_groups_UM($config['id_user']);
if (isset($group_um[0])) {
$group_um_string = implode(',', array_keys(users_get_groups($config['id_user'], 'um', true)));
} else {
$group_um_string = implode(',', array_keys($group_um));
}
$sql = sprintf(
"SELECT tusuario_perfil.* FROM tusuario_perfil
INNER JOIN tperfil ON tperfil.id_perfil = tusuario_perfil.id_perfil
WHERE id_usuario like '%s' AND id_grupo IN (%s) AND user_management = 0",
$id,
$group_um_string
);
$result = db_get_all_rows_sql($sql);
}
if ($result === false) { if ($result === false) {
$result = []; $result = [];
@ -285,6 +306,7 @@ function profile_print_profile_table($id)
[ [
'pandora_management' => '<> 1', 'pandora_management' => '<> 1',
'db_management' => '<> 1', 'db_management' => '<> 1',
'user_management' => '<> 1',
] ]
), ),
'assign_profile', 'assign_profile',

View File

@ -4664,7 +4664,7 @@ function reporting_prediction_date($report, $content)
$max_interval = $intervals_text[0]; $max_interval = $intervals_text[0];
$min_interval = $intervals_text[1]; $min_interval = $intervals_text[1];
$value = forecast_prediction_date($content['id_agent_module'], $content['period'], $max_interval, $min_interval); $value = forecast_prediction_date($content['id_agent_module'], $content['period'], $max_interval, $min_interval, $content['server_name']);
if ($value === false) { if ($value === false) {
$return['data']['value'] = __('Unknown'); $return['data']['value'] = __('Unknown');
@ -7506,40 +7506,57 @@ function reporting_general($report, $content)
if ($content['period'] == 0) { if ($content['period'] == 0) {
$data_res[$index] = modules_get_last_value($row['id_agent_module']); $data_res[$index] = modules_get_last_value($row['id_agent_module']);
} else { } else {
if (is_numeric($type_mod) && !$is_string[$index]) { $data_sum = reporting_get_agentmodule_data_sum(
switch ($row['operation']) { $row['id_agent_module'],
case 'sum': $content['period'],
$data_res[$index] = reporting_get_agentmodule_data_sum( $report['datetime']
$row['id_agent_module'], );
$content['period'],
$report['datetime']
);
break;
case 'max': $data_max = reporting_get_agentmodule_data_max(
$data_res[$index] = reporting_get_agentmodule_data_max( $row['id_agent_module'],
$row['id_agent_module'], $content['period']
$content['period'] );
);
break;
case 'min': $data_min = reporting_get_agentmodule_data_min(
$data_res[$index] = reporting_get_agentmodule_data_min( $row['id_agent_module'],
$row['id_agent_module'], $content['period']
$content['period'] );
);
break;
case 'avg': $data_avg = reporting_get_agentmodule_data_average(
default: $row['id_agent_module'],
$data_res[$index] = reporting_get_agentmodule_data_average( $content['period']
$row['id_agent_module'], );
$content['period']
); if ($content['style']['show_in_same_row'] && $content['group_by_agent'] == REPORT_GENERAL_NOT_GROUP_BY_AGENT) {
break; $data_res[$index] = [
} $data_avg,
$data_max,
$data_min,
$data_sum,
];
} else { } else {
$data_res[$index] = $type_mod; if (is_numeric($type_mod) && !$is_string[$index]) {
switch ($row['operation']) {
case 'sum':
$data_res[$index] = $data_sum;
break;
case 'max':
$data_res[$index] = $data_max;
break;
case 'min':
$data_res[$index] = $data_min;
break;
case 'avg':
default:
$data_res[$index] = $data_avg;
break;
}
} else {
$data_res[$index] = $type_mod;
}
} }
} }
@ -7581,44 +7598,89 @@ function reporting_general($report, $content)
break; break;
} }
// Calculate the avg, min and max if ($content['style']['show_in_same_row']) {
if (is_numeric($data_res[$index]) && !$is_string[$index]) { foreach ($data_res[$index] as $val) {
$change_min = false; // Calculate the avg, min and max
if (is_null($return['min']['value'])) { if (is_numeric($val)) {
$change_min = true; $change_min = false;
} else { if (is_null($return['min']['value'])) {
if ($return['min']['value'] > $data_res[$index]) { $change_min = true;
} else {
if ($return['min']['value'] > $val) {
$change_min = true;
}
}
if ($change_min) {
$return['min']['value'] = $val;
$return['min']['formated_value'] = format_for_graph($val, 2, '.', ',', $divisor, $unit);
$return['min']['agent'] = $ag_name;
$return['min']['module'] = $mod_name;
}
$change_max = false;
if (is_null($return['max']['value'])) {
$change_max = true;
} else {
if ($return['max']['value'] < $val) {
$change_max = true;
}
}
if ($change_max) {
$return['max']['value'] = $val;
$return['max']['formated_value'] = format_for_graph($val, 2, '.', ',', $divisor, $unit);
$return['max']['agent'] = $ag_name;
$return['max']['module'] = $mod_name;
}
if ($i == 0) {
$return['avg_value'] = $val;
} else {
$return['avg_value'] = ((($return['avg_value'] * $i) / ($i + 1)) + ($val / ($i + 1)));
}
}
}
} else {
// Calculate the avg, min and max
if (is_numeric($data_res[$index]) && !$is_string[$index]) {
$change_min = false;
if (is_null($return['min']['value'])) {
$change_min = true; $change_min = true;
} else {
if ($return['min']['value'] > $data_res[$index]) {
$change_min = true;
}
} }
}
if ($change_min) { if ($change_min) {
$return['min']['value'] = $data_res[$index]; $return['min']['value'] = $data_res[$index];
$return['min']['formated_value'] = format_for_graph($data_res[$index], 2, '.', ',', $divisor, $unit); $return['min']['formated_value'] = format_for_graph($data_res[$index], 2, '.', ',', $divisor, $unit);
$return['min']['agent'] = $ag_name; $return['min']['agent'] = $ag_name;
$return['min']['module'] = $mod_name; $return['min']['module'] = $mod_name;
} }
$change_max = false; $change_max = false;
if (is_null($return['max']['value'])) { if (is_null($return['max']['value'])) {
$change_max = true;
} else {
if ($return['max']['value'] < $data_res[$index]) {
$change_max = true; $change_max = true;
} else {
if ($return['max']['value'] < $data_res[$index]) {
$change_max = true;
}
} }
}
if ($change_max) { if ($change_max) {
$return['max']['value'] = $data_res[$index]; $return['max']['value'] = $data_res[$index];
$return['max']['formated_value'] = format_for_graph($data_res[$index], 2, '.', ',', $divisor, $unit); $return['max']['formated_value'] = format_for_graph($data_res[$index], 2, '.', ',', $divisor, $unit);
$return['max']['agent'] = $ag_name; $return['max']['agent'] = $ag_name;
$return['max']['module'] = $mod_name; $return['max']['module'] = $mod_name;
} }
if ($i == 0) { if ($i == 0) {
$return['avg_value'] = $data_res[$index]; $return['avg_value'] = $data_res[$index];
} else { } else {
$return['avg_value'] = ((($return['avg_value'] * $i) / ($i + 1)) + ($data_res[$index] / ($i + 1))); $return['avg_value'] = ((($return['avg_value'] * $i) / ($i + 1)) + ($data_res[$index] / ($i + 1)));
}
} }
} }
@ -7693,50 +7755,87 @@ function reporting_general($report, $content)
$data['id_module_type'] = $id_module_types[$i]; $data['id_module_type'] = $id_module_types[$i];
$data['operator'] = ''; $data['operator'] = '';
if ($content['period'] != 0) { if ($content['period'] != 0) {
switch ($operations[$i]) { if ($content['style']['show_in_same_row']) {
case 'sum': $data['operator'] = 'all';
$data['operator'] = __('Summatory'); } else {
break; switch ($operations[$i]) {
case 'sum':
$data['operator'] = __('Summatory');
break;
case 'min': case 'min':
$data['operator'] = __('Minimum'); $data['operator'] = __('Minimum');
break; break;
case 'max': case 'max':
$data['operator'] = __('Maximum'); $data['operator'] = __('Maximum');
break; break;
case 'avg': case 'avg':
default: default:
$data['operator'] = __('Rate'); $data['operator'] = __('Rate');
break; break;
}
} }
} }
if ($d === false) { if ($content['style']['show_in_same_row']) {
$data['value'] = null; foreach ($d as $val) {
} else { if ($val === false) {
switch ($config['dbtype']) { $data['value'][] = null;
case 'mysql': } else {
case 'postgresql': switch ($config['dbtype']) {
break; case 'mysql':
case 'postgresql':
break;
case 'oracle': case 'oracle':
if (preg_match('/[0-9]+,[0-9]E+[+-][0-9]+/', $d)) { if (preg_match('/[0-9]+,[0-9]E+[+-][0-9]+/', $val)) {
$d = oracle_format_float_to_php($d); $val = oracle_format_float_to_php($val);
}
break;
} }
break;
$divisor = get_data_multiplier($units[$i]);
if (!is_numeric($val) || $is_string[$i]) {
$data['value'][] = $val;
// to see the chains on the table
$data['formated_value'][] = $val;
} else {
$data['value'][] = $val;
$data['formated_value'][] = format_for_graph($val, 2, '.', ',', $divisor, $units[$i]);
}
}
} }
} else {
$divisor = get_data_multiplier($units[$i]); if ($d === false) {
$data['value'] = null;
if (!is_numeric($d) || $is_string[$i]) {
$data['value'] = $d;
// to see the chains on the table
$data['formated_value'] = $d;
} else { } else {
$data['value'] = $d; switch ($config['dbtype']) {
$data['formated_value'] = format_for_graph($d, 2, '.', ',', $divisor, $units[$i]); case 'mysql':
case 'postgresql':
break;
case 'oracle':
if (preg_match('/[0-9]+,[0-9]E+[+-][0-9]+/', $d)) {
$d = oracle_format_float_to_php($d);
}
break;
}
$divisor = get_data_multiplier($units[$i]);
if (!is_numeric($d) || $is_string[$i]) {
$data['value'] = $d;
// to see the chains on the table
$data['formated_value'] = $d;
} else {
$data['value'] = $d;
$data['formated_value'] = format_for_graph($d, 2, '.', ',', $divisor, $units[$i]);
}
} }
} }
@ -7766,18 +7865,6 @@ function reporting_custom_graph(
include_once $config['homedir'].'/include/functions_graph.php'; include_once $config['homedir'].'/include/functions_graph.php';
if ($type_report == 'custom_graph') {
if (is_metaconsole()) {
$id_meta = metaconsole_get_id_server($content['server_name']);
$server = metaconsole_get_connection_by_id($id_meta);
if (metaconsole_connect($server) != NOERR) {
return false;
}
}
}
$graph = db_get_row('tgraph', 'id_graph', $content['id_gs']);
$return = []; $return = [];
$return['type'] = 'custom_graph'; $return['type'] = 'custom_graph';
@ -7791,10 +7878,47 @@ function reporting_custom_graph(
} }
} }
$id_meta = 0;
if ($type_report == 'custom_graph') { if ($type_report == 'custom_graph') {
$graphs = db_get_all_rows_field_filter('tgraph', 'id_graph', $content['id_gs']);
$id_graph = $content['id_gs']; $id_graph = $content['id_gs'];
if (is_metaconsole()) {
$id_meta = metaconsole_get_id_server($content['server_name']);
$server = metaconsole_get_connection_by_id($id_meta);
if (metaconsole_connect($server) != NOERR) {
return false;
}
}
$graphs = db_get_all_rows_field_filter(
'tgraph',
'id_graph',
$content['id_gs']
);
$module_source = db_get_all_rows_sql(
'SELECT id_agent_module
FROM tgraph_source
WHERE id_graph = '.$content['id_gs']
);
if (isset($module_source) && is_array($module_source)) {
$modules = [];
foreach ($module_source as $key => $value) {
$modules[$key]['module'] = $value['id_agent_module'];
$modules[$key]['server'] = $id_meta;
}
}
if (is_metaconsole()) {
metaconsole_restore_db();
}
} else if ($type_report == 'automatic_graph') { } else if ($type_report == 'automatic_graph') {
$graphs = db_get_all_rows_field_filter(
'tgraph',
'id_graph',
$content['id_gs']
);
$graphs[0]['stacked'] = ''; $graphs[0]['stacked'] = '';
$graphs[0]['summatory_series'] = ''; $graphs[0]['summatory_series'] = '';
$graphs[0]['average_series'] = ''; $graphs[0]['average_series'] = '';
@ -7805,8 +7929,8 @@ function reporting_custom_graph(
if (is_metaconsole()) { if (is_metaconsole()) {
$module_source = db_get_all_rows_sql( $module_source = db_get_all_rows_sql(
'SELECT id_agent_module, id_server 'SELECT id_agent_module, id_server
FROM tgraph_source FROM tgraph_source
WHERE id_graph = '.$content['id_gs'] WHERE id_graph = '.$content['id_gs']
); );
if (isset($module_source) && is_array($module_source)) { if (isset($module_source) && is_array($module_source)) {
@ -7823,21 +7947,6 @@ function reporting_custom_graph(
$content['name'] = __('Simple graph'); $content['name'] = __('Simple graph');
} }
if ($type_report != 'automatic_graph') {
$module_source = db_get_all_rows_sql(
'SELECT id_agent_module
FROM tgraph_source
WHERE id_graph = '.$content['id_gs']
);
if (isset($module_source) && is_array($module_source)) {
$modules = [];
foreach ($module_source as $key => $value) {
$modules[$key] = $value['id_agent_module'];
}
}
}
$agent_description = agents_get_description($id_agent); $agent_description = agents_get_description($id_agent);
$agent_group = agents_get_agent_group($id_agent); $agent_group = agents_get_agent_group($id_agent);
$agent_address = agents_get_address($id_agent); $agent_address = agents_get_address($id_agent);
@ -7853,7 +7962,7 @@ function reporting_custom_graph(
$return['title'] = $content['name']; $return['title'] = $content['name'];
$return['landscape'] = $content['landscape']; $return['landscape'] = $content['landscape'];
$return['pagebreak'] = $content['pagebreak']; $return['pagebreak'] = $content['pagebreak'];
$return['subtitle'] = $graph['name']; $return['subtitle'] = $graphs[0]['name'];
$return['agent_name'] = $agent_alias; $return['agent_name'] = $agent_alias;
$return['module_name'] = $module_name; $return['module_name'] = $module_name;
$return['description'] = $content['description']; $return['description'] = $content['description'];
@ -7933,12 +8042,6 @@ function reporting_custom_graph(
break; break;
} }
if ($type_report == 'custom_graph') {
if (is_metaconsole()) {
metaconsole_restore_db();
}
}
return reporting_check_structure_content($return); return reporting_check_structure_content($return);
} }
@ -11636,7 +11739,6 @@ function reporting_get_stats_servers()
$table_srv->style[1] = $table_srv->style[3] = 'text-align: left; padding: 5px;'; $table_srv->style[1] = $table_srv->style[3] = 'text-align: left; padding: 5px;';
$tdata = []; $tdata = [];
'<span class="big_data">'.format_numeric($server_performance['total_local_modules']).'</span>';
$tdata[0] = html_print_image('images/module.png', true, ['title' => __('Total running modules')]); $tdata[0] = html_print_image('images/module.png', true, ['title' => __('Total running modules')]);
$tdata[1] = '<span class="big_data">'.format_numeric($server_performance['total_modules']).'</span>'; $tdata[1] = '<span class="big_data">'.format_numeric($server_performance['total_modules']).'</span>';
$tdata[2] = '<span class="med_data">'.format_numeric($server_performance['total_modules_rate'], 2).'</span>'; $tdata[2] = '<span class="med_data">'.format_numeric($server_performance['total_modules_rate'], 2).'</span>';
@ -11743,12 +11845,6 @@ function reporting_get_stats_servers()
); );
$tdata[1] = '<span class="big_data" id="total_events">'.html_print_image('images/spinner.gif', true).'</span>'; $tdata[1] = '<span class="big_data" id="total_events">'.html_print_image('images/spinner.gif', true).'</span>';
/*
Hello there! :)
We added some of what seems to be "buggy" messages to the openSource version recently. This is not to force open-source users to move to the enterprise version, this is just to inform people using Pandora FMS open source that it requires skilled people to maintain and keep it running smoothly without professional support. This does not imply open-source version is limited in any way. If you check the recently added code, it contains only warnings and messages, no limitations except one: we removed the option to add custom logo in header. In the Update Manager section, it warns about the 'danger of applying automated updates without a proper backup, remembering in the process that the Enterprise version comes with a human-tested package. Maintaining an OpenSource version with more than 500 agents is not so easy, that's why someone using a Pandora with 8000 agents should consider asking for support. It's not a joke, we know of many setups with a huge number of agents, and we hate to hear that “its becoming unstable and slow” :(
You can of course remove the warnings, that's why we include the source and do not use any kind of trick. And that's why we added here this comment, to let you know this does not reflect any change in our opensource mentality of does the last 14 years.
*/
if ($system_events > 50000 && !enterprise_installed()) { if ($system_events > 50000 && !enterprise_installed()) {
$tdata[2] = "<div id='monitoreventsmodal' class='publienterprise' title='Community version' style='text-align:left'><img data-title='Enterprise version' class='img_help forced_title' data-use_title_for_force_title='1' src='images/alert_enterprise.png'></div>"; $tdata[2] = "<div id='monitoreventsmodal' class='publienterprise' title='Community version' style='text-align:left'><img data-title='Enterprise version' class='img_help forced_title' data-use_title_for_force_title='1' src='images/alert_enterprise.png'></div>";
} else { } else {
@ -11762,7 +11858,7 @@ function reporting_get_stats_servers()
$output = '<fieldset class="databox tactical_set"> $output = '<fieldset class="databox tactical_set">
<legend>'.__('Server performance').'</legend>'.html_print_table($table_srv, true).'</fieldset>'; <legend>'.__('Server performance').'</legend>'.html_print_table($table_srv, true).'</fieldset>';
$public_hash = get_parameter('hash', false); $public_hash = get_parameter('auth_hash', false);
if ($public_hash === false) { if ($public_hash === false) {
$output .= '<script type="text/javascript">'; $output .= '<script type="text/javascript">';
$output .= '$(document).ready(function () {'; $output .= '$(document).ready(function () {';

View File

@ -2884,7 +2884,7 @@ function reporting_html_agent_configuration(
$row['description'] = $module['description']; $row['description'] = $module['description'];
$row['interval'] = $module['interval']; $row['interval'] = $module['interval'];
$row['unit'] = $module['unit']; $row['unit'] = $module['unit'];
$row['status'] = $module['status_icon']; $row['status'] = ($pdf === 0) ? $module['status_icon'] : explode(':', $module['status'])[0];
$row['tags'] = implode(',', $module['tags']); $row['tags'] = implode(',', $module['tags']);
$table1->data[] = $row; $table1->data[] = $row;
@ -3928,10 +3928,10 @@ function reporting_html_general($table, $item, $pdf=0)
$table1->data[] = [ $table1->data[] = [
agents_get_alias($id_agent), agents_get_alias($id_agent),
modules_get_agentmodule_name($id_module), modules_get_agentmodule_name($id_module),
$row2['Rate'], $row2['all'][0],
$row2['Maximum'], $row2['all'][1],
$row2['Minimum'], $row2['all'][2],
$row2['Summatory'], $row2['all'][3],
]; ];
} }
} }
@ -4014,7 +4014,7 @@ function reporting_html_general($table, $item, $pdf=0)
$table_summary->data[0][0] = $item['min']['agent'].' - '.$item['min']['module'].str_repeat('&nbsp;', 20).$item['min']['formated_value']; $table_summary->data[0][0] = $item['min']['agent'].' - '.$item['min']['module'].str_repeat('&nbsp;', 20).$item['min']['formated_value'];
$table_summary->data[0][1] = ''; $table_summary->data[0][1] = '';
$table_summary->data[0][2] = format_for_graph($item['avg_value'], 2); $table_summary->data[0][2] = $item['avg_value'];
$table_summary->data[0][3] = $item['max']['agent'].' - '.$item['max']['module'].str_repeat('&nbsp;', 20).$item['max']['formated_value']; $table_summary->data[0][3] = $item['max']['agent'].' - '.$item['max']['module'].str_repeat('&nbsp;', 20).$item['max']['formated_value'];
$table_summary->data[0][4] = ''; $table_summary->data[0][4] = '';

View File

@ -19,7 +19,7 @@ function treeview_printModuleTable($id_module, $server_data=false, $no_head=fals
$server_name = ''; $server_name = '';
$server_id = ''; $server_id = '';
$url_hash = ''; $url_hash = '';
$console_url = ''; $console_url = ui_get_full_url('/');
} else { } else {
$server_name = $server_data['server_name']; $server_name = $server_data['server_name'];
$server_id = $server_data['id']; $server_id = $server_data['id'];
@ -500,7 +500,7 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
$server_name = ''; $server_name = '';
$server_id = ''; $server_id = '';
$url_hash = ''; $url_hash = '';
$console_url = ''; $console_url = ui_get_full_url('/');
} else { } else {
$server_name = $server_data['server_name']; $server_name = $server_data['server_name'];
$server_id = $server_data['id']; $server_id = $server_data['id'];
@ -567,7 +567,7 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
$table->head = []; $table->head = [];
$table->data = []; $table->data = [];
// Agent name // Agent name.
if ($agent['disabled']) { if ($agent['disabled']) {
$cellName = '<em>'; $cellName = '<em>';
} else { } else {
@ -576,10 +576,10 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
if (is_metaconsole()) { if (is_metaconsole()) {
$pwd = $server_data['auth_token']; $pwd = $server_data['auth_token'];
// Create HASH login info // Create HASH login info.
$user = $config['id_user']; $user = $config['id_user'];
// Extract auth token from serialized field // Extract auth token from serialized field.
$pwd_deserialiced = json_decode($pwd, true); $pwd_deserialiced = json_decode($pwd, true);
$hashdata = $user.$pwd_deserialiced['auth_token']; $hashdata = $user.$pwd_deserialiced['auth_token'];
@ -588,7 +588,11 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
$cellName .= '<a href="'.$url.'">'.'<b><span style="font-weight:bold;text-transform:uppercase;" title="'.$agent['nombre'].'">'.$agent['alias'].'</span></b></a>'; $cellName .= '<a href="'.$url.'">'.'<b><span style="font-weight:bold;text-transform:uppercase;" title="'.$agent['nombre'].'">'.$agent['alias'].'</span></b></a>';
} else { } else {
$cellName .= '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$agent['id_agente'].'">'.'<b><span style="font-weight:bold;text-transform:uppercase;" title="'.$agent['nombre'].'">'.$agent['alias'].'</span></b></a>'; $url = ui_get_full_url(
'index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$agent['id_agente']
);
$cellName .= '<a href="'.$url.'">';
$cellName .= '<b><span style="font-weight:bold;text-transform:uppercase;" title="'.$agent['nombre'].'">'.$agent['alias'].'</span></b></a>';
} }
if ($agent['disabled']) { if ($agent['disabled']) {
@ -600,7 +604,7 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
$row['data'] = $cellName; $row['data'] = $cellName;
$table->data['name'] = $row; $table->data['name'] = $row;
// Addresses // Addresses.
$ips = []; $ips = [];
$addresses = agents_get_addresses($id_agente); $addresses = agents_get_addresses($id_agente);
$address = agents_get_address($id_agente); $address = agents_get_address($id_agente);
@ -611,8 +615,11 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
} }
} }
if (!empty($addresses)) { if (empty($addresses) === false) {
$address .= ui_print_help_tip(__('Other IP addresses').': <br>'.implode('<br>', $addresses), true); $address .= ui_print_help_tip(
__('Other IP addresses').': <br>'.implode('<br>', $addresses),
true
);
} }
$row = []; $row = [];
@ -620,25 +627,27 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
$row['data'] = $address; $row['data'] = $address;
$table->data['address'] = $row; $table->data['address'] = $row;
// Agent Interval // Agent Interval.
$row = []; $row = [];
$row['title'] = __('Interval'); $row['title'] = __('Interval');
$row['data'] = human_time_description_raw($agent['intervalo']); $row['data'] = human_time_description_raw($agent['intervalo']);
$table->data['interval'] = $row; $table->data['interval'] = $row;
// Comments // Comments.
$row = []; $row = [];
$row['title'] = __('Description'); $row['title'] = __('Description');
$row['data'] = $agent['comentarios']; $row['data'] = $agent['comentarios'];
$table->data['description'] = $row; $table->data['description'] = $row;
// Last contact // Last contact.
$last_contact = ui_print_timestamp($agent['ultimo_contacto'], true); $last_contact = ui_print_timestamp($agent['ultimo_contacto'], true);
if ($agent['ultimo_contacto_remoto'] == '01-01-1970 00:00:00') { if ($agent['ultimo_contacto_remoto'] == '01-01-1970 00:00:00') {
$last_remote_contact = __('Never'); $last_remote_contact = __('Never');
} else { } else {
$last_remote_contact = date_w_fixed_tz($agent['ultimo_contacto_remoto']); $last_remote_contact = date_w_fixed_tz(
$agent['ultimo_contacto_remoto']
);
} }
$row = []; $row = [];
@ -646,7 +655,7 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
$row['data'] = "$last_contact / $last_remote_contact"; $row['data'] = "$last_contact / $last_remote_contact";
$table->data['contact'] = $row; $table->data['contact'] = $row;
// Next contact (agent) // Next contact (agent).
$progress = agents_get_next_contact($id_agente); $progress = agents_get_next_contact($id_agente);
$row = []; $row = [];
@ -660,7 +669,7 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
); );
$table->data['next_contact'] = $row; $table->data['next_contact'] = $row;
// End of table // End of table.
$agent_table = html_print_table($table, true); $agent_table = html_print_table($table, true);
if ($user_access_node && check_acl($config['id_user'], $agent['id_grupo'], 'AW')) { if ($user_access_node && check_acl($config['id_user'], $agent['id_grupo'], 'AW')) {

View File

@ -541,8 +541,9 @@ function ui_print_timestamp($unixtime, $return=false, $option=[])
pandora_setlocale(); pandora_setlocale();
$title = human_time_comparation($unixtime); $title = human_time_comparation($unixtime);
$strf_format = date2strftime_format($config['date_format'], $unixtime);
$data = strftime( $data = strftime(
date2strftime_format($config['date_format']), $strf_format,
$unixtime $unixtime
); );
} else if ($prominent == 'compact') { } else if ($prominent == 'compact') {
@ -1708,9 +1709,8 @@ function ui_process_page_head($string, $bitfield)
<meta name="author" content="'.get_copyright_notice().'" /> <meta name="author" content="'.get_copyright_notice().'" />
<meta name="copyright" content="(c) '.get_copyright_notice().'" /> <meta name="copyright" content="(c) '.get_copyright_notice().'" />
<meta name="robots" content="index, follow" />'; <meta name="robots" content="index, follow" />';
$output .= '<link rel="icon" href="'.ui_get_favicon().'" type="image/ico" />'; $output .= '<link rel="icon" href="'.ui_get_full_url('/').ui_get_favicon().'" type="image/ico" />';
$output .= ' $output .= '<link rel="shortcut icon" href="'.ui_get_full_url('/').ui_get_favicon().'" type="image/x-icon" />
<link rel="shortcut icon" href="'.ui_get_favicon().'" type="image/x-icon" />
<link rel="alternate" href="operation/events/events_rss.php" title="Pandora RSS Feed" type="application/rss+xml" />'; <link rel="alternate" href="operation/events/events_rss.php" title="Pandora RSS Feed" type="application/rss+xml" />';
if ($config['language'] != 'en') { if ($config['language'] != 'en') {
@ -3408,6 +3408,14 @@ function ui_print_datatable(array $parameters)
$js .= $parameters['drawCallback']; $js .= $parameters['drawCallback'];
} }
for ($i = 1; $i <= (count($parameters['columns']) - 3); $i++) {
if ($i != (count($parameters['columns']) - 3)) {
$columns .= $i.',';
} else {
$columns .= $i;
}
}
$js .= ' $js .= '
if (dt_'.$table_id.'.page.info().pages > 1) { if (dt_'.$table_id.'.page.info().pages > 1) {
$("#'.$table_id.'_wrapper > .dataTables_paginate.paging_simple_numbers").show() $("#'.$table_id.'_wrapper > .dataTables_paginate.paging_simple_numbers").show()
@ -3438,7 +3446,8 @@ function ui_print_datatable(array $parameters)
order : "current", order : "current",
page : "All", page : "All",
search : "applied" search : "applied"
} },
columns: [1,'.$columns.']
} }
} }
], ],
@ -6089,3 +6098,26 @@ function ui_get_full_external_url(string $url)
return $url; return $url;
} }
function ui_print_message_dialog($title, $text, $id='', $img='', $text_button='', $hidden=true)
{
if ($hidden == true) {
$style = 'display:none';
}
echo '<div id="message_dialog_'.$id.'" title="'.$title.'" style="'.$style.'">';
echo '<div class="content_dialog">';
echo '<div class="icon_message_dialog">';
echo html_print_image($img, true, ['alt' => $title, 'border' => 0]);
echo '</div>';
echo '<div class="content_message_dialog">';
echo '<div class="text_message_dialog">';
echo '<h1>'.$title.'</h1>';
echo '<p>'.$text.'</p>';
echo '<div id="err_msg"></div>';
echo '</div>';
echo '</div>';
echo '</div>';
echo '</div>';
}

View File

@ -53,6 +53,23 @@ function update_manager_verify_registration()
return false; return false;
} }
/**
* Check if a trial license is in use.
*
* @return boolean true if a trial license is in use, false otherwise.
*/
function update_manager_verify_trial()
{
global $config;
if (isset($config['license_licensed_to'])
&& strstr($config['license_licensed_to'], 'info@pandorafms.com') !== FALSE
) {
return true;
}
return false;
}
/** /**
* Parses responses from configuration wizard. * Parses responses from configuration wizard.
@ -440,6 +457,11 @@ function registration_wiz_modal(
global $config; global $config;
$output = ''; $output = '';
// Do not show the wizard for trial licenses.
if (update_manager_verify_trial()) {
return '';
}
$product_name = get_product_name(); $product_name = get_product_name();
$output .= '<div id="registration_wizard" title="'; $output .= '<div id="registration_wizard" title="';

View File

@ -668,3 +668,106 @@ function get_name_admin():string
return $mail; return $mail;
} }
/**
* Obtiene una matriz con los grupos como clave y si tiene o no permiso UM sobre ese grupo(valor)
*
* @param string User id
* @return array Return .
*/
function users_get_groups_UM($id_user)
{
$sql = sprintf(
"SELECT id_grupo, user_management FROM tusuario_perfil
LEFT JOIN tperfil ON tperfil.id_perfil = tusuario_perfil.id_perfil
WHERE id_usuario like '%s' AND user_management = 1 ORDER BY id_grupo",
$id_user
);
$groups = db_get_all_rows_sql($sql);
$return = [];
foreach ($groups as $key => $group) {
if (!isset($return[$group['id_grupo']]) || (isset($return[$group['id_grupo']]) && $group['user_management'] != 0)) {
$return[$group['id_grupo']] = $group['user_management'];
}
}
return $return;
}
/**
* Obtiene una matriz con los grupos como clave y si tiene o no permiso UM sobre ese grupo(valor)
*
* @param string User id
* @return array Return .
*/
function users_get_users_by_group($id_group, $um=false)
{
$sql = sprintf(
"SELECT tusuario.* FROM tusuario
INNER JOIN tusuario_perfil ON tusuario_perfil.id_usuario = tusuario.id_user
AND tusuario_perfil.id_grupo = '%s'",
$id_group
);
$users = db_get_all_rows_sql($sql);
$return = [];
foreach ($users as $key => $user) {
$return[$user['id_user']] = $user;
$return[$user['id_user']]['edit'] = $um;
}
return $return;
}
function users_has_profile_without_UM($id_user, $id_groups)
{
$sql = sprintf(
"SELECT id_usuario, tperfil.user_management FROM tusuario_perfil
INNER JOIN tperfil ON tperfil.id_perfil = tusuario_perfil.id_perfil AND tperfil.user_management = 0
WHERE tusuario_perfil.id_usuario like '%s' AND tusuario_perfil.id_grupo IN (%s)
ORDER BY tperfil.user_management DESC",
$id_user,
$id_groups
);
$without_um = db_get_all_rows_sql($sql);
if (isset($without_um[0])) {
$sql = sprintf(
"SELECT id_grupo, tperfil.* FROM tusuario_perfil
INNER JOIN tperfil ON tperfil.id_perfil = tusuario_perfil.id_perfil
WHERE tusuario_perfil.id_usuario like '%s'
ORDER BY tperfil.user_management DESC",
$id_user
);
$um = db_get_all_rows_sql($sql);
return 1;
} else {
return 0;
}
}
function users_get_user_profile($id_user)
{
$sql = sprintf(
"SELECT * FROM tusuario_perfil
INNER JOIN tperfil ON tperfil.id_perfil = tusuario_perfil.id_perfil
WHERE tusuario_perfil.id_usuario like '%s'",
$id_user
);
$aux = db_get_all_rows_sql($sql);
$user_profiles = [];
foreach ($aux as $key => $value) {
$user_profiles[$value['id_grupo']] = $value;
}
return $user_profiles;
}

View File

@ -47,6 +47,7 @@ if ($file === '' || $hash === '' || $hash !== md5($file_raw.$config['dbpass']) |
if ($parse_sec2_query[0] === 'sec2') { if ($parse_sec2_query[0] === 'sec2') {
switch ($parse_sec2_query[1]) { switch ($parse_sec2_query[1]) {
case $main_file_manager: case $main_file_manager:
case 'operation/snmpconsole/snmp_mib_uploader':
$downloadable_file = $_SERVER['DOCUMENT_ROOT'].'/pandora_console/'.$file; $downloadable_file = $_SERVER['DOCUMENT_ROOT'].'/pandora_console/'.$file;
break; break;

View File

@ -638,7 +638,8 @@ function stacked_gauge(
$font='', $font='',
$font_size='', $font_size='',
$unit='', $unit='',
$homeurl='' $homeurl='',
$transitionDuration=500
) { ) {
include_once 'functions_d3.php'; include_once 'functions_d3.php';
@ -656,7 +657,8 @@ function stacked_gauge(
$unit, $unit,
$font, $font,
($font_size + 2), ($font_size + 2),
$no_data_image $no_data_image,
$transitionDuration
); );
} }

View File

@ -2432,7 +2432,7 @@ function pandoraFlotArea(
if (!value[x]) { if (!value[x]) {
x = x + 1; x = x + 1;
} }
if (value[x].min) { if (typeof value[x].min !== "undefined" && value[x].min) {
min_y_array = format_unit_yaxes(value[x].min); min_y_array = format_unit_yaxes(value[x].min);
min_y = min_y_array["y"]; min_y = min_y_array["y"];
min_bigger = min_y_array["unit"]; min_bigger = min_y_array["unit"];
@ -2441,7 +2441,7 @@ function pandoraFlotArea(
min_bigger = ""; min_bigger = "";
} }
if (value[x].max) { if (typeof value[x].max !== "undefined" && value[x].max) {
max_y_array = format_unit_yaxes(value[x].max); max_y_array = format_unit_yaxes(value[x].max);
max_y = max_y_array["y"]; max_y = max_y_array["y"];
max_bigger = max_y_array["unit"]; max_bigger = max_y_array["unit"];
@ -2450,7 +2450,7 @@ function pandoraFlotArea(
max_bigger = ""; max_bigger = "";
} }
if (value[x].avg) { if (typeof value[x].avg !== "undefined" && value[x].avg) {
avg_y_array = format_unit_yaxes(value[x].avg); avg_y_array = format_unit_yaxes(value[x].avg);
avg_y = avg_y_array["y"]; avg_y = avg_y_array["y"];
avg_bigger = avg_y_array["unit"]; avg_bigger = avg_y_array["unit"];

View File

@ -294,7 +294,8 @@ function d3_gauges(
$unit, $unit,
$font, $font,
$font_size, $font_size,
$no_data_image $no_data_image,
$transitionDuration
) { ) {
global $config; global $config;
@ -310,7 +311,7 @@ function d3_gauges(
$output .= "<script language=\"javascript\" type=\"text/javascript\"> $output .= "<script language=\"javascript\" type=\"text/javascript\">
var data = $data; var data = $data;
createGauges(data, '$width', '$height','$font_size','$no_data_image','$font'); createGauges(data, '$width', '$height','$font_size','$no_data_image','$font', '$transitionDuration');
</script>"; </script>";
return $output; return $output;

View File

@ -14,7 +14,7 @@
global $config; global $config;
function include_javascript_dependencies_flot_graph($return=false) function include_javascript_dependencies_flot_graph($return=false, $mobile=false)
{ {
global $config; global $config;
@ -28,8 +28,16 @@ function include_javascript_dependencies_flot_graph($return=false)
$metaconsole_hack = '../../'; $metaconsole_hack = '../../';
} }
$output = '';
if ($mobile === true) {
$output .= '
<script language="javascript" type="text/javascript" src="'.ui_get_full_url($metaconsole_hack.'/mobile/include/javascript/jquery.js').'"></script>
<script language="javascript" type="text/javascript" src="'.ui_get_full_url($metaconsole_hack.'/mobile/include/javascript/jquery.mobile-1.3.1.js').'"></script>';
}
// NOTE: jquery.flot.threshold is not te original file. Is patched to allow multiple thresholds and filled area // NOTE: jquery.flot.threshold is not te original file. Is patched to allow multiple thresholds and filled area
$output = ' $output .= '
<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="'.ui_get_full_url($metaconsole_hack.'/include/graphs/flot/excanvas.js').'"></script><![endif]--> <!--[if lte IE 8]><script language="javascript" type="text/javascript" src="'.ui_get_full_url($metaconsole_hack.'/include/graphs/flot/excanvas.js').'"></script><![endif]-->
<script language="javascript" type="text/javascript" src="'.ui_get_full_url($metaconsole_hack.'/include/graphs/flot/jquery.flot.js').'"></script> <script language="javascript" type="text/javascript" src="'.ui_get_full_url($metaconsole_hack.'/include/graphs/flot/jquery.flot.js').'"></script>
<script language="javascript" type="text/javascript" src="'.ui_get_full_url($metaconsole_hack.'/include/graphs/flot/jquery.flot.min.js').'"></script> <script language="javascript" type="text/javascript" src="'.ui_get_full_url($metaconsole_hack.'/include/graphs/flot/jquery.flot.min.js').'"></script>

View File

@ -1005,7 +1005,8 @@ function createGauge(
critical_inverse, critical_inverse,
font_size, font_size,
height, height,
font font,
transitionDuration
) { ) {
var gauges; var gauges;
@ -1014,7 +1015,8 @@ function createGauge(
label: etiqueta, label: etiqueta,
min: undefined != min ? min : 0, min: undefined != min ? min : 0,
max: undefined != max ? max : 100, max: undefined != max ? max : 100,
font_size: font_size font_size: font_size,
transitionDuration: transitionDuration
}; };
if (value == null) { if (value == null) {
@ -1128,7 +1130,7 @@ function createGauge(
gauges = new Gauge(name, config, font); gauges = new Gauge(name, config, font);
gauges.render(); gauges.render();
gauges.redraw(value); gauges.redraw(value, config.transitionDuration);
$(".gauge>text").each(function() { $(".gauge>text").each(function() {
label = $(this).text(); label = $(this).text();
@ -1155,12 +1157,17 @@ function createGauge(
$(this).text(text); $(this).text(text);
} }
}); });
config = false;
max_warning2 = false;
min_warning2 = false;
} }
function createGauges(data, width, height, font_size, no_data_image, font) { function createGauges(
data,
width,
height,
font_size,
no_data_image,
font,
transitionDuration
) {
var nombre, var nombre,
label, label,
minimun_warning, minimun_warning,
@ -1211,7 +1218,8 @@ function createGauges(data, width, height, font_size, no_data_image, font) {
critical_inverse, critical_inverse,
font_size, font_size,
height, height,
font font,
transitionDuration
); );
} }
} }
@ -1247,7 +1255,7 @@ function Gauge(placeholderName, configuration, font) {
this.config.yellowColor = configuration.yellowColor || "#FF9900"; this.config.yellowColor = configuration.yellowColor || "#FF9900";
this.config.redColor = configuration.redColor || "#DC3912"; this.config.redColor = configuration.redColor || "#DC3912";
this.config.transitionDuration = configuration.transitionDuration || 500; this.config.transitionDuration = configuration.transitionDuration;
}; };
this.render = function() { this.render = function() {
@ -1481,11 +1489,7 @@ function Gauge(placeholderName, configuration, font) {
var pointer = pointerContainer.selectAll("path"); var pointer = pointerContainer.selectAll("path");
pointer pointer
.transition() .transition()
.duration( .duration(undefined != transitionDuration ? transitionDuration : 0)
undefined != transitionDuration
? transitionDuration
: this.config.transitionDuration
)
//.delay(0) //.delay(0)
//.ease("linear") //.ease("linear")
//.attr("transform", function(d) //.attr("transform", function(d)

View File

@ -1,8 +1,9 @@
/* global $ */ /* global $, jQuery*/
/** /**
* Add modules from available to selected. * Add modules from available to selected.
*/ */
// eslint-disable-next-line no-unused-vars
function addItems(id, noneStr) { function addItems(id, noneStr) {
$("#available-select-" + id + " :selected") $("#available-select-" + id + " :selected")
.toArray() .toArray()
@ -17,6 +18,7 @@ function addItems(id, noneStr) {
/** /**
* Mark all options for given id. * Mark all options for given id.
*/ */
// eslint-disable-next-line no-unused-vars
function markAll(id) { function markAll(id) {
$("#" + id + " option").prop("selected", true); $("#" + id + " option").prop("selected", true);
} }
@ -24,6 +26,7 @@ function markAll(id) {
/** /**
* Remove modules from selected back to available. * Remove modules from selected back to available.
*/ */
// eslint-disable-next-line no-unused-vars
function removeItems(id, noneStr) { function removeItems(id, noneStr) {
$("#selected-select-" + id + " :selected") $("#selected-select-" + id + " :selected")
.toArray() .toArray()
@ -69,16 +72,19 @@ function filterItems(id, str) {
}); });
} }
// eslint-disable-next-line no-unused-vars
function filterAvailableItems(txt, id, noneStr) { function filterAvailableItems(txt, id, noneStr) {
filterItems("available-select-" + id, txt); filterItems("available-select-" + id, txt);
keepSelectClean("available-select-" + id, noneStr); keepSelectClean("available-select-" + id, noneStr);
} }
// eslint-disable-next-line no-unused-vars
function filterSelectedItems(txt, id, noneStr) { function filterSelectedItems(txt, id, noneStr) {
filterItems("selected-select-" + id, txt); filterItems("selected-select-" + id, txt);
keepSelectClean("selected-select-" + id, noneStr); keepSelectClean("selected-select-" + id, noneStr);
} }
// eslint-disable-next-line no-unused-vars
function disableFilters(id) { function disableFilters(id) {
$("#id-group-selected-select-" + id).prop("disabled", true); $("#id-group-selected-select-" + id).prop("disabled", true);
$("#checkbox-id-group-recursion-selected-select-" + id).prop( $("#checkbox-id-group-recursion-selected-select-" + id).prop(
@ -87,6 +93,7 @@ function disableFilters(id) {
); );
} }
// eslint-disable-next-line no-unused-vars
function reloadContent(id, url, options, side, noneStr) { function reloadContent(id, url, options, side, noneStr) {
var current; var current;
var opposite; var opposite;
@ -155,3 +162,65 @@ $(document).submit(function() {
.keyup(); .keyup();
$("[id^=selected-select-] option").prop("selected", true); $("[id^=selected-select-] option").prop("selected", true);
}); });
// eslint-disable-next-line no-unused-vars
function fmAgentChange(uniqId) {
var idGroup = $("#filtered-module-group-" + uniqId).val();
var recursion = $("#filtered-module-recursion-" + uniqId).is(":checked");
jQuery.post(
"ajax.php",
{
page: "operation/agentes/ver_agente",
get_agents_group_json: 1,
id_group: idGroup,
privilege: "AW",
keys_prefix: "_",
recursion: recursion
},
function(data) {
$("#filtered-module-agents-" + uniqId).html("");
$("#filtered-module-modules-" + uniqId).html("");
jQuery.each(data, function(id, value) {
// Remove keys_prefix from the index
id = id.substring(1);
var option = $("<option></option>")
.attr("value", value["id_agente"])
.html(value["alias"]);
$("#filtered-module-agents-" + uniqId).append(option);
});
},
"json"
);
}
// eslint-disable-next-line no-unused-vars
function fmModuleChange(uniqId) {
var idModuleGroup = $("#filtered-module-module-group-" + uniqId).val();
var idAgents = $("#filtered-module-agents-" + uniqId).val();
var showCommonModules = $(
"#filtered-module-show-common-modules-" + uniqId
).val();
jQuery.post(
"ajax.php",
{
page: "operation/agentes/ver_agente",
get_modules_group_json: 1,
id_module_group: idModuleGroup,
id_agents: idAgents,
selection: showCommonModules
},
function(data) {
$("#filtered-module-modules-" + uniqId).html("");
if (data) {
jQuery.each(data, function(id, value) {
var option = $("<option></option>")
.attr("value", value["id_agente_modulo"])
.html(value["nombre"]);
$("#filtered-module-modules-" + uniqId).append(option);
});
}
},
"json"
);
}

View File

@ -1865,3 +1865,120 @@ function ajaxRequest(id, settings) {
} }
}); });
} }
/**
* -------------------------------------
* Connection Check
* --------------------------------------
*/
checkConnection(1);
/**
* Performs connection tests every minutes and add connection listeners
* @param {integer} time in minutes
*/
function checkConnection(minutes) {
var cicle = minutes * 60 * 1000;
var checkConnection = setInterval(handleConnection, cicle);
// Connection listeters.
window.addEventListener("online", handleConnection);
window.addEventListener("offline", handleConnection);
}
/**
* Handle connection status test.
*
* Test conectivity with server and shows modal message.
*/
function handleConnection() {
var connected;
var msg = "online";
if (navigator.onLine) {
isReachable(getServerUrl())
.then(function(online) {
if (online) {
// handle online status
connected = true;
showConnectionMessage(connected, msg);
} else {
connected = false;
msg = "No connectivity with server";
showConnectionMessage(connected, msg);
}
})
.catch(function(err) {
connected = false;
msg = err;
showConnectionMessage(connected, msg);
});
} else {
// handle offline status
connected = false;
msg = "Connection offline";
showConnectionMessage(connected, msg);
}
}
/**
* Test server reachibilty and get response.
*
* @param {String} url
*
* Return {promise}
*/
function isReachable(url) {
/**
* Note: fetch() still "succeeds" for 404s on subdirectories,
* which is ok when only testing for domain reachability.
*
* Example:
* https://google.com/noexist does not throw
* https://noexist.com/noexist does throw
*/
return fetch(url, { method: "HEAD", mode: "no-cors" })
.then(function(resp) {
return resp && (resp.ok || resp.type === "opaque");
})
.catch(function(error) {
console.warn("[conn test failure]:", error);
});
}
/**
* Gets server origin url
*/
function getServerUrl() {
var server_url;
try {
server_url = get_php_value("homeurl");
} catch (SyntaxError) {
console.warn("Pandora homeurl cannot be found.");
server_url = window.location.origin + "/pandora_console";
}
return server_url;
}
/**
* Shows or hide connection infoMessage.
*
* @param {bool} conn
* @param {string} msg
*/
function showConnectionMessage(conn = true, msg = "") {
var data = {};
if (conn) {
$("div#message_dialog_connection")
.closest(".ui-dialog-content")
.dialog("close");
} else {
data.title = "Connection with server has been lost";
data.text = "Connection status: " + msg;
infoMessage(data, "message_dialog_connection");
}
}

View File

@ -86,11 +86,14 @@ function initialiceLayout(data) {
data: { data: {
page: data.page, page: data.page,
method: "getCellsLayout", method: "getCellsLayout",
dashboardId: data.dashboardId dashboardId: data.dashboardId,
auth_class: data.auth.class,
auth_hash: data.auth.hash,
id_user: data.auth.user
}, },
dataType: "json", dataType: "json",
success: function(data) { success: function(d) {
loadLayout(data); loadLayout(d);
}, },
error: function(error) { error: function(error) {
console.error(error); console.error(error);
@ -136,7 +139,8 @@ function initialiceLayout(data) {
position.maxWidth, position.maxWidth,
position.minHeight, position.minHeight,
position.maxHeight, position.maxHeight,
widgetId widgetId,
false
); );
}); });
// Commit. // Commit.
@ -167,7 +171,10 @@ function initialiceLayout(data) {
dashboardId: data.dashboardId, dashboardId: data.dashboardId,
cellId: id, cellId: id,
widgetId: widgetId, widgetId: widgetId,
gridWidth: gridWidth gridWidth: gridWidth,
auth_class: data.auth.class,
auth_hash: data.auth.hash,
id_user: data.auth.user
}, },
dataType: "html", dataType: "html",
success: function(cellData) { success: function(cellData) {
@ -205,7 +212,10 @@ function initialiceLayout(data) {
widgetId: widgetId, widgetId: widgetId,
newWidth: newWidth, newWidth: newWidth,
newHeight: newHeight, newHeight: newHeight,
gridWidth: gridWidth gridWidth: gridWidth,
auth_class: data.auth.class,
auth_hash: data.auth.hash,
id_user: data.auth.user
}, },
dataType: "html", dataType: "html",
success: function(widgetData) { success: function(widgetData) {
@ -291,7 +301,10 @@ function initialiceLayout(data) {
page: data.page, page: data.page,
method: "saveLayout", method: "saveLayout",
dashboardId: data.dashboardId, dashboardId: data.dashboardId,
items: items items: items,
auth_class: data.auth.class,
auth_hash: data.auth.hash,
id_user: data.auth.user
}, },
dataType: "html", dataType: "html",
success: function(data) { success: function(data) {
@ -313,11 +326,14 @@ function initialiceLayout(data) {
page: data.page, page: data.page,
dashboardId: data.dashboardId, dashboardId: data.dashboardId,
method: "deleteCell", method: "deleteCell",
cellId: cellId cellId: cellId,
auth_class: data.auth.class,
auth_hash: data.auth.hash,
id_user: data.auth.user
}, },
dataType: "json", dataType: "json",
success: function(data) { success: function(data) {
// For defect x and y = 0 // By default x and y = 0
// width and height = 4 // width and height = 4
// position auto = true. // position auto = true.
if (data.result !== 0) { if (data.result !== 0) {
@ -338,11 +354,14 @@ function initialiceLayout(data) {
data: { data: {
page: data.page, page: data.page,
method: "insertCellLayout", method: "insertCellLayout",
dashboardId: data.dashboardId dashboardId: data.dashboardId,
auth_class: data.auth.class,
auth_hash: data.auth.hash,
id_user: data.auth.user
}, },
dataType: "json", dataType: "json",
success: function(data) { success: function(data) {
// For defect x and y = 0 // By default x and y = 0
// width and height = 4 // width and height = 4
// position auto = true. // position auto = true.
if (data.cellId !== 0) { if (data.cellId !== 0) {
@ -373,7 +392,7 @@ function initialiceLayout(data) {
dashboardId: data.dashboardId, dashboardId: data.dashboardId,
widgetId: widgetId widgetId: widgetId
}, },
width: 450, width: widgetId == 14 ? 750 : 450,
maxHeight: 600, maxHeight: 600,
minHeight: 400 minHeight: 400
}, },
@ -536,7 +555,10 @@ function initialiceLayout(data) {
method: "drawAddWidget", method: "drawAddWidget",
cellId: cellId, cellId: cellId,
offset: offset, offset: offset,
search: search search: search,
auth_class: data.auth.class,
auth_hash: data.auth.hash,
id_user: data.auth.user
}, },
dataType: "html", dataType: "html",
success: function(data) { success: function(data) {
@ -606,7 +628,10 @@ function initialiceLayout(data) {
cellId: cellId, cellId: cellId,
widgetId: widgetId, widgetId: widgetId,
gridWidth: gridWidth, gridWidth: gridWidth,
redraw: true redraw: true,
auth_class: data.auth.class,
auth_hash: data.auth.hash,
id_user: data.auth.user
}, },
dataType: "html", dataType: "html",
success: function(cellData) { success: function(cellData) {
@ -633,7 +658,10 @@ function initialiceLayout(data) {
newWidth: newWidth, newWidth: newWidth,
newHeight: newHeight, newHeight: newHeight,
gridWidth: gridWidth, gridWidth: gridWidth,
widgetId: widgetId widgetId: widgetId,
auth_class: data.auth.class,
auth_hash: data.auth.hash,
id_user: data.auth.user
}, },
dataType: "html", dataType: "html",
success: function(dataWidget) { success: function(dataWidget) {
@ -755,8 +783,9 @@ function dashboardLoadNetworkMap(settings) {
x_offset: settings.x_offset, x_offset: settings.x_offset,
y_offset: settings.y_offset, y_offset: settings.y_offset,
zoom_dash: settings.zoom_dash, zoom_dash: settings.zoom_dash,
id_user: settings.id_user, auth_class: settings.auth_class,
hash: settings.hash auth_hash: settings.auth_hash,
id_user: settings.id_user
}, },
dataType: "html", dataType: "html",
success: function(data) { success: function(data) {
@ -784,6 +813,8 @@ function dashboardLoadWuxStats(settings) {
id_agent: settings.id_agent, id_agent: settings.id_agent,
transaction: settings.transaction, transaction: settings.transaction,
view_all_stats: settings.view_all_stats, view_all_stats: settings.view_all_stats,
auth_class: settings.auth_class,
auth_hash: settings.auth_hash,
id_user: settings.id_user id_user: settings.id_user
}, },
dataType: "html", dataType: "html",
@ -821,9 +852,10 @@ function processTreeSearch(settings) {
data: { data: {
getChildren: 1, getChildren: 1,
page: settings.page, page: settings.page,
id_user: settings.user,
hash: settings.hash,
type: settings.type, type: settings.type,
auth_class: settings.auth_class,
auth_hash: settings.auth_hash,
id_user: settings.id_user,
filter: filters filter: filters
}, },
success: function(data) { success: function(data) {
@ -858,8 +890,11 @@ function processTreeSearch(settings) {
emptyMessage: settings.translate.emptyMessage, emptyMessage: settings.translate.emptyMessage,
foundMessage: settings.translate.foundMessage, foundMessage: settings.translate.foundMessage,
tree: data.tree, tree: data.tree,
baseURL: settings.baseURL, auth_hash: settings.auth_hash,
auth_class: settings.auth_class,
id_user: settings.id_user,
ajaxURL: settings.ajaxUrl, ajaxURL: settings.ajaxUrl,
baseURL: settings.baseUrl,
filter: filters, filter: filters,
counterTitles: { counterTitles: {
total: { total: {

View File

@ -713,7 +713,6 @@ function update_event(table, id_evento, type, event_rep, row) {
}); });
var t1 = new Date(); var t1 = new Date();
// Update events matching current filters and id_evento selected.
$.ajax({ $.ajax({
async: true, async: true,
type: "POST", type: "POST",
@ -751,6 +750,7 @@ function update_event(table, id_evento, type, event_rep, row) {
} }
}); });
} }
// Update events matching current filters and id_evento selected.
function validate_event(table, id_evento, event_rep, row) { function validate_event(table, id_evento, event_rep, row) {
var button = document.getElementById("val-" + id_evento); var button = document.getElementById("val-" + id_evento);
@ -791,7 +791,39 @@ function delete_event(table, id_evento, event_rep, row) {
processed += 1; processed += 1;
return; return;
} }
var message =
"<h4 style = 'text-align: center; color: black;' > Are you sure?</h4> ";
confirmDialog({
title: "ATTENTION",
message: message,
cancel: "Cancel",
ok: "Ok",
onAccept: function() {
button.children[0];
button.children[0].src = "images/spinner.gif";
return update_event(
table,
id_evento,
{ delete_event: 1 },
event_rep,
row
);
},
onDeny: function() {
button.children[0];
button.children[0].src = "images/cross.png";
return;
}
});
}
function execute_delete_event_reponse(table, id_evento, event_rep, row) {
var button = document.getElementById("del-" + id_evento);
if (!button) {
// Button does not exist. Ignore.
processed += 1;
return;
}
button.children[0]; button.children[0];
button.children[0].src = "images/spinner.gif"; button.children[0].src = "images/spinner.gif";
return update_event(table, id_evento, { delete_event: 1 }, event_rep, row); return update_event(table, id_evento, { delete_event: 1 }, event_rep, row);
@ -799,110 +831,126 @@ function delete_event(table, id_evento, event_rep, row) {
// Imported from old files. // Imported from old files.
function execute_event_response(event_list_btn) { function execute_event_response(event_list_btn) {
processed = 0; var message =
$("#max_custom_event_resp_msg").hide(); "<h4 style = 'text-align: center; color: black;' > Are you sure?</h4> ";
$("#max_custom_selected").hide(); confirmDialog({
title: "ATTENTION",
message: message,
cancel: "Cancel",
ok: "Ok",
onAccept: function() {
// Continue execution.
processed = 0;
$("#max_custom_event_resp_msg").hide();
$("#max_custom_selected").hide();
var response_id = $("select[name=response_id]").val(); var response_id = $("select[name=response_id]").val();
var total_checked = $(".chk_val:checked").length; var total_checked = $(".chk_val:checked").length;
// Check select an event. // Check select an event.
if (total_checked == 0) { if (total_checked == 0) {
$("#max_custom_selected").show(); $("#max_custom_selected").show();
return; return;
} }
if (!isNaN(response_id)) { if (!isNaN(response_id)) {
// It is a custom response // It is a custom response
var response = get_response(response_id); var response = get_response(response_id);
// If cannot get response abort it // If cannot get response abort it
if (response == null) { if (response == null) {
return;
}
// Limit number of events to apply custom responses
// due performance reasons.
if (total_checked > $("#max_execution_event_response").val()) {
$("#max_custom_event_resp_msg").show();
return;
}
var response_command = [];
$(".response_command_input").each(function() {
response_command[$(this).attr("name")] = $(this).val();
});
if (event_list_btn) {
$("#button-submit_event_response").hide(function() {
$("#response_loading_dialog").show(function() {
var check_params = get_response_params(response_id);
if (check_params[0] !== "") {
show_event_response_command_dialog(
response_id,
response,
total_checked
);
} else {
check_massive_response_event(
response_id,
response,
total_checked,
response_command
);
}
});
});
} else {
$("#button-btn_str").hide(function() {
$("#execute_again_loading").show(function() {
check_massive_response_event(
response_id,
response,
total_checked,
response_command
);
});
});
}
} else {
// It is not a custom response
switch (response_id) {
case "in_progress_selected":
$(".chk_val:checked").each(function() {
// Parent: TD. GrandParent: TR.
in_process_event(
dt_events,
$(this).val(),
$(this).attr("event_rep"),
this.parentElement.parentElement
);
});
break;
case "validate_selected":
$(".chk_val:checked").each(function() {
validate_event(
dt_events,
$(this).val(),
$(this).attr("event_rep"),
this.parentElement.parentElement
);
});
break;
case "delete_selected":
console.log($(this));
$(".chk_val:checked").each(function() {
execute_delete_event_reponse(
dt_events,
$(this).val(),
$(this).attr("event_rep"),
this.parentElement.parentElement
);
});
break;
}
}
},
onDeny: function() {
processed += 1;
return; return;
} }
});
// Limit number of events to apply custom responses
// due performance reasons.
if (total_checked > $("#max_execution_event_response").val()) {
$("#max_custom_event_resp_msg").show();
return;
}
var response_command = [];
$(".response_command_input").each(function() {
response_command[$(this).attr("name")] = $(this).val();
});
if (event_list_btn) {
$("#button-submit_event_response").hide(function() {
$("#response_loading_dialog").show(function() {
var check_params = get_response_params(response_id);
if (check_params[0] !== "") {
show_event_response_command_dialog(
response_id,
response,
total_checked
);
} else {
check_massive_response_event(
response_id,
response,
total_checked,
response_command
);
}
});
});
} else {
$("#button-btn_str").hide(function() {
$("#execute_again_loading").show(function() {
check_massive_response_event(
response_id,
response,
total_checked,
response_command
);
});
});
}
} else {
// It is not a custom response
switch (response_id) {
case "in_progress_selected":
$(".chk_val:checked").each(function() {
// Parent: TD. GrandParent: TR.
in_process_event(
dt_events,
$(this).val(),
$(this).attr("event_rep"),
this.parentElement.parentElement
);
});
break;
case "validate_selected":
$(".chk_val:checked").each(function() {
validate_event(
dt_events,
$(this).val(),
$(this).attr("event_rep"),
this.parentElement.parentElement
);
});
break;
case "delete_selected":
$(".chk_val:checked").each(function() {
delete_event(
dt_events,
$(this).val(),
$(this).attr("event_rep"),
this.parentElement.parentElement
);
});
break;
}
}
} }
function check_massive_response_event( function check_massive_response_event(

View File

@ -494,3 +494,61 @@ function generalShowMsg(data, idMsg) {
] ]
}); });
} }
function infoMessage(data, idMsg) {
var title = data.title;
var err_messge = data.text;
if (idMsg == null) {
idMsg = uniqId();
}
if ($("#" + idMsg).length === 0) {
$("body").append('<div title="' + title + '" id="' + idMsg + '"></div>');
$("#" + idMsg).empty();
}
$("#err_msg").empty();
$("#err_msg").html("\n\n" + err_messge);
$("#" + idMsg)
.dialog({
height: 250,
width: 528,
opacity: 1,
modal: true,
position: {
my: "center",
at: "center",
of: window,
collision: "fit"
},
title: data.title,
buttons: [
{
class:
"ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok submit-next",
text: "Retry",
click: function(e) {
handleConnection();
}
},
{
class:
"ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok submit-cancel",
text: "Close",
click: function() {
$(this).dialog("close");
}
}
],
open: function(event, ui) {
$(".ui-widget-overlay").addClass("error-modal-opened");
},
close: function(event, ui) {
$(".ui-widget-overlay").removeClass("error-modal-opened");
}
})
.show();
}

View File

@ -43,7 +43,7 @@ var TreeController = {
var $group = $("<ul></ul>"); var $group = $("<ul></ul>");
// First group // First group
if (typeof rootGroup != "undefinded" && rootGroup == true) { if (typeof rootGroup != "undefined" && rootGroup == true) {
$group $group
.addClass("tree-root") .addClass("tree-root")
.hide() .hide()
@ -450,7 +450,10 @@ var TreeController = {
var postData = { var postData = {
page: controller.ajaxPage, page: controller.ajaxPage,
getDetail: 1, getDetail: 1,
type: type type: type,
auth_class: controller.auth_class,
id_user: controller.id_user,
auth_hash: controller.auth_hash
}; };
if (typeof id !== "undefined") postData.id = id; if (typeof id !== "undefined") postData.id = id;
@ -769,34 +772,38 @@ var TreeController = {
// Data pop-up // Data pop-up
if (typeof element.id != "undefined" && !isNaN(element.id)) { if (typeof element.id != "undefined" && !isNaN(element.id)) {
var $dataImage = $( if (isNaN(element.metaID)) {
'<img src="' + var $dataImage = $(
(controller.baseURL.length > 0 '<img src="' +
? controller.baseURL (controller.baseURL.length > 0
: "") + ? controller.baseURL
'images/binary.png" /> ' : "") +
); 'images/binary.png" /> '
$dataImage.addClass("module-data").click(function(e) { );
e.stopPropagation(); $dataImage.addClass("module-data").click(function(e) {
e.stopPropagation();
try { try {
var serverName = var serverName =
element.serverName.length > 0 ? element.serverName : ""; element.serverName.length > 0
if ($("#module_details_window").length > 0) ? element.serverName
show_module_detail_dialog( : "";
element.id, if ($("#module_details_window").length > 0)
"", show_module_detail_dialog(
serverName, element.id,
0, "",
86400, serverName,
element.name.replace(/&#x20;/g, " ") 0,
); 86400,
} catch (error) { element.name.replace(/&#x20;/g, " ")
// console.log(error); );
} } catch (error) {
}); // console.log(error);
}
});
$content.append($dataImage); $content.append($dataImage);
}
} }
} }
@ -966,11 +973,6 @@ var TreeController = {
}); });
} }
} }
// Get hash and user.
var public_hash = $("#hidden-publi_dash_tree_view_hash").val();
if (typeof public_hash === "undefined") public_hash = 0;
var public_user = $("#hidden-publi_dash_tree_view_id_user").val();
if (typeof public_user === "undefined") public_user = 0;
if ( if (
typeof element.searchChildren != "undefined" && typeof element.searchChildren != "undefined" &&
@ -1008,9 +1010,11 @@ var TreeController = {
rootID: element.rootID, rootID: element.rootID,
serverID: element.serverID, serverID: element.serverID,
rootType: element.rootType, rootType: element.rootType,
metaID: element.metaID,
filter: controller.filter, filter: controller.filter,
hash: public_hash, auth_class: controller.auth_class,
id_user: public_user id_user: controller.id_user,
auth_hash: controller.auth_hash
}, },
complete: function(xhr, textStatus) { complete: function(xhr, textStatus) {
$node.removeClass("leaf-loading"); $node.removeClass("leaf-loading");
@ -1145,6 +1149,16 @@ var TreeController = {
this.filter = data.filter; this.filter = data.filter;
} }
if (typeof data.auth_class !== "undefined") {
this.auth_class = data.auth_class;
}
if (typeof data.id_user !== "undefined") {
this.id_user = data.id_user;
}
if (typeof data.auth_hash !== "undefined") {
this.auth_hash = data.auth_hash;
}
this.load(); this.load();
}, },
remove: function() { remove: function() {

File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More