Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
Conflicts: pandora_console/extras/mr/51.sql
This commit is contained in:
fbsanchez
commit
a9485024f4
|
|
@ -1,5 +1,5 @@
|
|||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.758, AIX version
|
||||
# Version 7.0NG.758.1, AIX version
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2021 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.758, FreeBSD Version
|
||||
# Version 7.0NG.758.1, FreeBSD Version
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2021 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.758, HP-UX Version
|
||||
# Version 7.0NG.758.1, HP-UX Version
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2021 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.758, GNU/Linux
|
||||
# Version 7.0NG.758.1, GNU/Linux
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2021 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.758, GNU/Linux
|
||||
# Version 7.0NG.758.1, GNU/Linux
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2021 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.758, Solaris Version
|
||||
# Version 7.0NG.758.1, Solaris Version
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2021 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Base config file for Pandora FMS Windows Agent
|
||||
# (c) 2006-2021 Artica Soluciones Tecnologicas
|
||||
# Version 7.0NG.758
|
||||
# Version 7.0NG.758.1
|
||||
# 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
|
||||
# Foundation; either version 2 of the Licence or any later version
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Fichero de configuracion base de agentes de Pandora
|
||||
# Base config file for Pandora agents
|
||||
# Version 7.0NG.758, AIX version
|
||||
# Version 7.0NG.758.1, 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.758
|
||||
# Version 7.0NG.758.1
|
||||
# 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.758, HPUX Version
|
||||
# Version 7.0NG.758.1, HPUX Version
|
||||
|
||||
# General Parameters
|
||||
# ==================
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.758
|
||||
# Version 7.0NG.758.1
|
||||
# Licensed under GPL license v2,
|
||||
# (c) 2003-2021 Artica Soluciones Tecnologicas
|
||||
# please visit http://pandora.sourceforge.net
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.758
|
||||
# Version 7.0NG.758.1
|
||||
# Licensed under GPL license v2,
|
||||
# (c) 2003-2021 Artica Soluciones Tecnologicas
|
||||
# please visit http://pandora.sourceforge.net
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.758
|
||||
# Version 7.0NG.758.1
|
||||
# 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.758, Solaris version
|
||||
# Version 7.0NG.758.1, Solaris version
|
||||
|
||||
# General Parameters
|
||||
# ==================
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.758, AIX version
|
||||
# Version 7.0NG.758.1, AIX version
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2021 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
package: pandorafms-agent-unix
|
||||
Version: 7.0NG.758-211119
|
||||
Version: 7.0NG.758.1
|
||||
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.758-211119"
|
||||
pandora_version="7.0NG.758.1"
|
||||
|
||||
echo "Test if you has the tools for to make the packages."
|
||||
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ fi
|
|||
if [ "$#" -ge 2 ]; then
|
||||
VERSION="$2"
|
||||
else
|
||||
VERSION="7.0NG.758"
|
||||
VERSION="7.0NG.758.1"
|
||||
fi
|
||||
|
||||
# Path for the generated DMG file
|
||||
|
|
|
|||
|
|
@ -19,11 +19,11 @@
|
|||
<choice id="com.pandorafms.pandorafms_src" visible="false">
|
||||
<pkg-ref id="com.pandorafms.pandorafms_src"/>
|
||||
</choice>
|
||||
<pkg-ref id="com.pandorafms.pandorafms_src" version="7.0NG.758" onConclusion="none">pandorafms_src.pdk</pkg-ref>
|
||||
<pkg-ref id="com.pandorafms.pandorafms_src" version="7.0NG.758.1" onConclusion="none">pandorafms_src.pdk</pkg-ref>
|
||||
<choice id="com.pandorafms.pandorafms_uninstall" visible="true" customLocation="/Applications">
|
||||
<pkg-ref id="com.pandorafms.pandorafms_uninstall"/>
|
||||
</choice>
|
||||
<pkg-ref id="com.pandorafms.pandorafms_uninstall" version="7.0NG.758" onConclusion="none">pandorafms_uninstall.pdk</pkg-ref>
|
||||
<pkg-ref id="com.pandorafms.pandorafms_uninstall" version="7.0NG.758.1" onConclusion="none">pandorafms_uninstall.pdk</pkg-ref>
|
||||
<!-- <installation-check script="check()" />
|
||||
<script>
|
||||
<![CDATA[
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@
|
|||
<key>CFBundleIconFile</key> <string>pandorafms.icns</string>
|
||||
<key>CFBundleIdentifier</key> <string>com.pandorafms.pandorafms_uninstall</string>
|
||||
|
||||
<key>CFBundleVersion</key> <string>7.0NG.758</string>
|
||||
<key>CFBundleGetInfoString</key> <string>7.0NG.758 Pandora FMS Agent uninstaller for MacOS by Artica ST on Aug 2020</string>
|
||||
<key>CFBundleShortVersionString</key> <string>7.0NG.758</string>
|
||||
<key>CFBundleVersion</key> <string>7.0NG.758.1</string>
|
||||
<key>CFBundleGetInfoString</key> <string>7.0NG.758.1 Pandora FMS Agent uninstaller for MacOS by Artica ST on Aug 2020</string>
|
||||
<key>CFBundleShortVersionString</key> <string>7.0NG.758.1</string>
|
||||
|
||||
<key>NSPrincipalClass</key><string>NSApplication</string>
|
||||
<key>NSMainNibFile</key><string>MainMenu</string>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.758, GNU/Linux
|
||||
# Version 7.0NG.758.1, GNU/Linux
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2021 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.758, FreeBSD Version
|
||||
# Version 7.0NG.758.1, FreeBSD Version
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2021 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.758, HP-UX Version
|
||||
# Version 7.0NG.758.1, HP-UX Version
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2021 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.758, GNU/Linux
|
||||
# Version 7.0NG.758.1, GNU/Linux
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2021 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.758, GNU/Linux
|
||||
# Version 7.0NG.758.1, GNU/Linux
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2021 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.758, NetBSD Version
|
||||
# Version 7.0NG.758.1, NetBSD Version
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2021 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Base config file for Pandora FMS agents
|
||||
# Version 7.0NG.758, Solaris Version
|
||||
# Version 7.0NG.758.1, Solaris Version
|
||||
# Licensed under GPL license v2,
|
||||
# Copyright (c) 2003-2021 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
|
|
|||
|
|
@ -1014,8 +1014,8 @@ my $Sem = undef;
|
|||
# Semaphore used to control the number of threads
|
||||
my $ThreadSem = undef;
|
||||
|
||||
use constant AGENT_VERSION => '7.0NG.758';
|
||||
use constant AGENT_BUILD => '211119';
|
||||
use constant AGENT_VERSION => '7.0NG.758.1';
|
||||
use constant AGENT_BUILD => '211123';
|
||||
|
||||
# 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.758
|
||||
%define release 211119
|
||||
%define version 7.0NG.758.1
|
||||
%define release 1
|
||||
|
||||
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.758
|
||||
%define release 211119
|
||||
%define version 7.0NG.758.1
|
||||
%define release 1
|
||||
|
||||
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.758"
|
||||
PI_BUILD="211119"
|
||||
PI_VERSION="7.0NG.758.1"
|
||||
PI_BUILD="211123"
|
||||
OS_NAME=`uname -s`
|
||||
|
||||
FORCE=0
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Base config file for Pandora FMS Windows Agent
|
||||
# (c) 2006-2021 Artica Soluciones Tecnologicas
|
||||
# Version 7.0NG.758
|
||||
# Version 7.0NG.758.1
|
||||
# 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
|
||||
# Foundation; either version 2 of the Licence or any later version
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ AllowLanguageSelection
|
|||
{Yes}
|
||||
|
||||
AppName
|
||||
{Pandora FMS Windows Agent v7.0NG.758}
|
||||
{Pandora FMS Windows Agent v7.0NG.758.1}
|
||||
|
||||
ApplicationID
|
||||
{17E3D2CF-CA02-406B-8A80-9D31C17BD08F}
|
||||
|
|
@ -186,7 +186,7 @@ UpgradeApplicationID
|
|||
{}
|
||||
|
||||
Version
|
||||
{211119}
|
||||
{211123}
|
||||
|
||||
ViewReadme
|
||||
{Yes}
|
||||
|
|
@ -2387,7 +2387,7 @@ Windows,BuildSeparateArchives
|
|||
{No}
|
||||
|
||||
Windows,Executable
|
||||
{<%AppName%>-<%Version%>-Setup<%Ext%>}
|
||||
{<%AppName%>-Setup<%Ext%>}
|
||||
|
||||
Windows,FileDescription
|
||||
{<%AppName%> <%Version%> Setup}
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ using namespace Pandora;
|
|||
using namespace Pandora_Strutils;
|
||||
|
||||
#define PATH_SIZE _MAX_PATH+1
|
||||
#define PANDORA_VERSION ("7.0NG.758 Build 211119")
|
||||
#define PANDORA_VERSION ("7.0NG.758.1 Build 211123")
|
||||
|
||||
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.758(Build 211119))"
|
||||
VALUE "ProductVersion", "(7.0NG.758.1(Build 211123))"
|
||||
VALUE "FileVersion", "1.0.0.0"
|
||||
END
|
||||
END
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
package: pandorafms-console
|
||||
Version: 7.0NG.758-211119
|
||||
Version: 7.0NG.758.1
|
||||
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.758-211119"
|
||||
pandora_version="7.0NG.758.1"
|
||||
|
||||
package_pear=0
|
||||
package_pandora=1
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ ALTER TABLE `talert_special_days` ADD FOREIGN KEY (`id_calendar`) REFERENCES `ta
|
|||
ALTER TABLE `tagent_repository` ADD COLUMN `deployment_timeout` INT UNSIGNED DEFAULT 600 AFTER `path`;
|
||||
ALTER TABLE `tncm_vendor` ADD COLUMN `icon` VARCHAR(255) DEFAULT '';
|
||||
ALTER TABLE `tevento` MODIFY COLUMN `event_type` ENUM('going_unknown','unknown','alert_fired','alert_recovered','alert_ceased','alert_manual_validation','recon_host_detected','system','error','new_agent','going_up_warning','going_up_critical','going_down_warning','going_down_normal','going_down_critical','going_up_normal', 'configuration_change', 'ncm') DEFAULT 'unknown';
|
||||
ALTER TABLE `tagent_repository` ADD COLUMN `deployment_timeout` INT UNSIGNED DEFAULT 600 AFTER `path`;
|
||||
|
||||
INSERT IGNORE INTO `talert_calendar` VALUES (1, 'Default', 0, 'Default calendar');
|
||||
UPDATE `talert_special_days` set `day_code` = 1 WHERE `same_day` = 'monday';
|
||||
|
|
|
|||
|
|
@ -1565,7 +1565,7 @@ ALTER TABLE `tagente_modulo` DROP COLUMN `ff_normal`,
|
|||
MODIFY COLUMN `dynamic_next` bigint(20) NOT NULL DEFAULT '0',
|
||||
MODIFY COLUMN `dynamic_two_tailed` tinyint(1) unsigned NULL DEFAULT '0';
|
||||
ALTER TABLE tagente_modulo MODIFY COLUMN `custom_string_1` MEDIUMTEXT;
|
||||
ALTER TABLE `tagente_modulo` ADD COLUMN `debug_content` varchar(200);
|
||||
ALTER TABLE `tagente_modulo` ADD COLUMN `debug_content` TEXT;
|
||||
|
||||
-- ---------------------------------------------------------------------
|
||||
-- Table `tagente_datos`
|
||||
|
|
|
|||
|
|
@ -688,7 +688,7 @@ foreach ($simple_alerts as $alert) {
|
|||
$data[3] .= '</tr>';
|
||||
}
|
||||
|
||||
$data[3] .= '<div id="update_action-div" class="invisible left">';
|
||||
$data[3] .= '<div id="update_action-div" class="invisible">';
|
||||
$data[3] .= '</div>';
|
||||
$data[3] .= '</table>';
|
||||
// Is possible manage actions if have LW permissions in the agent group of the alert module
|
||||
|
|
@ -1163,18 +1163,18 @@ function show_display_update_action(id_module_action, alert_id, alert_id_agent_m
|
|||
background: "black"
|
||||
},
|
||||
open: function() {
|
||||
$("#action_select_ajax, #action_select_ajax").select2({
|
||||
$('#update_action-div').css('overflow', 'hidden');
|
||||
$("#action_select, #action_select_ajax").select2({
|
||||
tags: true,
|
||||
dropdownParent: $("#update_action-div")
|
||||
dropdownParent: $('#update_action-')
|
||||
});
|
||||
},
|
||||
width: 500,
|
||||
height: 300
|
||||
width: 455,
|
||||
height: 370
|
||||
})
|
||||
.show ();
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
/* ]]> */
|
||||
|
|
|
|||
|
|
@ -422,8 +422,8 @@ if ($show_update_action_menu) {
|
|||
$id_action
|
||||
);
|
||||
|
||||
$data .= '<form id="update_action-'.$alert['id'].'" method="post">';
|
||||
$data .= '<table class="databox_color w100p bg_color222">';
|
||||
$data .= '<form id="update_action-'.$alert['id'].'" method="post" style="height:85%;">';
|
||||
$data .= '<table class="databox_color w100p bg_color222" style="height:100%;">';
|
||||
$data .= html_print_input_hidden(
|
||||
'update_action',
|
||||
1,
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@
|
|||
/**
|
||||
* Pandora build version and version
|
||||
*/
|
||||
$build_version = 'PC211119';
|
||||
$pandora_version = 'v7.0NG.758';
|
||||
$build_version = 'PC211123';
|
||||
$pandora_version = 'v7.0NG.758.1';
|
||||
|
||||
// Do not overwrite default timezone set if defined.
|
||||
$script_tz = @date_default_timezone_get();
|
||||
|
|
|
|||
|
|
@ -173,6 +173,7 @@ define('COL_GRAPH13', '#E83128');
|
|||
// Styles.
|
||||
// Size of text in characters for truncate.
|
||||
define('GENERIC_SIZE_TEXT', 50);
|
||||
define('MENU_SIZE_TEXT', 20);
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -679,7 +679,7 @@ function agents_get_agents(
|
|||
// Add the group filter to
|
||||
$where = db_format_array_where_clause_sql($filter, 'AND', '('.$where_secondary.') AND ');
|
||||
if ($where == '' && $where_secondary != '') {
|
||||
$where = $where_secondary;
|
||||
$where = '('.$where_secondary.')';
|
||||
}
|
||||
|
||||
$where_nogroup = db_format_array_where_clause_sql(
|
||||
|
|
|
|||
|
|
@ -376,11 +376,11 @@ function menu_print_menu(&$menu)
|
|||
if (isset($sub2['title'])) {
|
||||
$sub_title = $sub2['title'];
|
||||
} else {
|
||||
$sub_title = '';
|
||||
$sub_title = $sub2['text'];
|
||||
}
|
||||
|
||||
$submenu2_list .= '<li class="'.$class.'" >';
|
||||
$submenu2_list .= '<a href="'.$link.'"><div class="'.$sub_tree_class.'" title="'.$sub2['text'].'" >'.$sub2['text'].'</div></a></li>';
|
||||
$submenu2_list .= '<a href="'.$link.'"><div class="'.$sub_tree_class.'" title="'.$sub_title.'" >'.$sub2['text'].'</div></a></li>';
|
||||
$sub_title = '';
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -177,13 +177,8 @@ function servers_get_performance()
|
|||
WHERE tagente_modulo.id_agente_modulo = tagente_estado.id_agente_modulo
|
||||
AND tagente.id_agente = tagente_estado.id_agente
|
||||
AND tagente_modulo.disabled = 0
|
||||
AND tagente_modulo.id_modulo <> 0
|
||||
AND delete_pending = 0
|
||||
AND (utimestamp > 0
|
||||
OR (id_tipo_modulo = 100
|
||||
OR (id_tipo_modulo > 21
|
||||
AND id_tipo_modulo < 23)
|
||||
)
|
||||
)
|
||||
AND tagente.disabled = 0
|
||||
GROUP BY tagente_modulo.id_modulo'
|
||||
);
|
||||
|
|
|
|||
|
|
@ -347,7 +347,7 @@ function tactical_get_data($id_user=false, $user_strict=false, $acltags, $return
|
|||
$list['_total_agents_'] = $total_agentes[0]['total_agents'];
|
||||
$list['_monitor_alerts_fire_count_'] = $group_stat[0]['alerts_fired'];
|
||||
|
||||
$list['_monitors_alerts_'] = tactical_monitor_alerts(explode(',', $user_groups_ids), $user_strict, explode(',', $user_groups_ids));
|
||||
$list['_monitors_alerts_'] = tactical_monitor_alerts($user_strict);
|
||||
// Get total count of monitors for this group, except disabled.
|
||||
$list['_monitor_checks_'] = ($list['_monitors_not_init_'] + $list['_monitors_unknown_'] + $list['_monitors_warning_'] + $list['_monitors_critical_'] + $list['_monitors_ok_']);
|
||||
|
||||
|
|
@ -466,12 +466,14 @@ function tactical_get_data($id_user=false, $user_strict=false, $acltags, $return
|
|||
}
|
||||
|
||||
$list['_monitors_alerts_fired_'] = tactical_monitor_fired_alerts(explode(',', $user_groups_ids), $user_strict, explode(',', $user_groups_ids));
|
||||
$list['_monitors_alerts_'] = tactical_monitor_alerts(explode(',', $user_groups_ids), $user_strict, explode(',', $user_groups_ids));
|
||||
$list['_monitors_alerts_'] = tactical_monitor_alerts($user_strict);
|
||||
|
||||
$total_agentes = agents_get_agents(false, ['count(DISTINCT id_agente) as total_agents'], 'AR', false, false, 1);
|
||||
$list['_total_agents_'] = $total_agentes[0]['total_agents'];
|
||||
|
||||
$list['_monitor_checks_'] = ($list['_monitors_not_init_'] + $list['_monitors_unknown_'] + $list['_monitors_warning_'] + $list['_monitors_critical_'] + $list['_monitors_ok_']);
|
||||
|
||||
$list['_monitor_total_'] = ($list['_monitors_not_init_'] + $list['_monitors_unknown_'] + $list['_monitors_warning_'] + $list['_monitors_critical_'] + $list['_monitors_ok_']);
|
||||
$list['_monitor_checks_'] = ($list['_monitors_unknown_'] + $list['_monitors_warning_'] + $list['_monitors_critical_'] + $list['_monitors_ok_']);
|
||||
|
||||
// Calculate not_normal monitors
|
||||
$list['_monitor_not_normal_'] = ($list['_monitor_checks_'] - $list['_monitors_ok_']);
|
||||
|
|
@ -497,42 +499,33 @@ function tactical_status_modules_agents($id_user=false, $user_strict=false, $acc
|
|||
}
|
||||
|
||||
|
||||
function tactical_monitor_alerts($group_array, $strict_user=false, $id_group_strict=false)
|
||||
function tactical_monitor_alerts($strict_user=false)
|
||||
{
|
||||
// If there are not groups to query, we jump to nextone
|
||||
if (empty($group_array)) {
|
||||
return 0;
|
||||
} else if (!is_array($group_array)) {
|
||||
$group_array = [$group_array];
|
||||
}
|
||||
$groups = users_get_groups($config['id_user'], 'AR', false);
|
||||
$id_groups = array_keys($groups);
|
||||
|
||||
$group_clause = implode(',', $group_array);
|
||||
$group_clause = '('.$group_clause.')';
|
||||
|
||||
if ($strict_user) {
|
||||
$group_clause_strict = implode(',', $id_group_strict);
|
||||
$group_clause_strict = '('.$group_clause_strict.')';
|
||||
$sql = "SELECT COUNT(talert_template_modules.id)
|
||||
FROM talert_template_modules, tagente_modulo, tagente_estado, tagente
|
||||
WHERE tagente.id_grupo IN $group_clause_strict AND tagente_modulo.id_agente = tagente.id_agente
|
||||
AND tagente.disabled = 0 AND tagente_modulo.disabled = 0
|
||||
AND talert_template_modules.disabled = 0
|
||||
AND tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo
|
||||
AND talert_template_modules.id_agent_module = tagente_modulo.id_agente_modulo";
|
||||
$count = db_get_sql($sql);
|
||||
return $count;
|
||||
if (empty($id_groups)) {
|
||||
$where_clause .= ' AND (1 = 0) ';
|
||||
} else {
|
||||
// TODO REVIEW ORACLE AND POSTGRES
|
||||
return db_get_sql(
|
||||
"SELECT COUNT(talert_template_modules.id)
|
||||
FROM talert_template_modules, tagente_modulo, tagente_estado, tagente
|
||||
WHERE tagente.id_grupo IN $group_clause AND tagente_modulo.id_agente = tagente.id_agente
|
||||
AND tagente.disabled = 0 AND tagente_modulo.disabled = 0
|
||||
AND talert_template_modules.disabled = 0
|
||||
AND tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo
|
||||
AND talert_template_modules.id_agent_module = tagente_modulo.id_agente_modulo"
|
||||
$where_clause .= sprintf(
|
||||
' AND id_agent_module IN (
|
||||
SELECT tam.id_agente_modulo
|
||||
FROM tagente_modulo tam
|
||||
WHERE tam.id_agente IN (SELECT ta.id_agente
|
||||
FROM tagente ta LEFT JOIN tagent_secondary_group tasg ON
|
||||
ta.id_agente = tasg.id_agent
|
||||
WHERE (ta.id_grupo IN (%s) OR tasg.id_group IN (%s)))) ',
|
||||
implode(',', $id_groups),
|
||||
implode(',', $id_groups)
|
||||
);
|
||||
}
|
||||
|
||||
$filter_alert = [];
|
||||
$filter_alert['disabled'] = 'all_enabled';
|
||||
|
||||
$alert_count = get_group_alerts($id_groups, $filter_alert, false, $where_clause, false, false, false, true, $strict_user);
|
||||
|
||||
return $alert_count;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -301,6 +301,7 @@ function users_get_groups(
|
|||
$search=''
|
||||
) {
|
||||
static $group_cache = [];
|
||||
|
||||
$filter = '';
|
||||
|
||||
// Added users_group_cache to avoid unnecessary proccess on massive calls...
|
||||
|
|
@ -342,13 +343,6 @@ function users_get_groups(
|
|||
$query = 'SELECT * FROM tgrupo ORDER BY nombre';
|
||||
$raw_groups = db_get_all_rows_sql($query);
|
||||
|
||||
if (empty($search) === false) {
|
||||
$filter = sprintf(
|
||||
' AND lower(tgrupo.nombre) like lower("%%%s%%")',
|
||||
$search
|
||||
);
|
||||
}
|
||||
|
||||
$query = sprintf(
|
||||
"SELECT tgrupo.*, tperfil.*, tusuario_perfil.tags, tusuario_perfil.no_hierarchy FROM tgrupo, tusuario_perfil, tperfil
|
||||
WHERE (tgrupo.id_grupo = tusuario_perfil.id_grupo OR tusuario_perfil.id_grupo = 0)
|
||||
|
|
@ -451,6 +445,16 @@ function users_get_groups(
|
|||
}
|
||||
}
|
||||
|
||||
// Search filter.
|
||||
if (empty($search) === false) {
|
||||
$user_groups = array_filter(
|
||||
$user_groups,
|
||||
function ($group) use ($search) {
|
||||
return (bool) preg_match('/'.$search.'/i', $group['nombre']);
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
$users_group_cache[$users_group_cache_key] = $user_groups;
|
||||
|
||||
return $user_groups;
|
||||
|
|
|
|||
|
|
@ -519,8 +519,6 @@ class EventsListWidget extends Widget
|
|||
}
|
||||
}
|
||||
|
||||
$hours = ($this->values['maxHours'] * SECONDS_1HOUR);
|
||||
|
||||
// Put hours in seconds.
|
||||
$filter = [];
|
||||
$order = [];
|
||||
|
|
@ -546,7 +544,7 @@ class EventsListWidget extends Widget
|
|||
}
|
||||
} else {
|
||||
// Filtering.
|
||||
$filter['event_view_hr'] = $hours;
|
||||
$filter['event_view_hr'] = $this->values['maxHours'];
|
||||
|
||||
// Group.
|
||||
$filter['id_group_filter'] = $this->values['groupId'];
|
||||
|
|
|
|||
|
|
@ -3321,6 +3321,13 @@ td.empty_field {
|
|||
width: 96%;
|
||||
}
|
||||
|
||||
#update_action-
|
||||
> .select2-container--default
|
||||
.select2-results
|
||||
> .select2-results__options {
|
||||
max-height: 125px !important;
|
||||
}
|
||||
|
||||
/* Policies styles */
|
||||
|
||||
table#policy_modules td * {
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@
|
|||
<div style='height: 10px'>
|
||||
<?php
|
||||
$version = '7.0NG.758';
|
||||
$build = '211119';
|
||||
$build = '211105';
|
||||
$banner = "v$version Build $build";
|
||||
|
||||
error_reporting(0);
|
||||
|
|
|
|||
|
|
@ -479,7 +479,7 @@ if ($load_filter_id === 0) {
|
|||
|
||||
// Do not load the user filter if we come from the 24h event graph.
|
||||
$from_event_graph = get_parameter('filter[from_event_graph]', $filter['from_event_graph']);
|
||||
if ($loaded_filter !== false && $from_event_graph != 1) {
|
||||
if ($loaded_filter !== false && $from_event_graph != 1 && !isset($fb64)) {
|
||||
$filter = events_get_event_filter($loaded_filter['id_filter']);
|
||||
if ($filter !== false) {
|
||||
$id_group = $filter['id_group'];
|
||||
|
|
@ -1504,7 +1504,8 @@ try {
|
|||
[
|
||||
'text' => 'options',
|
||||
'class' => 'action_buttons w120px',
|
||||
],[
|
||||
],
|
||||
[
|
||||
'text' => 'm',
|
||||
'extra' => $checkbox_all,
|
||||
'class' => 'mw120px',
|
||||
|
|
@ -1547,7 +1548,8 @@ try {
|
|||
[
|
||||
'text' => 'options',
|
||||
'class' => 'action_buttons mw120px',
|
||||
],[
|
||||
],
|
||||
[
|
||||
'text' => 'm',
|
||||
'extra' => $checkbox_all,
|
||||
'class' => 'w20px no-text-imp',
|
||||
|
|
|
|||
|
|
@ -220,7 +220,7 @@ if (check_acl($config['id_user'], 0, 'VR') || check_acl($config['id_user'], 0, '
|
|||
|
||||
$name = io_safe_output($layout['name']);
|
||||
|
||||
$sub2['operation/visual_console/render_view&id='.$layout['id']]['text'] = mb_substr($name, 0, 19);
|
||||
$sub2['operation/visual_console/render_view&id='.$layout['id']]['text'] = ui_print_truncate_text($name, MENU_SIZE_TEXT, false, true, false);
|
||||
$sub2['operation/visual_console/render_view&id='.$layout['id']]['id'] = mb_substr($name, 0, 19);
|
||||
$sub2['operation/visual_console/render_view&id='.$layout['id']]['title'] = $name;
|
||||
if (!empty($config['vc_refr'])) {
|
||||
|
|
@ -235,7 +235,7 @@ if (check_acl($config['id_user'], 0, 'VR') || check_acl($config['id_user'], 0, '
|
|||
if ($break_max_console) {
|
||||
$sub2['godmode/reporting/visual_console_favorite']['text'] = __('Show more').' >';
|
||||
$sub2['godmode/reporting/visual_console_favorite']['id'] = 'visual_favourite_console';
|
||||
$sub2['godmode/reporting/visual_console_favorite']['title'] = 'show_more';
|
||||
$sub2['godmode/reporting/visual_console_favorite']['title'] = __('Show more');
|
||||
$sub2['godmode/reporting/visual_console_favorite']['refr'] = 0;
|
||||
}
|
||||
|
||||
|
|
@ -281,7 +281,7 @@ if (check_acl($config['id_user'], 0, 'MR') || check_acl($config['id_user'], 0, '
|
|||
continue;
|
||||
}
|
||||
|
||||
$sub2['operation/gis_maps/render_view&map_id='.$gisMap['id_tgis_map']]['text'] = mb_substr(io_safe_output($gisMap['map_name']), 0, 15);
|
||||
$sub2['operation/gis_maps/render_view&map_id='.$gisMap['id_tgis_map']]['text'] = ui_print_truncate_text(io_safe_output($gisMap['map_name']), MENU_SIZE_TEXT, false, true, false);
|
||||
$sub2['operation/gis_maps/render_view&map_id='.$gisMap['id_tgis_map']]['id'] = mb_substr(io_safe_output($gisMap['map_name']), 0, 15);
|
||||
$sub2['operation/gis_maps/render_view&map_id='.$gisMap['id_tgis_map']]['title'] = io_safe_output($gisMap['map_name']);
|
||||
$sub2['operation/gis_maps/render_view&map_id='.$gisMap['id_tgis_map']]['refr'] = 0;
|
||||
|
|
@ -345,7 +345,7 @@ if (check_acl($config['id_user'], 0, 'RR') || check_acl($config['id_user'], 0, '
|
|||
$name = io_safe_output($dashboard['name']);
|
||||
|
||||
$sub2['operation/dashboard/dashboard&dashboardId='.$dashboard['id']] = [
|
||||
'text' => mb_substr($name, 0, 19),
|
||||
'text' => ui_print_truncate_text($name, MENU_SIZE_TEXT, false, true, false),
|
||||
'title' => $name,
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -208,14 +208,7 @@ if ($searchpolicies === true) {
|
|||
$sql = "SELECT id, name, description, id_group, status
|
||||
FROM tpolicies
|
||||
WHERE name LIKE '$stringSearchSQL'
|
||||
AND
|
||||
(id_group IN ($id_user_groups_str)
|
||||
OR 1 = (
|
||||
SELECT is_admin
|
||||
FROM tusuario
|
||||
WHERE id_user = 'admin'
|
||||
)
|
||||
)
|
||||
AND id_group IN ($id_user_groups_str)
|
||||
";
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -225,7 +225,7 @@ if ($searchUsers) {
|
|||
|
||||
$user_groups = users_get_groups(
|
||||
$user['id_user'],
|
||||
'AR',
|
||||
false,
|
||||
$user_can_manage_all
|
||||
);
|
||||
|
||||
|
|
@ -236,7 +236,6 @@ if ($searchUsers) {
|
|||
&& $config['id_user'] != $user['id_user']
|
||||
|| (users_is_admin($config['id_user']) === false
|
||||
&& users_is_admin($user['id_user']) === true)
|
||||
|| $config['id_user'] === $user['id_user']
|
||||
) {
|
||||
unset($users[$key]);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
# Pandora FMS Console
|
||||
#
|
||||
%define name pandorafms_console
|
||||
%define version 7.0NG.758
|
||||
%define release 211119
|
||||
%define version 7.0NG.758.1
|
||||
%define release 1
|
||||
|
||||
# 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.758
|
||||
%define release 211119
|
||||
%define version 7.0NG.758.1
|
||||
%define release 1
|
||||
|
||||
# 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.758
|
||||
%define release 211119
|
||||
%define version 7.0NG.758.1
|
||||
%define release 1
|
||||
%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.758"
|
||||
PI_VERSION="7.0NG.758.1"
|
||||
FORCE=0
|
||||
DESTDIR=""
|
||||
LOG_TIMESTAMP=`date +"%Y/%m/%d %H:%M:%S"`
|
||||
|
|
|
|||
|
|
@ -266,7 +266,7 @@ CREATE TABLE IF NOT EXISTS `tagente_modulo` (
|
|||
`prediction_threshold` int(4) default 0,
|
||||
`parent_module_id` int(10) unsigned NOT NULL default 0,
|
||||
`cps` int NOT NULL default 0,
|
||||
`debug_content` varchar(200),
|
||||
`debug_content` TEXT,
|
||||
PRIMARY KEY (`id_agente_modulo`),
|
||||
KEY `main_idx` (`id_agente_modulo`,`id_agente`),
|
||||
KEY `tam_agente` (`id_agente`),
|
||||
|
|
|
|||
|
|
@ -76,10 +76,11 @@ $inputs = [
|
|||
[
|
||||
'label' => __('Name'),
|
||||
'arguments' => [
|
||||
'type' => 'text',
|
||||
'name' => 'name',
|
||||
'value' => $arrayDashboard['name'],
|
||||
'size' => '',
|
||||
'type' => 'text',
|
||||
'name' => 'name',
|
||||
'value' => $arrayDashboard['name'],
|
||||
'size' => '',
|
||||
'maxlength' => 35,
|
||||
],
|
||||
],
|
||||
[
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
package: pandorafms-server
|
||||
Version: 7.0NG.758-211119
|
||||
Version: 7.0NG.758.1
|
||||
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.758-211119"
|
||||
pandora_version="7.0NG.758.1"
|
||||
|
||||
package_cpan=0
|
||||
package_pandora=1
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#############################################################################
|
||||
# Pandora FMS Server Parameters
|
||||
# Pandora FMS, the Flexible Monitoring System.
|
||||
# Version 7.0NG.758
|
||||
# Version 7.0NG.758.1
|
||||
# Licensed under GPL license v2,
|
||||
# (c) 2003-2021 Artica Soluciones Tecnologicas
|
||||
# http://www.pandorafms.com
|
||||
|
|
|
|||
|
|
@ -45,8 +45,8 @@ our @EXPORT = qw(
|
|||
);
|
||||
|
||||
# version: Defines actual version of Pandora Server for this module only
|
||||
my $pandora_version = "7.0NG.758";
|
||||
my $pandora_build = "211119";
|
||||
my $pandora_version = "7.0NG.758.1";
|
||||
my $pandora_build = "211123";
|
||||
our $VERSION = $pandora_version." ".$pandora_build;
|
||||
|
||||
# Setup hash
|
||||
|
|
|
|||
|
|
@ -33,8 +33,8 @@ use base 'Exporter';
|
|||
our @ISA = qw(Exporter);
|
||||
|
||||
# version: Defines actual version of Pandora Server for this module only
|
||||
my $pandora_version = "7.0NG.758";
|
||||
my $pandora_build = "211119";
|
||||
my $pandora_version = "7.0NG.758.1";
|
||||
my $pandora_build = "211123";
|
||||
our $VERSION = $pandora_version." ".$pandora_build;
|
||||
|
||||
our %EXPORT_TAGS = ( 'all' => [ qw() ] );
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
# Pandora FMS Server
|
||||
#
|
||||
%define name pandorafms_server
|
||||
%define version 7.0NG.758
|
||||
%define release 211119
|
||||
%define version 7.0NG.758.1
|
||||
%define release 1
|
||||
|
||||
Summary: Pandora FMS Server
|
||||
Name: %{name}
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
# Pandora FMS Server
|
||||
#
|
||||
%define name pandorafms_server
|
||||
%define version 7.0NG.758
|
||||
%define release 211119
|
||||
%define version 7.0NG.758.1
|
||||
%define release 1
|
||||
|
||||
Summary: Pandora FMS Server
|
||||
Name: %{name}
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@
|
|||
# This code is licensed under GPL 2.0 license.
|
||||
# **********************************************************************
|
||||
|
||||
PI_VERSION="7.0NG.758"
|
||||
PI_BUILD="211119"
|
||||
PI_VERSION="7.0NG.758.1"
|
||||
PI_BUILD="211123"
|
||||
|
||||
MODE=$1
|
||||
if [ $# -gt 1 ]; then
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ use PandoraFMS::Config;
|
|||
use PandoraFMS::DB;
|
||||
|
||||
# version: define current version
|
||||
my $version = "7.0NG.758 Build 211119";
|
||||
my $version = "7.0NG.758.1 Build 211123";
|
||||
|
||||
# Pandora server configuration
|
||||
my %conf;
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ use Encode::Locale;
|
|||
Encode::Locale::decode_argv;
|
||||
|
||||
# version: define current version
|
||||
my $version = "7.0NG.758 Build 211119";
|
||||
my $version = "7.0NG.758.1 Build 211123";
|
||||
|
||||
# save program name for logging
|
||||
my $progname = basename($0);
|
||||
|
|
|
|||
Loading…
Reference in New Issue