mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-04-08 18:55:09 +02:00
Merge branch 'develop' into '713-Asignar-políticas-a-grupos-dev'
# Conflicts: # pandora_console/extras/mr/4.sql
This commit is contained in:
vgilc
commit
6dba0a5040
@ -127094,7 +127094,7 @@ msgstr ""
|
||||
#: ../../Documentos/Pandoras/pandorafms_develop/pandora_console/godmode/setup/setup_ehorus.php:87
|
||||
#: ../../Documentos/COPIA SEG/godmode/setup/setup_ehorus.php:87
|
||||
#: ../../code/pandorafms/pandora_console/godmode/setup/setup_ehorus.php:87
|
||||
msgid "e.g., switch.ehorus.com"
|
||||
msgid "e.g., portal.ehorus.com"
|
||||
msgstr ""
|
||||
|
||||
#: ../../Documentos/Pandoras/pandorafms_develop/pandora_console/godmode/setup/setup_ehorus.php:92
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.705, AIX version
|
||||
# Version 7.0NG.707, AIX version
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.705, FreeBSD Version
|
||||
# Version 7.0NG.707, FreeBSD Version
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.705, HP-UX Version
|
||||
# Version 7.0NG.707, HP-UX Version
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.705, GNU/Linux
|
||||
# Version 7.0NG.707, GNU/Linux
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.705, GNU/Linux
|
||||
# Version 7.0NG.707, GNU/Linux
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.705, Solaris Version
|
||||
# Version 7.0NG.707, Solaris Version
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# Base config file for Pandora FMS Windows Agent
|
||||
# (c) 2006-2010 Artica Soluciones Tecnologicas
|
||||
# Version 7.0NG.705
|
||||
# Version 7.0NG.707
|
||||
|
||||
# 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
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# Fichero de configuracion base de agentes de Pandora
|
||||
# Base config file for Pandora agents
|
||||
# Version 7.0NG.705, AIX version
|
||||
# Version 7.0NG.707, AIX version
|
||||
|
||||
# General Parameters
|
||||
# ==================
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# Fichero de configuracion base de agentes de Pandora
|
||||
# Base config file for Pandora agents
|
||||
# Version 7.0NG.705
|
||||
# Version 7.0NG.707
|
||||
# FreeBSD/IPSO version
|
||||
# Licenced under GPL licence, 2003-2007 Sancho Lerena
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# Fichero de configuracion base de agentes de Pandora
|
||||
# Base config file for Pandora agents
|
||||
# Version 7.0NG.705, HPUX Version
|
||||
# Version 7.0NG.707, HPUX Version
|
||||
|
||||
# General Parameters
|
||||
# ==================
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.705
|
||||
# Version 7.0NG.707
|
||||
# Licensed under GPL license v2,
|
||||
# (c) 2003-2010 Artica Soluciones Tecnologicas
|
||||
# please visit http://pandora.sourceforge.net
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.705
|
||||
# Version 7.0NG.707
|
||||
# Licensed under GPL license v2,
|
||||
# (c) 2003-2009 Artica Soluciones Tecnologicas
|
||||
# please visit http://pandora.sourceforge.net
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.705
|
||||
# Version 7.0NG.707
|
||||
# Licensed under GPL license v2,
|
||||
# please visit http://pandora.sourceforge.net
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# Fichero de configuracion base de agentes de Pandora
|
||||
# Base config file for Pandora agents
|
||||
# Version 7.0NG.705, Solaris version
|
||||
# Version 7.0NG.707, Solaris version
|
||||
|
||||
# General Parameters
|
||||
# ==================
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.705, AIX version
|
||||
# Version 7.0NG.707, AIX version
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
package: pandorafms-agent-unix
|
||||
Version: 7.0NG.705-170626
|
||||
Version: 7.0NG.707-170718
|
||||
Architecture: all
|
||||
Priority: optional
|
||||
Section: admin
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
|
||||
pandora_version="7.0NG.705-170626"
|
||||
pandora_version="7.0NG.707-170718"
|
||||
|
||||
echo "Test if you has the tools for to make the packages."
|
||||
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.705, GNU/Linux
|
||||
# Version 7.0NG.707, GNU/Linux
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2012 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.705, FreeBSD Version
|
||||
# Version 7.0NG.707, FreeBSD Version
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2016 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.705, HP-UX Version
|
||||
# Version 7.0NG.707, HP-UX Version
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.705, GNU/Linux
|
||||
# Version 7.0NG.707, GNU/Linux
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2014 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
@ -18,8 +18,7 @@ logfile /var/log/pandora/pandora_agent.log
|
||||
# Interval in seconds, 300 by default
|
||||
interval 300
|
||||
|
||||
# Debug mode only generate XML, and stop after first execution,
|
||||
# and does not copy XML to server.
|
||||
# Debug mode renames XML in the temp folder and continues running
|
||||
debug 0
|
||||
|
||||
# Optional. UDP Server to receive orders from outside
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.705, GNU/Linux
|
||||
# Version 7.0NG.707, GNU/Linux
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.705, NetBSD Version
|
||||
# Version 7.0NG.707, NetBSD Version
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.705, Solaris Version
|
||||
# Version 7.0NG.707, Solaris Version
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
||||
@ -40,8 +40,8 @@ my $Sem = undef;
|
||||
# Semaphore used to control the number of threads
|
||||
my $ThreadSem = undef;
|
||||
|
||||
use constant AGENT_VERSION => '7.0NG.705';
|
||||
use constant AGENT_BUILD => '170626';
|
||||
use constant AGENT_VERSION => '7.0NG.707';
|
||||
use constant AGENT_BUILD => '170718';
|
||||
|
||||
# Agent log default file size maximum and instances
|
||||
use constant DEFAULT_MAX_LOG_SIZE => 600000;
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
#Pandora FMS Linux Agent
|
||||
#
|
||||
%define name pandorafms_agent_unix
|
||||
%define version 7.0NG.705
|
||||
%define release 170626
|
||||
%define version 7.0NG.707
|
||||
%define release 170718
|
||||
|
||||
Summary: Pandora FMS Linux agent, PERL version
|
||||
Name: %{name}
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
#Pandora FMS Linux Agent
|
||||
#
|
||||
%define name pandorafms_agent_unix
|
||||
%define version 7.0NG.705
|
||||
%define release 170626
|
||||
%define version 7.0NG.707
|
||||
%define release 170718
|
||||
|
||||
Summary: Pandora FMS Linux agent, PERL version
|
||||
Name: %{name}
|
||||
|
||||
@ -9,8 +9,8 @@
|
||||
# Please see http://www.pandorafms.org. This code is licensed under GPL 2.0 license.
|
||||
# **********************************************************************
|
||||
|
||||
PI_VERSION="7.0NG.705"
|
||||
PI_BUILD="170626"
|
||||
PI_VERSION="7.0NG.707"
|
||||
PI_BUILD="170718"
|
||||
OS_NAME=`uname -s`
|
||||
|
||||
FORCE=0
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# Base config file for Pandora FMS Windows Agent
|
||||
# (c) 2006-2014 Artica Soluciones Tecnologicas
|
||||
# Version 7.0NG.705
|
||||
# Version 7.0NG.707
|
||||
|
||||
# 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
|
||||
@ -36,7 +36,7 @@ temporal "%ProgramFiles%\pandora_agent\temp"
|
||||
# If set to __rand__ the agent will generate a random name.
|
||||
#agent_name_cmd cscript.exe //B "%ProgramFiles%\Pandora_Agent\util\agentname.vbs"
|
||||
agent_name_cmd __rand__
|
||||
|
||||
|
||||
|
||||
#Parent agent_name
|
||||
#parent_agent_name caprica
|
||||
@ -77,7 +77,7 @@ server_port 41121
|
||||
# If set to 1 disables log writing into pandora_agent.log
|
||||
#disable_logfile 1
|
||||
|
||||
# Debug mode do not copy XML data files to server.
|
||||
# Debug mode renames XML in the temp folder and continues running
|
||||
# debug 1
|
||||
|
||||
# If set to 1 allows the agent to be configured via the web console
|
||||
|
||||
@ -3,7 +3,7 @@ AllowLanguageSelection
|
||||
{Yes}
|
||||
|
||||
AppName
|
||||
{Pandora FMS Windows Agent v7.0NG.705}
|
||||
{Pandora FMS Windows Agent v7.0NG.707}
|
||||
|
||||
ApplicationID
|
||||
{17E3D2CF-CA02-406B-8A80-9D31C17BD08F}
|
||||
@ -186,7 +186,7 @@ UpgradeApplicationID
|
||||
{}
|
||||
|
||||
Version
|
||||
{170626}
|
||||
{170718}
|
||||
|
||||
ViewReadme
|
||||
{Yes}
|
||||
|
||||
@ -30,7 +30,7 @@ using namespace Pandora;
|
||||
using namespace Pandora_Strutils;
|
||||
|
||||
#define PATH_SIZE _MAX_PATH+1
|
||||
#define PANDORA_VERSION ("7.0NG.705(Build 170626)")
|
||||
#define PANDORA_VERSION ("7.0NG.707(Build 170718)")
|
||||
|
||||
string pandora_path;
|
||||
string pandora_dir;
|
||||
|
||||
@ -11,7 +11,7 @@ BEGIN
|
||||
VALUE "LegalCopyright", "Artica ST"
|
||||
VALUE "OriginalFilename", "PandoraAgent.exe"
|
||||
VALUE "ProductName", "Pandora FMS Windows Agent"
|
||||
VALUE "ProductVersion", "(7.0NG.705(Build 170626))"
|
||||
VALUE "ProductVersion", "(7.0NG.707(Build 170718))"
|
||||
VALUE "FileVersion", "1.0.0.0"
|
||||
END
|
||||
END
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
package: pandorafms-console
|
||||
Version: 7.0NG.705-170626
|
||||
Version: 7.0NG.707-170718
|
||||
Architecture: all
|
||||
Priority: optional
|
||||
Section: admin
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
|
||||
pandora_version="7.0NG.705-170626"
|
||||
pandora_version="7.0NG.707-170718"
|
||||
|
||||
package_pear=0
|
||||
package_pandora=1
|
||||
|
||||
@ -93,7 +93,7 @@ function mainAgentsAlerts() {
|
||||
$groups = users_get_groups ();
|
||||
|
||||
$filter_groups .= '<b>'.__('Group').'</b>';
|
||||
$filter_groups .= html_print_select_groups(false, "AR", true, 'group_id', $group_id, false, '', '', true, false, true, '', false , 'width: 100px; margin-right: 10px;; margin-top: 5px;');
|
||||
$filter_groups .= html_print_select_groups(false, "AR", true, 'group_id', $group_id, false, '', '', true, false, true, '', false , 'margin-right: 10px; margin-top: 5px;');
|
||||
|
||||
$check = '<b>'.__('Show modules without alerts').'</b>';
|
||||
$check .= html_print_checkbox('slides_ids[]', $d['id'], $show_modules, true, false, '', true);
|
||||
|
||||
@ -127,7 +127,7 @@ function extension_db_status_execute_checks($db_user, $db_password, $db_host, $d
|
||||
ui_print_error_message(
|
||||
__('Unsuccessful installed tables into the testing DB'));
|
||||
}
|
||||
else {
|
||||
else {/*
|
||||
if (enterprise_installed()) {
|
||||
$install_tables_enterprise =
|
||||
extension_db_status_execute_sql_file(
|
||||
@ -139,7 +139,7 @@ function extension_db_status_execute_checks($db_user, $db_password, $db_host, $d
|
||||
__('Unsuccessful installed enterprise tables into the testing DB'));
|
||||
}
|
||||
}
|
||||
|
||||
*/
|
||||
extension_db_check_tables_differences(
|
||||
$connection_test,
|
||||
$connection_system,
|
||||
@ -159,6 +159,7 @@ function extension_db_check_tables_differences($connection_test,
|
||||
|
||||
global $config;
|
||||
|
||||
|
||||
// --------- Check the tables --------------------------------------
|
||||
mysql_select_db($db_name_test, $connection_test);
|
||||
$result = mysql_query("SHOW TABLES", $connection_test);
|
||||
@ -170,9 +171,8 @@ function extension_db_check_tables_differences($connection_test,
|
||||
//~ $tables_test = array_merge($tables_test,
|
||||
//~ extension_db_status_extension_tables());
|
||||
|
||||
|
||||
mysql_select_db($db_name_system, $connection_system);
|
||||
$result = mysql_query("SHOW TABLES", $connection_system);
|
||||
mysql_select_db($db_name_system, $connection_test);
|
||||
$result = mysql_query("SHOW TABLES", $connection_test);
|
||||
$tables_system = array();
|
||||
while ($row = mysql_fetch_array ($result)) {
|
||||
$tables_system[] = $row[0];
|
||||
@ -227,8 +227,8 @@ function extension_db_check_tables_differences($connection_test,
|
||||
|
||||
|
||||
|
||||
mysql_select_db($db_name_system, $connection_system);
|
||||
$result = mysql_query("EXPLAIN " . $table, $connection_system);
|
||||
mysql_select_db($db_name_system, $connection_test);
|
||||
$result = mysql_query("EXPLAIN " . $table, $connection_test);
|
||||
$fields_system = array();
|
||||
if (!empty($result)) {
|
||||
while ($row = mysql_fetch_array ($result)) {
|
||||
|
||||
@ -14,4 +14,4 @@ CREATE TABLE IF NOT EXISTS `tpolicy_groups` (
|
||||
UNIQUE (`id_policy`, `id_group`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
COMMIT;
|
||||
COMMIT;
|
||||
@ -724,6 +724,7 @@ CREATE TABLE IF NOT EXISTS `treport_content_template` (
|
||||
`module_names` TEXT,
|
||||
`module_free_text` TEXT,
|
||||
`each_agent` tinyint(1) default 1,
|
||||
`historical_db` tinyint(1) UNSIGNED NOT NULL default 0,
|
||||
PRIMARY KEY(`id_rc`)
|
||||
) ENGINE = InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
@ -1149,10 +1150,10 @@ ALTER TABLE titem MODIFY `source_data` int(10) unsigned;
|
||||
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 ('days_autodisable_deletion', '30');
|
||||
INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 1);
|
||||
INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 4);
|
||||
UPDATE tconfig SET value = 'https://licensing.artica.es/pandoraupdate7/server.php' WHERE token='url_update_manager';
|
||||
DELETE FROM `tconfig` WHERE `token` = 'current_package_enterprise';
|
||||
INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '704');
|
||||
INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '708');
|
||||
|
||||
-- ---------------------------------------------------------------------
|
||||
-- Table `tplanned_downtime_agents`
|
||||
@ -1181,6 +1182,7 @@ ALTER TABLE tevent_filter ADD COLUMN `date_to` date DEFAULT NULL;
|
||||
ALTER TABLE tusuario ADD COLUMN `id_filter` int(10) UNSIGNED NULL DEFAULT NULL;
|
||||
ALTER TABLE tusuario ADD CONSTRAINT `fk_id_filter` FOREIGN KEY (`id_filter`) REFERENCES tevent_filter(`id_filter`) ON DELETE SET NULL;
|
||||
ALTER TABLE tusuario ADD COLUMN `session_time` int(10) signed NOT NULL default '0';
|
||||
alter table tusuario add autorefresh_white_list text not null default '';
|
||||
|
||||
-- ---------------------------------------------------------------------
|
||||
-- Table `tagente_modulo`
|
||||
@ -1384,3 +1386,9 @@ CREATE TABLE IF NOT EXISTS `treset_pass` (
|
||||
UPDATE tgis_map_connection SET conection_data = '{"type":"OSM","url":"http://tile.openstreetmap.org/${z}/${x}/${y}.png"}' where id_tmap_connection = 1;
|
||||
|
||||
ALTER TABLE tpolicy_modules MODIFY post_process double(24,15) default 0;
|
||||
|
||||
-- ---------------------------------------------------------------------
|
||||
-- Table `tserver_export`
|
||||
-- ---------------------------------------------------------------------
|
||||
|
||||
ALTER TABLE tserver_export MODIFY `name` varchar(600) BINARY NOT NULL default '';
|
||||
25
pandora_console/general/check_image_module.php
Normal file
25
pandora_console/general/check_image_module.php
Normal file
@ -0,0 +1,25 @@
|
||||
<?php
|
||||
|
||||
include_once ('include/config.php');
|
||||
include_once ('include/functions.php');
|
||||
include_once ('include/functions_db.php');
|
||||
include_once ('include/auth/mysql.php');
|
||||
|
||||
$id = get_parameter('get_image');
|
||||
|
||||
$sql = 'SELECT datos FROM tagente_estado WHERE id_agente_modulo = '.$id;
|
||||
|
||||
$result = db_get_sql($sql);
|
||||
|
||||
$image = strpos($result, 'data:image');
|
||||
|
||||
if($image === false){
|
||||
echo 0;
|
||||
}
|
||||
else{
|
||||
echo 1;
|
||||
}
|
||||
|
||||
?>
|
||||
|
||||
|
||||
@ -32,13 +32,18 @@ if (!$config["MR"]) {
|
||||
|
||||
echo '<a class="white_bold footer" target="_blank" href="' . $config["homeurl"] . $license_file. '">';
|
||||
|
||||
if($current_package == 0){
|
||||
$build_package_version = $build_version;
|
||||
}
|
||||
else{
|
||||
$build_package_version = $current_package;
|
||||
if(enterprise_installed()){
|
||||
enterprise_include_once("../include/functions_update_manager.php");
|
||||
}
|
||||
|
||||
$current_package = update_manager_get_current_package();
|
||||
|
||||
if($current_package == 0){
|
||||
$build_package_version = $build_version;
|
||||
}
|
||||
else{
|
||||
$build_package_version = $current_package;
|
||||
}
|
||||
|
||||
echo sprintf(__('Pandora FMS %s - Build %s - MR %s', $pandora_version, $build_package_version, $config["MR"]));
|
||||
|
||||
|
||||
@ -191,7 +191,9 @@ config_check();
|
||||
$_GET['refr'] = null;
|
||||
}
|
||||
|
||||
if ($config['autorefresh_white_list'] !== null && array_search($_GET['sec2'], $config['autorefresh_white_list']) !== false) {
|
||||
$select = db_process_sql("SELECT autorefresh_white_list FROM tusuario WHERE id_user = '" . $config['id_user'] . "'");
|
||||
$autorefresh_list = json_decode($select[0]['autorefresh_white_list']);
|
||||
if ($autorefresh_list !== null && array_search($_GET['sec2'], $autorefresh_list) !== false) {
|
||||
$autorefresh_img = html_print_image("images/header_refresh.png", true, array("class" => 'bot', "alt" => 'lightning', 'title' => __('Configure autorefresh')));
|
||||
|
||||
if ($_GET['refr']) {
|
||||
@ -354,7 +356,7 @@ config_check();
|
||||
var new_chat = <?php echo (int)$_SESSION['new_chat'];?>;
|
||||
$(document).ready (function () {
|
||||
<?php
|
||||
if (($config['autorefresh_white_list'] !== null) && (array_search($_GET['sec2'], $config['autorefresh_white_list']) !== false) && (!isset($_GET["refr"]))) {
|
||||
if (($autorefresh_list !== null) && (array_search($_GET['sec2'], $autorefresh_list) !== false) && (!isset($_GET["refr"]))) {
|
||||
?>
|
||||
$("a.autorefresh_txt").toggle ();
|
||||
$("#combo_refr").toggle ();
|
||||
|
||||
@ -119,7 +119,7 @@ $(document).ready (function () {
|
||||
|
||||
// Update config['skip_login_help_dialog'] to don't display more this message
|
||||
if (skip_login_help) {
|
||||
jQuery.get ("ajax.php",
|
||||
jQuery.post ("ajax.php",
|
||||
{"page": "general/login_help_dialog",
|
||||
"skip_login_help": 1},
|
||||
function (data) {}
|
||||
|
||||
@ -72,7 +72,7 @@ echo '<div id="login_body" ' . $login_body_style . '>';
|
||||
echo '<div id="header_login">';
|
||||
echo '<div id="icon_custom_pandora">';
|
||||
|
||||
if (PANDORA_ENTERPRISE) {
|
||||
if (file_exists (ENTERPRISE_DIR . "/load_enterprise.php")) {
|
||||
if(isset ($config['custom_logo'])){
|
||||
echo '<img src="enterprise/images/custom_logo/' . $config['custom_logo'] .'" alt="pandora_console">';
|
||||
}
|
||||
@ -88,7 +88,7 @@ echo '<div id="header_login">';
|
||||
echo '<div id="list_icon_docs_support"><ul>';
|
||||
echo '<li><a href="http://wiki.pandorafms.com/" target="_blank"><img src="images/icono_docs.png" alt="docs pandora"></a></li>';
|
||||
echo '<li>' . __('Docs') . '</li>';
|
||||
if (defined ('PANDORA_ENTERPRISE')) {
|
||||
if (file_exists (ENTERPRISE_DIR . "/load_enterprise.php")) {
|
||||
echo '<li id="li_margin_left"><a href="https://support.artica.es" target="_blank"><img src="images/icono_support.png" alt="support pandora"></a></li>';
|
||||
} else {
|
||||
echo '<li id="li_margin_left"><a href="https://pandorafms.com/monitoring-services/support/" target="_blank"><img src="images/icono_support.png" alt="support pandora"></a></li>';
|
||||
@ -136,7 +136,7 @@ echo '<div class="login_page">';
|
||||
case 'login':
|
||||
if (!empty ($page) && !empty ($sec)) {
|
||||
foreach ($_POST as $key => $value) {
|
||||
html_print_input_hidden ($key, $value);
|
||||
html_print_input_hidden (io_safe_input($key), $value);
|
||||
}
|
||||
}
|
||||
if ($config['auth'] == 'saml') {
|
||||
@ -192,7 +192,7 @@ echo '<div class="login_page">';
|
||||
case 'double_auth':
|
||||
if (!empty ($page) && !empty ($sec)) {
|
||||
foreach ($_POST as $key => $value) {
|
||||
html_print_input_hidden ($key, $value);
|
||||
html_print_input_hidden (io_safe_input($key), $value);
|
||||
}
|
||||
}
|
||||
echo '<div class="login_nick">';
|
||||
@ -234,7 +234,7 @@ echo '<div class="login_page">';
|
||||
echo '<div class="login_data">';
|
||||
echo '<div class ="text_banner_login">';
|
||||
echo '<div><span class="span1">';
|
||||
if(defined ('PANDORA_ENTERPRISE')){
|
||||
if(file_exists (ENTERPRISE_DIR . "/load_enterprise.php")){
|
||||
if($config['custom_title1_login']){
|
||||
echo strtoupper(io_safe_output($config['custom_title1_login']));
|
||||
}
|
||||
@ -247,7 +247,7 @@ echo '<div class="login_page">';
|
||||
}
|
||||
echo '</span></div>';
|
||||
echo '<div><span class="span2">';
|
||||
if(defined ('PANDORA_ENTERPRISE')){
|
||||
if(file_exists (ENTERPRISE_DIR . "/load_enterprise.php")){
|
||||
if($config['custom_title2_login']){
|
||||
echo strtoupper(io_safe_output($config['custom_title2_login']));
|
||||
}
|
||||
@ -261,7 +261,7 @@ echo '<div class="login_page">';
|
||||
echo '</span></div>';
|
||||
echo '</div>';
|
||||
echo '<div class ="img_banner_login">';
|
||||
if (defined ('PANDORA_ENTERPRISE')) {
|
||||
if (file_exists (ENTERPRISE_DIR . "/load_enterprise.php")) {
|
||||
if(isset($config['custom_splash_login'])){
|
||||
html_print_image ("enterprise/images/custom_splash_login/".$config['custom_splash_login'], false, array ( "alt" => "splash", "border" => 0, "title" => $splash_title), false, true);
|
||||
}
|
||||
|
||||
@ -932,7 +932,7 @@ if ($update_module || $create_module) {
|
||||
|
||||
$post_process = (string) get_parameter ('post_process', 0.0);
|
||||
if(get_parameter ('prediction_module')){
|
||||
$prediction_module = get_parameter ('prediction_module');
|
||||
$prediction_module = 1;
|
||||
}
|
||||
else{
|
||||
$prediction_module = 0;
|
||||
|
||||
@ -150,7 +150,7 @@ if (!$own_info['is_admin'] && !check_acl ($config['id_user'], 0, "AW"))
|
||||
$return_all_group = false;
|
||||
else
|
||||
$return_all_group = true;
|
||||
html_print_select_groups(false, "AR", $return_all_group, "ag_group", $ag_group, 'this.form.submit();', '', 0, false, false, true, '', false, 'width:100px;');
|
||||
html_print_select_groups(false, "AR", $return_all_group, "ag_group", $ag_group, 'this.form.submit();', '', 0, false, false, true, '', false);
|
||||
|
||||
echo "<td>";
|
||||
echo __('Show Agents') . ' ';
|
||||
|
||||
@ -148,7 +148,7 @@ $table_simple->colspan[6][1] = 3;
|
||||
|
||||
$table_simple->data[0][0] = __('Name');
|
||||
$table_simple->data[0][1] = html_print_input_text_extended ('name',
|
||||
io_safe_output($name), 'text-name', '', 45, 100, $disabledBecauseInPolicy, '', $largeClassDisabledBecauseInPolicy, true);
|
||||
io_safe_input(html_entity_decode($name)), 'text-name', '', 45, 100, $disabledBecauseInPolicy, '', $largeClassDisabledBecauseInPolicy, true);
|
||||
//$table_simple->data[0][1] = html_print_input_text ('name',
|
||||
// io_safe_output($name), '', 45, 100, true, $disabledBecauseInPolicy);
|
||||
|
||||
|
||||
@ -32,7 +32,7 @@ $id_alert = get_parameter ("id_alert", 0); // ID given as parameter
|
||||
$alert = alerts_get_alert_agent_module($id_alert);
|
||||
$template = alerts_get_alert_template ($alert['id_alert_template']);
|
||||
$actions = alerts_get_alert_agent_module_actions ($id_alert);
|
||||
$agent_name = modules_get_agentmodule_agent_name ($alert['id_agent_module']);
|
||||
$agent_alias = modules_get_agentmodule_agent_alias ($alert['id_agent_module']);
|
||||
$agent = modules_get_agentmodule_agent ($alert['id_agent_module']);
|
||||
$module_name = modules_get_agentmodule_name ($alert['id_agent_module']);
|
||||
|
||||
@ -65,7 +65,7 @@ $table_details->data[] = $data;
|
||||
|
||||
$data[0] = __('Agent');
|
||||
$data[1] ='<a style=" font-size: 7pt;" href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$agent.
|
||||
'" title="'.$agent_name.'"><b><span style=" font-size: 7pt;">'.$agent_name.'</span></b></a>';
|
||||
'" title="'.$agent_alias.'"><b><span style=" font-size: 7pt;">'.$agent_alias.'</span></b></a>';
|
||||
$table_details->data[] = $data;
|
||||
|
||||
$data[0] = __('Module');
|
||||
|
||||
@ -496,7 +496,7 @@ $table->data['edit3'][0] = __('Post process') .
|
||||
ui_print_help_icon ('postprocess', true);
|
||||
|
||||
$table->data['edit3'][1] = html_print_extended_select_for_post_process('post_process',
|
||||
0, '', 0, '', false, true, 'width:150px;', true);
|
||||
-1, '','', 0, false, true, 'width:150px;', true, false, 1);
|
||||
|
||||
$table->data['edit3'][2] = __('SMNP community');
|
||||
$table->data['edit3'][3] = html_print_input_text ('snmp_community', '',
|
||||
@ -1153,6 +1153,11 @@ function process_manage_edit ($module_name, $agents_select = null) {
|
||||
$values['plugin_pass'] = io_input_password($value);
|
||||
}
|
||||
break;
|
||||
case 'post_process':
|
||||
if($value !== '-1'){
|
||||
$values['post_process'] = $value;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
if ($value != '') {
|
||||
$values[$field] = $value;
|
||||
|
||||
@ -430,7 +430,7 @@ switch ($action) {
|
||||
$table_aux->colspan[0][0] = 4;
|
||||
$table_aux->data[0][0] = "<b>". __("Group") . "</b>";
|
||||
|
||||
$table_aux->data[0][1] = html_print_select_groups(false, $access, true, 'id_group', $id_group, '', '', '', true, false, true, '', false, 'width:150px', false, false, 'id_grupo', $strict_user). '<br>';
|
||||
$table_aux->data[0][1] = html_print_select_groups(false, $access, true, 'id_group', $id_group, '', '', '', true, false, true, '', false, "", false, false, 'id_grupo', $strict_user). '<br>';
|
||||
|
||||
$table_aux->data[0][2] = "<b>". __("Free text for search: ") . ui_print_help_tip(
|
||||
__('Search by report name or description, list matches.'),true) . "</b>";
|
||||
|
||||
@ -84,7 +84,46 @@ function visual_map_main() {
|
||||
//Fixed to wait the load of images.
|
||||
$(window).load(function() {
|
||||
|
||||
|
||||
$('#module').change(function(){
|
||||
var txt = $("#module").val();
|
||||
if(selectedItem == 'simple_value' || creationItem == 'simple_value'){
|
||||
$.ajax({
|
||||
async:false,
|
||||
type: "POST",
|
||||
url: "ajax.php",
|
||||
data: {"page" : "general/check_image_module",
|
||||
"get_image" : txt,
|
||||
},
|
||||
success: function(data) {
|
||||
if(data == 0){
|
||||
$("#data_image_check").html('Off');
|
||||
$('#data_image_container').css('display','none');
|
||||
$('#data_image_check').css('display','none');
|
||||
$('#data_image_check_label').css('display','none');
|
||||
$('.block_tinymce').remove();
|
||||
$('#process_value_row').css('display','table-row');
|
||||
if($('#process_value').val() != '0'){
|
||||
$('#period_row').css('display','table-row');
|
||||
}
|
||||
}
|
||||
else{
|
||||
$('#data_image_container').css('display','inline');
|
||||
$('#data_image_check').css('display','inline');
|
||||
$('#data_image_check_label').css('display','inline');
|
||||
$("#data_image_check").html('On');
|
||||
$('#process_value_row').css('display','none');
|
||||
$('#period_row').css('display','none');
|
||||
$('#text-label_ifr').contents().find('#tinymce').html('_VALUE_');
|
||||
$('.block_tinymce').remove();
|
||||
$('#label_row').append('<div class="block_tinymce" style="background-color:#fbfbfb;position:absolute;left:0px;height:230px;width:100%;opacity:0.7;z-index:5;"></div>');
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
// Begin - Background label color changer
|
||||
|
||||
$( "#text-label_ifr" ).contents().find( "body" ).bind("contextmenu", function(e) {
|
||||
@ -360,10 +399,32 @@ function update_button_palette_callback() {
|
||||
setModuleGraph(idItem);
|
||||
break;
|
||||
case 'simple_value':
|
||||
$("#text_" + idItem).html(values['label']);
|
||||
//checkpoint
|
||||
if(($('#text-label_ifr').contents().find('#tinymce p').html() == '_VALUE_' ||
|
||||
$('#text-label_ifr').contents().find('#tinymce').html() == '_VALUE_')
|
||||
&& $('#data_image_check').html() != 'On'){
|
||||
alert('_VALUE_ exactly value is only enable for data image. Please change label text or select a data image module.');
|
||||
return;
|
||||
}
|
||||
$("#" + idItem).html(values['label']);
|
||||
if(values['label'].replace( /<.*?>/g, '' ) == '_VALUE_'){
|
||||
$("#text_" + idItem).html('<img style="width:'+values['width_data_image']+'px;" src="images/console/signes/data_image.png">');
|
||||
$("#" + idItem).html('<img style="width:'+values['width_data_image']+'px;" src="images/console/signes/data_image.png">');
|
||||
}
|
||||
else{
|
||||
$("#text_" + idItem).html(
|
||||
'<table><tbody><tr><td></td></tr><tr><td><span style="" id="text_21" class="text">'+values["label"]+'</span></td></tr><tr><td></td></tr></tbody></table>'
|
||||
)
|
||||
$("#" + idItem).html(
|
||||
'<table><tbody><tr><td></td></tr><tr><td><span style="" id="text_21" class="text">'+values["label"]+'</span></td></tr><tr><td></td></tr></tbody></table>'
|
||||
)
|
||||
|
||||
}
|
||||
|
||||
|
||||
//$("#simplevalue_" + idItem)
|
||||
//.html($('<img></img>').attr('src', "images/spinner.gif"));
|
||||
setModuleValue(idItem,values['process_simple_value'], values['period']);
|
||||
setModuleValue(idItem,values['process_simple_value'], values['period'],values['width']);
|
||||
break;
|
||||
case 'label':
|
||||
$("#text_" + idItem).html(values['label']);
|
||||
@ -510,7 +571,14 @@ function readFields() {
|
||||
values['process_simple_value'] = $("select[name=process_value]").val();
|
||||
values['background'] = $("#background_image").val();
|
||||
values['period'] = undefined != $("#hidden-period").val() ? $("#hidden-period").val() : $("#period").val();
|
||||
if (values['period'] == null) {
|
||||
values['period'] = undefined != $("#hidden-period").val() ? $("#hidden-period").val() : $("#period_select").val();
|
||||
}
|
||||
values['width'] = $("input[name=width]").val();
|
||||
values['width_data_image'] = $("#data_image_width").val();
|
||||
if(values['width_data_image'] != 0){
|
||||
values['width'] = values['width_data_image'];
|
||||
}
|
||||
values['height'] = $("input[name=height]").val();
|
||||
values['parent'] = $("select[name=parent]").val();
|
||||
values['map_linked'] = $("select[name=map_linked]").val();
|
||||
@ -563,14 +631,14 @@ function create_button_palette_callback() {
|
||||
var validate = true;
|
||||
switch (creationItem) {
|
||||
case 'box_item':
|
||||
if (($("input[name='width_box']").val() == '')) {
|
||||
alert('Undefined width');
|
||||
validate = false;
|
||||
}
|
||||
if (($("input[name='height_box']").val() == '')) {
|
||||
alert('Undefined height');
|
||||
validate = false;
|
||||
}
|
||||
if (($("input[name='width_box']").val() == '')) {
|
||||
alert('Undefined width');
|
||||
validate = false;
|
||||
}
|
||||
if (($("input[name='height_box']").val() == '')) {
|
||||
alert('Undefined height');
|
||||
validate = false;
|
||||
}
|
||||
break;
|
||||
case 'group_item':
|
||||
case 'static_graph':
|
||||
@ -630,7 +698,7 @@ function create_button_palette_callback() {
|
||||
validate = false;
|
||||
}
|
||||
break;
|
||||
case 'module_graph':
|
||||
case 'module_graph':
|
||||
if (values['width_module_graph'] == '') {
|
||||
alert('Undefined width');
|
||||
validate = false;
|
||||
@ -678,6 +746,7 @@ function create_button_palette_callback() {
|
||||
create_line('step_1', values);
|
||||
break;
|
||||
default:
|
||||
|
||||
insertDB(creationItem, values);
|
||||
break;
|
||||
}
|
||||
@ -956,6 +1025,14 @@ function toggle_item_palette() {
|
||||
$( "#text-label_ifr" ).contents().find( "body" ).css("background","lightgray");
|
||||
|
||||
}
|
||||
|
||||
if(creationItem != 'simple_value'){
|
||||
$("#data_image_check").html('Off');
|
||||
$("#data_image_check").css('display','none');
|
||||
$("#data_image_check_label").css('display','none');
|
||||
$("#data_image_container").css('display','none');
|
||||
$('.block_tinymce').remove();
|
||||
}
|
||||
}
|
||||
|
||||
function fill_parent_select(id_item) {
|
||||
@ -1518,7 +1595,6 @@ function set_static_graph_status(idElement, image, status) {
|
||||
data: parameter,
|
||||
success: function (data) {
|
||||
set_static_graph_status(idElement, image, data);
|
||||
|
||||
if($('#'+idElement+' table').css('float') == 'right' || $('#'+idElement+ ' table').css('float') == 'left'){
|
||||
$('#'+idElement+ ' img').css('margin-top', parseInt($('#'+idElement).css('height'))/2 - parseInt($('#'+idElement+ ' img').css('height'))/2);
|
||||
}
|
||||
@ -1554,7 +1630,6 @@ function set_static_graph_status(idElement, image, status) {
|
||||
suffix = ".png";
|
||||
break;
|
||||
}
|
||||
|
||||
set_image("image", idElement, image + suffix);
|
||||
}
|
||||
|
||||
@ -1678,12 +1753,13 @@ function setModuleGraph(id_data) {
|
||||
|
||||
}
|
||||
|
||||
function setModuleValue(id_data, process_simple_value, period) {
|
||||
function setModuleValue(id_data, process_simple_value, period,width_data_image) {
|
||||
var parameter = Array();
|
||||
parameter.push ({name: "page", value: "include/ajax/visual_console_builder.ajax"});
|
||||
parameter.push ({name: "action", value: "get_module_value"});
|
||||
parameter.push ({name: "id_element", value: id_data});
|
||||
parameter.push ({name: "period", value: period});
|
||||
parameter.push ({name: "width", value: width_data_image});
|
||||
parameter.push ({name: "id_visual_console", value: id_visual_console});
|
||||
if (process_simple_value != undefined) {
|
||||
parameter.push ({name: "process_simple_value", value: process_simple_value});
|
||||
@ -1695,7 +1771,9 @@ function setModuleValue(id_data, process_simple_value, period) {
|
||||
type: "POST",
|
||||
dataType: 'json',
|
||||
success: function (data) {
|
||||
var currentValue = $("#text_" + id_data).html();
|
||||
|
||||
var currentValue = $("#text_" + id_data).html();
|
||||
|
||||
//currentValue = currentValue.replace(/_VALUE_/gi, data.value);
|
||||
$("#text_" + id_data).html(currentValue);
|
||||
//$("#text_" + id_data).html('Data value');
|
||||
@ -2025,6 +2103,10 @@ function createItem(type, values, id_data) {
|
||||
if($('#preview > img')[0].naturalWidth > 150 || $('#preview > img')[0].naturalHeight > 150){
|
||||
$image.attr('width', '70')
|
||||
.attr('height', '70');
|
||||
}
|
||||
else{
|
||||
$image.attr('width', $('#preview > img')[0].naturalWidth)
|
||||
.attr('height', $('#preview > img')[0].naturalHeight);
|
||||
}
|
||||
}
|
||||
else {
|
||||
@ -2206,10 +2288,14 @@ function createItem(type, values, id_data) {
|
||||
case 'simple_value':
|
||||
sizeStyle = '';
|
||||
imageSize = '';
|
||||
if($('#data_image_check').html() == 'On'){
|
||||
values['label'] = '<img style="width:'+$('#data_image_width').val()+'px;" src="images/console/signes/data_image.png">';
|
||||
|
||||
}
|
||||
item = $('<div id="' + id_data + '" class="item simple_value" style="position: absolute; ' + sizeStyle + ' top: ' + values['top'] + 'px; left: ' + values['left'] + 'px;">' +
|
||||
'<span id="text_' + id_data + '" class="text"> ' + values['label'] + '</span> ' + '</div>'
|
||||
);
|
||||
setModuleValue(id_data,values.process_simple_value,values.period);
|
||||
setModuleValue(id_data,values.process_simple_value,values.period,values.width_data_image);
|
||||
break;
|
||||
case 'label':
|
||||
item = $('<div id="' + id_data + '" ' +
|
||||
@ -2289,6 +2375,7 @@ function addItemSelectParents(id_data, text) {
|
||||
}
|
||||
|
||||
function insertDB(type, values) {
|
||||
|
||||
metaconsole = $("input[name='metaconsole']").val();
|
||||
|
||||
$("#saving_in_progress_dialog").dialog({
|
||||
@ -2421,7 +2508,7 @@ function updateDB_visual(type, idElement , values, event, top, left) {
|
||||
if (type == 'simple_value') {
|
||||
setModuleValue(idElement,
|
||||
values.process_simple_value,
|
||||
values.period);
|
||||
values.period,values.width_data_image);
|
||||
}
|
||||
|
||||
|
||||
@ -2900,6 +2987,39 @@ function eventsItems(drag) {
|
||||
if ((!is_opened_palette) && (autosave)) {
|
||||
toggle_item_palette();
|
||||
}
|
||||
|
||||
if(selectedItem == 'simple_value'){
|
||||
|
||||
var found = $('#'+idItem).find("img");
|
||||
|
||||
if(found.length > 0){
|
||||
$("#data_image_check").css('display','inline');
|
||||
$("#data_image_check_label").css('display','inline');
|
||||
$('#data_image_container').css('display','inline');
|
||||
$("#data_image_check").html('On');
|
||||
$('.block_tinymce').remove();
|
||||
$('#label_row').append('<div class="block_tinymce" style="background-color:#fbfbfb;position:absolute;left:0px;height:230px;width:100%;opacity:0.7;z-index:5;"></div>');
|
||||
$('#process_value_row').css('display','none');
|
||||
$('#period_row').css('display','none');
|
||||
}
|
||||
else{
|
||||
$("#data_image_check").html('Off');
|
||||
$("#data_image_check").css('display','none');
|
||||
$("#data_image_check_label").css('display','none');
|
||||
$('#data_image_container').css('display','none');
|
||||
$('.block_tinymce').remove();
|
||||
$('#process_value_row').css('display','table-row');
|
||||
if($('#process_value').val() != 0){
|
||||
$('#period_row').css('display','table-row');
|
||||
}
|
||||
}
|
||||
}
|
||||
else{
|
||||
$("#data_image_check").css('display','none');
|
||||
$("#data_image_check_label").css('display','none');
|
||||
$('#data_image_container').css('display','none');
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
//Set the limit of draggable in the div with id "background" and set drag
|
||||
|
||||
@ -51,7 +51,8 @@ if (is_ajax ()) {
|
||||
$row['control'] = __('Yes').' '.html_print_radio_button('fallback_local_auth', 1, '', $config['fallback_local_auth'], true).' ';
|
||||
$row['control'] .= __('No').' '.html_print_radio_button('fallback_local_auth', 0, '', $config['fallback_local_auth'], true);
|
||||
$table->data['fallback_local_auth'] = $row;
|
||||
|
||||
|
||||
if (enterprise_installed()) {
|
||||
// Autocreate remote users
|
||||
$row = array();
|
||||
$row['name'] = __('Autocreate remote users');
|
||||
@ -59,8 +60,7 @@ if (is_ajax ()) {
|
||||
$row['control'] .= __('No').' '.html_print_radio_button_extended('autocreate_remote_users', 0, '', $config['autocreate_remote_users'], false, '', '', true);
|
||||
$table->data['autocreate_remote_users'] = $row;
|
||||
|
||||
if (enterprise_installed()) {
|
||||
add_enterprise_auth_autocreate_profiles($table, $type_auth);
|
||||
add_enterprise_auth_autocreate_profiles($table, $type_auth);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -84,7 +84,7 @@ $table_remote->data['ehorus_pass'] = $row;
|
||||
$row = array();
|
||||
$row['name'] = __('API Hostname');
|
||||
$row['control'] = html_print_input_text('ehorus_hostname', $config['ehorus_hostname'], '', 30, 100, true);
|
||||
$row['control'] .= ui_print_help_tip(__('Hostname of the eHorus API') . '. ' . __('Without protocol and port') . '. ' . __('e.g., switch.ehorus.com'), true);
|
||||
$row['control'] .= ui_print_help_tip(__('Hostname of the eHorus API') . '. ' . __('Without protocol and port') . '. ' . __('e.g., portal.ehorus.com'), true);
|
||||
$table_remote->data['ehorus_hostname'] = $row;
|
||||
|
||||
// Directory port
|
||||
|
||||
@ -221,8 +221,6 @@ if (($filter_group == 0) && ($filter_search == '')) {
|
||||
$table = new stdClass();
|
||||
$table->width = '100%';
|
||||
$table->class = "databox filters";
|
||||
if(defined('METACONSOLE'))
|
||||
$table->class = "databox_filters";
|
||||
$table->rowclass[0] = '';
|
||||
$table->data[0][0] = '<b>' . __('Group') . '</b>';
|
||||
$table->data[0][1] = html_print_select_groups(false, "AR", true,
|
||||
@ -496,3 +494,10 @@ echo '</div>';
|
||||
enterprise_hook('close_meta_frame');
|
||||
|
||||
?>
|
||||
<script type="text/javascript">
|
||||
$(document).ready (function () {
|
||||
console.log('sknknan');
|
||||
// text-filter_search
|
||||
});
|
||||
</script>
|
||||
|
||||
|
||||
BIN
pandora_console/images/console/signes/data_image.png
Normal file
BIN
pandora_console/images/console/signes/data_image.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 13 KiB |
BIN
pandora_console/images/spinner_green.gif
Normal file
BIN
pandora_console/images/spinner_green.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.2 KiB |
@ -517,11 +517,11 @@ if ($table_events) {
|
||||
$date_subtract_day = time() - (24 * 60 * 60);
|
||||
|
||||
if($all_events_24h){
|
||||
events_print_event_table ("utimestamp > $date_subtract_day", 10, '100%',
|
||||
events_print_event_table ("utimestamp > $date_subtract_day", 200, '100%',
|
||||
false, $id_agente,true);
|
||||
}
|
||||
else{
|
||||
events_print_event_table ("estado <> 1 $tags_condition", 10, '100%',
|
||||
events_print_event_table ("estado <> 1 $tags_condition", 200, '100%',
|
||||
false, $id_agente,true);
|
||||
}
|
||||
}
|
||||
|
||||
@ -268,21 +268,16 @@ if ($get_module_detail) {
|
||||
foreach ($columns as $col => $attr) {
|
||||
if ($attr[1] != "modules_format_data") {
|
||||
$data[] = date('d F Y h:i:s A', $row['utimestamp']);
|
||||
|
||||
}
|
||||
elseif (($config['command_snapshot']) && (preg_match ("/[\n]+/i", $row[$attr[0]]))) {
|
||||
// Its a single-data, multiline data (data snapshot) ?
|
||||
|
||||
|
||||
// Detect string data with \n and convert to <br>'s
|
||||
$datos = $row[$attr[0]];
|
||||
//$datos = preg_replace ('/\n/i','<br>',$row[$attr[0]]);
|
||||
//$datos = preg_replace ('/\s/i',' ',$datos);
|
||||
|
||||
// Because this *SHIT* of print_table monster, I cannot format properly this cells
|
||||
// so, eat this, motherfucker :))
|
||||
|
||||
$datos = io_safe_input($datos);
|
||||
$datos = preg_replace("/\n/", "</br></br>", $datos);
|
||||
|
||||
// I dont why, but using index (value) method, data is automatically converted to html entities ¿?
|
||||
$data[] = $datos;
|
||||
@ -290,7 +285,6 @@ if ($get_module_detail) {
|
||||
elseif ($is_web_content_string) {
|
||||
//Fixed the goliat sends the strings from web
|
||||
//without HTML entities
|
||||
|
||||
$data[] = io_safe_input($row[$attr[0]]);
|
||||
}
|
||||
else {
|
||||
@ -301,9 +295,6 @@ if ($get_module_detail) {
|
||||
$data[] = io_safe_input($row[$attr[0]]);
|
||||
}
|
||||
else if (is_numeric($row[$attr[0]]) && !modules_is_string_type($row['module_type']) ) {
|
||||
|
||||
//~ $data[] = remove_right_zeros(number_format($row[$attr[0]], $config['graph_precision']));
|
||||
//~ $data[] = (double) $row[$attr[0]];
|
||||
switch($row['module_type']) {
|
||||
case 15:
|
||||
$value = db_get_value('snmp_oid', 'tagente_modulo', 'id_agente_modulo', $module_id);
|
||||
@ -328,17 +319,12 @@ if ($get_module_detail) {
|
||||
$data[] = 'No data';
|
||||
}
|
||||
else {
|
||||
|
||||
if(is_snapshot_data($row[$attr[0]])){
|
||||
$data[] = "<a target='_blank' href='".io_safe_input($row[$attr[0]])."'><img style='width:300px' src='".io_safe_input($row[$attr[0]])."'></a>";
|
||||
}
|
||||
else{
|
||||
$data[] = $row[$attr[0]];
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
if(is_snapshot_data($row[$attr[0]])){
|
||||
$data[] = "<a target='_blank' href='".io_safe_input($row[$attr[0]])."'><img style='width:300px' src='".io_safe_input($row[$attr[0]])."'></a>";
|
||||
}
|
||||
else{
|
||||
$data[] = $row[$attr[0]];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
126
pandora_console/include/ajax/snmp_browser.ajax.php
Normal file
126
pandora_console/include/ajax/snmp_browser.ajax.php
Normal file
@ -0,0 +1,126 @@
|
||||
<?php
|
||||
|
||||
//Pandora FMS- http://pandorafms.com
|
||||
// ==================================================
|
||||
// Copyright (c) 2005-2017 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 Lesser General Public License
|
||||
// as published by the Free Software Foundation; 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.
|
||||
include_once($config['homedir'] . "/include/functions_config.php");
|
||||
include_once($config['homedir'] . "/include/functions_snmp_browser.php");
|
||||
require_once ($config['homedir'] . '/include/functions_network_components.php');
|
||||
|
||||
global $config;
|
||||
|
||||
if(is_ajax()){
|
||||
ob_clean();
|
||||
$action = (string) get_parameter ("action", "");
|
||||
$target_ip = (string) get_parameter ("target_ip", '');
|
||||
$community = (string) get_parameter ("community", '');
|
||||
$snmp_version = (string) get_parameter ("snmp_browser_version", '');
|
||||
$snmp3_auth_user = get_parameter('snmp3_browser_auth_user');
|
||||
$snmp3_security_level = get_parameter('snmp3_browser_security_level');
|
||||
$snmp3_auth_method = get_parameter('snmp3_browser_auth_method');
|
||||
$snmp3_auth_pass = get_parameter('snmp3_browser_auth_pass');
|
||||
$snmp3_privacy_method = get_parameter('snmp3_browser_privacy_method');
|
||||
$snmp3_privacy_pass = get_parameter('snmp3_browser_privacy_pass');
|
||||
|
||||
$targets_oids = get_parameter ("oids", "");
|
||||
$targets_oids = explode(",", $targets_oids);
|
||||
|
||||
|
||||
$custom_action = get_parameter ("custom_action", "");
|
||||
if ($custom_action != "") {
|
||||
$custom_action = urldecode (base64_decode ($custom_action));
|
||||
}
|
||||
if($action == 'create_modules_snmp'){
|
||||
$fail_modules = array();
|
||||
foreach ($targets_oids as $key => $target_oid) {
|
||||
$oid = snmp_browser_get_oid ($target_ip, $community,
|
||||
htmlspecialchars_decode($target_oid), $snmp_version, $snmp3_auth_user,
|
||||
$snmp3_security_level, $snmp3_auth_method, $snmp3_auth_pass,
|
||||
$snmp3_privacy_method, $snmp3_privacy_pass);
|
||||
|
||||
|
||||
$name_check = db_get_value ('name', 'tnetwork_component',
|
||||
'name', $oid['oid']);
|
||||
|
||||
if(empty($oid['description'])) {
|
||||
$description = '';
|
||||
} else {
|
||||
$description = io_safe_input($oid['description']);
|
||||
}
|
||||
|
||||
if(!$name_check){
|
||||
$id = network_components_create_network_component ($oid['oid'],17,1,
|
||||
array ('description' => $description,
|
||||
'module_interval' => 300,
|
||||
'max' => 0,
|
||||
'min' => 0,
|
||||
'tcp_send' => $snmp_version,
|
||||
'tcp_rcv' => '',
|
||||
'tcp_port' => 0,
|
||||
'snmp_oid' => $oid['numeric_oid'],
|
||||
'snmp_community' => $community,
|
||||
'id_module_group' => 3,
|
||||
'id_modulo' => 2,
|
||||
'id_plugin' => 0,
|
||||
'plugin_user' => '',
|
||||
'plugin_pass' => '',
|
||||
'plugin_parameter' => '',
|
||||
'macros' => '',
|
||||
'max_timeout' => 0,
|
||||
'max_retries' => 0,
|
||||
'history_data' => '',
|
||||
'dynamic_interval' => 0,
|
||||
'dynamic_max' => 0,
|
||||
'dynamic_min' => 0,
|
||||
'dynamic_two_tailed' => 0,
|
||||
'min_warning' => 0,
|
||||
'max_warning' => 0,
|
||||
'str_warning' => '',
|
||||
'min_critical' => 0,
|
||||
'max_critical' => 0,
|
||||
'str_critical' => '',
|
||||
'min_ff_event' => 0,
|
||||
'custom_string_1' => '',
|
||||
'custom_string_2' => '',
|
||||
'custom_string_3' => '',
|
||||
'post_process' => 0,
|
||||
'unit' => '',
|
||||
'wizard_level' => 'nowizard',
|
||||
'macros' => '',
|
||||
'critical_instructions' => '',
|
||||
'warning_instructions' => '',
|
||||
'unknown_instructions' => '',
|
||||
'critical_inverse' => 0,
|
||||
'warning_inverse' => 0,
|
||||
'id_category' => 0,
|
||||
'tags' => '',
|
||||
'disabled_types_event' => '{"going_unknown":1}',
|
||||
'min_ff_event_normal' => 0,
|
||||
'min_ff_event_warning' => 0,
|
||||
'min_ff_event_critical' => 0,
|
||||
'each_ff' => 0));
|
||||
}
|
||||
|
||||
if(empty($id)) {
|
||||
array_push($fail_modules,$name_check);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
echo json_encode($fail_modules);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
|
||||
?>
|
||||
@ -422,6 +422,7 @@ switch ($action) {
|
||||
$values['type'] = visual_map_get_simple_value_type(
|
||||
$process_simple_value);
|
||||
$values['period'] = $period;
|
||||
$values['width'] = $width;
|
||||
}
|
||||
case 'percentile_bar':
|
||||
case 'percentile_item':
|
||||
@ -897,6 +898,7 @@ switch ($action) {
|
||||
//This allows min, max and avg process in a simple value
|
||||
$values['type'] = visual_map_get_simple_value_type($process_simple_value);
|
||||
$values['period'] = $period;
|
||||
$values['width'] = $width;
|
||||
break;
|
||||
case 'label':
|
||||
$values['type'] = LABEL;
|
||||
|
||||
@ -22,8 +22,8 @@
|
||||
/**
|
||||
* Pandora build version and version
|
||||
*/
|
||||
$build_version = 'PC170626';
|
||||
$pandora_version = 'v7.0NG.705';
|
||||
$build_version = 'PC170718';
|
||||
$pandora_version = 'v7.0NG.707';
|
||||
|
||||
// Do not overwrite default timezone set if defined.
|
||||
$script_tz = @date_default_timezone_get();
|
||||
@ -252,7 +252,7 @@ if (isset($_POST['vc_refr'])) {
|
||||
|
||||
|
||||
//======= Autorefresh code =============================================
|
||||
$select = db_process_sql("SELECT value FROM tconfig WHERE token='autorefresh_white_list'");
|
||||
$select = db_process_sql("SELECT autorefresh_white_list FROM tusuario WHERE id_user = '" . $config['id_user'] . "'");
|
||||
$autorefresh_list = json_decode($select[0]['value']);
|
||||
$config['autorefresh_white_list'] = array();
|
||||
$config['autorefresh_white_list'] = $autorefresh_list;
|
||||
|
||||
@ -467,6 +467,7 @@ define("OPTION_SINGLE_SELECT_TIME", 7);
|
||||
define("OPTION_CUSTOM_INPUT", 8);
|
||||
define("OPTION_AGENT_AUTOCOMPLETE", 9);
|
||||
define("OPTION_SELECT_MULTISELECTION", 10);
|
||||
define("OPTION_COLOR_PICKER", 11);
|
||||
|
||||
/* Transactional map constants */
|
||||
define("NODE_TYPE", 0);
|
||||
|
||||
File diff suppressed because one or more lines are too long
43
pandora_console/include/ehorus/bundle.min.js
vendored
43
pandora_console/include/ehorus/bundle.min.js
vendored
File diff suppressed because one or more lines are too long
@ -37,6 +37,12 @@ div.term-container div.terminal {
|
||||
-webkit-transform: rotate(360deg);
|
||||
}
|
||||
}
|
||||
.button-color-animate {
|
||||
color: #337ab7;
|
||||
-webkit-transition: color 2000ms linear;
|
||||
-ms-transition: color 2000ms linear;
|
||||
transition: color 2000ms linear;
|
||||
}
|
||||
@-moz-keyframes spin {
|
||||
from {
|
||||
transform: scale(1) rotate(0deg);
|
||||
|
||||
@ -61,7 +61,7 @@
|
||||
position: absolute;
|
||||
opacity: 0;
|
||||
left: -9999em;
|
||||
top: -9999em;
|
||||
top: 0;
|
||||
width: 0;
|
||||
height: 0;
|
||||
z-index: -10;
|
||||
@ -71,7 +71,22 @@
|
||||
resize: none;
|
||||
}
|
||||
|
||||
.terminal .terminal-cursor {
|
||||
.terminal a {
|
||||
color: inherit;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.terminal a:hover {
|
||||
cursor: pointer;
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.terminal a.xterm-invalid-link:hover {
|
||||
cursor: text;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.terminal.focus:not(.xterm-cursor-style-underline):not(.xterm-cursor-style-bar) .terminal-cursor {
|
||||
background-color: #fff;
|
||||
color: #000;
|
||||
}
|
||||
@ -82,19 +97,41 @@
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
.terminal.focus .terminal-cursor.blinking {
|
||||
animation: blink-cursor 1.2s infinite step-end;
|
||||
.terminal:not(.xterm-cursor-style-underline):not(.xterm-cursor-style-bar).focus.xterm-cursor-blink-on .terminal-cursor {
|
||||
background-color: transparent;
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
@keyframes blink-cursor {
|
||||
0% {
|
||||
background-color: #fff;
|
||||
color: #000;
|
||||
}
|
||||
50% {
|
||||
background-color: transparent;
|
||||
color: #FFF;
|
||||
}
|
||||
.terminal.xterm-cursor-style-bar .terminal-cursor,
|
||||
.terminal.xterm-cursor-style-underline .terminal-cursor {
|
||||
position: relative;
|
||||
}
|
||||
.terminal.xterm-cursor-style-bar .terminal-cursor::before,
|
||||
.terminal.xterm-cursor-style-underline .terminal-cursor::before {
|
||||
content: "";
|
||||
display: block;
|
||||
position: absolute;
|
||||
background-color: #fff;
|
||||
}
|
||||
.terminal.xterm-cursor-style-bar .terminal-cursor::before {
|
||||
top: 0;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
width: 1px;
|
||||
}
|
||||
.terminal.xterm-cursor-style-underline .terminal-cursor::before {
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
height: 1px;
|
||||
}
|
||||
.terminal.xterm-cursor-style-bar.focus.xterm-cursor-blink.xterm-cursor-blink-on .terminal-cursor::before,
|
||||
.terminal.xterm-cursor-style-underline.focus.xterm-cursor-blink.xterm-cursor-blink-on .terminal-cursor::before {
|
||||
background-color: transparent;
|
||||
}
|
||||
.terminal.xterm-cursor-style-bar.focus.xterm-cursor-blink .terminal-cursor::before,
|
||||
.terminal.xterm-cursor-style-underline.focus.xterm-cursor-blink .terminal-cursor::before {
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
.terminal .composition-view {
|
||||
@ -116,6 +153,10 @@
|
||||
overflow-y: scroll;
|
||||
}
|
||||
|
||||
.terminal .xterm-wide-char {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.terminal .xterm-rows {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
|
||||
@ -1796,6 +1796,26 @@ function check_acl($id_user, $id_group, $access, $onlyOneGroup = false) {
|
||||
$id_group = (int) $id_group;
|
||||
}
|
||||
|
||||
if($_SESSION['check_acl'] != null){
|
||||
if (empty ($_SESSION['check_acl']))
|
||||
return 0;
|
||||
|
||||
$result = 0;
|
||||
$acl_column = get_acl_column($access);
|
||||
foreach ($_SESSION['check_acl'] as $row) {
|
||||
// For each profile for this pair of group and user do...
|
||||
if (isset($row[$acl_column])) {
|
||||
$result += $row[$acl_column];
|
||||
}
|
||||
}
|
||||
|
||||
if ($result >= 1) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
$parents_id = array($id_group);
|
||||
if ($id_group != 0 && $onlyOneGroup !== true) {
|
||||
$group = db_get_row_filter('tgrupo', array('id_grupo' => $id_group));
|
||||
@ -1844,8 +1864,13 @@ function check_acl($id_user, $id_group, $access, $onlyOneGroup = false) {
|
||||
OR tusuario_perfil.id_grupo = 0)", $id_user, implode(', ', $parents_id));
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
$rowdup = db_get_all_rows_sql ($query);
|
||||
|
||||
$_SESSION['check_acl'] = $rowdup;
|
||||
|
||||
if (empty ($rowdup))
|
||||
return 0;
|
||||
|
||||
|
||||
@ -8893,7 +8893,7 @@ function api_set_create_tag ($id, $trash1, $other, $returnType) {
|
||||
|
||||
//http://127.0.0.1/pandora_console/include/api.php?op=set&op2=create_event&id=name_event&other=2|system|3|admin|2|1|10|0|comments||Pandora||critical_inst|warning_inst|unknown_inst|other||&other_mode=url_encode_separator_|&apipass=1234&user=admin&pass=pandora
|
||||
function api_set_create_event($id, $trash1, $other, $returnType) {
|
||||
|
||||
|
||||
if ($other['type'] == 'string') {
|
||||
returnError('error_parameter', 'Error in the parameters.');
|
||||
return;
|
||||
@ -9048,6 +9048,13 @@ function api_set_create_event($id, $trash1, $other, $returnType) {
|
||||
}
|
||||
if ($other['data'][18] != '') {
|
||||
$values['id_extra'] = $other['data'][18];
|
||||
$sql_validation = 'SELECT id_evento FROM tevento where estado=0 and id_extra ="'. $other['data'][18] .'";';
|
||||
$validation = db_get_all_rows_sql($sql_validation);
|
||||
if($validation){
|
||||
foreach ($validation as $val) {
|
||||
api_set_validate_event_by_id($val['id_evento']);
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
$values['id_extra'] = '';
|
||||
@ -9228,12 +9235,10 @@ function api_get_netflow_get_summary ($discard_1, $discard_2, $params) {
|
||||
//http://localhost/pandora_console/include/api.php?op=set&op2=validate_event_by_id&id=23&apipass=1234&user=admin&pass=pandora
|
||||
function api_set_validate_event_by_id ($id, $trash1, $trash2, $returnType) {
|
||||
global $config;
|
||||
|
||||
$data['type'] = 'string';
|
||||
$check_id = db_get_value('id_evento', 'tevento', 'id_evento', $id);
|
||||
|
||||
if ($check_id) { //event exists
|
||||
|
||||
$status = db_get_value('estado', 'tevento', 'id_evento', $id);
|
||||
if ($status == 1) { //event already validated
|
||||
$data['data'] = "Event already validated";
|
||||
|
||||
@ -855,9 +855,6 @@ function config_process_config () {
|
||||
config_update_value ('status_images_set', 'default');
|
||||
}
|
||||
|
||||
if(!isset ($config['autorefresh_white_list'])){
|
||||
config_update_value ('autorefresh_white_list', '');
|
||||
}
|
||||
// Load user session
|
||||
if (isset ($_SESSION['id_usuario']))
|
||||
$config["id_user"] = $_SESSION["id_usuario"];
|
||||
@ -1749,7 +1746,7 @@ function config_process_config () {
|
||||
config_update_value('ehorus_custom_field', 'eHorusID');
|
||||
}
|
||||
if (!isset($config['ehorus_hostname'])) {
|
||||
config_update_value('ehorus_hostname', 'switch.ehorus.com');
|
||||
config_update_value('ehorus_hostname', 'portal.ehorus.com');
|
||||
}
|
||||
if (!isset($config['ehorus_port'])) {
|
||||
config_update_value('ehorus_port', 18080);
|
||||
|
||||
@ -164,7 +164,7 @@ function custom_graphs_print($id_graph, $height, $width, $period,
|
||||
$background_color = 'white', $modules_param = array(), $homeurl = '',
|
||||
$name_list = array(), $unit_list = array(), $show_last = true,
|
||||
$show_max = true, $show_min = true, $show_avg = true, $ttl = 1,
|
||||
$dashboard = false, $vconsole = false, $percentil = null, $from_interface = false) {
|
||||
$dashboard = false, $vconsole = false, $percentil = null, $from_interface = false,$id_widget_dashboard=false) {
|
||||
|
||||
global $config;
|
||||
|
||||
@ -260,7 +260,8 @@ function custom_graphs_print($id_graph, $height, $width, $period,
|
||||
$dashboard,
|
||||
$vconsole,
|
||||
$percentil,
|
||||
$from_interface);
|
||||
$from_interface,
|
||||
$id_widget_dashboard);
|
||||
|
||||
if ($return)
|
||||
return $output;
|
||||
|
||||
@ -3394,9 +3394,9 @@ function events_sql_events_grouped_agents($id_agent, $server_id = -1,
|
||||
$sql_post .= " AND (utimestamp <= " . $udate_to . ")";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//Search by tag
|
||||
if (!empty($tag_with)) {
|
||||
if (!empty($tag_with) && (io_safe_output($tag_with) != "[]") && (io_safe_output($tag_with) != "[\"0\"]")) {
|
||||
$sql_post .= ' AND ( ';
|
||||
$first = true;
|
||||
foreach ($tag_with as $id_tag) {
|
||||
@ -3406,7 +3406,7 @@ function events_sql_events_grouped_agents($id_agent, $server_id = -1,
|
||||
}
|
||||
$sql_post .= ' ) ';
|
||||
}
|
||||
if (!empty($tag_without)) {
|
||||
if (!empty($tag_without) && (io_safe_output($tag_without) != "[]") && (io_safe_output($tag_with) != "[\"0\"]")) {
|
||||
$sql_post .= ' AND ( ';
|
||||
$first = true;
|
||||
foreach ($tag_without as $id_tag) {
|
||||
|
||||
@ -368,6 +368,7 @@ function gis_activate_ajax_refresh($layers = null, $lastTimeOfData = null, $publ
|
||||
}
|
||||
}
|
||||
}
|
||||
EventZoomEnd(null,map.zoom);
|
||||
}
|
||||
});
|
||||
}
|
||||
@ -396,7 +397,7 @@ function gis_activate_ajax_refresh($layers = null, $lastTimeOfData = null, $publ
|
||||
}
|
||||
?>
|
||||
}
|
||||
|
||||
|
||||
last_time_of_data = Math.round(new Date().getTime() / 1000); //Unixtimestamp
|
||||
|
||||
//Test if the user change the refresh time.
|
||||
@ -405,11 +406,16 @@ function gis_activate_ajax_refresh($layers = null, $lastTimeOfData = null, $publ
|
||||
idIntervalAjax = setInterval("clock_ajax_refresh()", refreshAjaxIntervalSeconds);
|
||||
oldRefreshAjaxIntervalSeconds = refreshAjaxIntervalSeconds;
|
||||
}
|
||||
|
||||
EventZoomEnd(null,map.zoom);
|
||||
|
||||
|
||||
}
|
||||
|
||||
$(document).ready (
|
||||
function () {
|
||||
idIntervalAjax = setInterval("clock_ajax_refresh()", refreshAjaxIntervalSeconds);
|
||||
EventZoomEnd(null,map.zoom);
|
||||
}
|
||||
);
|
||||
</script>
|
||||
|
||||
@ -579,11 +579,46 @@ function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events,
|
||||
}
|
||||
else {
|
||||
$data = db_get_all_rows_filter ('tagente_datos',
|
||||
array ('id_agente_modulo' => (int)$agent_module_id,
|
||||
"utimestamp > $datelimit",
|
||||
"utimestamp < $date",
|
||||
'order' => 'utimestamp ASC'),
|
||||
array ('datos', 'utimestamp'), 'AND', $search_in_history_db);
|
||||
array ('id_agente_modulo' => (int)$agent_module_id,
|
||||
"utimestamp > $datelimit",
|
||||
"utimestamp < $date",
|
||||
'order' => 'utimestamp ASC'),
|
||||
array ('datos', 'utimestamp'), 'AND', false);
|
||||
|
||||
if ($search_in_history_db) {
|
||||
$cache = false;
|
||||
$history = false;
|
||||
|
||||
$sql = "SELECT datos, utimestamp FROM tagente_datos WHERE id_agente_modulo = " . (int)$agent_module_id .
|
||||
" AND utimestamp > " . $datelimit . " AND utimestamp < " . $date .
|
||||
" ORDER BY utimestamp ASC";
|
||||
|
||||
// Connect to the history DB
|
||||
if (! isset ($config['history_db_connection']) || $config['history_db_connection'] === false) {
|
||||
$config['history_db_connection'] = db_connect($config['history_db_host'], $config['history_db_name'], $config['history_db_user'], io_output_password($config['history_db_pass']), $config['history_db_port'], false);
|
||||
}
|
||||
if ($config['history_db_connection'] !== false) {
|
||||
$history = mysql_db_process_sql ($sql, 'affected_rows', $config['history_db_connection'], false);
|
||||
}
|
||||
|
||||
if ($history === false) {
|
||||
$history = array ();
|
||||
}
|
||||
|
||||
$new_data = array();
|
||||
$last_timestamp = 0;
|
||||
foreach($history as $h) {
|
||||
$new_data[] = $h;
|
||||
$last_timestamp = $h['utimestamp'];
|
||||
}
|
||||
foreach($data as $d) {
|
||||
if ($d['utimestamp'] > $last_timestamp) {
|
||||
$new_data[] = $d;
|
||||
$last_timestamp = $d['utimestamp'];
|
||||
}
|
||||
}
|
||||
$data = $new_data;
|
||||
}
|
||||
}
|
||||
|
||||
// Get module warning_min and critical_min
|
||||
@ -832,7 +867,8 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
|
||||
$only_image = false, $homeurl = '', $ttl = 1, $projection = false,
|
||||
$adapt_key = '', $compare = false, $show_unknown = false,
|
||||
$menu = true, $backgroundColor = 'white', $percentil = null,
|
||||
$dashboard = false, $vconsole = false, $type_graph = 'area', $fullscale = false) {
|
||||
$dashboard = false, $vconsole = false, $type_graph = 'area', $fullscale = false,
|
||||
$id_widget_dashboard = false) {
|
||||
|
||||
global $config;
|
||||
global $graphic_type;
|
||||
@ -897,8 +933,7 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
|
||||
$date, $unit, $baseline, $return_data, $show_title,
|
||||
$projection, $adapt_key, $compare, '', '', $show_unknown,
|
||||
$percentil, $dashboard, $vconsole, $type_graph, $fullscale);
|
||||
|
||||
|
||||
|
||||
if ($return_data) {
|
||||
return $data_returned;
|
||||
}
|
||||
@ -949,6 +984,13 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
|
||||
}
|
||||
else {
|
||||
// Color commented not to restrict serie colors
|
||||
if($id_widget_dashboard){
|
||||
$opcion = unserialize(db_get_value_filter('options','twidget_dashboard',array('id' => $id_widget_dashboard)));
|
||||
$color['min']['color'] = $opcion['min'];
|
||||
$color['sum']['color'] = $opcion['avg'];
|
||||
$color['max']['color'] = $opcion['max'];
|
||||
}
|
||||
|
||||
return
|
||||
area_graph($flash_chart, $chart, $width, $height, $color,
|
||||
$legend, $long_index,
|
||||
@ -1035,7 +1077,7 @@ function graphic_combined_module ($module_list, $weight_list, $period,
|
||||
$prediction_period = false, $background_color = 'white',
|
||||
$name_list = array(), $unit_list = array(), $show_last = true, $show_max = true,
|
||||
$show_min = true, $show_avg = true, $labels = array(), $dashboard = false,
|
||||
$vconsole = false, $percentil = null, $from_interface = false) {
|
||||
$vconsole = false, $percentil = null, $from_interface = false, $id_widget_dashboard=false) {
|
||||
|
||||
global $config;
|
||||
global $graphic_type;
|
||||
@ -1870,6 +1912,15 @@ function graphic_combined_module ($module_list, $weight_list, $period,
|
||||
$color[15] = array('border' => '#000000',
|
||||
'color' => COL_GRAPH13,
|
||||
'alpha' => CHART_DEFAULT_ALPHA);
|
||||
|
||||
if($id_widget_dashboard){
|
||||
$opcion = unserialize(db_get_value_filter('options','twidget_dashboard',array('id' => $id_widget_dashboard)));
|
||||
foreach ($module_list as $key => $value) {
|
||||
if(!empty($opcion[$value])){
|
||||
$color[$key]['color'] = $opcion[$value];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$threshold_data = array();
|
||||
|
||||
@ -3419,7 +3470,12 @@ function graph_custom_sql_graph ($id, $width, $height,
|
||||
global $config;
|
||||
|
||||
$report_content = db_get_row ('treport_content', 'id_rc', $id);
|
||||
$historical_db = db_get_value_sql("SELECT historical_db from treport_content where id_rc =".$id);
|
||||
if($id != null){
|
||||
$historical_db = db_get_value_sql("SELECT historical_db from treport_content where id_rc =".$id);
|
||||
}
|
||||
else{
|
||||
$historical_db = $content['historical_db'];
|
||||
}
|
||||
if ($report_content["external_source"] != "") {
|
||||
$sql = io_safe_output ($report_content["external_source"]);
|
||||
}
|
||||
@ -3868,7 +3924,9 @@ function grafico_modulo_boolean_data ($agent_module_id, $period, $show_events,
|
||||
$timestamp_short = date($time_format, $timestamp);
|
||||
$long_index[$timestamp_short] = date(
|
||||
html_entity_decode($config['date_format'], ENT_QUOTES, "UTF-8"), $timestamp);
|
||||
$timestamp = $timestamp_short;
|
||||
if (!$fullscale) {
|
||||
$timestamp = $timestamp_short;
|
||||
}
|
||||
/////////////////////////////////////////////////////////////////
|
||||
|
||||
if ($total > $max_value) {
|
||||
|
||||
@ -624,7 +624,7 @@ function html_print_select_from_sql ($sql, $name, $selected = '',
|
||||
function html_print_extended_select_for_post_process($name, $selected = '',
|
||||
$script = '', $nothing = '', $nothing_value = '0', $size = false,
|
||||
$return = false, $select_style = false, $unique_name = true,
|
||||
$disabled = false) {
|
||||
$disabled = false, $no_change = 0) {
|
||||
|
||||
global $config;
|
||||
|
||||
@ -632,6 +632,10 @@ function html_print_extended_select_for_post_process($name, $selected = '',
|
||||
|
||||
|
||||
$fields = post_process_get_custom_values();
|
||||
if($no_change != 0){
|
||||
$fields[-1] = __('No change');
|
||||
}
|
||||
|
||||
$selected_float = (float)$selected;
|
||||
$found = false;
|
||||
|
||||
|
||||
@ -1722,7 +1722,7 @@ function modules_get_agentmodule_data ($id_agent_module, $period,
|
||||
break;
|
||||
//log4x
|
||||
case 24:
|
||||
$sql = sprintf ("SELECT datos AS data, utimestamp
|
||||
$sql = sprintf ("SELECT message AS data, utimestamp
|
||||
FROM tagente_datos_log4x
|
||||
WHERE id_agente_modulo = %d
|
||||
AND utimestamp > %d AND utimestamp <= %d
|
||||
|
||||
@ -148,8 +148,9 @@ function networkmap_process_networkmap($id = 0) {
|
||||
case "WINNT":
|
||||
case "Windows":
|
||||
$filename_plain = sys_get_temp_dir() . "\\plain.txt";
|
||||
$cmd = $config['graphviz_win'] . "$filter -Tplain -o " . $filename_plain . " " .
|
||||
$filename_dot;
|
||||
|
||||
$cmd = io_safe_output($config['graphviz_bin_dir'] . "\\$filter.exe -Tplain -o " . $filename_plain . " " .
|
||||
$filename_dot);
|
||||
break;
|
||||
default:
|
||||
$filename_plain = sys_get_temp_dir() . "/plain.txt";
|
||||
@ -157,7 +158,7 @@ function networkmap_process_networkmap($id = 0) {
|
||||
$filename_dot;
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
system ($cmd);
|
||||
|
||||
unlink($filename_dot);
|
||||
@ -165,6 +166,8 @@ function networkmap_process_networkmap($id = 0) {
|
||||
$nodes = networkmap_loadfile($id, $filename_plain,
|
||||
$relation_nodes, $graph);
|
||||
|
||||
unlink($filename_plain);
|
||||
|
||||
//Set the position of modules
|
||||
foreach ($nodes as $key => $node) {
|
||||
if ($node['type'] == 'module') {
|
||||
@ -265,8 +268,6 @@ function networkmap_process_networkmap($id = 0) {
|
||||
db_process_sql_update('tmap',
|
||||
array('center_x' => $networkmap['center_x'], 'center_y' => $networkmap['center_y']),
|
||||
array('id' => $id));
|
||||
|
||||
unlink($filename_plain);
|
||||
}
|
||||
|
||||
return $nodes_and_relations;
|
||||
|
||||
@ -128,6 +128,26 @@ function reporting_make_reporting_data($report = null, $id_report,
|
||||
$content['period'] = $period;
|
||||
}
|
||||
|
||||
if(defined('METACONSOLE')){
|
||||
if (is_array($content['id_agent'])) {
|
||||
$new_array = array();
|
||||
foreach ($content['id_agent'] as $key => $value) {
|
||||
$meta_id = explode("|",$value);
|
||||
array_push($new_array,$meta_id[1]);
|
||||
}
|
||||
$content['id_agent'] = $new_array;
|
||||
}
|
||||
else {
|
||||
$meta_id = explode("|",$content['id_agent']);
|
||||
if ($meta_id[1] != null) {
|
||||
$content['id_agent'] = array();
|
||||
$content['id_agent'] = $meta_id[1];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
$content['style'] = json_decode(io_safe_output($content['style']), true);
|
||||
if(isset($content['style']['name_label'])){
|
||||
//Add macros name
|
||||
@ -147,7 +167,18 @@ function reporting_make_reporting_data($report = null, $id_report,
|
||||
}
|
||||
}
|
||||
|
||||
$content['name'] = reporting_label_macro($items_label, $content['style']['name_label']);
|
||||
|
||||
|
||||
if(sizeof($content['id_agent']) != 1){
|
||||
$content['style']['name_label'] = str_replace("_agent_",sizeof($content['id_agent']).__(' agents'),$content['style']['name_label']);
|
||||
}
|
||||
|
||||
if(sizeof($content['id_agent_module']) != 1){
|
||||
$content['style']['name_label'] = str_replace("_module_",sizeof($content['id_agent_module']).__(' modules'),$content['style']['name_label']);
|
||||
}
|
||||
|
||||
$content['name'] = reporting_label_macro($items_label, $content['style']['name_label']);
|
||||
|
||||
|
||||
if ($metaconsole_on) {
|
||||
//Restore db connection
|
||||
@ -3940,9 +3971,12 @@ function reporting_sql($report, $content) {
|
||||
$header = explode('|', $content['header_definition']);
|
||||
$return['header'] = $header;
|
||||
}
|
||||
|
||||
$historical_db = db_get_value_sql("SELECT historical_db from treport_content where id_rc =".$content['id_rc']);
|
||||
|
||||
if($content['id_rc'] != null){
|
||||
$historical_db = db_get_value_sql("SELECT historical_db from treport_content where id_rc =".$content['id_rc']);
|
||||
}
|
||||
else{
|
||||
$historical_db = $content['historical_db'];
|
||||
}
|
||||
$result = db_get_all_rows_sql($sql,$historical_db);
|
||||
if ($result !== false) {
|
||||
|
||||
@ -4339,6 +4373,20 @@ function reporting_advanced_sla ($id_agent_module, $time_from = null, $time_to =
|
||||
$max_value = null;
|
||||
$min_value = null;
|
||||
}
|
||||
if ( (!isset($min_value)) && (!isset($max_value)) ) {
|
||||
if ( ($agentmodule_info["id_tipo_modulo"] == "2") // generic_proc
|
||||
|| ($agentmodule_info["id_tipo_modulo"] == "6") // remote_icmp_proc
|
||||
|| ($agentmodule_info["id_tipo_modulo"] == "9") // remote_tcp_proc
|
||||
|| ($agentmodule_info["id_tipo_modulo"] == "18") // remote_snmp_proc
|
||||
|| ($agentmodule_info["id_tipo_modulo"] == "21") // async_proc
|
||||
|| ($agentmodule_info["id_tipo_modulo"] == "31") ) { // web_proc
|
||||
// Boolean values are OK if they're different from 0
|
||||
$max_value = 0;
|
||||
$min_value = 0;
|
||||
$inverse_interval = 1;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
// By default show last day
|
||||
@ -5763,17 +5811,12 @@ function reporting_custom_graph($report, $content, $type = 'dinamic',
|
||||
|
||||
require_once ($config["homedir"] . '/include/functions_graph.php');
|
||||
|
||||
if ($type_report == 'automatic_graph') {
|
||||
// Do none
|
||||
}
|
||||
else {
|
||||
if ($config['metaconsole']) {
|
||||
$id_meta = metaconsole_get_id_server($content["server_name"]);
|
||||
|
||||
|
||||
$server = metaconsole_get_connection_by_id ($id_meta);
|
||||
metaconsole_connect($server);
|
||||
}
|
||||
if ($config['metaconsole']) {
|
||||
$id_meta = metaconsole_get_id_server($content["server_name"]);
|
||||
|
||||
|
||||
$server = metaconsole_get_connection_by_id ($id_meta);
|
||||
metaconsole_connect($server);
|
||||
}
|
||||
|
||||
$graph = db_get_row ("tgraph", "id_graph", $content['id_gs']);
|
||||
@ -5816,9 +5859,17 @@ function reporting_custom_graph($report, $content, $type = 'dinamic',
|
||||
|
||||
array_push ($weights, $graph_item["weight"]);
|
||||
if (in_array('label',$content['style'])) {
|
||||
if (defined('METACONSOLE')) {
|
||||
$item = array('type' => 'custom_graph',
|
||||
'id_agent' =>$content['id_agent'],
|
||||
'id_agent_module'=>$graph_item['id_agent_module']);
|
||||
}
|
||||
else {
|
||||
$item = array('type' => 'custom_graph',
|
||||
'id_agent' =>modules_get_agentmodule_agent($graph_item['id_agent_module']),
|
||||
'id_agent_module'=>$graph_item['id_agent_module']);
|
||||
}
|
||||
|
||||
$label = reporting_label_macro($item, $content['style']['label']);
|
||||
$labels[$graph_item['id_agent_module']] = $label;
|
||||
}
|
||||
@ -5838,6 +5889,13 @@ function reporting_custom_graph($report, $content, $type = 'dinamic',
|
||||
$height = 50;
|
||||
}
|
||||
}
|
||||
if (defined('METACONSOLE')) {
|
||||
$modules_new = array();
|
||||
foreach ($modules as $mod) {
|
||||
$modules_new[] = $mod['module'];
|
||||
}
|
||||
$modules = $modules_new;
|
||||
}
|
||||
|
||||
switch ($type) {
|
||||
case 'dinamic':
|
||||
@ -10234,7 +10292,6 @@ function reporting_get_agentmodule_sla_working_timestamp ($period, $date_end, $w
|
||||
}
|
||||
|
||||
function reporting_label_macro ($item, $label) {
|
||||
|
||||
switch ($item['type']) {
|
||||
case 'event_report_agent':
|
||||
case 'alert_report_agent':
|
||||
@ -10260,6 +10317,7 @@ function reporting_label_macro ($item, $label) {
|
||||
$label = str_replace("_address_", $agent_name, $label);
|
||||
}
|
||||
break;
|
||||
case 'automatic_graph':
|
||||
case 'simple_graph':
|
||||
case 'module_histogram_graph':
|
||||
case 'custom_graph':
|
||||
@ -10313,4 +10371,4 @@ function reporting_label_macro ($item, $label) {
|
||||
return $label;
|
||||
}
|
||||
|
||||
?>
|
||||
?>
|
||||
@ -279,4 +279,111 @@ function snmp_update_translation($oid, $new_oid, $description, $post_process) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Print the event filter tag cloud (enterprise feature)
|
||||
* @param $filter_resume: Array with the active filters
|
||||
* @param $filter_refs: Array of all arrays to humanize some tags
|
||||
*/
|
||||
function print_snmp_tags_active_filters ($filter_resume = array()) {
|
||||
global $config;
|
||||
|
||||
$tags_set = array();
|
||||
|
||||
// Alert
|
||||
if (isset($filter_resume['filter_fired'])) {
|
||||
array_push ($tags_set, array(
|
||||
'title' => __('Alert'),
|
||||
'value' => $filter_resume['filter_fired']
|
||||
));
|
||||
}
|
||||
// Severity
|
||||
if (isset($filter_resume['filter_severity'])) {
|
||||
array_push ($tags_set, array(
|
||||
'title' => __('Severity'),
|
||||
'value' => $filter_resume['filter_severity']
|
||||
));
|
||||
}
|
||||
// Pagination
|
||||
if ($filter_resume['pagination'] == "") {
|
||||
$filter_resume['pagination'] = $config["block_size"];
|
||||
}
|
||||
array_push ($tags_set, array(
|
||||
'title' => __('Pagination'),
|
||||
'value' => $filter_resume['pagination']
|
||||
));
|
||||
// Free search
|
||||
if (isset($filter_resume['free_search_string']) && $filter_resume['free_search_string'] != "") {
|
||||
array_push ($tags_set, array(
|
||||
'title' => __('Search'),
|
||||
'value' => $filter_resume['free_search_string']
|
||||
));
|
||||
}
|
||||
// Status
|
||||
if (isset($filter_resume['filter_status']) && $filter_resume['filter_status'] != "") {
|
||||
array_push ($tags_set, array(
|
||||
'title' => __('Status'),
|
||||
'value' => $filter_resume['filter_status']
|
||||
));
|
||||
}
|
||||
// Group by
|
||||
if (isset($filter_resume['group_by'])) {
|
||||
if ($filter_resume['group_by'] == 0) {
|
||||
array_push ($tags_set, array(
|
||||
'title' => __('Group by Enterprise String / IP'),
|
||||
'value' => __('No')
|
||||
));
|
||||
}
|
||||
else {
|
||||
array_push ($tags_set, array(
|
||||
'title' => __('Group by Enterprise String / IP'),
|
||||
'value' => __('Yes')
|
||||
));
|
||||
}
|
||||
}
|
||||
// Date from
|
||||
if (isset($filter_resume['date_from_trap']) && $filter_resume['date_from_trap'] != "") {
|
||||
if (isset($filter_resume['time_from_trap']) && $filter_resume['time_from_trap'] != "") {
|
||||
array_push ($tags_set, array(
|
||||
'title' => __('From'),
|
||||
'value' => $filter_resume['date_from_trap'] . " " . $filter_resume['time_from_trap']
|
||||
));
|
||||
}
|
||||
else {
|
||||
array_push ($tags_set, array(
|
||||
'title' => __('From'),
|
||||
'value' => $filter_resume['date_from_trap']
|
||||
));
|
||||
}
|
||||
}
|
||||
// Date to
|
||||
if (isset($filter_resume['date_to_trap']) && $filter_resume['date_to_trap'] != "") {
|
||||
if (isset($filter_resume['time_to_trap']) && $filter_resume['time_to_trap'] != "") {
|
||||
array_push ($tags_set, array(
|
||||
'title' => __('To'),
|
||||
'value' => $filter_resume['date_to_trap'] . " " . $filter_resume['time_to_trap']
|
||||
));
|
||||
}
|
||||
else {
|
||||
array_push ($tags_set, array(
|
||||
'title' => __('To'),
|
||||
'value' => $filter_resume['date_to_trap']
|
||||
));
|
||||
}
|
||||
}
|
||||
// Trap type
|
||||
if (isset($filter_resume['trap_type'])) {
|
||||
array_push ($tags_set, array(
|
||||
'title' => __('Trap type'),
|
||||
'value' => $filter_resume['trap_type']
|
||||
));
|
||||
}
|
||||
$title = '';
|
||||
if(!$config['pure']){
|
||||
$title = isset($filter_resume['title'])
|
||||
? __('Active filter') . " (" . $filter_resume['title'] . ")"
|
||||
: __('Active filters');
|
||||
}
|
||||
if (sizeof($filter_resume) > 0) ui_print_tags_view($title, $tags_set);
|
||||
}
|
||||
?>
|
||||
|
||||
@ -116,7 +116,7 @@ function snmp_browser_print_tree ($tree, $id = 0, $depth = 0, $last = 0, $last_a
|
||||
echo "</a>";
|
||||
}
|
||||
|
||||
echo ' <span>' . $level . '</span>';
|
||||
echo html_print_checkbox("create_$sub_id", 0, false, true, false, '') .' <span>' . $level . '</span>';
|
||||
if (isset ($sub_level['__VALUE__'])) {
|
||||
echo '<span class="value" style="display: none;"> = ' . $sub_level['__VALUE__'] . '</span>';
|
||||
}
|
||||
@ -618,3 +618,137 @@ function snmp_browser_print_container ($return = false, $width = '100%', $height
|
||||
}
|
||||
|
||||
?>
|
||||
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function () {
|
||||
$('input[name*=create_network_component]').click(function () {
|
||||
var id_check = $('#ul_0').find('input').map(function(){
|
||||
if(this.id.indexOf('checkbox-create_')!=-1){
|
||||
if($(this).is(':checked')){
|
||||
return this.id;
|
||||
}
|
||||
|
||||
} }).get();
|
||||
$('input[name*=create_network_component]').removeClass("sub add");
|
||||
$('input[name*=create_network_component]').addClass("sub spinn");
|
||||
|
||||
var target_ip = $('#text-target_ip').val();
|
||||
var community = $('#text-community').val();
|
||||
var snmp_version = $('#snmp_browser_version').val();
|
||||
var snmp3_auth_user = $('#text-snmp3_browser_auth_user').val();
|
||||
var snmp3_security_level = $('#snmp3_browser_security_level').val();
|
||||
var snmp3_auth_method = $('#snmp3_browser_auth_method').val();
|
||||
var snmp3_auth_pass = $('#password-snmp3_browser_auth_pass').val();
|
||||
var snmp3_privacy_method = $('#snmp3_browser_privacy_method').val();
|
||||
var snmp3_privacy_pass = $('#password-snmp3_browser_privacy_pass').val();
|
||||
|
||||
var custom_action = $('#hidden-custom_action').val();
|
||||
if (custom_action == undefined) {
|
||||
custom_action = '';
|
||||
}
|
||||
|
||||
var oids = [];
|
||||
id_check.forEach(function(product, index) {
|
||||
var oid = $("#"+product).siblings('a').attr('href');
|
||||
if(oid.indexOf('javascript: snmpGet("')!=-1) {
|
||||
oid = oid.replace('javascript: snmpGet("',"");
|
||||
oid = oid.replace('");',"");
|
||||
oids.push(oid);
|
||||
}
|
||||
|
||||
});
|
||||
// Prepare the AJAX call
|
||||
var params = [
|
||||
"target_ip=" + target_ip,
|
||||
"community=" + community,
|
||||
"oids=" + oids,
|
||||
"snmp_browser_version=" + snmp_version,
|
||||
"snmp3_browser_auth_user=" + snmp3_auth_user,
|
||||
"snmp3_browser_security_level=" + snmp3_security_level,
|
||||
"snmp3_browser_auth_method=" + snmp3_auth_method,
|
||||
"snmp3_browser_auth_pass=" + snmp3_auth_pass,
|
||||
"snmp3_browser_privacy_method=" + snmp3_privacy_method,
|
||||
"snmp3_browser_privacy_pass=" + snmp3_privacy_pass,
|
||||
"action=" + "create_modules_snmp",
|
||||
"custom_action=" + custom_action,
|
||||
"page=include/ajax/snmp_browser.ajax"
|
||||
];
|
||||
|
||||
$.ajax({
|
||||
type: "GET",
|
||||
url: "ajax.php",
|
||||
data: params.join ("&"),
|
||||
dataType: "json",
|
||||
success: function(data) {
|
||||
$('input[name*=create_network_component]').removeClass("sub spinn");
|
||||
$('input[name*=create_network_component]').addClass("sub add");
|
||||
|
||||
if(data.length !== 0){
|
||||
$('#error_text').text("");
|
||||
data.forEach( function(valor, indice, array) {
|
||||
console.log(valor);
|
||||
$('#error_text').append('<br/>'+ valor );
|
||||
});
|
||||
$("#dialog_error")
|
||||
.dialog({
|
||||
resizable: true,
|
||||
draggable: true,
|
||||
modal: true,
|
||||
height: 300,
|
||||
width: 500,
|
||||
overlay: {
|
||||
opacity: 0.5,
|
||||
background: "black"
|
||||
}
|
||||
});
|
||||
} else {
|
||||
$("#dialog_success")
|
||||
.dialog({
|
||||
resizable: true,
|
||||
draggable: true,
|
||||
modal: true,
|
||||
height: 250,
|
||||
width: 500,
|
||||
overlay: {
|
||||
opacity: 0.5,
|
||||
background: "black"
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
$('input[id^=checkbox-create]').change(function () {
|
||||
if ($(this).is(':checked') ) {
|
||||
$('input[name*=create_network_component]').show();
|
||||
var id_input = $(this).attr("id");
|
||||
id_input = id_input.split("checkbox-create_");
|
||||
var checks = $('#ul_'+id_input[1]).find('input').map(function(){
|
||||
if(this.id.indexOf('checkbox-create_')!=-1){
|
||||
return this.id;
|
||||
} }).get();
|
||||
|
||||
checks.forEach(function(product, index) {
|
||||
$("#"+product).prop('checked', "true");
|
||||
});
|
||||
|
||||
} else {
|
||||
var id_input = $(this).attr("id");
|
||||
|
||||
id_input = id_input.split("checkbox-create_");
|
||||
var checks = $('#ul_'+id_input[1]).find('input').map(function(){
|
||||
if(this.id.indexOf('checkbox-create_')!=-1){
|
||||
return this.id;
|
||||
} }).get();
|
||||
|
||||
checks.forEach(function(product, index) {
|
||||
$("#"+product).prop('checked', false);
|
||||
});
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
</script>
|
||||
|
||||
@ -1438,17 +1438,25 @@ function visual_map_print_item($mode = "read", $layoutData,
|
||||
|
||||
|
||||
if(get_parameter('action') == 'edit'){
|
||||
|
||||
//echo 'Data value';
|
||||
|
||||
echo $io_safe_output_text;
|
||||
//html_debug($layoutData);
|
||||
//echo 'Data value';
|
||||
if(strip_tags($io_safe_output_text) != '_VALUE_'){
|
||||
echo $io_safe_output_text;
|
||||
}
|
||||
else{
|
||||
echo "<img style='width:".$layoutData['width']."px;' src='images/console/signes/data_image.png'>";
|
||||
}
|
||||
|
||||
}
|
||||
else{
|
||||
|
||||
echo str_replace(array('_VALUE_','_value_'), $value, $io_safe_output_text);
|
||||
|
||||
if(strip_tags($io_safe_output_text) != '_VALUE_'){
|
||||
echo str_replace(array('_VALUE_','_value_'), $value, $io_safe_output_text);
|
||||
}
|
||||
else{
|
||||
echo str_replace('>', ' style="width:'.$layoutData['width'].'px">',$value);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
//Restore db connection
|
||||
@ -1575,6 +1583,8 @@ function visual_map_get_simple_value_type($process_simple_value) {
|
||||
function visual_map_get_simple_value($type, $id_module, $period = SECONDS_1DAY) {
|
||||
global $config;
|
||||
|
||||
|
||||
|
||||
$unit_text = db_get_sql ('SELECT unit
|
||||
FROM tagente_modulo WHERE id_agente_modulo = ' . $id_module);
|
||||
$unit_text = trim(io_safe_output($unit_text));
|
||||
@ -1583,23 +1593,35 @@ function visual_map_get_simple_value($type, $id_module, $period = SECONDS_1DAY)
|
||||
case SIMPLE_VALUE:
|
||||
$value = db_get_value ('datos', 'tagente_estado',
|
||||
'id_agente_modulo', $id_module);
|
||||
|
||||
|
||||
if ($value === false) {
|
||||
$value = __('Unknown');
|
||||
|
||||
$value = preg_replace ('/\n/i','<br>',$value);
|
||||
$value = preg_replace ('/\s/i',' ',$value);
|
||||
}
|
||||
else {
|
||||
if ( is_numeric($value) ) {
|
||||
if ($config['simple_module_value']) {
|
||||
$value = remove_right_zeros(number_format($value, $config['graph_precision']));
|
||||
if(strpos($value, 'data:image') !== false){
|
||||
$value = '<img class="b64img" src="'.$value.'">';
|
||||
}
|
||||
else{
|
||||
|
||||
if ( is_numeric($value) ) {
|
||||
if ($config['simple_module_value']) {
|
||||
$value = remove_right_zeros(number_format($value, $config['graph_precision']));
|
||||
}
|
||||
}
|
||||
if (!empty($unit_text)) {
|
||||
$value .= " " . $unit_text;
|
||||
}
|
||||
|
||||
$value = preg_replace ('/\n/i','<br>',$value);
|
||||
$value = preg_replace ('/\s/i',' ',$value);
|
||||
|
||||
}
|
||||
if (!empty($unit_text)) {
|
||||
$value .= " " . $unit_text;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
$value = preg_replace ('/\n/i','<br>',$value);
|
||||
$value = preg_replace ('/\s/i',' ',$value);
|
||||
|
||||
return $value;
|
||||
break;
|
||||
case SIMPLE_VALUE_MAX:
|
||||
|
||||
@ -188,7 +188,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
|
||||
<td align="left" style="">' .
|
||||
html_print_input_text('label', '', '', 20, 200, true) . '
|
||||
<span id="advice_label" style="font-style:italic;z-index:3;display:inline;margin-top:0px;float:right;margin-right:100px;">
|
||||
'.__("Click right mouse button to change background label editor color").'
|
||||
'.__("Click right mouse button to change the background color of the label editor").'
|
||||
</span>
|
||||
</td>';
|
||||
|
||||
@ -314,8 +314,8 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) {
|
||||
$form_items['module_row']['html'] = '<td align="left">' .
|
||||
__('Module') . '</td>
|
||||
<td align="left">' .
|
||||
html_print_select(array(), 'module', '', '', __('Any'), 0, true) .
|
||||
'</td>';
|
||||
html_print_select(array(), 'module', '', '', __('Any'), 0, true). '<div id="data_image_container" style="display:none;"><span id="data_image_check_label" style="margin-left:20px;">'.__("Data image").': </span><span id="data_image_check">Off</span><span id="data_image_width_label"> - Width: </span><input style="margin-left:5px;width:40px;" type="number" id="data_image_width" value="100"></input></div>
|
||||
</td>';
|
||||
|
||||
|
||||
$form_items['type_graph'] = array();
|
||||
|
||||
@ -138,6 +138,7 @@ function js_printMap(id_div, initial_zoom, center_latitude, center_longitude, ob
|
||||
var baseLayer = null;
|
||||
|
||||
map.events.on({"zoomend": EventZoomEnd});
|
||||
map.events.on({"mouseup": EventZoomEnd});
|
||||
|
||||
//Define the maps layer
|
||||
for (var baselayerIndex in objBaseLayers) {
|
||||
@ -224,10 +225,18 @@ function js_printMap(id_div, initial_zoom, center_latitude, center_longitude, ob
|
||||
.transform(map.displayProjection, map.getProjectionObject());
|
||||
|
||||
map.setCenter (lonLat, initial_zoom);
|
||||
|
||||
}
|
||||
|
||||
function EventZoomEnd (evt) {
|
||||
var actual_zoom = (evt.object.zoom < 6) ? 6 : evt.object.zoom;
|
||||
function EventZoomEnd (evt,zoom = map.zoom) {
|
||||
if(evt == null){
|
||||
var actual_zoom = (zoom < 6) ? 6 : zoom;
|
||||
}
|
||||
else{
|
||||
var actual_zoom = (evt.object.zoom < 6) ? 6 : evt.object.zoom;
|
||||
}
|
||||
|
||||
|
||||
var max_width_marker = 38;
|
||||
var max_zoom_map = map.numZoomLevels;
|
||||
var max_font_size = 15;
|
||||
@ -258,7 +267,6 @@ function EventZoomEnd (evt) {
|
||||
var new_width_marker = (actual_zoom * max_width_marker) / max_zoom_map;
|
||||
var new_height_marker = (actual_zoom * max_width_marker) / max_zoom_map;
|
||||
|
||||
console.log(feature);
|
||||
feature.style.fontSize = '' + actual_font_size + ' !important';
|
||||
feature.style.graphicHeight = new_height_marker;
|
||||
feature.style.graphicWidth = new_width_marker;
|
||||
@ -280,6 +288,7 @@ function EventZoomEnd (evt) {
|
||||
function changeShowStatus(newShowStatus) {
|
||||
statusShow = newShowStatus;
|
||||
hideAgentsStatus();
|
||||
EventZoomEnd(null,map.zoom);
|
||||
js_refreshParentLines();
|
||||
}
|
||||
|
||||
|
||||
@ -16385,7 +16385,7 @@ msgid "Without protocol and port"
|
||||
msgstr ""
|
||||
|
||||
#: ../../godmode/setup/setup_ehorus.php:87
|
||||
msgid "e.g., switch.ehorus.com"
|
||||
msgid "e.g., portal.ehorus.com"
|
||||
msgstr ""
|
||||
|
||||
#: ../../godmode/setup/setup_ehorus.php:92
|
||||
|
||||
@ -16547,7 +16547,7 @@ msgid "Without protocol and port"
|
||||
msgstr "Without protocol and port"
|
||||
|
||||
#: ../../godmode/setup/setup_ehorus.php:87
|
||||
msgid "e.g., switch.ehorus.com"
|
||||
msgid "e.g., portal.ehorus.com"
|
||||
msgstr "e.g., switch.eHorus.com"
|
||||
|
||||
#: ../../godmode/setup/setup_ehorus.php:92
|
||||
|
||||
@ -16978,8 +16978,8 @@ msgid "Without protocol and port"
|
||||
msgstr "Sin protocolo y puerto"
|
||||
|
||||
#: ../../godmode/setup/setup_ehorus.php:87
|
||||
msgid "e.g., switch.ehorus.com"
|
||||
msgstr "e.g., switch.ehorus.com"
|
||||
msgid "e.g., portal.ehorus.com"
|
||||
msgstr "e.g., portal.ehorus.com"
|
||||
|
||||
#: ../../godmode/setup/setup_ehorus.php:92
|
||||
msgid "API Port"
|
||||
|
||||
@ -17215,7 +17215,7 @@ msgid "Without protocol and port"
|
||||
msgstr ""
|
||||
|
||||
#: ../../godmode/setup/setup_ehorus.php:87
|
||||
msgid "e.g., switch.ehorus.com"
|
||||
msgid "e.g., portal.ehorus.com"
|
||||
msgstr ""
|
||||
|
||||
#: ../../godmode/setup/setup_ehorus.php:92
|
||||
|
||||
@ -16299,8 +16299,8 @@ msgid "Without protocol and port"
|
||||
msgstr "プロトコルとポート番号は含みません"
|
||||
|
||||
#: ../../godmode/setup/setup_ehorus.php:87
|
||||
msgid "e.g., switch.ehorus.com"
|
||||
msgstr "例: switch.ehorus.com"
|
||||
msgid "e.g., portal.ehorus.com"
|
||||
msgstr "例: portal.ehorus.com"
|
||||
|
||||
#: ../../godmode/setup/setup_ehorus.php:92
|
||||
msgid "API Port"
|
||||
|
||||
@ -656,7 +656,7 @@ input.sub[disabled] {
|
||||
input.next, input.upd, input.ok, input.wand, input.delete, input.cog,
|
||||
input.target, input.search, input.copy, input.add, input.graph,
|
||||
input.percentile, input.binary, input.camera, input.config,
|
||||
input.cancel, input.default, input.filter, input.pdf {
|
||||
input.cancel, input.default, input.filter, input.pdf,input.spinn {
|
||||
padding-right: 30px;
|
||||
height: 23px;
|
||||
|
||||
@ -741,6 +741,9 @@ input.pdf:disabled {
|
||||
input.camera {
|
||||
background-image: url(../../images/input_camera.png) !important;
|
||||
}
|
||||
input.spinn {
|
||||
background-image: url(../../images/spinner_green.gif) !important;
|
||||
}
|
||||
|
||||
#toolbox #auto_save {
|
||||
padding-top: 5px;
|
||||
|
||||
@ -351,7 +351,7 @@ if (! isset ($config['id_user'])) {
|
||||
|
||||
if (($nick_in_db != false) && ((!is_user_admin($nick)
|
||||
|| $config['enable_pass_policy_admin']))
|
||||
&& (defined('PANDORA_ENTERPRISE'))
|
||||
&& (file_exists (ENTERPRISE_DIR . "/load_enterprise.php"))
|
||||
&& ($config['enable_pass_policy'])) {
|
||||
include_once(ENTERPRISE_DIR . "/include/auth/mysql.php");
|
||||
|
||||
@ -523,12 +523,12 @@ if (! isset ($config['id_user'])) {
|
||||
else { //login wrong
|
||||
$blocked = false;
|
||||
|
||||
if ((!is_user_admin($nick) || $config['enable_pass_policy_admin']) && defined('PANDORA_ENTERPRISE')) {
|
||||
if ((!is_user_admin($nick) || $config['enable_pass_policy_admin']) && file_exists (ENTERPRISE_DIR . "/load_enterprise.php")) {
|
||||
$blocked = login_check_blocked($nick);
|
||||
}
|
||||
|
||||
if (!$blocked) {
|
||||
if (defined('PANDORA_ENTERPRISE')) {
|
||||
if (file_exists (ENTERPRISE_DIR . "/load_enterprise.php")) {
|
||||
login_check_failed($nick); //Checks failed attempts
|
||||
}
|
||||
$login_failed = true;
|
||||
|
||||
@ -70,8 +70,8 @@
|
||||
<body>
|
||||
<div style='height: 10px'>
|
||||
<?php
|
||||
$version = '7.0NG.705';
|
||||
$build = '170626';
|
||||
$version = '7.0NG.707';
|
||||
$build = '170718';
|
||||
$banner = "v$version Build $build";
|
||||
|
||||
error_reporting(0);
|
||||
|
||||
@ -238,7 +238,7 @@ if (empty($export_btn) || $show_form) {
|
||||
|
||||
$table->data[0][1] = html_print_select_groups($config['id_user'],
|
||||
"RR", users_can_manage_group_all(), "group", $group, '', '', 0, true, false, true,
|
||||
'w130', false);
|
||||
'', false);
|
||||
|
||||
//Agent selector
|
||||
$table->data[1][0] = '<b>'.__('Source agent').'</b>';
|
||||
|
||||
@ -141,9 +141,29 @@ $result = db_get_all_rows_sql ($sql, true);
|
||||
|
||||
|
||||
if ($result === false) {
|
||||
ui_print_empty_data( __('This agent doesn\'t have any GIS data.') );
|
||||
|
||||
$sql2 = sprintf ("
|
||||
SELECT current_longitude AS longitude, current_latitude AS latitude, current_altitude AS altitude,
|
||||
start_timestamp, description, number_of_packages, manual_placement
|
||||
FROM tgis_data_status
|
||||
WHERE tagente_id_agente = %d
|
||||
ORDER BY start_timestamp DESC
|
||||
LIMIT %d OFFSET %d", $agentId, $config['block_size'], (int)get_parameter ('offset'));
|
||||
|
||||
$result2 = db_get_all_rows_sql ($sql2, true);
|
||||
|
||||
if ($result2 === false) {
|
||||
ui_print_empty_data( __('This agent doesn\'t have any GIS data.') );
|
||||
} else {
|
||||
$result2[0]['end_timestamp'] = date('Y-m-d H:i:s');
|
||||
$result = $result2;
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
||||
if ($result !== false) {
|
||||
if(!$countData){
|
||||
$countData = 1;
|
||||
}
|
||||
ui_pagination ($countData, false) ;
|
||||
$table->data = array();
|
||||
foreach ($result as $key => $row) {
|
||||
|
||||
@ -150,7 +150,10 @@ $alias = db_get_value ("alias","tagente","id_agente",$id_agent);
|
||||
$avg_only = $show_other;
|
||||
}
|
||||
|
||||
$period = get_parameter ("period", SECONDS_1DAY);
|
||||
$period = get_parameter ("period");
|
||||
if ($period == "") {
|
||||
$period = get_parameter ("period_select", SECONDS_1DAY);
|
||||
}
|
||||
$id = get_parameter ("id", 0);
|
||||
$width = get_parameter ("width", STATWIN_DEFAULT_CHART_WIDTH);
|
||||
$height = get_parameter ("height", STATWIN_DEFAULT_CHART_HEIGHT);
|
||||
|
||||
@ -613,7 +613,7 @@ $data = array();
|
||||
$data[0] = __('Group') . $jump;
|
||||
|
||||
$data[0] .= html_print_select_groups($config["id_user"], $access, true,
|
||||
'id_group', $id_group, '', '', 0, true, false, false, 'w130', false, false, false, false, 'id_grupo', $strict_user). $jump;
|
||||
'id_group', $id_group, '', '', 0, true, false, false, '', false, false, false, false, 'id_grupo', $strict_user). $jump;
|
||||
//**********************************************************************
|
||||
// TODO
|
||||
// This code is disabled for to enabled in Pandora 5.1
|
||||
|
||||
@ -77,7 +77,7 @@ $table->style[1] = 'font-weight: bold; vertical-align: top;';
|
||||
$table->style[2] = 'font-weight: bold; vertical-align: top;';
|
||||
|
||||
$table->data[0][0] = __('Group');
|
||||
$table->data[0][1] = html_print_select_groups(false, $access, true, 'group', '', 'changeGroup();', '', 0, true, false, true, '', false, 'width:120px;') . '<br />' . '<br />';
|
||||
$table->data[0][1] = html_print_select_groups(false, $access, true, 'group', '', 'changeGroup();', '', 0, true, false, true, '', false, 'max-width:200px;') . '<br />' . '<br />';
|
||||
|
||||
$table->data[0][2] = __('Type');
|
||||
$table->data[0][3] = html_print_checkbox('alert_fired', 'alert_fired', true, true, false, 'changeType();') . __('Alert fired') . '<br />' .
|
||||
@ -276,6 +276,9 @@ $(document).ready (function () {
|
||||
setInterval("check_event()", (10 * 1000)); //10 seconds between ajax request
|
||||
$("#table1").css("background-color", "#fff");
|
||||
$("#table2").css("background-color", "#fff");
|
||||
|
||||
group_width = $("#group").width();
|
||||
$("#id_agents").width(group_width + 9);
|
||||
});
|
||||
|
||||
</script>
|
||||
|
||||
@ -47,6 +47,26 @@ if (is_ajax()) {
|
||||
}
|
||||
else {
|
||||
snmp_browser_print_tree ($snmp_tree);
|
||||
echo html_print_submit_button(__('Create network components'),'create_network_component',
|
||||
false, array('style' => 'display: none', 'class' => 'sub add'), true);
|
||||
|
||||
echo '<div id="dialog_error" style="display: none" title="Network components">';
|
||||
echo "<div>";
|
||||
echo "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='images/icono_error_mr.png'></div>";
|
||||
echo "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>ERROR</strong></h3>";
|
||||
echo "<p style='font-family:Verdana; font-size:12pt;margin-bottom: 0px'>".__('Error creating the following modules:')."</p>";
|
||||
echo "<p id='error_text' style='font-family:Verdana; font-size:12pt;'></p>";
|
||||
echo "</div>";
|
||||
echo '</div>';
|
||||
|
||||
|
||||
echo '<div id="dialog_success" style="display: none" title="Network components">';
|
||||
echo "<div>";
|
||||
echo "<div style='width:25%; float:left'><img style='padding-left:20px; padding-top:20px;' src='images/icono_exito_mr.png'></div>";
|
||||
echo "<div style='width:75%; float:left;'><h3><strong style='font-family:Verdana; font-size:13pt;'>SUCCESS</strong></h3>";
|
||||
echo "<p style='font-family:Verdana; font-size:12pt;'>".__('Modules successfully created')."</p>";
|
||||
echo "</div>";
|
||||
echo '</div>';
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
@ -194,7 +194,7 @@ $severities = get_priorities ();
|
||||
$alerted = array (__('Not fired'), __('Fired'));
|
||||
foreach ($all_traps as $trap) {
|
||||
$agent = agents_get_agent_with_ip ($trap['source']);
|
||||
$agents[$trap["source"]] = $agent !== false ? $agent["nombre"] : $trap["source"];
|
||||
$agents[$trap["source"]] = $agent !== false ? ($agent["alias"] ? $agent["alias"] : $agent["nombre"]) : $trap["source"];
|
||||
$oid = enterprise_hook ('get_oid', array ($trap));
|
||||
if ($oid === ENTERPRISE_NOT_HOOK) {
|
||||
$oid = $trap["oid"];
|
||||
@ -518,15 +518,22 @@ $filter .= html_print_submit_button(__('Update'), 'search', false, 'class="sub u
|
||||
$filter .= '</div>';
|
||||
$filter .= '</form>';
|
||||
|
||||
|
||||
|
||||
|
||||
$filter_resume = array();
|
||||
$filter_resume['filter_fired'] = $alerted[$filter_fired];
|
||||
$filter_resume['filter_severity'] = $severities[$filter_severity];
|
||||
$filter_resume['pagination'] = $paginations[$pagination];
|
||||
$filter_resume['free_search_string'] = $free_search_string;
|
||||
$filter_resume['filter_status'] = $status_array[$filter_status];
|
||||
$filter_resume['group_by'] = $group_by;
|
||||
$filter_resume['date_from_trap'] = $date_from_trap;
|
||||
$filter_resume['time_from_trap'] = $time_from_trap;
|
||||
$filter_resume['date_to_trap'] = $date_to_trap;
|
||||
$filter_resume['time_to_trap'] = $time_to_trap;
|
||||
$filter_resume['trap_type'] = $trap_types[$trap_type];
|
||||
|
||||
$traps = db_get_all_rows_sql($sql);
|
||||
$trapcount = (int) db_get_value_sql($sql_count);
|
||||
|
||||
|
||||
|
||||
// No traps
|
||||
if (empty ($traps)) {
|
||||
// Header
|
||||
@ -546,6 +553,9 @@ if (empty ($traps)) {
|
||||
|
||||
if(!empty ($traps2)){
|
||||
ui_toggle($filter, __('Toggle filter(s)'));
|
||||
|
||||
print_snmp_tags_active_filters($filter_resume);
|
||||
|
||||
ui_print_info_message ( array('no_close'=>true, 'message'=> __('There are no SNMP traps in database that contains this filter') ) );
|
||||
} else {
|
||||
ui_print_info_message ( array('no_close'=>true, 'message'=> __('There are no SNMP traps in database') ) );
|
||||
@ -651,6 +661,8 @@ if (empty ($traps)) {
|
||||
ui_toggle($filter, __('Toggle filter(s)'));
|
||||
unset ($table);
|
||||
|
||||
print_snmp_tags_active_filters($filter_resume);
|
||||
|
||||
if (($config['dbtype'] == 'oracle') && ($traps !== false)) {
|
||||
for ($i = 0; $i < count($traps); $i++) {
|
||||
unset($traps[$i]['rnum']);
|
||||
@ -774,7 +786,7 @@ if ($traps !== false) {
|
||||
continue;
|
||||
}
|
||||
$data[1] = '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$agent["id_agente"].'" title="'.__('View agent details').'">';
|
||||
$data[1] .= '<strong>'.$agent["nombre"].ui_print_help_tip($trap['source'], true, "images/tip-blanco.png");'</strong></a>';
|
||||
$data[1] .= '<strong>'.$agent["alias"].ui_print_help_tip($trap['source'], true, "images/tip-blanco.png");'</strong></a>';
|
||||
}
|
||||
|
||||
//OID
|
||||
|
||||
@ -94,11 +94,11 @@ if (isset ($_GET["modified"]) && !$view_mode) {
|
||||
//save autorefresh list
|
||||
$autorefresh_list = get_parameter_post ("autorefresh_list");
|
||||
if(($autorefresh_list[0] === '') || ($autorefresh_list[0] === '0')){
|
||||
db_process_sql("UPDATE tconfig SET value ='' WHERE token='autorefresh_white_list'");
|
||||
}else{
|
||||
db_process_sql("UPDATE tconfig SET value ='".json_encode($autorefresh_list)."' WHERE token='autorefresh_white_list'");
|
||||
$upd_info['autorefresh_white_list'] = "";
|
||||
}
|
||||
else{
|
||||
$upd_info['autorefresh_white_list'] = json_encode($autorefresh_list);
|
||||
}
|
||||
|
||||
|
||||
$is_admin = db_get_value('is_admin', 'tusuario', 'id_user', $id);
|
||||
|
||||
@ -382,8 +382,8 @@ $autorefresh_list_out['operation/visual_console/render_view'] = "render_view";
|
||||
$autorefresh_list_out['operation/events/events'] = "events";
|
||||
|
||||
if(!isset($autorefresh_list)){
|
||||
$select = db_process_sql("SELECT value FROM tconfig WHERE token='autorefresh_white_list'");
|
||||
$autorefresh_list = json_decode($select[0]['value']);
|
||||
$select = db_process_sql("SELECT autorefresh_white_list FROM tusuario WHERE id_user = '" . $config['id_user'] . "'");
|
||||
$autorefresh_list = json_decode($select[0]['autorefresh_white_list']);
|
||||
if($autorefresh_list === null){
|
||||
$autorefresh_list[0] = __('None');
|
||||
}else{
|
||||
|
||||
@ -245,11 +245,12 @@ $ignored_params['refr'] = '';
|
||||
//cb();
|
||||
url = js_html_entity_decode( href ) + duration;
|
||||
//$(document).attr ("location", url);
|
||||
$.get(window.location.href.replace("render_view","pure_ajax"), function(respuestaSolicitud){
|
||||
$.post(window.location.href.replace("refr=300","refr="+new_count), function(respuestaSolicitud){
|
||||
$('#background_<?php echo $id_layout; ?>').html(respuestaSolicitud);
|
||||
startCountDown(refr, false);
|
||||
});
|
||||
}
|
||||
$("#main_pure").css('background-color','<?php echo $layout['background_color']; ?>');
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@ -260,6 +261,7 @@ $ignored_params['refr'] = '';
|
||||
|
||||
$('select#refr').change(function (event) {
|
||||
refr = Number.parseInt(event.target.value, 10);
|
||||
new_count = event.target.value;
|
||||
startCountDown(refr, false);
|
||||
});
|
||||
}
|
||||
@ -278,14 +280,19 @@ $ignored_params['refr'] = '';
|
||||
|
||||
$(".overlay").removeClass("overlay").addClass("overlaydisabled");
|
||||
|
||||
$('.item:not(.icon) img').each( function() {
|
||||
$('.item:not(.icon) img:not(.b64img)').each( function() {
|
||||
if ($(this).css('float')=='left' || $(this).css('float')=='right') {
|
||||
$(this).css('margin-top',(parseInt($(this).parent().parent().css('height'))/2-parseInt($(this).css('height'))/2)+'px');
|
||||
$(this).css('margin-left','');
|
||||
}
|
||||
else {
|
||||
$(this).css('margin-left',(parseInt($(this).parent().parent().css('width'))/2-parseInt($(this).css('width'))/2)+'px');
|
||||
$(this).css('margin-top','');
|
||||
if(parseInt($(this).parent().parent().css('width'))/2-parseInt($(this).css('width'))/2 < 0){
|
||||
$(this).css('margin-left','');
|
||||
$(this).css('margin-top','');
|
||||
} else {
|
||||
$(this).css('margin-left',(parseInt($(this).parent().parent().css('width'))/2-parseInt($(this).css('width'))/2)+'px');
|
||||
$(this).css('margin-top','');
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
# Pandora FMS Console
|
||||
#
|
||||
%define name pandorafms_console
|
||||
%define version 7.0NG.705
|
||||
%define release 170626
|
||||
%define version 7.0NG.707
|
||||
%define release 170718
|
||||
|
||||
# User and Group under which Apache is running
|
||||
%define httpd_name httpd
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user