Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
This commit is contained in:
daniel
commit
25242e19d4
|
|
@ -1,5 +1,5 @@
|
|||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.718, AIX version
|
||||
# Version 7.0NG.719, 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.718, FreeBSD Version
|
||||
# Version 7.0NG.719, 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.718, HP-UX Version
|
||||
# Version 7.0NG.719, 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.718, GNU/Linux
|
||||
# Version 7.0NG.719, 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.718, GNU/Linux
|
||||
# Version 7.0NG.719, 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.718, Solaris Version
|
||||
# Version 7.0NG.719, 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.718
|
||||
# Version 7.0NG.719
|
||||
|
||||
# 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.718, AIX version
|
||||
# Version 7.0NG.719, 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.718
|
||||
# Version 7.0NG.719
|
||||
# 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.718, HPUX Version
|
||||
# Version 7.0NG.719, HPUX Version
|
||||
|
||||
# General Parameters
|
||||
# ==================
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.718
|
||||
# Version 7.0NG.719
|
||||
# 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.718
|
||||
# Version 7.0NG.719
|
||||
# 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.718
|
||||
# Version 7.0NG.719
|
||||
# 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.718, Solaris version
|
||||
# Version 7.0NG.719, Solaris version
|
||||
|
||||
# General Parameters
|
||||
# ==================
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.718, AIX version
|
||||
# Version 7.0NG.719, 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.718-180210
|
||||
Version: 7.0NG.719-180219
|
||||
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.718-180210"
|
||||
pandora_version="7.0NG.719-180219"
|
||||
|
||||
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.718, GNU/Linux
|
||||
# Version 7.0NG.719, 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.718, FreeBSD Version
|
||||
# Version 7.0NG.719, 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.718, HP-UX Version
|
||||
# Version 7.0NG.719, 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.718, GNU/Linux
|
||||
# Version 7.0NG.719, GNU/Linux
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2014 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.718, GNU/Linux
|
||||
# Version 7.0NG.719, 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.718, NetBSD Version
|
||||
# Version 7.0NG.719, 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.718, Solaris Version
|
||||
# Version 7.0NG.719, 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.718';
|
||||
use constant AGENT_BUILD => '180210';
|
||||
use constant AGENT_VERSION => '7.0NG.719';
|
||||
use constant AGENT_BUILD => '180219';
|
||||
|
||||
# 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.718
|
||||
%define release 180210
|
||||
%define version 7.0NG.719
|
||||
%define release 180219
|
||||
|
||||
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.718
|
||||
%define release 180210
|
||||
%define version 7.0NG.719
|
||||
%define release 180219
|
||||
|
||||
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.718"
|
||||
PI_BUILD="180210"
|
||||
PI_VERSION="7.0NG.719"
|
||||
PI_BUILD="180219"
|
||||
OS_NAME=`uname -s`
|
||||
|
||||
FORCE=0
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Base config file for Pandora FMS Windows Agent
|
||||
# (c) 2006-2017 Artica Soluciones Tecnologicas
|
||||
# Version 7.0NG.718
|
||||
# Version 7.0NG.719
|
||||
|
||||
# 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
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ AllowLanguageSelection
|
|||
{Yes}
|
||||
|
||||
AppName
|
||||
{Pandora FMS Windows Agent v7.0NG.718}
|
||||
{Pandora FMS Windows Agent v7.0NG.719}
|
||||
|
||||
ApplicationID
|
||||
{17E3D2CF-CA02-406B-8A80-9D31C17BD08F}
|
||||
|
|
@ -186,7 +186,7 @@ UpgradeApplicationID
|
|||
{}
|
||||
|
||||
Version
|
||||
{180210}
|
||||
{180219}
|
||||
|
||||
ViewReadme
|
||||
{Yes}
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ using namespace Pandora;
|
|||
using namespace Pandora_Strutils;
|
||||
|
||||
#define PATH_SIZE _MAX_PATH+1
|
||||
#define PANDORA_VERSION ("7.0NG.718(Build 180210)")
|
||||
#define PANDORA_VERSION ("7.0NG.719(Build 180219)")
|
||||
|
||||
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.718(Build 180210))"
|
||||
VALUE "ProductVersion", "(7.0NG.719(Build 180219))"
|
||||
VALUE "FileVersion", "1.0.0.0"
|
||||
END
|
||||
END
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
package: pandorafms-console
|
||||
Version: 7.0NG.718-180210
|
||||
Version: 7.0NG.719-180219
|
||||
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.718-180210"
|
||||
pandora_version="7.0NG.719-180219"
|
||||
|
||||
package_pear=0
|
||||
package_pandora=1
|
||||
|
|
|
|||
|
|
@ -6,39 +6,51 @@ ALTER TABLE tlayout_data ADD COLUMN `clock_animation` varchar(60) NOT NULL defau
|
|||
ALTER TABLE tlayout_data ADD COLUMN `time_format` varchar(60) NOT NULL default "time";
|
||||
ALTER TABLE tlayout_data ADD COLUMN `timezone` varchar(60) NOT NULL default "Europe/Madrid";
|
||||
|
||||
create table IF NOT EXISTS tcluster(
|
||||
id int unsigned not null auto_increment,
|
||||
name tinytext not null default '',
|
||||
cluster_type enum('AA','AP') not null default 'AA',
|
||||
description text not null default '',
|
||||
group int(10) unsigned NOT NULL default '0',
|
||||
id_agent int(10) unsigned NOT NULL,
|
||||
PRIMARY KEY (id),
|
||||
FOREIGN KEY (id_agent) REFERENCES tagente(id_agente)
|
||||
ON UPDATE CASCADE
|
||||
-- ---------------------------------------------------------------------
|
||||
-- Table `tcluster`
|
||||
-- ---------------------------------------------------------------------
|
||||
|
||||
create table IF NOT EXISTS `tcluster`(
|
||||
`id` int unsigned not null auto_increment,
|
||||
`name` tinytext not null default '',
|
||||
`cluster_type` enum('AA','AP') not null default 'AA',
|
||||
`description` text not null default '',
|
||||
`group` int(10) unsigned NOT NULL default '0',
|
||||
`id_agent` int(10) unsigned NOT NULL,
|
||||
PRIMARY KEY (`id`),
|
||||
FOREIGN KEY (`id_agent`) REFERENCES tagente(`id_agente`)
|
||||
ON UPDATE CASCADE
|
||||
) engine=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
create table IF NOT EXISTS tcluster_item(
|
||||
id int unsigned not null auto_increment,
|
||||
name tinytext not null default '',
|
||||
item_type enum('AA','AP') not null default 'AA',
|
||||
critical_limit int unsigned NOT NULL default '0',
|
||||
warning_limit int unsigned NOT NULL default '0',
|
||||
is_critical tinyint(2) unsigned NOT NULL default '0',
|
||||
id_cluster int unsigned,
|
||||
PRIMARY KEY (id),
|
||||
FOREIGN KEY (id_cluster) REFERENCES tcluster(id)
|
||||
ON DELETE SET NULL ON UPDATE CASCADE
|
||||
-- ---------------------------------------------------------------------
|
||||
-- Table `tcluster_item`
|
||||
-- ---------------------------------------------------------------------
|
||||
|
||||
create table IF NOT EXISTS `tcluster_item`(
|
||||
`id` int unsigned not null auto_increment,
|
||||
`name` tinytext not null default '',
|
||||
`item_type` enum('AA','AP') not null default 'AA',
|
||||
`critical_limit` int unsigned NOT NULL default '0',
|
||||
`warning_limit` int unsigned NOT NULL default '0',
|
||||
`is_critical` tinyint(2) unsigned NOT NULL default '0',
|
||||
`id_cluster` int unsigned,
|
||||
PRIMARY KEY (`id`),
|
||||
FOREIGN KEY (`id_cluster`) REFERENCES tcluster(`id`)
|
||||
ON DELETE SET NULL ON UPDATE CASCADE
|
||||
) engine=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
create table IF NOT EXISTS tcluster_agent(
|
||||
id_cluster int unsigned not null,
|
||||
id_agent int(10) unsigned not null,
|
||||
PRIMARY KEY (id_cluster,id_agent),
|
||||
FOREIGN KEY (id_agent) REFERENCES tagente(id_agente)
|
||||
ON UPDATE CASCADE,
|
||||
FOREIGN KEY (id_cluster) REFERENCES tcluster(id)
|
||||
ON UPDATE CASCADE
|
||||
-- ---------------------------------------------------------------------
|
||||
-- Table `tcluster_agent`
|
||||
-- ---------------------------------------------------------------------
|
||||
|
||||
create table IF NOT EXISTS `tcluster_agent`(
|
||||
`id_cluster` int unsigned not null,
|
||||
`id_agent` int(10) unsigned not null,
|
||||
PRIMARY KEY (`id_cluster`,`id_agent`),
|
||||
FOREIGN KEY (`id_agent`) REFERENCES tagente(`id_agente`)
|
||||
ON UPDATE CASCADE,
|
||||
FOREIGN KEY (`id_cluster`) REFERENCES tcluster(`id`)
|
||||
ON UPDATE CASCADE
|
||||
) engine=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
COMMIT;
|
||||
|
|
@ -135,9 +135,6 @@ if ($update_agents) {
|
|||
$result = false;
|
||||
foreach ($id_agents as $id_agent) {
|
||||
if (!empty($values)) {
|
||||
if ($config['metaconsole_agent_cache'] == 1) {
|
||||
$values['update_module_count'] = 1; // Force an update of the agent cache.
|
||||
}
|
||||
$group_old = false;
|
||||
if($values['id_grupo']){
|
||||
$group_old = db_get_sql("SELECT id_grupo FROM tagente WHERE id_agente =" .$id_agent);
|
||||
|
|
@ -146,6 +143,12 @@ if ($update_agents) {
|
|||
$result = db_process_sql_update ('tagente',
|
||||
$values,
|
||||
array ('id_agente' => $id_agent));
|
||||
|
||||
if ($result && $config['metaconsole_agent_cache'] == 1) {
|
||||
$server_name['server_name'] = db_get_sql("SELECT server_name FROM tagente WHERE id_agente =" .$id_agent);
|
||||
// Force an update of the agent cache.
|
||||
$result_metaconsole = agent_update_from_cache($id_agent,$values,$server_name);
|
||||
}
|
||||
|
||||
if($group_old || $result){
|
||||
if ($group_old && $group_old != null) {
|
||||
|
|
|
|||
|
|
@ -364,7 +364,7 @@ else {
|
|||
$data[2] = db_get_sql ("SELECT COUNT(*) FROM tlayout_data WHERE id_layout = ".$map['id']);
|
||||
|
||||
// Fix: IW was the old ACL for report editing, now is RW
|
||||
if ($vconsole_write || $vconsole_manage) {
|
||||
if ($vconsoles_write || $vconsoles_manage) {
|
||||
if (!is_metaconsole()) {
|
||||
$data[3] = '<a class="copy_visualmap" href="index.php?sec=network&sec2=godmode/reporting/map_builder&id_layout='.$map['id'].'&copy_layout=1">'.html_print_image ("images/copy.png", true).'</a>';
|
||||
$data[4] = '<a class="delete_visualmap" href="index.php?sec=network&sec2=godmode/reporting/map_builder&id_layout='.$map['id'].'&delete_layout=1">'.html_print_image ("images/cross.png", true).'</a>';
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 659 B |
Binary file not shown.
|
After Width: | Height: | Size: 491 B |
Binary file not shown.
|
After Width: | Height: | Size: 658 B |
Binary file not shown.
|
After Width: | Height: | Size: 508 B |
Binary file not shown.
|
After Width: | Height: | Size: 1.0 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 643 B |
Binary file not shown.
|
After Width: | Height: | Size: 581 B |
|
|
@ -781,6 +781,7 @@ if ($list_modules) {
|
|||
$table->head[6] = __('Thresholds');
|
||||
$table->head[7] = __('Data');
|
||||
$table->head[8] = __('Graph');
|
||||
$table->headstyle[8] = 'min-width: 60px';
|
||||
$table->head[9] = __('Last contact') . ' ' .
|
||||
'<a href="' . $url . '&sort_field=last_contact&sort=up&refr=&filter_monitors=1&status_filter_monitor=' .$status_filter_monitor.' &status_text_monitor='. $status_text_monitor.'&status_module_group= '.$status_module_group.'">' . html_print_image("images/sort_up.png", true, array("style" => $selectLastContactUp, "alt" => "up")) . '</a>' .
|
||||
'<a href="' . $url . '&sort_field=last_contact&sort=down&refr=&filter_monitors=1&status_filter_monitor=' .$status_filter_monitor.' &status_text_monitor='. $status_text_monitor.'&status_module_group= '.$status_module_group.'">' . html_print_image("images/sort_down.png", true, array("style" => $selectLastContactDown, "alt" => "down")) . '</a>';
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ function process_user_login ($login, $pass, $api = false) {
|
|||
return process_user_login_local ($login, $pass, $api);
|
||||
}
|
||||
else {
|
||||
$login_remote = process_user_login_remote ($login, $pass, $api);
|
||||
$login_remote = process_user_login_remote ($login, io_safe_output($pass), $api);
|
||||
if ($login_remote == false && $config['fallback_local_auth'] == '1') {
|
||||
return process_user_login_local ($login, $pass, $api);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,8 +22,8 @@
|
|||
/**
|
||||
* Pandora build version and version
|
||||
*/
|
||||
$build_version = 'PC180210';
|
||||
$pandora_version = 'v7.0NG.718';
|
||||
$build_version = 'PC180219';
|
||||
$pandora_version = 'v7.0NG.719';
|
||||
|
||||
// Do not overwrite default timezone set if defined.
|
||||
$script_tz = @date_default_timezone_get();
|
||||
|
|
|
|||
|
|
@ -1448,7 +1448,9 @@ function tags_checks_event_acl($id_user, $id_group, $access, $tags = array(), $c
|
|||
if (!empty($tags)) {
|
||||
foreach ($tags as $tag) {
|
||||
$tag_id = tags_get_id($tag);
|
||||
$tags_aux[$tag_id] = $tag_id;
|
||||
if (isset($tag_id)&& ($tag_id !== false)) {
|
||||
$tags_aux[$tag_id] = $tag_id;
|
||||
}
|
||||
}
|
||||
$tags_str = implode(',', $tags_aux);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4375,8 +4375,6 @@ div#footer_help{
|
|||
.route {
|
||||
fill: none;
|
||||
transition: all 2s ease-in-out;
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
}
|
||||
|
||||
.limit_scroll{
|
||||
|
|
@ -4470,5 +4468,155 @@ form ul.form_flex li ul li{
|
|||
|
||||
.modal_module_list:hover{
|
||||
cursor: pointer;
|
||||
>>>>>>> develop
|
||||
|
||||
}
|
||||
|
||||
#main_cluster {
|
||||
max-width:1770px;
|
||||
margin:0 auto;
|
||||
}
|
||||
|
||||
.sub_cluster_1 {
|
||||
width:400px;
|
||||
float: left;
|
||||
margin-left: 30px;
|
||||
margin-bottom: 25px;
|
||||
vertical-align: top;
|
||||
border:1px solid #e7e9ea;
|
||||
height:150px;
|
||||
|
||||
}
|
||||
|
||||
.sub_cluster_2 {
|
||||
width:833px;
|
||||
float: left;
|
||||
margin-left: 30px;
|
||||
margin-bottom: 25px;
|
||||
vertical-align: top;
|
||||
border:1px solid #e7e9ea;
|
||||
height:150px;
|
||||
}
|
||||
|
||||
.sub_cluster_header {
|
||||
width:100%;
|
||||
height: 30px;
|
||||
background-color: #373737;
|
||||
color:white;
|
||||
text-align:center;
|
||||
font-size: 9pt;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-content: center;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.sub_cluster_body {
|
||||
width:100%;
|
||||
height: 120px;
|
||||
background-color: #f9faf9;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-content: center;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.sub_cluster_body_3 {
|
||||
width:100%;
|
||||
height: 120px;
|
||||
background-color: #f9faf9;
|
||||
overflow-y: scroll;
|
||||
}
|
||||
|
||||
#cluster_map {
|
||||
border:1px solid lightgray;
|
||||
width:900px;
|
||||
height:500px;
|
||||
float: left;
|
||||
margin-bottom: 30px;
|
||||
}
|
||||
|
||||
#cluster_status_content {
|
||||
width: 90%;
|
||||
height:30px;
|
||||
margin:0px auto;
|
||||
}
|
||||
|
||||
#cluster_status_bar {
|
||||
width: 85%;
|
||||
height:100%;
|
||||
float:left;
|
||||
|
||||
}
|
||||
|
||||
.status_animation {
|
||||
width: 1%;
|
||||
height:100%;
|
||||
left:0%;
|
||||
background-color: red;
|
||||
position:relative;
|
||||
}
|
||||
|
||||
#cluster_status_button {
|
||||
float:left;
|
||||
width:10%;
|
||||
margin-left:5%;;
|
||||
}
|
||||
|
||||
#last_contact_content{
|
||||
width: 90%;
|
||||
height:60px;
|
||||
margin:0px auto;
|
||||
}
|
||||
|
||||
|
||||
|
||||
#last_contact_clock {
|
||||
width: 15%;
|
||||
height:100%;
|
||||
float:left;
|
||||
|
||||
}
|
||||
|
||||
#last_contact_date {
|
||||
float:left;
|
||||
height:60px;
|
||||
width:80%;
|
||||
margin-left:5%;
|
||||
text-align:center;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-content: center;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
#last_contact_date_text {
|
||||
font-size:14pt;
|
||||
}
|
||||
|
||||
|
||||
.balanced_module_item {
|
||||
float:left;
|
||||
margin-top: 11.5px;
|
||||
margin-left: 5%;
|
||||
height: 25px;
|
||||
width:90%;
|
||||
}
|
||||
|
||||
.module_icon {
|
||||
float:left;
|
||||
width:10%;
|
||||
}
|
||||
|
||||
.modal_module_list {
|
||||
float:left;
|
||||
width: 90%;
|
||||
height:100%;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-content: center;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.events_bar {
|
||||
margin:0 auto;
|
||||
}
|
||||
|
|
@ -70,8 +70,8 @@
|
|||
<body>
|
||||
<div style='height: 10px'>
|
||||
<?php
|
||||
$version = '7.0NG.718';
|
||||
$build = '180210';
|
||||
$version = '7.0NG.719';
|
||||
$build = '180219';
|
||||
$banner = "v$version Build $build";
|
||||
|
||||
error_reporting(0);
|
||||
|
|
|
|||
|
|
@ -301,7 +301,7 @@ $tag_without = json_decode($tag_without_json_clean, true);
|
|||
if (empty($tag_without)) $tag_without = array();
|
||||
$tag_without = array_diff($tag_without, array(0 => 0));
|
||||
|
||||
$search = io_safe_output(get_parameter ("search"));
|
||||
$search = get_parameter ("search");
|
||||
|
||||
users_get_groups ($config["id_user"], "ER");
|
||||
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
# Pandora FMS Console
|
||||
#
|
||||
%define name pandorafms_console
|
||||
%define version 7.0NG.718
|
||||
%define release 180210
|
||||
%define version 7.0NG.719
|
||||
%define release 180219
|
||||
|
||||
# User and Group under which Apache is running
|
||||
%define httpd_name httpd
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
# Pandora FMS Console
|
||||
#
|
||||
%define name pandorafms_console
|
||||
%define version 7.0NG.718
|
||||
%define release 180210
|
||||
%define version 7.0NG.719
|
||||
%define release 180219
|
||||
%define httpd_name httpd
|
||||
# User and Group under which Apache is running
|
||||
%define httpd_name apache2
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
# This code is licensed under GPL 2.0 license.
|
||||
# **********************************************************************
|
||||
|
||||
PI_VERSION="7.0NG.718"
|
||||
PI_VERSION="7.0NG.719"
|
||||
FORCE=0
|
||||
DESTDIR=""
|
||||
LOG_TIMESTAMP=`date +"%Y/%m/%d %H:%M:%S"`
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
package: pandorafms-server
|
||||
Version: 7.0NG.718-180210
|
||||
Version: 7.0NG.719-180219
|
||||
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.718-180210"
|
||||
pandora_version="7.0NG.719-180219"
|
||||
|
||||
package_cpan=0
|
||||
package_pandora=1
|
||||
|
|
|
|||
|
|
@ -293,7 +293,7 @@ sub pandora_server_tasks ($) {
|
|||
if (($counter % 30) == 0) {
|
||||
|
||||
# Update module status and fired alert counts
|
||||
my @agents = get_db_rows ($dbh, 'SELECT id_agente, nombre, update_module_count, update_alert_count FROM tagente WHERE (update_module_count=1 OR update_alert_count=1)');
|
||||
my @agents = get_db_rows ($dbh, 'SELECT id_agente, nombre, update_module_count, update_alert_count FROM tagente WHERE disabled = 0 AND (update_module_count=1 OR update_alert_count=1)');
|
||||
foreach my $agent (@agents) {
|
||||
logger ($pa_config, "Updating module status and fired alert counts for agent " . $agent->{'nombre'}, 10);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#############################################################################
|
||||
# Pandora FMS Server Parameters
|
||||
# Pandora FMS, the Flexible Monitoring System.
|
||||
# Version 7.0NG.718
|
||||
# Version 7.0NG.719
|
||||
# Licensed under GPL license v2,
|
||||
# (c) 2003-2017 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
|
|
|||
|
|
@ -42,8 +42,8 @@ our @EXPORT = qw(
|
|||
);
|
||||
|
||||
# version: Defines actual version of Pandora Server for this module only
|
||||
my $pandora_version = "7.0NG.718";
|
||||
my $pandora_build = "180210";
|
||||
my $pandora_version = "7.0NG.719";
|
||||
my $pandora_build = "180219";
|
||||
our $VERSION = $pandora_version." ".$pandora_build;
|
||||
|
||||
# Setup hash
|
||||
|
|
|
|||
|
|
@ -5155,7 +5155,7 @@ sub pandora_update_agent_module_count ($$$) {
|
|||
}; # Module counts by status.
|
||||
|
||||
# Retrieve and hash module status counts.
|
||||
my @rows = get_db_rows ($dbh, 'SELECT estado, COUNT(*) AS total FROM tagente_modulo, tagente_estado WHERE tagente_modulo.id_agente_modulo=tagente_estado.id_agente_modulo AND tagente_modulo.id_agente=?GROUP BY estado', $agent_id);
|
||||
my @rows = get_db_rows ($dbh, 'SELECT estado, COUNT(*) AS total FROM tagente_modulo, tagente_estado WHERE tagente_modulo.disabled=0 AND tagente_modulo.id_agente_modulo=tagente_estado.id_agente_modulo AND tagente_modulo.id_agente=?GROUP BY estado', $agent_id);
|
||||
foreach my $row (@rows) {
|
||||
$counts->{$row->{'estado'}} = $row->{'total'};
|
||||
$total += $row->{'total'};
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@ use base 'Exporter';
|
|||
our @ISA = qw(Exporter);
|
||||
|
||||
# version: Defines actual version of Pandora Server for this module only
|
||||
my $pandora_version = "7.0NG.718";
|
||||
my $pandora_build = "180210";
|
||||
my $pandora_version = "7.0NG.719";
|
||||
my $pandora_build = "180219";
|
||||
our $VERSION = $pandora_version." ".$pandora_build;
|
||||
|
||||
our %EXPORT_TAGS = ( 'all' => [ qw() ] );
|
||||
|
|
|
|||
|
|
@ -349,7 +349,9 @@ sub pandora_trash_ascii {
|
|||
########################################################################
|
||||
sub safe_input($) {
|
||||
my $value = shift;
|
||||
|
||||
|
||||
return "" unless defined($value);
|
||||
|
||||
$value =~ s/([\x00-\xFF])/$CHR2ENT{$1}||$1/ge;
|
||||
|
||||
return $value;
|
||||
|
|
@ -360,7 +362,9 @@ sub safe_input($) {
|
|||
########################################################################
|
||||
sub safe_output($) {
|
||||
my $value = shift;
|
||||
|
||||
|
||||
return "" unless defined($value);
|
||||
|
||||
_decode_entities ($value, \%ENT2CHR);
|
||||
|
||||
return $value;
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
# Pandora FMS Server
|
||||
#
|
||||
%define name pandorafms_server
|
||||
%define version 7.0NG.718
|
||||
%define release 180210
|
||||
%define version 7.0NG.719
|
||||
%define release 180219
|
||||
|
||||
Summary: Pandora FMS Server
|
||||
Name: %{name}
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
# Pandora FMS Server
|
||||
#
|
||||
%define name pandorafms_server
|
||||
%define version 7.0NG.718
|
||||
%define release 180210
|
||||
%define version 7.0NG.719
|
||||
%define release 180219
|
||||
|
||||
Summary: Pandora FMS Server
|
||||
Name: %{name}
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@
|
|||
# This code is licensed under GPL 2.0 license.
|
||||
# **********************************************************************
|
||||
|
||||
PI_VERSION="7.0NG.718"
|
||||
PI_BUILD="180210"
|
||||
PI_VERSION="7.0NG.719"
|
||||
PI_BUILD="180219"
|
||||
|
||||
MODE=$1
|
||||
if [ $# -gt 1 ]; then
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ use PandoraFMS::Tools;
|
|||
use PandoraFMS::DB;
|
||||
|
||||
# version: define current version
|
||||
my $version = "7.0NG.718 PS180210";
|
||||
my $version = "7.0NG.719 PS180219";
|
||||
|
||||
# Pandora server configuration
|
||||
my %conf;
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ use Encode::Locale;
|
|||
Encode::Locale::decode_argv;
|
||||
|
||||
# version: define current version
|
||||
my $version = "7.0NG.718 PS180210";
|
||||
my $version = "7.0NG.719 PS180219";
|
||||
|
||||
# save program name for logging
|
||||
my $progname = basename($0);
|
||||
|
|
|
|||
Loading…
Reference in New Issue