Merge remote-tracking branch 'origin/develop' into ent-5759-intervalo-de-oracle-discovery-sale-mal

This commit is contained in:
fbsanchez 2020-06-22 12:25:04 +02:00
commit 166978f3aa
213 changed files with 142069 additions and 105536 deletions

View File

@ -30,6 +30,7 @@ $CODEHOME/pandora_console/pandora_console.rhel7.spec \
$CODEHOME/pandora_agents/unix/pandora_agent.redhat.spec \ $CODEHOME/pandora_agents/unix/pandora_agent.redhat.spec \
$CODEHOME/pandora_server/pandora_server.redhat.spec \ $CODEHOME/pandora_server/pandora_server.redhat.spec \
$PANDHOME_ENT/pandora_agents/pandora_agent.spec \ $PANDHOME_ENT/pandora_agents/pandora_agent.spec \
$PANDHOME_ENT/pandora_server/pandora_server_enterprise.redhat.spec \
$PANDHOME_ENT/pandora_console/enterprise/pandora_console_enterprise.redhat.spec \ $PANDHOME_ENT/pandora_console/enterprise/pandora_console_enterprise.redhat.spec \
$PANDHOME_ENT/pandora_console/enterprise/pandora_console_enterprise.rhel7.spec \ $PANDHOME_ENT/pandora_console/enterprise/pandora_console_enterprise.rhel7.spec \
$PANDHOME_ENT/pandora_server/PandoraFMS-Enterprise/pandora_server_enterprise.redhat.spec" $PANDHOME_ENT/pandora_server/PandoraFMS-Enterprise/pandora_server_enterprise.redhat.spec"
@ -37,7 +38,7 @@ DEBIAN_FILES="$CODEHOME/pandora_console/DEBIAN \
$CODEHOME/pandora_server/DEBIAN \ $CODEHOME/pandora_server/DEBIAN \
$CODEHOME/pandora_agents/unix/DEBIAN \ $CODEHOME/pandora_agents/unix/DEBIAN \
$PANDHOME_ENT/pandora_console/DEBIAN \ $PANDHOME_ENT/pandora_console/DEBIAN \
$PANDHOME_ENT/pandora_server/PandoraFMS-Enterprise/DEBIAN" $PANDHOME_ENT/pandora_server/DEBIAN"
INSTALLER_FILES="$CODEHOME/pandora_console/pandora_console_install \ INSTALLER_FILES="$CODEHOME/pandora_console/pandora_console_install \
$CODEHOME/pandora_server/pandora_server_installer \ $CODEHOME/pandora_server/pandora_server_installer \
$CODEHOME/pandora_agents/unix/pandora_agent_installer" $CODEHOME/pandora_agents/unix/pandora_agent_installer"

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix package: pandorafms-agent-unix
Version: 7.0NG.745-200526 Version: 7.0NG.746-200622
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="7.0NG.745-200526" pandora_version="7.0NG.746-200622"
echo "Test if you has the tools for to make the packages." echo "Test if you has the tools for to make the packages."
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -54,8 +54,8 @@ my $Sem = undef;
# Semaphore used to control the number of threads # Semaphore used to control the number of threads
my $ThreadSem = undef; my $ThreadSem = undef;
use constant AGENT_VERSION => '7.0NG.745'; use constant AGENT_VERSION => '7.0NG.746';
use constant AGENT_BUILD => '200526'; use constant AGENT_BUILD => '200622';
# Agent log default file size maximum and instances # Agent log default file size maximum and instances
use constant DEFAULT_MAX_LOG_SIZE => 600000; use constant DEFAULT_MAX_LOG_SIZE => 600000;

View File

@ -2,8 +2,8 @@
#Pandora FMS Linux Agent #Pandora FMS Linux Agent
# #
%define name pandorafms_agent_unix %define name pandorafms_agent_unix
%define version 7.0NG.745 %define version 7.0NG.746
%define release 200526 %define release 200622
Summary: Pandora FMS Linux agent, PERL version Summary: Pandora FMS Linux agent, PERL version
Name: %{name} Name: %{name}

View File

@ -2,8 +2,8 @@
#Pandora FMS Linux Agent #Pandora FMS Linux Agent
# #
%define name pandorafms_agent_unix %define name pandorafms_agent_unix
%define version 7.0NG.745 %define version 7.0NG.746
%define release 200526 %define release 200622
Summary: Pandora FMS Linux agent, PERL version Summary: Pandora FMS Linux agent, PERL version
Name: %{name} Name: %{name}

View File

@ -9,8 +9,8 @@
# Please see http://www.pandorafms.org. This code is licensed under GPL 2.0 license. # Please see http://www.pandorafms.org. This code is licensed under GPL 2.0 license.
# ********************************************************************** # **********************************************************************
PI_VERSION="7.0NG.745" PI_VERSION="7.0NG.746"
PI_BUILD="200526" PI_BUILD="200622"
OS_NAME=`uname -s` OS_NAME=`uname -s`
FORCE=0 FORCE=0
@ -164,7 +164,7 @@ uninstall () {
rm -f $DESTDIR/etc/logrotate.d/pandora_agent rm -f $DESTDIR/etc/logrotate.d/pandora_agent
# Remove systemd service if exists # Remove systemd service if exists
if [ $(systemctl --v | grep systemd | wc -l) != 0 ] if [ `systemctl --v 2> /dev/null | grep systemd | wc -l` != 0 ]
then then
PANDORA_AGENT_SERVICE="/etc/systemd/system/pandora_agent_daemon.service" PANDORA_AGENT_SERVICE="/etc/systemd/system/pandora_agent_daemon.service"
rm -f $PANDORA_AGENT_SERVICE rm -f $PANDORA_AGENT_SERVICE
@ -480,7 +480,7 @@ install () {
fi fi
# Create systemd service # Create systemd service
if [ $(systemctl --v | grep systemd | wc -l) != 0 ] if [ `systemctl --v 2> /dev/null | grep systemd | wc -l` != 0 ]
then then
echo "Creating systemd service for pandora_agent_daemon" echo "Creating systemd service for pandora_agent_daemon"

View File

@ -567,12 +567,12 @@ if ($enable_all == 1 || $enabled{'software'} == 1) {
#init_services #init_services
if ($enable_all == 1 || $enabled{'init_services'} == 1) { if ($enable_all == 1 || $enabled{'init_services'} == 1) {
get_servicies_init_machine ('Init_services', \%modules); get_servicies_init_machine ('Init services', \%modules);
} }
#filesystem #filesystem
if ($enable_all == 1 || $enabled{'filesystem'} == 1) { if ($enable_all == 1 || $enabled{'filesystem'} == 1) {
get_file_system('Filesystem', \%modules); get_file_system('File system', \%modules);
} }
#processes #processes

View File

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

View File

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

View File

@ -30,7 +30,7 @@ using namespace Pandora;
using namespace Pandora_Strutils; using namespace Pandora_Strutils;
#define PATH_SIZE _MAX_PATH+1 #define PATH_SIZE _MAX_PATH+1
#define PANDORA_VERSION ("7.0NG.745(Build 200526)") #define PANDORA_VERSION ("7.0NG.746(Build 200622)")
string pandora_path; string pandora_path;
string pandora_dir; string pandora_dir;

View File

@ -11,7 +11,7 @@ BEGIN
VALUE "LegalCopyright", "Artica ST" VALUE "LegalCopyright", "Artica ST"
VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "OriginalFilename", "PandoraAgent.exe"
VALUE "ProductName", "Pandora FMS Windows Agent" VALUE "ProductName", "Pandora FMS Windows Agent"
VALUE "ProductVersion", "(7.0NG.745(Build 200526))" VALUE "ProductVersion", "(7.0NG.746(Build 200622))"
VALUE "FileVersion", "1.0.0.0" VALUE "FileVersion", "1.0.0.0"
END END
END END

View File

@ -1,5 +1,5 @@
package: pandorafms-console package: pandorafms-console
Version: 7.0NG.745-200526 Version: 7.0NG.746-200622
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="7.0NG.745-200526" pandora_version="7.0NG.746-200622"
package_pear=0 package_pear=0
package_pandora=1 package_pandora=1

View File

@ -143,7 +143,7 @@ function mainAgentsAlerts()
__('Agents/Alerts'), __('Agents/Alerts'),
'images/op_alerts.png', 'images/op_alerts.png',
false, false,
'agents_alerts_view', '',
false, false,
$updated_time $updated_time
); );

View File

@ -450,7 +450,7 @@ function mainAgentsModules()
__('Agents/Modules'), __('Agents/Modules'),
'images/module_mc.png', 'images/module_mc.png',
false, false,
'agents_module_view', '',
false, false,
$updated_time $updated_time
); );
@ -541,11 +541,14 @@ function mainAgentsModules()
$show_filters .= '<td>'.$filter_modules.'</td>'; $show_filters .= '<td>'.$filter_modules.'</td>';
$show_filters .= '</tr>'; $show_filters .= '</tr>';
$show_filters .= '<tr>'; $show_filters .= '<tr>';
$show_filters .= "<td colspan=6 ><span style='float: right; padding-right: 20px;'>".$filter_update.'</sapn></td>'; $show_filters .= "<td colspan=6 ><span style='float: right; padding-right: 20px;'>".$filter_update.'</span></td>';
$show_filters .= '</tr>'; $show_filters .= '</tr>';
$show_filters .= '</table>'; $show_filters .= '</table>';
$show_filters .= '</form>'; $show_filters .= '</form>';
ui_toggle($show_filters, __('Filters')); ui_toggle(
$show_filters,
__('Filters ').ui_print_help_tip(__('Secondary groups and agent subgroups will be taken into account.'), true)
);
} }
if ($agents_id[0] != -1) { if ($agents_id[0] != -1) {

View File

@ -197,7 +197,7 @@ function extension_api_checker()
echo '</fieldset>'; echo '</fieldset>';
echo '<fieldset>'; echo '<fieldset>';
echo '<legend>'.__('Call parameters').'</legend>'; echo '<legend>'.__('Call parameters').' '.ui_print_help_tip(__('Action: get Operation: module_last_value id: 63'), true).'</legend>';
html_print_table($table2); html_print_table($table2);
echo '</fieldset>'; echo '</fieldset>';
echo "<div style='text-align: right;'>"; echo "<div style='text-align: right;'>";

View File

@ -248,7 +248,7 @@ function mainModuleGroups()
__('Combined table of agent group and module group'), __('Combined table of agent group and module group'),
'images/module_group.png', 'images/module_group.png',
false, false,
'module_groups_view', '',
false, false,
'' ''
); );

View File

@ -343,9 +343,6 @@ function main_net_tools()
echo "<table class='databox filters' width=100% id=netToolTable>"; echo "<table class='databox filters' width=100% id=netToolTable>";
echo '<tr><td>'; echo '<tr><td>';
echo __('Operation'); echo __('Operation');
ui_print_help_tip(
__('You can set the command path in the menu Administration -&gt; Extensions -&gt; Config Network Tools')
);
echo '</td><td>'; echo '</td><td>';
html_print_select( html_print_select(
@ -429,7 +426,12 @@ function godmode_net_tools()
return; return;
} }
ui_print_page_header(__('Config Network Tools')); ui_print_page_header(
__('Config Network Tools'),
'',
false,
'network_tools_tab'
);
$update_traceroute = (bool) get_parameter('update_traceroute', 0); $update_traceroute = (bool) get_parameter('update_traceroute', 0);
@ -472,23 +474,18 @@ function godmode_net_tools()
$table->data = []; $table->data = [];
$table->data[0][0] = __('Traceroute path'); $table->data[0][0] = __('Traceroute path');
$table->data[0][0] .= ui_print_help_tip(__('If empty, %s will search the traceroute system.', get_product_name()), true);
$table->data[0][1] = html_print_input_text('traceroute_path', $traceroute_path, '', 40, 255, true); $table->data[0][1] = html_print_input_text('traceroute_path', $traceroute_path, '', 40, 255, true);
$table->data[1][0] = __('Ping path'); $table->data[1][0] = __('Ping path');
$table->data[1][0] .= ui_print_help_tip(__('If empty, %s will search the ping system.', get_product_name()), true);
$table->data[1][1] = html_print_input_text('ping_path', $ping_path, '', 40, 255, true); $table->data[1][1] = html_print_input_text('ping_path', $ping_path, '', 40, 255, true);
$table->data[2][0] = __('Nmap path'); $table->data[2][0] = __('Nmap path');
$table->data[2][0] .= ui_print_help_tip(__('If empty, %s will search the nmap system.', get_product_name()), true);
$table->data[2][1] = html_print_input_text('nmap_path', $nmap_path, '', 40, 255, true); $table->data[2][1] = html_print_input_text('nmap_path', $nmap_path, '', 40, 255, true);
$table->data[3][0] = __('Dig path'); $table->data[3][0] = __('Dig path');
$table->data[3][0] .= ui_print_help_tip(__('If empty, %s will search the dig system', get_product_name()), true);
$table->data[3][1] = html_print_input_text('dig_path', $dig_path, '', 40, 255, true); $table->data[3][1] = html_print_input_text('dig_path', $dig_path, '', 40, 255, true);
$table->data[4][0] = __('Snmpget path'); $table->data[4][0] = __('Snmpget path');
$table->data[4][0] .= ui_print_help_tip(__('If empty, %s will search the snmpget system.', get_product_name()), true);
$table->data[4][1] = html_print_input_text('snmpget_path', $snmpget_path, '', 40, 255, true); $table->data[4][1] = html_print_input_text('snmpget_path', $snmpget_path, '', 40, 255, true);
echo '<form id="form_setup" method="post" >'; echo '<form id="form_setup" method="post" >';

View File

@ -35,14 +35,14 @@ function view_logfile($file_name)
echo '<h2>'.__('The preview file is imposible.').'</h2>'; echo '<h2>'.__('The preview file is imposible.').'</h2>';
} else if ($file_size > ($config['max_log_size'] * 1000)) { } else if ($file_size > ($config['max_log_size'] * 1000)) {
$data = file_get_contents($file_name, false, null, ($file_size - ($config['max_log_size'] * 1000))); $data = file_get_contents($file_name, false, null, ($file_size - ($config['max_log_size'] * 1000)));
echo "<h2>$file_name (".format_numeric(filesize($file_name) / 1024).' KB) </h2>'; echo "<h2>$file_name (".format_numeric(filesize($file_name) / 1024).' KB) '.ui_print_help_tip(__('The folder /var/log/pandora must have pandora:apache and its content too.'), true).' </h2>';
echo "<textarea style='width: 98%; float:right; height: 200px; margin-bottom:20px;' name='$file_name'>"; echo "<textarea style='width: 98%; float:right; height: 200px; margin-bottom:20px;' name='$file_name'>";
echo '... '; echo '... ';
echo $data; echo $data;
echo '</textarea><br><br>'; echo '</textarea><br><br>';
} else { } else {
$data = file_get_contents($file_name); $data = file_get_contents($file_name);
echo "<h2>$file_name (".format_numeric(filesize($file_name) / 1024).' KB) </h2>'; echo "<h2>$file_name (".format_numeric(filesize($file_name) / 1024).' KB) '.ui_print_help_tip(__('The folder /var/log/pandora must have pandora:apache and its content too.'), true).' </h2>';
echo "<textarea style='width: 98%; float:right; height: 200px; margin-bottom:20px;' name='$file_name'>"; echo "<textarea style='width: 98%; float:right; height: 200px; margin-bottom:20px;' name='$file_name'>";
echo $data; echo $data;
echo '</textarea><br><br>'; echo '</textarea><br><br>';

View File

@ -318,15 +318,15 @@ function quickShellSettings()
); );
$gotty_host = get_parameter( $gotty_host = get_parameter(
'gotty_host', 'gotty_host',
$config['gotty_host'] ''
); );
$gotty_ssh_port = get_parameter( $gotty_ssh_port = get_parameter(
'gotty_ssh_port', 'gotty_ssh_port',
$config['gotty_ssh_port'] ''
); );
$gotty_telnet_port = get_parameter( $gotty_telnet_port = get_parameter(
'gotty_telnet_port', 'gotty_telnet_port',
$config['gotty_telnet_port'] ''
); );
$gotty_user = get_parameter( $gotty_user = get_parameter(
@ -449,10 +449,7 @@ function quickShellSettings()
$hidden->data = []; $hidden->data = [];
$hidden->style[0] = 'font-weight: bold;width: 40%;'; $hidden->style[0] = 'font-weight: bold;width: 40%;';
$hidden->data[0][0] = __('Gotty user').ui_print_help_tip( $hidden->data[0][0] = __('Gotty user');
__('Optional, set a user to access gotty service'),
true
);
$hidden->data[0][1] = html_print_input_text( $hidden->data[0][1] = html_print_input_text(
'gotty_user', 'gotty_user',
$config['gotty_user'], $config['gotty_user'],
@ -462,10 +459,7 @@ function quickShellSettings()
true true
); );
$hidden->data[1][0] = __('Gotty password').ui_print_help_tip( $hidden->data[1][0] = __('Gotty password');
__('Optional, set a password to access gotty service'),
true
);
$hidden->data[1][1] = html_print_input_password( $hidden->data[1][1] = html_print_input_password(
'gotty_pass', 'gotty_pass',
io_output_password($config['gotty_pass']), io_output_password($config['gotty_pass']),

View File

@ -4,3 +4,14 @@ include/javascript/webchat.js
attachment/pandora_chat.log.json.txt attachment/pandora_chat.log.json.txt
attachment/pandora_chat.user_list.json.txt attachment/pandora_chat.user_list.json.txt
attachment/pandora_chat.global_counter.txt attachment/pandora_chat.global_counter.txt
enterprise/godmode/reporting/cluster_agent_check.php
enterprise/godmode/reporting/cluster_builder.main.php
enterprise/godmode/reporting/cluster_builder.php
enterprise/godmode/reporting/cluster_force.php
enterprise/godmode/reporting/cluster_list.php
enterprise/godmode/reporting/cluster_name_agents.php
enterprise/godmode/reporting/cluster_view.php
enterprise/include/ajax/clustermap.php
enterprise/include/functions_clustermap.php
enterprise/include/functions_clusters.php
enterprise/include/javascript/ClusterMapController.js

View File

@ -1,6 +1,15 @@
START TRANSACTION; START TRANSACTION;
INSERT INTO `ttipo_modulo` VALUES (38,'web_server_status_code_string',9,'Remote HTTP module to check server status code','mod_web_data.png'); INSERT INTO `ttipo_modulo` VALUES (38,'web_server_status_code_string',9,'Remote HTTP module to check server status code','mod_web_data.png');
ALTER TABLE trecon_task add column `rcmd_enabled` TINYINT(1) UNSIGNED DEFAULT 0 AFTER `wmi_enabled`; ALTER TABLE trecon_task add column `rcmd_enabled` TINYINT(1) UNSIGNED DEFAULT 0 AFTER `wmi_enabled`;
CREATE TABLE `tnode_relations` (
`id` int(10) unsigned NOT NULL auto_increment,
`gateway` VARCHAR(100) NOT NULL,
`imei` VARCHAR(100) NOT NULL,
`node_address` VARCHAR(60) NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
COMMIT; COMMIT;

View File

@ -1342,13 +1342,13 @@ ALTER TABLE `tmap` MODIFY COLUMN `id_user` varchar(250) NOT NULL DEFAULT '';
INSERT INTO `tconfig` (`token`, `value`) VALUES ('big_operation_step_datos_purge', '100'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('big_operation_step_datos_purge', '100');
INSERT INTO `tconfig` (`token`, `value`) VALUES ('small_operation_step_datos_purge', '1000'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('small_operation_step_datos_purge', '1000');
INSERT INTO `tconfig` (`token`, `value`) VALUES ('days_autodisable_deletion', '30'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('days_autodisable_deletion', '30');
INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 37); INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 38);
INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_docs_logo', 'default_docs.png'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_docs_logo', 'default_docs.png');
INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_support_logo', 'default_support.png'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_support_logo', 'default_support.png');
INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_logo_white_bg_preview', 'pandora_logo_head_white_bg.png'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_logo_white_bg_preview', 'pandora_logo_head_white_bg.png');
UPDATE tconfig SET value = 'https://licensing.artica.es/pandoraupdate7/server.php' WHERE token='url_update_manager'; UPDATE tconfig SET value = 'https://licensing.artica.es/pandoraupdate7/server.php' WHERE token='url_update_manager';
DELETE FROM `tconfig` WHERE `token` = 'current_package_enterprise'; DELETE FROM `tconfig` WHERE `token` = 'current_package_enterprise';
INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '745'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '746');
INSERT INTO `tconfig` (`token`, `value`) VALUES ('status_monitor_fields', 'policy,agent,data_type,module_name,server_type,interval,status,graph,warn,data,timestamp'); INSERT INTO `tconfig` (`token`, `value`) VALUES ('status_monitor_fields', 'policy,agent,data_type,module_name,server_type,interval,status,graph,warn,data,timestamp');
UPDATE `tconfig` SET `value` = 'mini_severity,evento,id_agente,estado,timestamp' WHERE `token` LIKE 'event_fields'; UPDATE `tconfig` SET `value` = 'mini_severity,evento,id_agente,estado,timestamp' WHERE `token` LIKE 'event_fields';
DELETE FROM `tconfig` WHERE `token` LIKE 'integria_api_password'; DELETE FROM `tconfig` WHERE `token` LIKE 'integria_api_password';
@ -2723,4 +2723,15 @@ UPDATE twidget SET description='Show a visual console' WHERE class_name='MapsMad
UPDATE twidget SET description='Clock' WHERE class_name='ClockWidget'; UPDATE twidget SET description='Clock' WHERE class_name='ClockWidget';
UPDATE twidget SET description='Group status' WHERE class_name='SystemGroupStatusWidget'; UPDATE twidget SET description='Group status' WHERE class_name='SystemGroupStatusWidget';
-- ----------------------------------------------------------------------
-- Table `tnode_relations`
-- ----------------------------------------------------------------------
CREATE TABLE `tnode_relations` (
`id` int(10) unsigned NOT NULL auto_increment,
`gateway` VARCHAR(100) NOT NULL,
`imei` VARCHAR(100) NOT NULL,
`node_address` VARCHAR(60) NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

View File

@ -52,7 +52,7 @@ ui_print_info_message(['no_close' => true, 'message' => __('There are no cluster
if (check_acl($config['id_user'], 0, 'AW')) { if (check_acl($config['id_user'], 0, 'AW')) {
?> ?>
<form action="index.php?sec=reporting&sec2=enterprise/godmode/reporting/cluster_builder&step=1" method="post"> <form action='index.php?sec=estado&sec2=enterprise/operation/cluster/cluster&op=new' method="post">
<input style="margin-bottom:20px;" type="submit" class="button_task" value="<?php echo __('Create Cluster'); ?>" /> <input style="margin-bottom:20px;" type="submit" class="button_task" value="<?php echo __('Create Cluster'); ?>" />
</form> </form>

View File

@ -153,7 +153,7 @@ $table->rowclass[] = '';
$table->data[] = $tdata; $table->data[] = $tdata;
// Users. // Users.
if (users_is_admin()) { if (users_is_admin() || check_acl($config['id_user'], 0, 'UM')) {
$tdata = []; $tdata = [];
$tdata[0] = reporting_get_stats_users($data); $tdata[0] = reporting_get_stats_users($data);
$table->rowclass[] = ''; $table->rowclass[] = '';

View File

@ -139,8 +139,10 @@ font-size:10pt;
echo '<br/> <br/>'; echo '<br/> <br/>';
echo __('Please know that all attempts to access this page are recorded in security logs of %s System Database', get_product_name()); echo __('Please know that all attempts to access this page are recorded in security logs of %s System Database', get_product_name());
if ($config['logged'] == false) { if ($config['logged'] == false) {
if (session_status() === PHP_SESSION_ACTIVE) {
session_destroy(); session_destroy();
} }
}
?> ?>
</div> </div>

View File

@ -38,6 +38,16 @@ enterprise_include_once('/include/class/SAPView.class.php');
$ajaxPage = 'general/sap_view'; $ajaxPage = 'general/sap_view';
// Header.
ui_print_page_header(
__('SAP view'),
'',
false,
'sap_view',
false,
''
);
// Control call flow. // Control call flow.
try { try {
// User access and validation is being processed on class constructor. // User access and validation is being processed on class constructor.

View File

@ -205,7 +205,7 @@ $custom_id_div .= html_print_input_text(
).'</div>'; ).'</div>';
if (!$new_agent && $alias != '') { if (!$new_agent && $alias != '') {
$table_agent_name = '<div class="label_select"><p class="input_label">'.__('Agent name').': '.ui_print_help_tip(__("The agent's name must be the same as the one defined at the console"), true).'</p>'; $table_agent_name = '<div class="label_select"><p class="input_label">'.__('Agent name').'</p>';
$table_agent_name .= '<div class="label_select_parent">'; $table_agent_name .= '<div class="label_select_parent">';
$table_agent_name .= '<div class="label_select_child_left" style="width: 60%;">'.html_print_input_text('agente', $nombre_agente, '', 50, 100, true).'</div>'; $table_agent_name .= '<div class="label_select_child_left" style="width: 60%;">'.html_print_input_text('agente', $nombre_agente, '', 50, 100, true).'</div>';
$table_agent_name .= '<div class="label_select_child_right agent_options_agent_name" style="width: 70%;">'; $table_agent_name .= '<div class="label_select_child_right agent_options_agent_name" style="width: 70%;">';
@ -247,10 +247,7 @@ if (!$new_agent && $alias != '') {
'title' => __('This agent can be remotely configured'), 'title' => __('This agent can be remotely configured'),
] ]
); );
$table_agent_name .= '</a>'.ui_print_help_tip( $table_agent_name .= '</a>';
__('You can remotely edit this agent configuration'),
true
);
} }
} }
@ -258,7 +255,7 @@ if (!$new_agent && $alias != '') {
// QR code div. // QR code div.
$table_qr_code = '<div class="box-shadow agent_qr white_box">'; $table_qr_code = '<div class="box-shadow agent_qr white_box">';
$table_qr_code .= '<p class="input_label">'.__('QR Code Agent view').': </p>'; $table_qr_code .= '<p class="input_label">'.__('QR Code Agent view').'</p>';
$table_qr_code .= '<div id="qr_container_image"></div>'; $table_qr_code .= '<div id="qr_container_image"></div>';
if ($id_agente) { if ($id_agente) {
$table_qr_code .= "<a id='qr_code_agent_view' href='javascript: show_dialog_qrcode(null, \"".ui_get_full_url('mobile/index.php?page=agent&id='.$id_agente)."\" );'></a>"; $table_qr_code .= "<a id='qr_code_agent_view' href='javascript: show_dialog_qrcode(null, \"".ui_get_full_url('mobile/index.php?page=agent&id='.$id_agente)."\" );'></a>";
@ -275,7 +272,7 @@ if ($new_agent) {
$label_select_parent = 'label_select_parent'; $label_select_parent = 'label_select_parent';
} }
$table_alias = '<div class="label_select"><p class="input_label">'.__('Alias').': '.ui_print_help_tip(__('Characters /,\,|,%,#,&,$ will be ignored'), true).'</p>'; $table_alias = '<div class="label_select"><p class="input_label">'.__('Alias').'</p>';
$table_alias .= '<div class='.$label_select_parent.'>'; $table_alias .= '<div class='.$label_select_parent.'>';
$table_alias .= '<div class='.$label_select_child_left.'>'.html_print_input_text('alias', $alias, '', 50, 100, true, false, true).'</div>'; $table_alias .= '<div class='.$label_select_child_left.'>'.html_print_input_text('alias', $alias, '', 50, 100, true, false, true).'</div>';
if ($new_agent) { if ($new_agent) {
@ -284,10 +281,10 @@ if ($new_agent) {
$table_alias .= '</div></div>'; $table_alias .= '</div></div>';
$table_ip = '<div class="label_select"><p class="input_label">'.__('IP Address').': </p>'; $table_ip = '<div class="label_select"><p class="input_label">'.__('IP Address').'</p>';
$table_ip .= '<div class="label_select_parent">'; $table_ip .= '<div class="label_select_parent">';
$table_ip .= '<div class="label_select_child_left">'.html_print_input_text('direccion', $direccion_agente, '', 16, 100, true).'</div>'; $table_ip .= '<div class="label_select_child_left">'.html_print_input_text('direccion', $direccion_agente, '', 16, 100, true).'</div>';
$table_ip .= '<div class="label_select_child_right">'.html_print_checkbox_switch('unique_ip', 1, $config['unique_ip'], true).__('Unique IP').ui_print_help_tip(__('Set the primary IP address as the unique IP, preventing the same primary IP address from being used in more than one agent'), true).'</div>'; $table_ip .= '<div class="label_select_child_right">'.html_print_checkbox_switch('unique_ip', 1, $config['unique_ip'], true).__('Unique IP').'</div>';
$table_ip .= '</div></div>'; $table_ip .= '</div></div>';
if ($id_agente) { if ($id_agente) {
@ -321,7 +318,7 @@ if (is_array($modules)) {
} }
} }
$table_primary_group = '<div class="label_select"><p class="input_label">'.__('Primary group').': </p>'; $table_primary_group = '<div class="label_select"><p class="input_label">'.__('Primary group').'</p>';
$table_primary_group .= '<div class="label_select_parent">'; $table_primary_group .= '<div class="label_select_parent">';
// Cannot change primary group if user have not permission for that group. // Cannot change primary group if user have not permission for that group.
if (isset($groups[$grupo]) || $new_agent) { if (isset($groups[$grupo]) || $new_agent) {
@ -335,7 +332,7 @@ $table_primary_group .= '<div class="label_select_child_icons"><span id="group_p
$table_primary_group .= ui_print_group_icon($grupo, true); $table_primary_group .= ui_print_group_icon($grupo, true);
$table_primary_group .= '</span></div></div></div>'; $table_primary_group .= '</span></div></div></div>';
$table_interval = '<div class="label_select"><p class="input_label">'.__('Interval').': </p>'; $table_interval = '<div class="label_select"><p class="input_label">'.__('Interval').'</p>';
$table_interval .= '<div class="label_select_parent">'; $table_interval .= '<div class="label_select_parent">';
$table_interval .= html_print_extended_select_for_time( $table_interval .= html_print_extended_select_for_time(
'intervalo', 'intervalo',
@ -358,7 +355,7 @@ if ($intervalo < SECONDS_5MINUTES) {
$table_interval .= '</div></div>'; $table_interval .= '</div></div>';
$table_os = '<div class="label_select"><p class="input_label">'.__('OS').': </p>'; $table_os = '<div class="label_select"><p class="input_label">'.__('OS').'</p>';
$table_os .= '<div class="label_select_parent">'; $table_os .= '<div class="label_select_parent">';
$table_os .= html_print_select_from_sql( $table_os .= html_print_select_from_sql(
'SELECT id_os, name FROM tconfig_os', 'SELECT id_os, name FROM tconfig_os',
@ -380,7 +377,7 @@ if (!array_key_exists($server_name, $servers)) {
// Set the agent have not server. // Set the agent have not server.
} }
$table_server = '<div class="label_select"><p class="input_label">'.__('Server').': </p>'; $table_server = '<div class="label_select"><p class="input_label">'.__('Server').'</p>';
$table_server .= '<div class="label_select_parent">'; $table_server .= '<div class="label_select_parent">';
if ($new_agent) { if ($new_agent) {
// Set first server by default. // Set first server by default.
@ -400,7 +397,7 @@ $table_server .= html_print_select(
).'<div class="label_select_child_icons"></div></div></div>'; ).'<div class="label_select_child_icons"></div></div></div>';
// Description. // Description.
$table_description = '<div class="label_select"><p class="input_label">'.__('Description').': </p>'; $table_description = '<div class="label_select"><p class="input_label">'.__('Description').'</p>';
$table_description .= html_print_textarea( $table_description .= html_print_textarea(
'comentarios', 'comentarios',
3, 3,
@ -425,7 +422,7 @@ echo '</div>';
if (enterprise_installed()) { if (enterprise_installed()) {
$secondary_groups_selected = enterprise_hook('agents_get_secondary_groups', [$id_agente]); $secondary_groups_selected = enterprise_hook('agents_get_secondary_groups', [$id_agente]);
$adv_secondary_groups_label = '<div class="label_select"><p class="input_label">'.__('Secondary groups').': </p></div>'; $adv_secondary_groups_label = '<div class="label_select"><p class="input_label">'.__('Secondary groups').'</p></div>';
$adv_secondary_groups_left = html_print_select_groups( $adv_secondary_groups_left = html_print_select_groups(
false, false,
// Use the current user to select the groups. // Use the current user to select the groups.
@ -532,20 +529,13 @@ if (enterprise_installed()) {
} }
} }
$table_adv_safe = '<div class="label_select_simple label_simple_items"><p class="input_label input_label_simple">'.__('Safe operation mode').': '.ui_print_help_tip( $table_adv_safe = '<div class="label_select_simple label_simple_items"><p class="input_label input_label_simple">'.__('Safe operation mode').'</p>';
__(
'This mode allow %s to disable all modules
of this agent while the selected module is on CRITICAL status',
get_product_name()
),
true
).'</p>';
$table_adv_safe .= html_print_checkbox_switch('safe_mode', 1, $safe_mode, true); $table_adv_safe .= html_print_checkbox_switch('safe_mode', 1, $safe_mode, true);
$table_adv_safe .= __('Module').'&nbsp;'.html_print_select($safe_mode_modules, 'safe_mode_module', $safe_mode_module, '', '', 0, true).'</div>'; $table_adv_safe .= __('Module').'&nbsp;'.html_print_select($safe_mode_modules, 'safe_mode_module', $safe_mode_module, '', '', 0, true).'</div>';
} }
// Remote configuration. // Remote configuration.
$table_adv_remote = '<div class="label_select"><p class="input_label">'.__('Remote configuration').': </p>'; $table_adv_remote = '<div class="label_select"><p class="input_label">'.__('Remote configuration').'</p>';
if (!$new_agent && isset($filename) && file_exists($filename['md5'])) { if (!$new_agent && isset($filename) && file_exists($filename['md5'])) {
$table_adv_remote .= date('F d Y H:i:s', fileatime($filename['md5'])); $table_adv_remote .= date('F d Y H:i:s', fileatime($filename['md5']));
@ -559,10 +549,7 @@ if (enterprise_installed()) {
'style' => 'vertical-align: middle;', 'style' => 'vertical-align: middle;',
] ]
).'</a>'; ).'</a>';
$table_adv_remote .= '</a>'.ui_print_help_tip( $table_adv_remote .= '</a>';
__('Delete this conf file implies that for restore you must reactive remote config in the local agent.'),
true
);
} else { } else {
$table_adv_remote .= '<em>'.__('Not available').'</em>'; $table_adv_remote .= '<em>'.__('Not available').'</em>';
} }
@ -583,17 +570,13 @@ if (enterprise_installed()) {
$cps_html = '<div class="label_select"><div class="label_simple_items">'; $cps_html = '<div class="label_select"><div class="label_simple_items">';
$cps_html .= html_print_checkbox_switch('cps', $cps_val, ($cps >= 0), true); $cps_html .= html_print_checkbox_switch('cps', $cps_val, ($cps >= 0), true);
$cps_html .= __('Cascade protection services').'&nbsp;'; $cps_html .= __('Cascade protection services').'&nbsp;';
$cps_html .= ui_print_help_tip(
__('Alerts and events will be managed by the service joined by this agent.'),
true
);
$cps_html .= '</div></div>'; $cps_html .= '</div></div>';
$table_adv_cascade .= $cps_html; $table_adv_cascade .= $cps_html;
} }
$table_adv_parent = '<div class="label_select"><label class="input_label">'.__('Parent').': </label>'; $table_adv_parent = '<div class="label_select"><label class="input_label">'.__('Parent').'</label>';
$params = []; $params = [];
$params['return'] = true; $params['return'] = true;
$params['show_helptip'] = true; $params['show_helptip'] = true;
@ -629,7 +612,7 @@ if (enterprise_installed()) {
$table_adv_parent .= '</div></div>'; $table_adv_parent .= '</div></div>';
// Learn mode / Normal mode. // Learn mode / Normal mode.
$table_adv_module_mode = '<div class="label_select"><p class="input_label">'.__('Module definition').': </p>'; $table_adv_module_mode = '<div class="label_select"><p class="input_label">'.__('Module definition').'</p>';
$table_adv_module_mode .= '<div class="switch_radio_button">'; $table_adv_module_mode .= '<div class="switch_radio_button">';
$table_adv_module_mode .= html_print_radio_button_extended( $table_adv_module_mode .= html_print_radio_button_extended(
'modo', 'modo',
@ -671,12 +654,12 @@ $table_adv_status .= html_print_checkbox_switch(
$disabled, $disabled,
true true
); );
$table_adv_status .= '<p class="input_label input_label_simple">'.__('Disabled mode').': '.ui_print_help_tip(__('If the remote configuration is enabled, it will also go into standby mode when disabling it.'), true).'</p>'; $table_adv_status .= '<p class="input_label input_label_simple">'.__('Disabled mode').'</p>';
$table_adv_status .= '</div>'; $table_adv_status .= '</div>';
// Url address. // Url address.
if (enterprise_installed()) { if (enterprise_installed()) {
$table_adv_url = '<div class="label_select"><p class="input_label">'.__('Url address').': '.ui_print_help_tip(__('URL address must be complete, for example: https://pandorafms.com/'), true).'</p>'; $table_adv_url = '<div class="label_select"><p class="input_label">'.__('Url address').'</p>';
$table_adv_url .= html_print_input_text( $table_adv_url .= html_print_input_text(
'url_description', 'url_description',
$url_description, $url_description,
@ -693,7 +676,7 @@ if (enterprise_installed()) {
'new-password' 'new-password'
).'</div>'; ).'</div>';
} else { } else {
$table_adv_url = '<div class="label_select"><p class="input_label">'.__('Url address').': </p></div>'; $table_adv_url = '<div class="label_select"><p class="input_label">'.__('Url address').'</p></div>';
$table_adv_url .= html_print_input_text( $table_adv_url .= html_print_input_text(
'url_description', 'url_description',
$url_description, $url_description,
@ -706,8 +689,7 @@ if (enterprise_installed()) {
$table_adv_quiet = '<div class="label_select_simple label_simple_one_item">'; $table_adv_quiet = '<div class="label_select_simple label_simple_one_item">';
$table_adv_quiet .= html_print_checkbox_switch('quiet', 1, $quiet, true); $table_adv_quiet .= html_print_checkbox_switch('quiet', 1, $quiet, true);
$table_adv_quiet .= '<p class="input_label input_label_simple">'.__('Quiet').': '; $table_adv_quiet .= '<p class="input_label input_label_simple">'.__('Quiet').'</p>';
$table_adv_quiet .= ui_print_help_tip(__('The agent still runs but the alerts and events will be stop'), true).'</p>';
$table_adv_quiet .= '</div>'; $table_adv_quiet .= '</div>';
$listIcons = gis_get_array_list_icons(); $listIcons = gis_get_array_list_icons();
@ -719,7 +701,7 @@ foreach ($listIcons as $index => $value) {
$path = 'images/gis_map/icons/'; $path = 'images/gis_map/icons/';
// TODO set better method the path. // TODO set better method the path.
$table_adv_agent_icon = '<div class="label_select"><p class="input_label">'.__('Agent icon').': '.ui_print_help_tip(__('Agent icon for GIS Maps.'), true).'</p>'; $table_adv_agent_icon = '<div class="label_select"><p class="input_label">'.__('Agent icon').'</p>';
if ($icon_path == '') { if ($icon_path == '') {
$display_icons = 'none'; $display_icons = 'none';
// Hack to show no icon. Use any given image to fix not found image errors. // Hack to show no icon. Use any given image to fix not found image errors.
@ -831,10 +813,7 @@ $table->width = '100%';
$table->class = 'custom_fields_table'; $table->class = 'custom_fields_table';
$table->head = [ $table->head = [
0 => __('Click to display').ui_print_help_tip( 0 => __('Click to display'),
__('This field allows url insertion using the BBCode\'s url tag').'.<br />'.__('The format is: [url=\'url to navigate\']\'text to show\'[/url] or [url]\'url to navigate\'[/url] ').'.<br /><br />'.__('e.g.: [url=google.com]Google web search[/url] or [url]www.goole.com[/url]'),
true
),
]; ];
$table->class = 'info_table'; $table->class = 'info_table';
$table->style = []; $table->style = [];

View File

@ -698,13 +698,14 @@ if ($id_agente) {
break; break;
} }
$helper = ($help_header === 'main_tab') ? 'main_tab' : '';
$pure = get_parameter('pure', 0); $pure = get_parameter('pure', 0);
if (!$pure) { if (!$pure) {
ui_print_page_header( ui_print_page_header(
agents_get_alias($id_agente), agents_get_alias($id_agente),
'images/setup.png', 'images/setup.png',
false, false,
$help_header, $helper,
true, true,
$onheader, $onheader,
false, false,

View File

@ -122,7 +122,7 @@ if ($enable_agent) {
enterprise_include_once('include/functions_agents.php'); enterprise_include_once('include/functions_agents.php');
$values = ['disabled' => 0]; $values = ['disabled' => 0];
enterprise_hook('agent_update_from_cache', [$enable_agent, $values, $server_name]); enterprise_hook('agent_update_from_cache', [$enable_agent, $values, $server_name]);
config_agents_update_config_token($enable_agent, 'standby', 0); enterprise_hook('config_agents_update_config_token', [$enable_agent, 'standby', 0]);
db_pandora_audit('Agent management', 'Enable '.$alias); db_pandora_audit('Agent management', 'Enable '.$alias);
} else { } else {
db_pandora_audit('Agent management', 'Fail to enable '.$alias); db_pandora_audit('Agent management', 'Fail to enable '.$alias);
@ -144,7 +144,7 @@ if ($disable_agent) {
enterprise_include_once('include/functions_agents.php'); enterprise_include_once('include/functions_agents.php');
$values = ['disabled' => 1]; $values = ['disabled' => 1];
enterprise_hook('agent_update_from_cache', [$disable_agent, $values, $server_name]); enterprise_hook('agent_update_from_cache', [$disable_agent, $values, $server_name]);
config_agents_update_config_token($disable_agent, 'standby', 1); enterprise_hook('config_agents_update_config_token', [$disable_agent, 'standby', 1]);
db_pandora_audit('Agent management', 'Disable '.$alias); db_pandora_audit('Agent management', 'Disable '.$alias);
} else { } else {
@ -556,9 +556,18 @@ if ($agents !== false) {
$agent['alias'] = $agent['nombre']; $agent['alias'] = $agent['nombre'];
} }
if ($agent['id_os'] == 100) { if ($agent['id_os'] == CLUSTER_OS_ID) {
$cluster = db_get_row_sql('select id from tcluster where id_agent = '.$agent['id_agente']); if (enterprise_installed()) {
echo '<a href="index.php?sec=reporting&sec2=enterprise/godmode/reporting/cluster_builder&id_cluster='.$cluster['id'].'&step=1&update=1">'.$agent['alias'].'</a>'; $cluster = PandoraFMS\Enterprise\Cluster::loadFromAgentId(
$agent['id_agente']
);
$url = 'index.php?sec=reporting&sec2='.ENTERPRISE_DIR;
$url .= '/operation/cluster/cluster';
$url = ui_get_full_url(
$url.'&op=update&id='.$cluster->id()
);
echo '<a href="'.$url.'">'.$agent['alias'].'</a>';
}
} else { } else {
echo '<a alt ='.$agent['nombre']." href='index.php?sec=gagente& echo '<a alt ='.$agent['nombre']." href='index.php?sec=gagente&
sec2=godmode/agentes/configurar_agente&tab=$main_tab& sec2=godmode/agentes/configurar_agente&tab=$main_tab&
@ -594,10 +603,19 @@ if ($agents !== false) {
echo '</span><div class="left actions" style="visibility: hidden; clear: left">'; echo '</span><div class="left actions" style="visibility: hidden; clear: left">';
if ($check_aw) { if ($check_aw) {
if ($agent['id_os'] == 100) { if ($agent['id_os'] == CLUSTER_OS_ID) {
$cluster = db_get_row_sql('select id from tcluster where id_agent = '.$agent['id_agente']); if (enterprise_installed()) {
echo '<a href="index.php?sec=reporting&sec2=enterprise/godmode/reporting/cluster_builder&id_cluster='.$cluster['id'].'&step=1&update=1">'.__('Edit').'</a>'; $cluster = PandoraFMS\Enterprise\Cluster::loadFromAgentId(
$agent['id_agente']
);
$url = 'index.php?sec=reporting&sec2='.ENTERPRISE_DIR;
$url .= '/operation/cluster/cluster';
$url = ui_get_full_url(
$url.'&op=update&id='.$cluster->id()
);
echo '<a href="'.$url.'">'.__('Edit').'</a>';
echo ' | '; echo ' | ';
}
} else { } else {
echo '<a href="index.php?sec=gagente& echo '<a href="index.php?sec=gagente&
sec2=godmode/agentes/configurar_agente&tab=main& sec2=godmode/agentes/configurar_agente&tab=main&
@ -618,8 +636,18 @@ if ($agents !== false) {
id_agente='.$agent['id_agente'].'">'.__('Alerts').'</a>'; id_agente='.$agent['id_agente'].'">'.__('Alerts').'</a>';
echo ' | '; echo ' | ';
if ($agent['id_os'] == 100) { if ($agent['id_os'] == CLUSTER_OS_ID) {
echo '<a href="index.php?sec=reporting&sec2=enterprise/godmode/reporting/cluster_view&id='.$cluster['id'].'">'.__('View').'</a>'; if (enterprise_installed()) {
$cluster = PandoraFMS\Enterprise\Cluster::loadFromAgentId(
$agent['id_agente']
);
$url = 'index.php?sec=reporting&sec2='.ENTERPRISE_DIR;
$url .= '/operation/cluster/cluster';
$url = ui_get_full_url(
$url.'&op=view&id='.$cluster->id()
);
echo '<a href="'.$url.'">'.__('View').'</a>';
}
} else { } else {
echo '<a href="index.php?sec=estado echo '<a href="index.php?sec=estado
&sec2=operation/agentes/ver_agente &sec2=operation/agentes/ver_agente

View File

@ -703,6 +703,10 @@ foreach ($modules as $module) {
$module_interval2 = $module['module_interval']; $module_interval2 = $module['module_interval'];
$module_group2 = $module['id_module_group']; $module_group2 = $module['id_module_group'];
if ($module['id_modulo'] == MODULE_DATA && $module['id_policy_module'] != 0) {
$nombre_modulo = utf8_decode($module['nombre']);
}
$data = []; $data = [];
if (!$checked) { if (!$checked) {
@ -834,7 +838,7 @@ foreach ($modules as $module) {
$data[6] = ui_print_status_image($status, htmlspecialchars($title), true); $data[6] = ui_print_status_image($status, htmlspecialchars($title), true);
// MAX / MIN values // MAX / MIN values.
if ($module['id_tipo_modulo'] != 25) { if ($module['id_tipo_modulo'] != 25) {
$data[7] = ui_print_module_warn_value( $data[7] = ui_print_module_warn_value(
$module['max_warning'], $module['max_warning'],

View File

@ -572,15 +572,13 @@ if ($moduletype == MODULE_DATA) {
if ($__code_from == 'policies') { if ($__code_from == 'policies') {
// If is the policy form, module_interval will store the factor (not the seconds). // If is the policy form, module_interval will store the factor (not the seconds).
// So server will transform it to interval in seconds // So server will transform it to interval in seconds.
$table_advanced->data[1][1] = sprintf(__('Default').': 1', $interval_factor); $table_advanced->data[1][1] = sprintf(__('Default').': 1', $interval_factor);
$table_advanced->data[1][1] .= html_print_input_hidden('module_interval', $interval_factor, true); $table_advanced->data[1][1] .= html_print_input_hidden('module_interval', $interval_factor, true);
} else if ($module_id_policy_module != 0) {
$table_advanced->data[1][1] .= ui_print_help_tip(__('The policy modules of data type will only update their intervals when policy is applied.'), true);
} }
// If it is a non policy form, the module_interval will not provided and will // If it is a non policy form, the module_interval will not provided and will.
// be taken the agent interval (this code is at configurar_agente.php) // be taken the agent interval (this code is at configurar_agente.php).
} else { } else {
$table_advanced->data[1][0] = __('Interval'); $table_advanced->data[1][0] = __('Interval');
$table_advanced->colspan[1][1] = 2; $table_advanced->colspan[1][1] = 2;
@ -607,9 +605,9 @@ $table_advanced->colspan[1][4] = 3;
$table_advanced->data[2][0] = __('Min. Value'); $table_advanced->data[2][0] = __('Min. Value');
$table_advanced->colspan[2][1] = 2; $table_advanced->colspan[2][1] = 2;
$table_advanced->data[2][1] = html_print_input_text('min', $min, '', 5, 15, true, $disabledBecauseInPolicy, false, '', $classdisabledBecauseInPolicy).' '.ui_print_help_tip(__('Any value below this number is discarted.'), true); $table_advanced->data[2][1] = html_print_input_text('min', $min, '', 5, 15, true, $disabledBecauseInPolicy, false, '', $classdisabledBecauseInPolicy);
$table_advanced->data[2][3] = __('Max. Value'); $table_advanced->data[2][3] = __('Max. Value');
$table_advanced->data[2][4] = html_print_input_text('max', $max, '', 5, 15, true, $disabledBecauseInPolicy, false, '', $classdisabledBecauseInPolicy).' '.ui_print_help_tip(__('Any value over this number is discarted.'), true); $table_advanced->data[2][4] = html_print_input_text('max', $max, '', 5, 15, true, $disabledBecauseInPolicy, false, '', $classdisabledBecauseInPolicy);
$table_advanced->colspan[2][4] = 3; $table_advanced->colspan[2][4] = 3;
@ -685,10 +683,10 @@ $table_advanced->data[4][1] = html_print_select_from_sql(
false, false,
false, false,
$disabled_export $disabled_export
).ui_print_help_tip(__('In case you use an Export server you can link this module and export data to one these.'), true); );
$table_advanced->colspan[4][1] = 2; $table_advanced->colspan[4][1] = 2;
// Code comes from module_editor // Code comes from module_editor.
if ($__code_from == 'modules') { if ($__code_from == 'modules') {
$throw_unknown_events_check = modules_is_disable_type_event($id_agent_module, EVENTS_GOING_UNKNOWN); $throw_unknown_events_check = modules_is_disable_type_event($id_agent_module, EVENTS_GOING_UNKNOWN);
} else { } else {
@ -806,7 +804,7 @@ $table_advanced->data[6][1] = html_print_input_text(
false, false,
'', '',
$classdisabledBecauseInPolicy $classdisabledBecauseInPolicy
).ui_print_help_tip(__('Module execution flip flop time interval (in secs).'), true); );
$table_advanced->colspan[6][1] = 2; $table_advanced->colspan[6][1] = 2;
$table_advanced->data[6][3] = __('FF timeout'); $table_advanced->data[6][3] = __('FF timeout');
@ -822,11 +820,11 @@ if (preg_match('/async/', $module_type_name) || $edit) {
10, 10,
true, true,
$disabledBecauseInPolicy $disabledBecauseInPolicy
).ui_print_help_tip(__('Timeout in secs from start of flip flop counting. If this value is exceeded, FF counter is reset. Set to 0 for no timeout.'), true).'</span>'; ).'</span>';
} }
if (!preg_match('/async/', $module_type_name) || $edit) { if (!preg_match('/async/', $module_type_name) || $edit) {
$table_advanced->data[6][4] .= '<span id="ff_timeout_disable">'.__('Disabled').ui_print_help_tip(__('This value can be set only in the async modules.'), true).'</span>'; $table_advanced->data[6][4] .= '<span id="ff_timeout_disable">'.__('Disabled').'</span>';
} }
$table_advanced->colspan[6][4] = 3; $table_advanced->colspan[6][4] = 3;
@ -972,7 +970,6 @@ if ($__code_from == 'modules') {
} }
$table_advanced->data[8][0] = __('Quiet'); $table_advanced->data[8][0] = __('Quiet');
$table_advanced->data[8][0] .= ui_print_help_tip(__('The module still stores data but the alerts and events will be stop'), true);
$table_advanced->data[8][1] = html_print_checkbox('quiet_module', 1, $quiet_module, true, $disabledBecauseInPolicy); $table_advanced->data[8][1] = html_print_checkbox('quiet_module', 1, $quiet_module, true, $disabledBecauseInPolicy);
$cps_array[-1] = __('Disabled'); $cps_array[-1] = __('Disabled');
@ -992,7 +989,6 @@ if ($cps_module > 0) {
$table_advanced->data[8][2] = ''; $table_advanced->data[8][2] = '';
$table_advanced->data[8][3] = __('Cascade Protection Services'); $table_advanced->data[8][3] = __('Cascade Protection Services');
$table_advanced->data[8][3] .= ui_print_help_tip(__('Disable the alerts and events of the elements that belong to this service'), true);
$table_advanced->colspan[8][4] = 3; $table_advanced->colspan[8][4] = 3;
$table_advanced->data[8][4] = html_print_select($cps_array, 'cps_module', $cps_module, '', '', 0, true, false, true, '', $disabledBecauseInPolicy); $table_advanced->data[8][4] = html_print_select($cps_array, 'cps_module', $cps_module, '', '', 0, true, false, true, '', $disabledBecauseInPolicy);
@ -1010,16 +1006,16 @@ $table_advanced->data[9][1] = html_print_textarea(
$largeClassDisabledBecauseInPolicy $largeClassDisabledBecauseInPolicy
); );
$table_advanced->data[10][0] = __('Critical instructions').ui_print_help_tip(__('Instructions when the status is critical'), true); $table_advanced->data[10][0] = __('Critical instructions');
$table_advanced->data[10][1] = html_print_textarea('critical_instructions', 3, 65, $critical_instructions, $disabledTextBecauseInPolicy.$textarea_custom_style, true, $largeClassDisabledBecauseInPolicy); $table_advanced->data[10][1] = html_print_textarea('critical_instructions', 3, 65, $critical_instructions, $disabledTextBecauseInPolicy.$textarea_custom_style, true, $largeClassDisabledBecauseInPolicy);
$table_advanced->colspan[10][1] = 6; $table_advanced->colspan[10][1] = 6;
$table_advanced->data[11][0] = __('Warning instructions').ui_print_help_tip(__('Instructions when the status is warning'), true); $table_advanced->data[11][0] = __('Warning instructions');
$table_advanced->data[11][1] = html_print_textarea('warning_instructions', 3, 65, $warning_instructions, $disabledTextBecauseInPolicy.$textarea_custom_style, true, $largeClassDisabledBecauseInPolicy); $table_advanced->data[11][1] = html_print_textarea('warning_instructions', 3, 65, $warning_instructions, $disabledTextBecauseInPolicy.$textarea_custom_style, true, $largeClassDisabledBecauseInPolicy);
$table_advanced->colspan[11][1] = 6; $table_advanced->colspan[11][1] = 6;
$table_advanced->data[12][0] = __('Unknown instructions').ui_print_help_tip(__('Instructions when the status is unknown'), true); $table_advanced->data[12][0] = __('Unknown instructions');
$table_advanced->data[12][1] = html_print_textarea('unknown_instructions', 3, 65, $unknown_instructions, $disabledTextBecauseInPolicy.$textarea_custom_style, true, $largeClassDisabledBecauseInPolicy); $table_advanced->data[12][1] = html_print_textarea('unknown_instructions', 3, 65, $unknown_instructions, $disabledTextBecauseInPolicy.$textarea_custom_style, true, $largeClassDisabledBecauseInPolicy);
$table_advanced->colspan[12][1] = 6; $table_advanced->colspan[12][1] = 6;
@ -1053,10 +1049,10 @@ if (isset($id_agente) && $moduletype == MODULE_DATA) {
} }
$table_advanced->data[15][0] = __('Timeout'); $table_advanced->data[15][0] = __('Timeout');
$table_advanced->data[15][1] = html_print_input_text('max_timeout', $max_timeout, '', 5, 10, true, $disabledBecauseInPolicy, false, '', $classdisabledBecauseInPolicy).' '.ui_print_help_tip(__('Seconds that agent will wait for the execution of the module.'), true); $table_advanced->data[15][1] = html_print_input_text('max_timeout', $max_timeout, '', 5, 10, true, $disabledBecauseInPolicy, false, '', $classdisabledBecauseInPolicy);
$table_advanced->data[15][2] = ''; $table_advanced->data[15][2] = '';
$table_advanced->data[15][3] = __('Retries'); $table_advanced->data[15][3] = __('Retries');
$table_advanced->data[15][4] = html_print_input_text('max_retries', $max_retries, '', 5, 10, true, $disabledBecauseInPolicy, false, '', $classdisabledBecauseInPolicy).' '.ui_print_help_tip(__('Number of retries that the module will attempt to run.'), true); $table_advanced->data[15][4] = html_print_input_text('max_retries', $max_retries, '', 5, 10, true, $disabledBecauseInPolicy, false, '', $classdisabledBecauseInPolicy);
$table_advanced->colspan[15][4] = 3; $table_advanced->colspan[15][4] = 3;
if (check_acl($config['id_user'], 0, 'PM')) { if (check_acl($config['id_user'], 0, 'PM')) {
@ -1223,10 +1219,7 @@ $table_relations->style[4] = 'width: 10%; text-align: center;';
$table_relations->head[0] = __('Agent'); $table_relations->head[0] = __('Agent');
$table_relations->head[1] = __('Module'); $table_relations->head[1] = __('Module');
$table_relations->head[2] = __('Type'); $table_relations->head[2] = __('Type');
$table_relations->head[3] = __('Changes').ui_print_help_tip( $table_relations->head[3] = __('Changes');
__('Activate this to prevent the relation from being updated or deleted'),
true
);
$table_relations->head[4] = __('Delete'); $table_relations->head[4] = __('Delete');
// Create an invisible row to use their html to add new rows. // Create an invisible row to use their html to add new rows.

View File

@ -43,7 +43,47 @@ if (empty($update_module_id)) {
$data = []; $data = [];
$data[0] = __('Target IP').' '.ui_print_help_icon('wmi_module_tab', true); $data[0] = __('Target IP').' '.ui_print_help_icon('wmi_module_tab', true);
$data[1] = html_print_input_text('ip_target', $ip_target, '', 15, 60, true);
if ($page == 'enterprise/godmode/policies/policy_modules') {
if ($ip_target != 'auto' && $ip_target != '') {
$custom_ip_target = $ip_target;
$ip_target = 'custom';
} else if ($ip_target == '') {
$ip_target = 'force_pri';
$custom_ip_target = '';
} else {
$custom_ip_target = '';
}
$target_ip_values = [];
$target_ip_values['auto'] = __('Auto');
$target_ip_values['force_pri'] = __('Force primary key');
$target_ip_values['custom'] = __('Custom');
$data[1] = html_print_select(
$target_ip_values,
'ip_target',
$ip_target,
'',
'',
'',
true,
false,
false,
'',
false,
'width:200px;'
);
$data[1] .= html_print_input_text('custom_ip_target', $custom_ip_target, '', 15, 60, true);
} else {
if ($ip_target == 'auto') {
$ip_target = agents_get_address($id_agente);
}
$data[1] = html_print_input_text('ip_target', $ip_target, '', 15, 60, true);
}
$data[2] = __('Namespace').ui_print_help_tip(__('Optional. WMI namespace. If unsure leave blank.'), true); $data[2] = __('Namespace').ui_print_help_tip(__('Optional. WMI namespace. If unsure leave blank.'), true);
$data[3] = html_print_input_text( $data[3] = html_print_input_text(
'tcp_send', 'tcp_send',
@ -136,3 +176,21 @@ $data[3] = html_print_input_text(
); );
push_table_simple($data, 'key_field'); push_table_simple($data, 'key_field');
?>
<script type="text/javascript">
$(document).ready (function () {
var custom_ip_target = "<?php echo $custom_ip_target; ?>";
if(custom_ip_target == ''){
$("#text-custom_ip_target").hide();
}
$('#ip_target').change(function() {
if($(this).val() == 'custom') {
$("#text-custom_ip_target").show();
}
else{
$("#text-custom_ip_target").hide();
}
});
});
</script>

View File

@ -62,7 +62,7 @@ ui_print_page_header(
__('Planned Downtime'), __('Planned Downtime'),
'images/gm_monitoring.png', 'images/gm_monitoring.png',
false, false,
'planned_downtime_editor', '',
true, true,
$buttons $buttons
); );
@ -717,11 +717,11 @@ $table->data[5][1] = "
<table> <table>
<tr> <tr>
<td>".__('From:').'</td> <td>".__('From:').'</td>
<td>'.html_print_input_text('once_date_from', $once_date_from, '', 10, 10, true, $disabled_in_execution).ui_print_help_tip(__('Date format is YY/MM/DD'), true).html_print_input_text('once_time_from', $once_time_from, '', 9, 9, true, $disabled_in_execution).ui_print_help_tip(__('Watch format is hours (24h):minutes:seconds'), true).'</td> <td>'.html_print_input_text('once_date_from', $once_date_from, '', 10, 10, true, $disabled_in_execution).html_print_input_text('once_time_from', $once_time_from, '', 9, 9, true, $disabled_in_execution).'</td>
</tr> </tr>
<tr> <tr>
<td>'.__('To:').'</td> <td>'.__('To:').'</td>
<td>'.html_print_input_text('once_date_to', $once_date_to, '', 10, 10, true).ui_print_help_tip(__('Date format is YY/MM/DD'), true).html_print_input_text('once_time_to', $once_time_to, '', 9, 9, true).ui_print_help_tip(__('Watch format is hours (24h):minutes:seconds'), true)."</td> <td>'.html_print_input_text('once_date_to', $once_date_to, '', 10, 10, true).html_print_input_text('once_time_to', $once_time_to, '', 9, 9, true)."</td>
</tr> </tr>
</table> </table>
</div> </div>
@ -804,7 +804,7 @@ $table->data[5][1] = "
true, true,
$disabled_in_execution $disabled_in_execution
).ui_print_help_tip( ).ui_print_help_tip(
__('Watch format is hours (24h):minutes:seconds.').'.<br>'.__('The end time must be higher than the start time'), __('The end time must be higher than the start time'),
true true
).'</td> ).'</td>
<td>'.__('To hour:').'</td> <td>'.__('To hour:').'</td>
@ -817,7 +817,7 @@ $table->data[5][1] = "
true, true,
$disabled_in_execution $disabled_in_execution
).ui_print_help_tip( ).ui_print_help_tip(
__('Watch format is hours (24h):minutes:seconds.').'.<br>'.__('The end time must be higher than the start time'), __('The end time must be higher than the start time'),
true true
).'</td> ).'</td>
</tr> </tr>

View File

@ -55,7 +55,7 @@ ui_print_page_header(
__('Scheduled Downtime'), __('Scheduled Downtime'),
'images/gm_monitoring.png', 'images/gm_monitoring.png',
false, false,
'planned_downtime', '',
true, true,
'' ''
); );

View File

@ -48,17 +48,13 @@ if (defined('METACONSOLE')) {
if (defined('METACONSOLE')) { if (defined('METACONSOLE')) {
alerts_meta_print_header(); alerts_meta_print_header();
} else { } else {
$header_help = 'alerts_action'; ui_print_page_header(
__('Alerts').' &raquo; '.__('Alert actions'),
if ($copy_action) { 'images/gm_alerts.png',
$header_help = 'alerts_config'; false,
} '',
true
if ($delete_action) { );
$header_help = 'alerts_action';
}
ui_print_page_header(__('Alerts').' &raquo; '.__('Alert actions'), 'images/gm_alerts.png', false, $header_help, true);
} }
if ($copy_action) { if ($copy_action) {

View File

@ -284,7 +284,7 @@ if (defined('METACONSOLE')) {
__('Alerts').' &raquo; '.__('Alert commands'), __('Alerts').' &raquo; '.__('Alert commands'),
'images/gm_alerts.png', 'images/gm_alerts.png',
false, false,
'alerts_command_tab', '',
true true
); );
} }

View File

@ -230,16 +230,6 @@ if ($delete_alert) {
'', '',
true true
); );
$id_cluster = db_get_all_rows_sql('select id,cluster_type from tcluster where id_agent = '.$id_agente);
if ($id_cluster) {
if ($id_cluster[0]['cluster_type'] == 'AA') {
header('Location: index.php?sec=reporting&sec2=enterprise/godmode/reporting/cluster_builder&id_cluster='.$id_cluster[0]['id'].'&step=5&update=1&message_delete_alert='.$result);
} else {
header('Location: index.php?sec=reporting&sec2=enterprise/godmode/reporting/cluster_builder&id_cluster='.$id_cluster[0]['id'].'&step=7&update=1&message_delete_alert='.$result);
}
}
} }
if ($add_action) { if ($add_action) {
@ -328,16 +318,6 @@ if ($delete_action) {
'', '',
true true
); );
$id_cluster = db_get_all_rows_sql('select id,cluster_type from tcluster where id_agent = '.$id_agente);
if ($id_cluster) {
if ($id_cluster[0]['cluster_type'] == 'AA') {
header('Location: index.php?sec=reporting&sec2=enterprise/godmode/reporting/cluster_builder&id_cluster='.$id_cluster[0]['id'].'&step=5&update=1&message_delete_action='.$result);
} else {
header('Location: index.php?sec=reporting&sec2=enterprise/godmode/reporting/cluster_builder&id_cluster='.$id_cluster[0]['id'].'&step=7&update=1&message_delete_action='.$result);
}
}
} }
if ($enable_alert) { if ($enable_alert) {
@ -359,16 +339,6 @@ if ($enable_alert) {
'', '',
true true
); );
$id_cluster = db_get_all_rows_sql('select id,cluster_type from tcluster where id_agent = '.$id_agente);
if ($id_cluster) {
if ($id_cluster[0]['cluster_type'] == 'AA') {
header('Location: index.php?sec=reporting&sec2=enterprise/godmode/reporting/cluster_builder&id_cluster='.$id_cluster[0]['id'].'&step=5&update=1&message_enable_alert='.$result);
} else {
header('Location: index.php?sec=reporting&sec2=enterprise/godmode/reporting/cluster_builder&id_cluster='.$id_cluster[0]['id'].'&step=7&update=1&message_enable_alert='.$result);
}
}
} }
if ($disable_alert) { if ($disable_alert) {
@ -390,16 +360,6 @@ if ($disable_alert) {
'', '',
true true
); );
$id_cluster = db_get_all_rows_sql('select id,cluster_type from tcluster where id_agent = '.$id_agente);
if ($id_cluster) {
if ($id_cluster[0]['cluster_type'] == 'AA') {
header('Location: index.php?sec=reporting&sec2=enterprise/godmode/reporting/cluster_builder&id_cluster='.$id_cluster[0]['id'].'&step=5&update=1&message_disable_alert='.$result);
} else {
header('Location: index.php?sec=reporting&sec2=enterprise/godmode/reporting/cluster_builder&id_cluster='.$id_cluster[0]['id'].'&step=7&update=1&message_disable_alert='.$result);
}
}
} }
if ($standbyon_alert) { if ($standbyon_alert) {
@ -421,16 +381,6 @@ if ($standbyon_alert) {
'', '',
true true
); );
$id_cluster = db_get_all_rows_sql('select id,cluster_type from tcluster where id_agent = '.$id_agente);
if ($id_cluster) {
if ($id_cluster[0]['cluster_type'] == 'AA') {
header('Location: index.php?sec=reporting&sec2=enterprise/godmode/reporting/cluster_builder&id_cluster='.$id_cluster[0]['id'].'&step=5&update=1&message_standbyon='.$result);
} else {
header('Location: index.php?sec=reporting&sec2=enterprise/godmode/reporting/cluster_builder&id_cluster='.$id_cluster[0]['id'].'&step=7&update=1&message_standbyon='.$result);
}
}
} }
if ($standbyoff_alert) { if ($standbyoff_alert) {
@ -452,16 +402,6 @@ if ($standbyoff_alert) {
'', '',
true true
); );
$id_cluster = db_get_all_rows_sql('select id,cluster_type from tcluster where id_agent = '.$id_agente);
if ($id_cluster) {
if ($id_cluster[0]['cluster_type'] == 'AA') {
header('Location: index.php?sec=reporting&sec2=enterprise/godmode/reporting/cluster_builder&id_cluster='.$id_cluster[0]['id'].'&step=5&update=1&message_standbyoff='.$result);
} else {
header('Location: index.php?sec=reporting&sec2=enterprise/godmode/reporting/cluster_builder&id_cluster='.$id_cluster[0]['id'].'&step=7&update=1&message_standbyoff='.$result);
}
}
} }
if ($id_agente) { if ($id_agente) {
@ -504,9 +444,9 @@ if ($id_agente) {
} }
if ($tab == 'list') { if ($tab == 'list') {
ui_print_page_header(__('Alerts').' &raquo; '.__('Manage alerts').' &raquo; '.__('List'), 'images/gm_alerts.png', false, 'alerts_config', true, $buttons); ui_print_page_header(__('Alerts').' &raquo; '.__('Manage alerts').' &raquo; '.__('List'), 'images/gm_alerts.png', false, '', true, $buttons);
} else { } else {
ui_print_page_header(__('Alerts').' &raquo; '.__('Manage alerts').' &raquo; '.__('Create'), 'images/gm_alerts.png', false, 'manage_alert_list', true, $buttons); ui_print_page_header(__('Alerts').' &raquo; '.__('Manage alerts').' &raquo; '.__('Create'), 'images/gm_alerts.png', false, '', true, $buttons);
} }
} else { } else {
alerts_meta_print_header(); alerts_meta_print_header();

View File

@ -118,6 +118,10 @@ if ($create_special_day) {
$values['id_group'] = (string) get_parameter('id_group'); $values['id_group'] = (string) get_parameter('id_group');
$values['description'] = (string) get_parameter('description'); $values['description'] = (string) get_parameter('description');
$aviable_description = true;
if (preg_match('/script/i', $values['description'])) {
$aviable_description = false;
}
$array_date = explode('-', $date); $array_date = explode('-', $date);
@ -142,8 +146,12 @@ if ($create_special_day) {
$result = ''; $result = '';
$messageAction = __('Could not be created, it already exists'); $messageAction = __('Could not be created, it already exists');
} else { } else {
if ($aviable_description) {
$result = alerts_create_alert_special_day($date, $same_day, $values); $result = alerts_create_alert_special_day($date, $same_day, $values);
$info = '{"Date":"'.$date.'","Same day of the week":"'.$same_day.'","Description":"'.$values['description'].'"}'; $info = '{"Date":"'.$date.'","Same day of the week":"'.$same_day.'","Description":"'.$values['description'].'"}';
} else {
$result = false;
}
} }
} }
@ -176,6 +184,11 @@ if ($update_special_day) {
$id_group = (string) get_parameter('id_group'); $id_group = (string) get_parameter('id_group');
$id_group_orig = (string) get_parameter('id_group_orig'); $id_group_orig = (string) get_parameter('id_group_orig');
$aviable_description = true;
if (preg_match('/script/i', $description)) {
$aviable_description = false;
}
$array_date = explode('-', $date); $array_date = explode('-', $date);
$year = $array_date[0]; $year = $array_date[0];
@ -206,14 +219,18 @@ if ($update_special_day) {
$result = ''; $result = '';
$messageAction = __('Could not be updated, it already exists'); $messageAction = __('Could not be updated, it already exists');
} else { } else {
if ($aviable_description !== false) {
$result = alerts_update_alert_special_day($id, $values); $result = alerts_update_alert_special_day($id, $values);
$info = '{"Date":"'.$date.'","Same day of the week":"'.$same_day.'","Description":"'.$description.'"}'; $info = '{"Date":"'.$date.'","Same day of the week":"'.$same_day.'","Description":"'.$description.'"}';
} }
}
} else { } else {
if ($aviable_description !== false) {
$result = alerts_update_alert_special_day($id, $values); $result = alerts_update_alert_special_day($id, $values);
$info = '{"Date":"'.$date.'","Same day of the week":"'.$same_day.'","Description":"'.$description.'"}'; $info = '{"Date":"'.$date.'","Same day of the week":"'.$same_day.'","Description":"'.$description.'"}';
} }
} }
}
if ($result) { if ($result) {
db_pandora_audit('Command management', 'Update special day '.$id, false, false, $info); db_pandora_audit('Command management', 'Update special day '.$id, false, false, $info);

View File

@ -136,7 +136,7 @@ if (!$delete_template) {
__('Alerts').' &raquo; '.__('Alert templates'), __('Alerts').' &raquo; '.__('Alert templates'),
'images/gm_alerts.png', 'images/gm_alerts.png',
false, false,
'alert_templates_tab', '',
true true
); );
} }

View File

@ -52,7 +52,7 @@ if ($al_action !== false) {
$is_in_group = in_array($al_action['id_group'], $own_groups); $is_in_group = in_array($al_action['id_group'], $own_groups);
// Header // Header.
if (defined('METACONSOLE')) { if (defined('METACONSOLE')) {
alerts_meta_print_header(); alerts_meta_print_header();
} else { } else {
@ -60,12 +60,12 @@ if ($al_action !== false) {
__('Alerts').' &raquo; '.__('Configure alert action'), __('Alerts').' &raquo; '.__('Configure alert action'),
'images/gm_alerts.png', 'images/gm_alerts.png',
false, false,
'alert_config', '',
true true
); );
} }
} else { } else {
// Header // Header.
if (defined('METACONSOLE')) { if (defined('METACONSOLE')) {
alerts_meta_print_header(); alerts_meta_print_header();
} else { } else {
@ -73,7 +73,7 @@ if ($al_action !== false) {
__('Alerts').' &raquo; '.__('Configure alert action'), __('Alerts').' &raquo; '.__('Configure alert action'),
'images/gm_alerts.png', 'images/gm_alerts.png',
false, false,
'alert_config', '',
true true
); );
} }

View File

@ -43,7 +43,7 @@ if (defined('METACONSOLE')) {
__('Alerts').' &raquo; '.__('Configure alert command'), __('Alerts').' &raquo; '.__('Configure alert command'),
'images/gm_alerts.png', 'images/gm_alerts.png',
false, false,
'alerts_config_command_tab', '',
true true
); );
} }
@ -206,7 +206,7 @@ for ($i = 1; $i <= $config['max_macro_fields']; $i++) {
$table->data['field'.$i][1] = html_print_input_text('field'.$i.'_description', $field_description, '', 30, 255, true); $table->data['field'.$i][1] = html_print_input_text('field'.$i.'_description', $field_description, '', 30, 255, true);
$table->data['field'.$i][2] = sprintf(__('Field %s values'), $i); $table->data['field'.$i][2] = sprintf(__('Field %s values'), $i).ui_print_help_tip(__('value1,tag1;value2,tag2;value3,tag3'), true);
if (!empty($fields_values)) { if (!empty($fields_values)) {
$field_values = $fields_values[($i - 1)]; $field_values = $fields_values[($i - 1)];

View File

@ -58,11 +58,11 @@ if ($a_template !== false) {
} else { } else {
$step = (int) get_parameter('step', 1); $step = (int) get_parameter('step', 1);
if ($step == 1) { if ($step == 1) {
$help_header = 'configure_alert_template_step_1'; $help_header = '';
} else if ($step == 2) { } else if ($step == 2) {
$help_header = 'configure_alert_template_step_2'; $help_header = 'configure_alert_template_step_2';
} else if ($step == 3) { } else if ($step == 3) {
$help_header = 'configure_alert_template_step_3'; $help_header = '';
} }
ui_print_page_header( ui_print_page_header(
@ -115,11 +115,11 @@ if ($a_template !== false) {
} else { } else {
$step = (int) get_parameter('step', 1); $step = (int) get_parameter('step', 1);
if ($step == 1) { if ($step == 1) {
$help_header = 'configure_alert_template_step_1'; $help_header = '';
} else if ($step == 2) { } else if ($step == 2) {
$help_header = 'configure_alert_template_step_2'; $help_header = 'configure_alert_template_step_2';
} else if ($step == 3) { } else if ($step == 3) {
$help_header = 'configure_alert_template_step_3'; $help_header = '';
} }
ui_print_page_header( ui_print_page_header(
@ -601,7 +601,7 @@ if ($step == 2) {
$table->data[0][2] = __('Use special days list'); $table->data[0][2] = __('Use special days list');
$table->data[0][3] = html_print_checkbox('special_day', 1, $special_day, true); $table->data[0][3] = html_print_checkbox('special_day', 1, $special_day, true);
$table->data[1][0] = __('Time from').' '.ui_print_help_tip(__('Watch format is hours (24h):minutes:seconds'), true); $table->data[1][0] = __('Time from');
$table->data[1][1] = html_print_input_text( $table->data[1][1] = html_print_input_text(
'time_from', 'time_from',
$time_from, $time_from,
@ -610,7 +610,7 @@ if ($step == 2) {
8, 8,
true true
); );
$table->data[1][2] = __('Time to').' '.ui_print_help_tip(__('Watch format is hours (24h):minutes:seconds'), true); $table->data[1][2] = __('Time to');
$table->data[1][3] = html_print_input_text( $table->data[1][3] = html_print_input_text(
'time_to', 'time_to',
$time_to, $time_to,
@ -849,7 +849,7 @@ if ($step == 2) {
} }
// $table->rowclass['field'.$i] = 'row_field'; // $table->rowclass['field'.$i] = 'row_field';
$table->data['field'.$i][0] = sprintf(__('Field %s'), $i).ui_print_help_icon('alert_macros', true); $table->data['field'.$i][0] = sprintf(__('Field %s'), $i);
// TinyMCE // TinyMCE
// triggering fields // triggering fields
// basic // basic

View File

@ -70,7 +70,7 @@ switch ($section) {
case 'responses': case 'responses':
$buttons['responses']['active'] = true; $buttons['responses']['active'] = true;
$subpage = ' - '.__('Responses'); $subpage = ' - '.__('Responses');
$help_header = 'events_responses_tab'; $help_header = '';
break; break;
case 'view': case 'view':

View File

@ -420,7 +420,7 @@ $table->class = 'databox filters';
$table->data = []; $table->data = [];
$table->data[0][0] = __('Map Name').ui_print_help_tip(__('Descriptive name for the map'), true).':'; $table->data[0][0] = __('Map Name');
$table->data[0][1] = html_print_input_text('map_name', $map_name, '', 30, 60, true); $table->data[0][1] = html_print_input_text('map_name', $map_name, '', 30, 60, true);
$table->rowspan[0][2] = 9; $table->rowspan[0][2] = 9;
@ -439,7 +439,7 @@ foreach ($listConnectionTemp as $connectionTemp) {
} }
} }
$table->data[1][0] = __('Add Map connection').ui_print_help_tip(__('At least one map connection must be defined, it will be possible to change between the connections in the map'), true).': '.$iconError; $table->data[1][0] = __('Add Map connection').$iconError;
$table->data[1][1] = "<table style='padding:0px;' class='no-class' border='0' id='map_connection'> $table->data[1][1] = "<table style='padding:0px;' class='no-class' border='0' id='map_connection'>
<tr> <tr>
<td style='padding:0px;' > <td style='padding:0px;' >
@ -459,10 +459,10 @@ if ($own_info['is_admin'] || check_acl($config['id_user'], 0, 'MM')) {
$display_all_group = false; $display_all_group = false;
} }
$table->data[2][0] = __('Group').ui_print_help_tip(__('Group that owns the map'), true).':'; $table->data[2][0] = __('Group');
$table->data[2][1] = html_print_select_groups(false, 'IW', $display_all_group, 'map_group_id', $map_group_id, '', '', '', true); $table->data[2][1] = html_print_select_groups(false, 'IW', $display_all_group, 'map_group_id', $map_group_id, '', '', '', true);
$table->data[3][0] = __('Default zoom').ui_print_help_tip(__('Default zoom level when opening the map'), true).':'; $table->data[3][0] = __('Default zoom');
$table->data[3][1] = html_print_input_text('map_zoom_level', $map_zoom_level, '', 2, 4, true).html_print_input_hidden('map_levels_zoom', $map_levels_zoom, true); $table->data[3][1] = html_print_input_text('map_zoom_level', $map_zoom_level, '', 2, 4, true).html_print_input_hidden('map_levels_zoom', $map_levels_zoom, true);
$table->data[4][0] = __('Center Latitude').':'; $table->data[4][0] = __('Center Latitude').':';
@ -485,7 +485,7 @@ $table->data[9][1] = html_print_input_text('map_default_altitude', $map_default_
html_print_table($table); html_print_table($table);
echo '<h3>'.__('Layers').ui_print_help_tip(__('Each layer can show agents from one group or the agents added to that layer or both.'), true).'</h3>'; echo '<h3>'.__('Layers').'</h3>';
$table->width = '100%'; $table->width = '100%';
$table->class = 'databox filters'; $table->class = 'databox filters';
@ -494,7 +494,7 @@ $table->valign[0] = 'top';
$table->valign[1] = 'top'; $table->valign[1] = 'top';
$table->data = []; $table->data = [];
$table->data[0][0] = '<h4>'.__('List of layers').ui_print_help_tip(__('It is possible to edit, delete and reorder the layers.'), true).'</h4>'; $table->data[0][0] = '<h4>'.__('List of layers').'</h4>';
$table->data[0][1] = '<div style="text-align: right;">'.html_print_button(__('New layer'), 'new_layer', false, 'newLayer();', 'class="sub add"', true).'</div>'; $table->data[0][1] = '<div style="text-align: right;">'.html_print_button(__('New layer'), 'new_layer', false, 'newLayer();', 'class="sub add"', true).'</div>';
$table->data[1][0] = '<table class="databox" border="0" cellpadding="4" cellspacing="4" id="list_layers"></table>'; $table->data[1][0] = '<table class="databox" border="0" cellpadding="4" cellspacing="4" id="list_layers"></table>';

View File

@ -91,7 +91,7 @@ if (defined('METACONSOLE')) {
$title_in_header, $title_in_header,
'images/group.png', 'images/group.png',
false, false,
'create_group_tab', '',
true, true,
'' ''
); );
@ -181,7 +181,7 @@ if ($config['enterprise_installed']) {
$table->data[3][1] = html_print_input_password('group_pass', $group_pass, '', 16, 255, true); $table->data[3][1] = html_print_input_password('group_pass', $group_pass, '', 16, 255, true);
} }
$table->data[$i][0] = __('Alerts'); $table->data[$i][0] = __('Alerts').ui_print_help_tip(__('Enable alert use in this group.'), true);
$table->data[$i][1] = html_print_checkbox_switch('alerts_enabled', 1, ! $alerts_disabled, true); $table->data[$i][1] = html_print_checkbox_switch('alerts_enabled', 1, ! $alerts_disabled, true);
$i++; $i++;

View File

@ -314,7 +314,7 @@ if (defined('METACONSOLE')) {
$title, $title,
'images/group.png', 'images/group.png',
false, false,
'group_list_tab', '',
true, true,
$buttons $buttons
); );
@ -347,9 +347,15 @@ if (($create_group) && (check_acl($config['id_user'], 0, 'PM'))) {
$check = db_get_value('nombre', 'tgrupo', 'nombre', $name); $check = db_get_value('nombre', 'tgrupo', 'nombre', $name);
$propagate = (bool) get_parameter('propagate'); $propagate = (bool) get_parameter('propagate');
$aviable_name = true;
if (preg_match('/script/i', $name)) {
$aviable_name = false;
}
// Check if name field is empty. // Check if name field is empty.
if ($name != '') { if ($name != '') {
if (!$check) { if (!$check) {
if ($aviable_name === true) {
$values = [ $values = [
'nombre' => $name, 'nombre' => $name,
'icon' => empty($icon) ? '' : substr($icon, 0, -4), 'icon' => empty($icon) ? '' : substr($icon, 0, -4),
@ -365,6 +371,8 @@ if (($create_group) && (check_acl($config['id_user'], 0, 'PM'))) {
]; ];
$result = db_process_sql_insert('tgrupo', $values); $result = db_process_sql_insert('tgrupo', $values);
}
if ($result) { if ($result) {
ui_print_success_message(__('Group successfully created')); ui_print_success_message(__('Group successfully created'));
} else { } else {
@ -394,8 +402,13 @@ if ($update_group) {
$contact = (string) get_parameter('contact'); $contact = (string) get_parameter('contact');
$other = (string) get_parameter('other'); $other = (string) get_parameter('other');
$aviable_name = true;
if (preg_match('/script/i', $name)) {
$aviable_name = false;
}
// Check if name field is empty. // Check if name field is empty.
if ($name != '') { if ($name != '' && $aviable_name === true) {
$sql = sprintf( $sql = sprintf(
'UPDATE tgrupo 'UPDATE tgrupo
SET nombre = "%s", SET nombre = "%s",
@ -711,8 +724,8 @@ if ($tab == 'tree') {
[ [
'style' => '', 'style' => '',
'class' => 'bot', 'class' => 'bot',
'alt' => $group['nombre'], 'alt' => io_safe_input($group['nombre']),
'title' => $group['nombre'], 'title' => io_safe_input($group['nombre']),
], ],
false, false,
false, false,

View File

@ -749,10 +749,6 @@ if ($fields === false) {
foreach ($fields as $field) { foreach ($fields as $field) {
$data[0] = '<b>'.$field['name'].'</b>'; $data[0] = '<b>'.$field['name'].'</b>';
$data[0] .= ui_print_help_tip(
__('This field allows url insertion using the BBCode\'s url tag').'.<br />'.__('The format is: [url=\'url to navigate\']\'text to show\'[/url] or [url]\'url to navigate\'[/url] ').'.<br /><br />'.__('e.g.: [url=google.com]Google web search[/url] or [url]www.goole.com[/url]'),
true
);
$combo = []; $combo = [];
$combo = $field['combo_values']; $combo = $field['combo_values'];
$combo = explode(',', $combo); $combo = explode(',', $combo);

View File

@ -30,7 +30,7 @@ require_once 'include/functions_modules.php';
enterprise_include('godmode/massive/massive_operations.php'); enterprise_include('godmode/massive/massive_operations.php');
$tab = (string) get_parameter('tab', 'massive_agents'); $tab = (string) get_parameter('tab', 'massive_agents');
$option = (string) get_parameter('option', ''); $option = (string) get_parameter('option');
$options_alerts = [ $options_alerts = [
@ -108,8 +108,36 @@ if (in_array($option, array_keys($options_alerts))) {
$tab = 'massive_satellite'; $tab = 'massive_satellite';
} else if (in_array($option, array_keys($options_plugins))) { } else if (in_array($option, array_keys($options_plugins))) {
$tab = 'massive_plugins'; $tab = 'massive_plugins';
} else { }
$option = '';
if ($tab == 'massive_agents' && $option == '') {
$option = 'edit_agents';
}
if ($tab == 'massive_modules' && $option == '') {
$option = 'edit_modules';
}
if ($tab == 'massive_policies' && $option == '') {
$option = 'edit_policy_modules';
}
switch ($option) {
case 'edit_agents':
$help_header = 'massive_agents_tab';
break;
case 'edit_modules':
$help_header = 'massive_modules_tab';
break;
case 'edit_policy_modules':
$help_header = 'massive_policies_tab';
break;
default:
$help_header = '';
break;
} }
switch ($tab) { switch ($tab) {
@ -119,12 +147,10 @@ switch ($tab) {
case 'massive_agents': case 'massive_agents':
$options = $options_agents; $options = $options_agents;
$help_header = 'massive_agents_tab';
break; break;
case 'massive_modules': case 'massive_modules':
$options = $options_modules; $options = $options_modules;
$help_header = 'massive_modules_tab';
break; break;
case 'massive_users': case 'massive_users':
@ -133,7 +159,6 @@ switch ($tab) {
case 'massive_policies': case 'massive_policies':
$options = $options_policies; $options = $options_policies;
$help_header = 'massive_policies_tab';
break; break;
case 'massive_snmp': case 'massive_snmp':
@ -246,7 +271,7 @@ ui_print_page_header(
$help_header, $help_header,
true, true,
$onheader, $onheader,
true, false,
'massivemodal' 'massivemodal'
); );

View File

@ -385,6 +385,7 @@ if (check_acl($config['id_user'], 0, 'PM') || check_acl($config['id_user'], 0, '
$sub['extensions/dbmanager']['text'] = __('DB Interface'); $sub['extensions/dbmanager']['text'] = __('DB Interface');
$sub['extensions/dbmanager']['id'] = 'DB Interface'; $sub['extensions/dbmanager']['id'] = 'DB Interface';
$sub['extensions/dbmanager']['sec'] = 'gbman'; $sub['extensions/dbmanager']['sec'] = 'gbman';
enterprise_hook('elasticsearch_interface_menu');
} }
} }

View File

@ -40,7 +40,7 @@ if (defined('METACONSOLE')) {
__('Module management').' &raquo; '.__('Component group management'), __('Module management').' &raquo; '.__('Component group management'),
'', '',
false, false,
'component_groups', '',
true true
); );
$sec = 'gmodules'; $sec = 'gmodules';

View File

@ -47,37 +47,6 @@ require_once $config['homedir'].'/include/functions_categories.php';
enterprise_include_once('meta/include/functions_components_meta.php'); enterprise_include_once('meta/include/functions_components_meta.php');
require_once $config['homedir'].'/include/functions_component_groups.php'; require_once $config['homedir'].'/include/functions_component_groups.php';
// Header.
if (defined('METACONSOLE')) {
components_meta_print_header();
$sec = 'advanced';
$id_modulo = (int) get_parameter('id_component_type');
$new_component = (bool) get_parameter('new_component');
} else {
$id_modulo = (int) get_parameter('id_component_type');
$new_component = (bool) get_parameter('new_component');
if ($id_modulo == 2 || $id_modulo == 4 || $id_modulo == 6) {
$help_header = 'local_module_tab';
} else if (!$new_component) {
$help_header = 'network_component_tab';
} else {
$help_header = 'network_component_tab';
}
ui_print_page_header(
__('Module management').' &raquo; '.__('Remote component management'),
'',
false,
$help_header,
true,
'',
false,
'modulemodal'
);
$sec = 'gmodules';
}
$type = (int) get_parameter('type'); $type = (int) get_parameter('type');
$name = (string) get_parameter('name'); $name = (string) get_parameter('name');
$description = (string) get_parameter('description'); $description = (string) get_parameter('description');
@ -95,6 +64,8 @@ $plugin_user = (string) get_parameter('plugin_user');
$plugin_pass = io_input_password((string) get_parameter('plugin_pass')); $plugin_pass = io_input_password((string) get_parameter('plugin_pass'));
$plugin_parameter = (string) get_parameter('plugin_parameter'); $plugin_parameter = (string) get_parameter('plugin_parameter');
$macros = (string) get_parameter('macros'); $macros = (string) get_parameter('macros');
$id_modulo = (int) get_parameter('id_component_type');
$new_component = (bool) get_parameter('new_component');
if (!empty($macros)) { if (!empty($macros)) {
$macros = json_decode(base64_decode($macros), true); $macros = json_decode(base64_decode($macros), true);
@ -213,6 +184,32 @@ $custom_string_1 = '';
$custom_string_2 = ''; $custom_string_2 = '';
$custom_string_3 = ''; $custom_string_3 = '';
// Header.
if (defined('METACONSOLE')) {
components_meta_print_header();
$sec = 'advanced';
} else {
if ($id_modulo == 2 || $id_modulo == 4 || $id_modulo == 6) {
$help_header = 'local_module_tab';
} else if ($new_component == false && $id == 0) {
$help_header = '';
} else {
$help_header = 'network_component_tab';
}
ui_print_page_header(
__('Module management').' &raquo; '.__('Remote component management'),
'',
false,
$help_header,
true,
'',
false,
'modulemodal'
);
$sec = 'gmodules';
}
if ($type >= 15 && $type <= 18) { if ($type >= 15 && $type <= 18) {
// New support for snmp v3. // New support for snmp v3.
$tcp_send = $snmp_version; $tcp_send = $snmp_version;

View File

@ -39,7 +39,7 @@ ui_print_page_header(
__('Module management').' &raquo; '.__('Module template management'), __('Module management').' &raquo; '.__('Module template management'),
'images/gm_modules.png', 'images/gm_modules.png',
false, false,
'module_template_tab', '',
true, true,
'', '',
true, true,

View File

@ -38,7 +38,7 @@ if (! defined('METACONSOLE')) {
__('Manage Netflow Filter'), __('Manage Netflow Filter'),
'images/gm_netflow.png', 'images/gm_netflow.png',
false, false,
'pcap_filter', '',
true true
); );

View File

@ -58,7 +58,7 @@ if (! defined('METACONSOLE')) {
__('Netflow Filter'), __('Netflow Filter'),
'images/gm_netflow.png', 'images/gm_netflow.png',
false, false,
'pcap_filter', '',
true, true,
$buttons $buttons
); );

View File

@ -176,8 +176,15 @@ $buttons['graph_container'] = [
'text' => '<a href="index.php?sec=reporting&sec2=godmode/reporting/graph_container">'.html_print_image('images/graph-container.png', true, ['title' => __('Graph container')]).'</a>', 'text' => '<a href="index.php?sec=reporting&sec2=godmode/reporting/graph_container">'.html_print_image('images/graph-container.png', true, ['title' => __('Graph container')]).'</a>',
]; ];
// Header // Header.
ui_print_page_header(__('Create container'), '', false, '', false, $buttons); ui_print_page_header(
__('Create container'),
'',
false,
'create_container',
false,
$buttons
);
if ($add_container) { if ($add_container) {
ui_print_result_message($id_container, __('Container stored successfully'), __('There was a problem storing container')); ui_print_result_message($id_container, __('Container stored successfully'), __('There was a problem storing container'));

View File

@ -164,25 +164,17 @@ echo '</div></td></tr>';
echo "<tr><td class='datos2'><b>".__('Percentil').'</b></td>'; echo "<tr><td class='datos2'><b>".__('Percentil').'</b></td>';
echo "<td class='datos2'>".html_print_checkbox('percentil', 1, $percentil, true).'</td>'; echo "<td class='datos2'>".html_print_checkbox('percentil', 1, $percentil, true).'</td>';
echo "<td class='datos2'><div id='thresholdDiv' name='thresholdDiv'><b>".__('Equalize maximum thresholds').'</b>'.ui_print_help_tip(__('If an option is selected, all graphs will have the highest value from all modules included in the graph as a maximum threshold'), true); echo "<td class='datos2'><div id='thresholdDiv' name='thresholdDiv'><b>".__('Equalize maximum thresholds').'</b>';
html_print_checkbox('threshold', CUSTOM_GRAPH_BULLET_CHART_THRESHOLD, $check, false, false, '', false); html_print_checkbox('threshold', CUSTOM_GRAPH_BULLET_CHART_THRESHOLD, $check, false, false, '', false);
echo '</div></td></tr>'; echo '</div></td></tr>';
echo "<tr><td class='datos2'><b>".__('Add summatory series').ui_print_help_tip( echo "<tr><td class='datos2'><b>".__('Add summatory series').'</b></td>';
__(
'Adds synthetic series to the graph, using all module
values to calculate the summation and/or average in each time interval.
This feature could be used instead of synthetic modules if you only want to see a graph.'
),
true
).'</b></td>';
echo "<td class='datos2'>".html_print_checkbox('summatory_series', 1, $summatory_series, true)."</td> echo "<td class='datos2'>".html_print_checkbox('summatory_series', 1, $summatory_series, true)."</td>
<td class='datos2'><b>".__('Add average series').'</b></td>'; <td class='datos2'><b>".__('Add average series').'</b></td>';
echo "<td class='datos2'>".html_print_checkbox('average_series', 1, $average_series, true).'</td></tr>'; echo "<td class='datos2'>".html_print_checkbox('average_series', 1, $average_series, true).'</td></tr>';
echo "<tr><td class='datos2'><b>".__('Modules and series').'</b></td>'; echo "<tr><td class='datos2'><b>".__('Modules and series').'</b></td>';
echo "<td class='datos2'>".html_print_checkbox('modules_series', 1, $modules_series, true).'</td>'; echo "<td class='datos2'>".html_print_checkbox('modules_series', 1, $modules_series, true).'</td>';
echo "<td class='datos2'><b>".__('Show full scale graph (TIP)').ui_print_help_tip(__('This option may cause performance issues'), true).'</td>'; echo "<td class='datos2'><b>".__('Show full scale graph (TIP)').'</td>';
echo "<td class='datos2'>".html_print_checkbox('fullscale', 1, $fullscale, true).'</td>';
echo '</tr>'; echo '</tr>';
echo '</table>'; echo '</table>';

View File

@ -296,7 +296,7 @@ switch ($tab) {
$head, $head,
'images/chart.png', 'images/chart.png',
false, false,
'graph_editor', '',
false, false,
$buttons $buttons
); );

View File

@ -84,7 +84,7 @@ if (!$is_metaconsole) {
__('Reporting').' &raquo; '.__('Visual Console'), __('Reporting').' &raquo; '.__('Visual Console'),
'images/op_reporting.png', 'images/op_reporting.png',
false, false,
'map_builder_intro', '',
false, false,
$buttons $buttons
); );

View File

@ -1169,10 +1169,7 @@ $class = 'databox filters';
<tr> <tr>
<td> <td>
<?php <?php
echo __('Time from').ui_print_help_tip( echo __('Time from');
__('Watch format is hours (24h):minutes:seconds'),
true
);
?> ?>
</td> </td>
<td colspan="6"> <td colspan="6">
@ -1190,10 +1187,7 @@ $class = 'databox filters';
<tr> <tr>
<td> <td>
<?php <?php
echo __('Time to').ui_print_help_tip( echo __('Time to');
__('Watch format is hours (24h):minutes:seconds'),
true
);
?> ?>
</td> </td>
<td colspan="6"> <td colspan="6">

View File

@ -471,7 +471,7 @@ foreach ($items as $item) {
if ($is_inventory_item) { if ($is_inventory_item) {
$external_source = json_decode($item['external_source'], true); $external_source = json_decode($item['external_source'], true);
$agents = $external_source['id_agents']; $agents = $external_source['id_agents'];
$modules = $external_source['inventory_modules']; $modules = io_safe_output($external_source['inventory_modules']);
$agent_name_db = []; $agent_name_db = [];
foreach ($agents as $a) { foreach ($agents as $a) {

View File

@ -767,9 +767,14 @@ switch ($action) {
) )
); );
if (count($reports)) { if (count($reports)) {
$filters = [
'search' => $search,
'id_group' => $id_group,
];
$filtersStr = http_build_query($filters, '', '&amp;');
$url = 'index.php?sec=reporting&sec2=godmode/reporting/reporting_builder'; $url = 'index.php?sec=reporting&sec2=godmode/reporting/reporting_builder';
$url .= '&'.$filtersStr;
ui_pagination($total_reports, $url, $offset, $pagination); ui_pagination($total_reports, $url, $offset, $pagination);
$table = new stdClass(); $table = new stdClass();
@ -3128,22 +3133,14 @@ if ($enterpriseEnable && defined('METACONSOLE')) {
// Print header. // Print header.
ui_meta_print_header(__('Reporting').$textReportName, '', $buttons); ui_meta_print_header(__('Reporting').$textReportName, '', $buttons);
} else { } else {
switch ($activeTab) { $tab_builder = ($activeTab === 'item_editor') ? 'reporting_item_editor_tab' : '';
case 'main':
$helpers = '';
break;
default:
$helpers = 'reporting_'.$activeTab.'_tab';
break;
}
if ($action !== 'update' && !is_metaconsole()) { if ($action !== 'update' && !is_metaconsole()) {
ui_print_page_header( ui_print_page_header(
$textReportName, $textReportName,
'images/op_reporting.png', 'images/op_reporting.png',
false, false,
$helpers, $tab_builder,
false, false,
$buttons, $buttons,
false, false,

View File

@ -805,12 +805,14 @@ if ($action == 'new' || $idVisualConsole === false) {
$buttons[$activeTab]['active'] = true; $buttons[$activeTab]['active'] = true;
$tab_builder = ($activeTab === 'editor') ? 'visual_console_editor_editor_tab' : '';
if (!defined('METACONSOLE')) { if (!defined('METACONSOLE')) {
ui_print_page_header( ui_print_page_header(
$visualConsoleName, $visualConsoleName,
'images/visual_console.png', 'images/visual_console.png',
false, false,
'visual_console_editor_'.$activeTab.'_tab', $tab_builder,
false, false,
$buttons $buttons
); );

View File

@ -78,7 +78,7 @@ if (!$is_metaconsole) {
__('Reporting').' &raquo; '.__('Visual Favourite Console'), __('Reporting').' &raquo; '.__('Visual Favourite Console'),
'images/op_reporting.png', 'images/op_reporting.png',
false, false,
'map_builder_favorite', '',
false, false,
$buttons $buttons
); );

View File

@ -59,7 +59,7 @@ function get_wiz_class($str)
__('Discovery'), __('Discovery'),
'', '',
false, false,
'discovery', '',
true, true,
'', '',
false, false,

View File

@ -30,7 +30,7 @@ if (! check_acl($config['id_user'], 0, 'AW')) {
if (isset($_GET['server'])) { if (isset($_GET['server'])) {
$id_server = get_parameter_get('server'); $id_server = get_parameter_get('server');
// Headers // Headers.
ui_print_page_header(__('Update Server'), 'images/gm_servers.png', false, 'servers', true); ui_print_page_header(__('Update Server'), 'images/gm_servers.png', false, 'servers', true);
$sql = sprintf('SELECT name, ip_address, description, server_type, exec_proxy, port FROM tserver WHERE id_server = %d', $id_server); $sql = sprintf('SELECT name, ip_address, description, server_type, exec_proxy, port FROM tserver WHERE id_server = %d', $id_server);
$row = db_get_row_sql($sql); $row = db_get_row_sql($sql);
@ -98,16 +98,16 @@ if (isset($_GET['server'])) {
echo '<input type="submit" class="sub upd" value="'.__('Update').'">'; echo '<input type="submit" class="sub upd" value="'.__('Update').'">';
echo '</div>'; echo '</div>';
} else if (isset($_GET['server_remote'])) { } else if (isset($_GET['server_remote'])) {
// Headers // Headers.
$id_server = get_parameter_get('server_remote'); $id_server = get_parameter_get('server_remote');
$ext = get_parameter('ext', ''); $ext = get_parameter('ext', '');
ui_print_page_header(__('Remote Configuration'), 'images/gm_servers.png', false, 'servers', true); ui_print_page_header(__('Remote Configuration'), 'images/gm_servers.png', false, 'servers', true);
enterprise_include('godmode/servers/server_disk_conf_editor.php'); enterprise_include('godmode/servers/server_disk_conf_editor.php');
} else { } else {
// Header // Header.
ui_print_page_header(__('%s servers', get_product_name()), 'images/gm_servers.png', false, 'servers', true); ui_print_page_header(__('%s servers', get_product_name()), 'images/gm_servers.png', false, '', true);
// Move SNMP modules back to the enterprise server // Move SNMP modules back to the enterprise server.
if (isset($_GET['server_reset_snmp_enterprise'])) { if (isset($_GET['server_reset_snmp_enterprise'])) {
$result = db_process_sql('UPDATE tagente_estado SET last_error=0'); $result = db_process_sql('UPDATE tagente_estado SET last_error=0');
@ -118,7 +118,7 @@ if (isset($_GET['server'])) {
} }
} }
// Reset module count // Reset module count.
if (isset($_GET['server_reset_counts'])) { if (isset($_GET['server_reset_counts'])) {
$reslt = db_process_sql('UPDATE tagente SET update_module_count=1, update_alert_count=1'); $reslt = db_process_sql('UPDATE tagente SET update_module_count=1, update_alert_count=1');
@ -167,7 +167,7 @@ if (isset($_GET['server'])) {
$server_md5 = md5(io_safe_output(servers_get_name($id_server, 'none').$ext), false); $server_md5 = md5(io_safe_output(servers_get_name($id_server, 'none').$ext), false);
if (file_exists($config['remote_config'].'/md5/'.$server_md5.'.srv.md5')) { if (file_exists($config['remote_config'].'/md5/'.$server_md5.'.srv.md5')) {
// Server remote configuration editor // Server remote configuration editor.
$file_name = $config['remote_config'].'/conf/'.$server_md5.'.srv.conf'; $file_name = $config['remote_config'].'/conf/'.$server_md5.'.srv.conf';
$correct = @unlink($file_name); $correct = @unlink($file_name);

View File

@ -283,7 +283,7 @@ if (($create != '') || ($view != '')) {
__('Plugin registration'), __('Plugin registration'),
'images/gm_servers.png', 'images/gm_servers.png',
false, false,
'plugin_definition', '',
true true
); );
} else { } else {
@ -291,7 +291,7 @@ if (($create != '') || ($view != '')) {
__('Plugin update'), __('Plugin update'),
'images/gm_servers.png', 'images/gm_servers.png',
false, false,
'plugin_definition', '',
true true
); );
} }
@ -391,7 +391,7 @@ if (($create != '') || ($view != '')) {
} }
$data = []; $data = [];
$data[0] = __('Plugin command'); $data[0] = __('Plugin command').ui_print_help_tip(__('Specify interpreter and plugin path. The server needs permissions to run it.'), true);
$data[1] = '<input type="text" name="form_execute" id="form_execute" class="command_component command_advanced_conf" size=100 value="'.$form_execute.'" '.$disabled.'>'; $data[1] = '<input type="text" name="form_execute" id="form_execute" class="command_component command_advanced_conf" size=100 value="'.$form_execute.'" '.$disabled.'>';
if ($locked) { if ($locked) {
$data[1] .= html_print_image('images/lock.png', true, ['class' => 'command_advanced_conf lock']); $data[1] .= html_print_image('images/lock.png', true, ['class' => 'command_advanced_conf lock']);

View File

@ -44,7 +44,7 @@ switch ($action) {
__('Create new map connection'), __('Create new map connection'),
'', '',
false, false,
'', 'map_connection_tab',
true, true,
$buttons $buttons
); );
@ -71,7 +71,7 @@ switch ($action) {
__('Edit map connection'), __('Edit map connection'),
'', '',
false, false,
'', 'map_connection_tab',
true, true,
$buttons $buttons
); );
@ -200,20 +200,20 @@ switch ($action) {
$table->width = '90%'; $table->width = '90%';
$table->data = []; $table->data = [];
$table->data[0][0] = __('Connection Name').ui_print_help_tip(__('Descriptive name for the connection'), true).':'; $table->data[0][0] = __('Connection Name');
$table->data[0][1] = html_print_input_text('name', $mapConnection_name, '', 30, 60, true); $table->data[0][1] = html_print_input_text('name', $mapConnection_name, '', 30, 60, true);
$table->data[1][0] = __('Group').ui_print_help_tip(__('Group that owns the connection'), true).':'; $table->data[1][0] = __('Group');
$table->data[1][1] = html_print_select_groups(false, false, false, 'group', $mapConnection_group, '', __('All'), '0', true); $table->data[1][1] = html_print_select_groups(false, false, false, 'group', $mapConnection_group, '', __('All'), '0', true);
$table->data[2][0] = __('Number of zoom levels').':'; $table->data[2][0] = __('Number of zoom levels');
$table->data[2][1] = html_print_input_text('num_levels_zoom', $mapConnection_numLevelsZoom, '', 4, 10, true); $table->data[2][1] = html_print_input_text('num_levels_zoom', $mapConnection_numLevelsZoom, '', 4, 10, true);
$table->data[3][0] = __('Default zoom level').ui_print_help_tip(__('Zoom level used when the map is opened'), true).':'; $table->data[3][0] = __('Default zoom level');
$table->data[3][1] = html_print_input_text('initial_zoom', $mapConnection_defaultZoom, '', 4, 10, true); $table->data[3][1] = html_print_input_text('initial_zoom', $mapConnection_defaultZoom, '', 4, 10, true);
echo '<h4>'.__('Basic configuration').' '.ui_print_help_icon('gis_basic_configurations_tab', true).'</h4>'; echo '<h4>'.__('Basic configuration').'</h4>';
html_print_table($table); html_print_table($table);
$table->width = '60%'; $table->width = '60%';
@ -222,10 +222,10 @@ $types['OSM'] = __('Open Street Maps');
$types['Gmap'] = __('Google Maps'); $types['Gmap'] = __('Google Maps');
$types['Static_Image'] = __('Static Image'); $types['Static_Image'] = __('Static Image');
$types['WMS'] = __('WMS Server'); $types['WMS'] = __('WMS Server');
$table->data[0][0] = __('Type').':'; $table->data[0][0] = __('Type');
$table->data[0][1] = html_print_select($types, 'sel_type', $mapConnection_type, 'selMapConnectionType();', __('Please select the connection type'), 0, true); $table->data[0][1] = html_print_select($types, 'sel_type', $mapConnection_type, 'selMapConnectionType();', __('Please select the connection type'), 0, true);
echo '<h4>'.__('Map connection type').' '.ui_print_help_icon('gis_map_connection_tab', true).'</h4>'; echo '<h4>'.__('Map connection type').'</h4>';
html_print_table($table); html_print_table($table);
$optionsConnectionTypeTable = ''; $optionsConnectionTypeTable = '';
@ -284,7 +284,7 @@ $optionsConnectionGmapTable = '<table class="databox" border="0" cellpadding="4"
$optionsConnectionImageTable = '<table class="databox" border="0" cellpadding="4" cellspacing="4" width="50%">'.'<tr class="row_0">'.'<td>'.__('Image URL').':</td>'.'<td colspan="3"><input id="type" type="hidden" name="type" value="Static_Image" />'.html_print_input_text('url', $mapConnectionDataUrl, '', 45, 90, true).'</td>'.'</tr>'.'<tr class="row_1">'.'<td colspan="4"><strong>'.__('Corners of the area of the image').':</strong></td>'.'</tr>'.'<tr class="row_2">'.'<td>'.__('Left').':</td>'.'<td>'.html_print_input_text('bb_left', $bb_left, '', 25, 25, true).'</td>'.'<td>'.__('Bottom').':</td>'.'<td>'.html_print_input_text('bb_bottom', $bb_bottom, '', 25, 25, true).'</td>'.'</tr>'.'<tr class="row_3">'.'<td>'.__('Right').':</td>'.'<td>'.html_print_input_text('bb_right', $bb_right, '', 25, 25, true).'</td>'.'<td>'.__('Top').':</td>'.'<td>'.html_print_input_text('bb_top', $bb_top, '', 25, 25, true).'</td>'.'</tr>'.'<tr class="row_4">'.'<td colspan="4"><strong>'.__('Image Size').':</strong></td>'.'</tr>'.'<tr class="row_5">'.'<td>'.__('Width').':</td>'.'<td>'.html_print_input_text('image_width', $image_width, '', 25, 25, true).'</td>'.'<td>'.__('Height').':</td>'.'<td>'.html_print_input_text('image_height', $image_height, '', 25, 25, true).'</td>'.'</tr>'.'</table>'; $optionsConnectionImageTable = '<table class="databox" border="0" cellpadding="4" cellspacing="4" width="50%">'.'<tr class="row_0">'.'<td>'.__('Image URL').':</td>'.'<td colspan="3"><input id="type" type="hidden" name="type" value="Static_Image" />'.html_print_input_text('url', $mapConnectionDataUrl, '', 45, 90, true).'</td>'.'</tr>'.'<tr class="row_1">'.'<td colspan="4"><strong>'.__('Corners of the area of the image').':</strong></td>'.'</tr>'.'<tr class="row_2">'.'<td>'.__('Left').':</td>'.'<td>'.html_print_input_text('bb_left', $bb_left, '', 25, 25, true).'</td>'.'<td>'.__('Bottom').':</td>'.'<td>'.html_print_input_text('bb_bottom', $bb_bottom, '', 25, 25, true).'</td>'.'</tr>'.'<tr class="row_3">'.'<td>'.__('Right').':</td>'.'<td>'.html_print_input_text('bb_right', $bb_right, '', 25, 25, true).'</td>'.'<td>'.__('Top').':</td>'.'<td>'.html_print_input_text('bb_top', $bb_top, '', 25, 25, true).'</td>'.'</tr>'.'<tr class="row_4">'.'<td colspan="4"><strong>'.__('Image Size').':</strong></td>'.'</tr>'.'<tr class="row_5">'.'<td>'.__('Width').':</td>'.'<td>'.html_print_input_text('image_width', $image_width, '', 25, 25, true).'</td>'.'<td>'.__('Height').':</td>'.'<td>'.html_print_input_text('image_height', $image_height, '', 25, 25, true).'</td>'.'</tr>'.'</table>';
// WMS Server Connection. // WMS Server Connection.
$optionsConnectionWMSTable = '<table class="databox" border="0" cellpadding="4" cellspacing="4" width="50%">'.'<tr class="row_0">'.'<td>'.__('WMS Server URL').'</td>'.'<td>'.'<input id="type" type="hidden" name="type" value="WMS" />'.html_print_input_text('url', $mapConnectionDataUrl, '', 90, 255, true).'</td>'.'</tr>'.'<tr class="row_1">'.'<td>'.__('Layers').ui_print_help_tip(__('Enter a single element or a comma separated list'), true).'</td>'.'<td>'.html_print_input_text('layers', $layers, '', 90, 255, true).'</td>'.'</tr>'.'</table>'; $optionsConnectionWMSTable = '<table class="databox" border="0" cellpadding="4" cellspacing="4" width="50%">'.'<tr class="row_0">'.'<td>'.__('WMS Server URL').'</td>'.'<td>'.'<input id="type" type="hidden" name="type" value="WMS" />'.html_print_input_text('url', $mapConnectionDataUrl, '', 90, 255, true).'</td>'.'</tr>'.'<tr class="row_1">'.'<td>'.__('Layers').'</td>'.'<td>'.html_print_input_text('layers', $layers, '', 90, 255, true).'</td>'.'</tr>'.'</table>';
if ($mapConnectionData != null) { if ($mapConnectionData != null) {
switch ($mapConnection_type) { switch ($mapConnection_type) {
@ -322,22 +322,22 @@ $table->data = [];
// $table->colspan[0][3] = 3; // $table->colspan[0][3] = 3;
$table->data[0][0] = ''; $table->data[0][0] = '';
$table->data[0][1] = __('Map Center').ui_print_help_tip(__('Position to center the map when the map is opened'), true); $table->data[0][1] = __('Map Center');
$table->data[0][2] = __('Default position for agents without GIS data'); $table->data[0][2] = __('Default position for agents without GIS data');
$table->data[1][0] = __('Change in the map').ui_print_help_tip(__('This selects what to change by clicking on the map'), true); $table->data[1][0] = __('Change in the map');
$table->data[1][1] = html_print_radio_button_extended('radio_button', 1, '', 1, false, 'changeSetManualPosition(true, false)', '', true); $table->data[1][1] = html_print_radio_button_extended('radio_button', 1, '', 1, false, 'changeSetManualPosition(true, false)', '', true);
$table->data[1][2] = html_print_radio_button_extended('radio_button', 2, '', 0, false, 'changeSetManualPosition(false, true)', '', true); $table->data[1][2] = html_print_radio_button_extended('radio_button', 2, '', 0, false, 'changeSetManualPosition(false, true)', '', true);
$table->data[2][0] = __('Latitude').':'; $table->data[2][0] = __('Latitude');
$table->data[2][1] = html_print_input_text('center_latitude', $mapConnection_centerLatitude, '', 10, 10, true); $table->data[2][1] = html_print_input_text('center_latitude', $mapConnection_centerLatitude, '', 10, 10, true);
$table->data[2][2] = html_print_input_text('default_latitude', $mapConnection_defaultLatitude, '', 10, 10, true); $table->data[2][2] = html_print_input_text('default_latitude', $mapConnection_defaultLatitude, '', 10, 10, true);
$table->data[3][0] = __('Longitude').':'; $table->data[3][0] = __('Longitude');
$table->data[3][1] = html_print_input_text('center_longitude', $mapConnection_centerLongitude, '', 10, 10, true); $table->data[3][1] = html_print_input_text('center_longitude', $mapConnection_centerLongitude, '', 10, 10, true);
$table->data[3][2] = html_print_input_text('default_longitude', $mapConnection_defaultLongitude, '', 10, 10, true); $table->data[3][2] = html_print_input_text('default_longitude', $mapConnection_defaultLongitude, '', 10, 10, true);
$table->data[4][0] = __('Altitude').':'; $table->data[4][0] = __('Altitude');
$table->data[4][1] = html_print_input_text('center_altitude', $mapConnection_centerAltitude, '', 10, 10, true); $table->data[4][1] = html_print_input_text('center_altitude', $mapConnection_centerAltitude, '', 10, 10, true);
$table->data[4][2] = html_print_input_text('default_altitude', $mapConnection_defaultAltitude, '', 10, 10, true); $table->data[4][2] = html_print_input_text('default_altitude', $mapConnection_defaultAltitude, '', 10, 10, true);
html_print_table($table); html_print_table($table);

View File

@ -249,10 +249,6 @@ $table->size[1] = '30%';
// enterprise_hook('enterprise_warnings_history_days'); // enterprise_hook('enterprise_warnings_history_days');
$table->data[1][0] = __('Max. days before delete events'); $table->data[1][0] = __('Max. days before delete events');
$table->data[1][0] .= ui_print_help_tip(
__('If the compaction or purge of the data is more frequent than the events deletion, anomalies in module graphs could appear'),
true
);
$table->data[1][1] = html_print_input_text( $table->data[1][1] = html_print_input_text(
'event_purge', 'event_purge',
@ -304,10 +300,6 @@ $table->data[5][1] = html_print_input_text(
); );
$table->data[6][0] = __('Max. days before purge'); $table->data[6][0] = __('Max. days before purge');
$table->data[6][0] .= ui_print_help_tip(
__('Configure a purge period more frequent than a compact data period has no sense'),
true
);
$table->data[6][1] = html_print_input_text( $table->data[6][1] = html_print_input_text(
'days_purge', 'days_purge',
$config['days_purge'], $config['days_purge'],
@ -348,10 +340,6 @@ $table->data[9][1] = html_print_input_text(
); );
$table->data[10][0] = __('Retention period of past special days'); $table->data[10][0] = __('Retention period of past special days');
$table->data[10][0] .= ui_print_help_tip(
__('This number is days to keep past special days. 0 means never remove.'),
true
);
$table->data[10][1] = html_print_input_text( $table->data[10][1] = html_print_input_text(
'num_past_special_days', 'num_past_special_days',
$config['num_past_special_days'], $config['num_past_special_days'],
@ -362,10 +350,6 @@ $table->data[10][1] = html_print_input_text(
); );
$table->data[11][0] = __('Max. macro data fields'); $table->data[11][0] = __('Max. macro data fields');
$table->data[11][0] .= ui_print_help_tip(
__('Number of macro fields in alerts and templates between 1 and 15'),
true
);
$table->data[11][1] = html_print_input_text( $table->data[11][1] = html_print_input_text(
'max_macro_fields', 'max_macro_fields',
$config['max_macro_fields'], $config['max_macro_fields'],
@ -454,10 +438,6 @@ if ($config['history_db_enabled'] == 1) {
enterprise_hook('enterprise_warnings_history_days'); enterprise_hook('enterprise_warnings_history_days');
$table_historical->data[0][0] = __('Max. days before purge'); $table_historical->data[0][0] = __('Max. days before purge');
$table_historical->data[0][0] .= ui_print_help_tip(
__('Configure a purge period more frequent than a compact data period has no sense'),
true
);
$table_historical->data[0][1] = html_print_input_text( $table_historical->data[0][1] = html_print_input_text(
'historical_days_purge', 'historical_days_purge',
$config_history['days_purge'], $config_history['days_purge'],
@ -478,10 +458,6 @@ if ($config['history_db_enabled'] == 1) {
); );
$table_historical->data[2][0] = __('Compact interpolation in hours (1 Fine-20 bad)'); $table_historical->data[2][0] = __('Compact interpolation in hours (1 Fine-20 bad)');
$table_historical->data[2][0] .= ui_print_help_tip(
__('Data will be compacted in intervals of the specified length.'),
true
);
$table_historical->data[2][1] = html_print_input_text( $table_historical->data[2][1] = html_print_input_text(
'historical_step_compact', 'historical_step_compact',
$config_history['step_compact'], $config_history['step_compact'],
@ -492,11 +468,6 @@ if ($config['history_db_enabled'] == 1) {
); );
$table_historical->data[3][0] = __('Max. days before delete events'); $table_historical->data[3][0] = __('Max. days before delete events');
$table_historical->data[3][0] .= ui_print_help_tip(
__('If the compaction or purge of the data is more frequent than the events deletion, anomalies in module graphs could appear'),
true
);
$table_historical->data[3][1] = html_print_input_text( $table_historical->data[3][1] = html_print_input_text(
'historical_event_purge', 'historical_event_purge',
$config_history['event_purge'], $config_history['event_purge'],
@ -558,10 +529,6 @@ $table_other->size[0] = '70%';
$table_other->size[1] = '30%'; $table_other->size[1] = '30%';
$table_other->data[1][0] = __('Item limit for realtime reports'); $table_other->data[1][0] = __('Item limit for realtime reports');
$table_other->data[1][0] .= ui_print_help_tip(
__('Set a value too high cause a slowdown on console and a performance penalty in the system.'),
true
);
$table_other->data[1][1] = html_print_input_text( $table_other->data[1][1] = html_print_input_text(
'report_limit', 'report_limit',
$config['report_limit'], $config['report_limit'],
@ -572,10 +539,6 @@ $table_other->data[1][1] = html_print_input_text(
); );
$table_other->data[2][0] = __('Compact interpolation in hours (1 Fine-20 bad)'); $table_other->data[2][0] = __('Compact interpolation in hours (1 Fine-20 bad)');
$table_other->data[2][0] .= ui_print_help_tip(
__('Data will be compacted in intervals of the specified length.'),
true
);
$table_other->data[2][1] = html_print_input_text( $table_other->data[2][1] = html_print_input_text(
'step_compact', 'step_compact',
$config['step_compact'], $config['step_compact'],
@ -614,10 +577,6 @@ $table_other->data[5][1] = html_print_checkbox_switch(
); );
$table_other->data[6][0] = __('Batch statistics period (secs)'); $table_other->data[6][0] = __('Batch statistics period (secs)');
$table_other->data[6][0] .= ui_print_help_tip(
__('If realtime statistics are disabled, statistics interval resfresh will be set here.'),
true
);
$table_other->data[6][1] = html_print_input_text( $table_other->data[6][1] = html_print_input_text(
'stats_interval', 'stats_interval',
$config['stats_interval'], $config['stats_interval'],
@ -631,10 +590,6 @@ $table_other->data[7][0] = __('Use agent access graph');
$table_other->data[7][1] = html_print_checkbox_switch('agentaccess', 1, $config['agentaccess'], true); $table_other->data[7][1] = html_print_checkbox_switch('agentaccess', 1, $config['agentaccess'], true);
$table_other->data[8][0] = __('Max. recommended number of files in attachment directory'); $table_other->data[8][0] = __('Max. recommended number of files in attachment directory');
$table_other->data[8][0] .= ui_print_help_tip(
__('This number is the maximum number of files in attachment directory. If this number is reached then a warning message will appear in the header notification space.'),
true
);
$table_other->data[8][1] = html_print_input_text( $table_other->data[8][1] = html_print_input_text(
'num_files_attachment', 'num_files_attachment',
$config['num_files_attachment'], $config['num_files_attachment'],
@ -648,10 +603,6 @@ $table_other->data[9][0] = __('Delete not init modules');
$table_other->data[9][1] = html_print_checkbox_switch('delete_notinit', 1, $config['delete_notinit'], true); $table_other->data[9][1] = html_print_checkbox_switch('delete_notinit', 1, $config['delete_notinit'], true);
$table_other->data[10][0] = __('Big Operation Step to purge old data'); $table_other->data[10][0] = __('Big Operation Step to purge old data');
$table_other->data[10][0] .= ui_print_help_tip(
__('The number of blocks that a time interval is split into. A bigger value means bigger blocks, which is faster but heavier on the database. Default is 100.'),
true
);
$table_other->data[10][1] = html_print_input_text( $table_other->data[10][1] = html_print_input_text(
'big_operation_step_datos_purge', 'big_operation_step_datos_purge',
$config['big_operation_step_datos_purge'], $config['big_operation_step_datos_purge'],
@ -662,10 +613,6 @@ $table_other->data[10][1] = html_print_input_text(
); );
$table_other->data[11][0] = __('Small Operation Step to purge old data'); $table_other->data[11][0] = __('Small Operation Step to purge old data');
$table_other->data[11][0] .= ui_print_help_tip(
__('The number of rows that are processed in a single query in deletion. Default is 1000. Increase to 3000-5000 in fast systems. Decrease to 500 or 250 on systems with locks.'),
true
);
$table_other->data[11][1] = html_print_input_text( $table_other->data[11][1] = html_print_input_text(
'small_operation_step_datos_purge', 'small_operation_step_datos_purge',
$config['small_operation_step_datos_purge'], $config['small_operation_step_datos_purge'],
@ -676,10 +623,6 @@ $table_other->data[11][1] = html_print_input_text(
); );
$table_other->data[12][0] = __('Graph container - Max. Items'); $table_other->data[12][0] = __('Graph container - Max. Items');
$table_other->data[12][0] .= ui_print_help_tip(
__('The number of graphs that are viewed in a container. Default is 10 .Increasing this number could lead to performance problems'),
true
);
$table_other->data[12][1] = html_print_input_text( $table_other->data[12][1] = html_print_input_text(
'max_graph_container', 'max_graph_container',
$config['max_graph_container'], $config['max_graph_container'],
@ -690,10 +633,6 @@ $table_other->data[12][1] = html_print_input_text(
); );
$table_other->data[13][0] = __('Events response max. execution'); $table_other->data[13][0] = __('Events response max. execution');
$table_other->data[13][0] .= ui_print_help_tip(
__('Number of events that will perform the desired action at the same time'),
true
);
$table_other->data[13][1] = html_print_input_text( $table_other->data[13][1] = html_print_input_text(
'max_execution_event_response', 'max_execution_event_response',
$config['max_execution_event_response'], $config['max_execution_event_response'],

View File

@ -183,6 +183,7 @@ switch ($section) {
case 'net': case 'net':
$buttons['net']['active'] = true; $buttons['net']['active'] = true;
$subpage = ' &raquo '.__('Netflow'); $subpage = ' &raquo '.__('Netflow');
$help_header = 'setup_netflow_tab';
break; break;
case 'ehorus': case 'ehorus':

View File

@ -50,10 +50,7 @@ if (is_ajax()) {
if ($type_auth != 'mysql') { if ($type_auth != 'mysql') {
// Fallback to local authentication. // Fallback to local authentication.
$row = []; $row = [];
$row['name'] = __('Fallback to local authentication').ui_print_help_tip( $row['name'] = __('Fallback to local authentication');
__('Enable this option if you want to fallback to local authentication when remote (ldap etc...) authentication failed. Only available when \'Save password\' is enabled.'),
true
);
$row['control'] = html_print_checkbox_switch( $row['control'] = html_print_checkbox_switch(
'fallback_local_auth', 'fallback_local_auth',
1, 1,
@ -215,10 +212,7 @@ if (is_ajax()) {
// Set default value. // Set default value.
set_unless_defined($config['double_auth_enabled'], false); set_unless_defined($config['double_auth_enabled'], false);
$row = []; $row = [];
$row['name'] = __('Double authentication').ui_print_help_tip( $row['name'] = __('Double authentication');
__('If this option is enabled, the users can use double authentication with their accounts'),
true
);
$row['control'] .= html_print_checkbox_switch( $row['control'] .= html_print_checkbox_switch(
'double_auth_enabled', 'double_auth_enabled',
1, 1,
@ -231,10 +225,7 @@ if (is_ajax()) {
// Default session timeout. // Default session timeout.
set_when_empty($config['session_timeout'], 90); set_when_empty($config['session_timeout'], 90);
$row = []; $row = [];
$row['name'] = __('Session timeout (mins)').ui_print_help_tip( $row['name'] = __('Session timeout (mins)');
__('This is defined in minutes, If you wish a permanent session should putting -1 in this field.'),
true
);
$row['control'] = html_print_input_text( $row['control'] = html_print_input_text(
'session_timeout', 'session_timeout',
$config['session_timeout'], $config['session_timeout'],

View File

@ -88,21 +88,18 @@ $table_remote->data['ehorus_pass'] = $row;
$row = []; $row = [];
$row['name'] = __('API Hostname'); $row['name'] = __('API Hostname');
$row['control'] = html_print_input_text('ehorus_hostname', $config['ehorus_hostname'], '', 30, 100, true); $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., portal.ehorus.com'), true);
$table_remote->data['ehorus_hostname'] = $row; $table_remote->data['ehorus_hostname'] = $row;
// Directory port. // Directory port.
$row = []; $row = [];
$row['name'] = __('API Port'); $row['name'] = __('API Port');
$row['control'] = html_print_input_text('ehorus_port', $config['ehorus_port'], '', 6, 100, true); $row['control'] = html_print_input_text('ehorus_port', $config['ehorus_port'], '', 6, 100, true);
$row['control'] .= ui_print_help_tip(__('e.g., 18080'), true);
$table_remote->data['ehorus_port'] = $row; $table_remote->data['ehorus_port'] = $row;
// Request timeout. // Request timeout.
$row = []; $row = [];
$row['name'] = __('Request timeout'); $row['name'] = __('Request timeout');
$row['control'] = html_print_input_text('ehorus_req_timeout', $config['ehorus_req_timeout'], '', 3, 10, true); $row['control'] = html_print_input_text('ehorus_req_timeout', $config['ehorus_req_timeout'], '', 3, 10, true);
$row['control'] .= ui_print_help_tip(__('Time in seconds to set the maximum time of the requests to the eHorus API').'. '.__('0 to disable'), true);
$table_remote->data['ehorus_req_timeout'] = $row; $table_remote->data['ehorus_req_timeout'] = $row;
// Test. // Test.

View File

@ -117,10 +117,10 @@ $table->data[$i++][1] = html_print_select_from_sql(
true true
); );
$table->data[$i][0] = __('Remote config directory').ui_print_help_tip(__('Directory where agent remote configuration is stored.'), true); $table->data[$i][0] = __('Remote config directory');
$table->data[$i++][1] = html_print_input_text('remote_config', io_safe_output($config['remote_config']), '', 30, 100, true); $table->data[$i++][1] = html_print_input_text('remote_config', io_safe_output($config['remote_config']), '', 30, 100, true);
$table->data[$i][0] = __('Phantomjs bin directory').ui_print_help_tip(__('Directory where phantomjs binary file exists and has execution grants.'), true); $table->data[$i][0] = __('Phantomjs bin directory');
$table->data[$i++][1] = html_print_input_text('phantomjs_bin', io_safe_output($config['phantomjs_bin']), '', 30, 100, true); $table->data[$i++][1] = html_print_input_text('phantomjs_bin', io_safe_output($config['phantomjs_bin']), '', 30, 100, true);
$table->data[$i][0] = __('Auto login (hash) password'); $table->data[$i][0] = __('Auto login (hash) password');
@ -146,10 +146,10 @@ $table->data[$i++][1] = html_print_checkbox_switch_extended('use_cert', 1, $conf
$table->rowstyle[$i] = 'display: none;'; $table->rowstyle[$i] = 'display: none;';
$table->rowid[$i] = 'ssl-path-tr'; $table->rowid[$i] = 'ssl-path-tr';
$table->data[$i][0] = __('Path of SSL Cert.').ui_print_help_tip(__('Path where you put your cert and name of this cert. Remember your cert only in .pem extension.'), true); $table->data[$i][0] = __('Path of SSL Cert.');
$table->data[$i++][1] = html_print_input_text('cert_path', io_safe_output($config['cert_path']), '', 50, 255, true); $table->data[$i++][1] = html_print_input_text('cert_path', io_safe_output($config['cert_path']), '', 50, 255, true);
$table->data[$i][0] = __('Attachment store').ui_print_help_tip(__('Directory where temporary data is stored.'), true); $table->data[$i][0] = __('Attachment store');
$table->data[$i++][1] = html_print_input_text('attachment_store', io_safe_output($config['attachment_store']), '', 50, 255, true); $table->data[$i++][1] = html_print_input_text('attachment_store', io_safe_output($config['attachment_store']), '', 50, 255, true);
$table->data[$i][0] = __('IP list with API access'); $table->data[$i][0] = __('IP list with API access');
@ -161,7 +161,7 @@ if (isset($_POST['list_ACL_IPs_for_API'])) {
$table->data[$i++][1] = html_print_textarea('list_ACL_IPs_for_API', 2, 25, $list_ACL_IPs_for_API, 'style="height: 50px; width: 300px"', true); $table->data[$i++][1] = html_print_textarea('list_ACL_IPs_for_API', 2, 25, $list_ACL_IPs_for_API, 'style="height: 50px; width: 300px"', true);
$table->data[$i][0] = __('API password').ui_print_help_tip(__('Please be careful if you put a password put https access.'), true); $table->data[$i][0] = __('API password');
$table->data[$i++][1] = html_print_input_password('api_password', io_output_password($config['api_password']), '', 25, 255, true); $table->data[$i++][1] = html_print_input_password('api_password', io_output_password($config['api_password']), '', 25, 255, true);
$table->data[$i][0] = __('Enable GIS features'); $table->data[$i][0] = __('Enable GIS features');
@ -171,7 +171,6 @@ $table->data[$i][0] = __('Enable Netflow');
$rbt_disabled = false; $rbt_disabled = false;
if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') { if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
$rbt_disabled = true; $rbt_disabled = true;
$table->data[$i][0] .= ui_print_help_tip(__('Not supported in Windows systems'), true);
} }
$table->data[$i++][1] = html_print_checkbox_switch_extended('activate_netflow', 1, $config['activate_netflow'], $rbt_disabled, '', '', true); $table->data[$i++][1] = html_print_checkbox_switch_extended('activate_netflow', 1, $config['activate_netflow'], $rbt_disabled, '', '', true);
@ -216,10 +215,7 @@ foreach ($timezones as $timezone) {
} }
} }
$table->data[$i][0] = __('Timezone setup').' '.ui_print_help_tip( $table->data[$i][0] = __('Timezone setup');
__('Must have the same time zone as the system or database to avoid mismatches of time.'),
true
);
$table->data[$i][1] = html_print_input_text_extended( $table->data[$i][1] = html_print_input_text_extended(
'timezone_text', 'timezone_text',
$config['timezone'], $config['timezone'],
@ -253,14 +249,9 @@ $table->data[$i][1] .= ' <a href="javascript: toggleButton(\'warning\');">'.html
$table->data[$i++][1] .= '<div id="layer_sound_warning"></div>'; $table->data[$i++][1] .= '<div id="layer_sound_warning"></div>';
$table->data[$i][0] = __('Public URL'); $table->data[$i][0] = __('Public URL');
$table->data[$i][0] .= ui_print_help_tip(
__('Set this value when your %s across inverse proxy or for example with mod_proxy of Apache.', get_product_name()).' '.__('Without the index.php such as http://domain/console_url/'),
true
);
$table->data[$i++][1] = html_print_input_text('public_url', $config['public_url'], '', 40, 255, true); $table->data[$i++][1] = html_print_input_text('public_url', $config['public_url'], '', 40, 255, true);
$table->data[$i][0] = __('Force use Public URL'); $table->data[$i][0] = __('Force use Public URL');
$table->data[$i][0] .= ui_print_help_tip(__('Force using defined public URL).', get_product_name()), true);
$table->data[$i++][1] = html_print_switch( $table->data[$i++][1] = html_print_switch(
[ [
'name' => 'force_public_url', 'name' => 'force_public_url',
@ -276,18 +267,16 @@ $table->data[$i][0] = __('Public URL host exclusions');
$table->data[$i++][1] = html_print_textarea('public_url_exclusions', 2, 25, $config['public_url_exclusions'], 'style="height: 50px; width: 300px"', true); $table->data[$i++][1] = html_print_textarea('public_url_exclusions', 2, 25, $config['public_url_exclusions'], 'style="height: 50px; width: 300px"', true);
$table->data[$i][0] = __('Referer security'); $table->data[$i][0] = __('Referer security');
$table->data[$i][0] .= ui_print_help_tip(__("If enabled, actively checks if the user comes from %s's URL", get_product_name()), true);
$table->data[$i++][1] = html_print_checkbox_switch('referer_security', 1, $config['referer_security'], true); $table->data[$i++][1] = html_print_checkbox_switch('referer_security', 1, $config['referer_security'], true);
$table->data[$i][0] = __('Event storm protection'); $table->data[$i][0] = __('Event storm protection');
$table->data[$i][0] .= ui_print_help_tip(__('If set to yes no events or alerts will be generated, but agents will continue receiving data.'), true);
$table->data[$i++][1] = html_print_checkbox_switch('event_storm_protection', 1, $config['event_storm_protection'], true); $table->data[$i++][1] = html_print_checkbox_switch('event_storm_protection', 1, $config['event_storm_protection'], true);
$table->data[$i][0] = __('Command Snapshot').ui_print_help_tip(__('The string modules with several lines show as command output'), true); $table->data[$i][0] = __('Command Snapshot');
$table->data[$i++][1] = html_print_checkbox_switch('command_snapshot', 1, $config['command_snapshot'], true); $table->data[$i++][1] = html_print_checkbox_switch('command_snapshot', 1, $config['command_snapshot'], true);
$table->data[$i][0] = __('Server logs directory').ui_print_help_tip(__('Directory where the server logs are stored.'), true); $table->data[$i][0] = __('Server logs directory');
$table->data[$i++][1] = html_print_input_text( $table->data[$i++][1] = html_print_input_text(
'server_log_dir', 'server_log_dir',
$config['server_log_dir'], $config['server_log_dir'],
@ -297,7 +286,7 @@ $table->data[$i++][1] = html_print_input_text(
true true
); );
$table->data[$i][0] = __('Log size limit in system logs viewer extension').ui_print_help_tip(__('Max size (in bytes) for the logs to be shown.'), true); $table->data[$i][0] = __('Log size limit in system logs viewer extension');
$table->data[$i++][1] = html_print_input_text( $table->data[$i++][1] = html_print_input_text(
'max_log_size', 'max_log_size',
$config['max_log_size'], $config['max_log_size'],
@ -312,7 +301,7 @@ $modes_tutorial = [
'on_demand' => __('On demand'), 'on_demand' => __('On demand'),
'expert' => __('Expert'), 'expert' => __('Expert'),
]; ];
$table->data[$i][0] = __('Tutorial mode').ui_print_help_tip(__("Configuration of our clippy, 'full mode' show the icon in the header and the contextual helps and it is noise, 'on demand' it is equal to full but it is not noise and 'expert' the icons in the header and the context is not."), true); $table->data[$i][0] = __('Tutorial mode');
$table->data[$i++][1] = html_print_select( $table->data[$i++][1] = html_print_select(
$modes_tutorial, $modes_tutorial,
'tutorial_mode', 'tutorial_mode',
@ -324,10 +313,10 @@ $table->data[$i++][1] = html_print_select(
); );
$config['past_planned_downtimes'] = isset($config['past_planned_downtimes']) ? $config['past_planned_downtimes'] : 1; $config['past_planned_downtimes'] = isset($config['past_planned_downtimes']) ? $config['past_planned_downtimes'] : 1;
$table->data[$i][0] = __('Allow create planned downtimes in the past').ui_print_help_tip(__('The planned downtimes created in the past will affect the SLA reports'), true); $table->data[$i][0] = __('Allow create planned downtimes in the past');
$table->data[$i++][1] = html_print_checkbox_switch('past_planned_downtimes', 1, $config['past_planned_downtimes'], true); $table->data[$i++][1] = html_print_checkbox_switch('past_planned_downtimes', 1, $config['past_planned_downtimes'], true);
$table->data[$i][0] = __('Limit for bulk operations').ui_print_help_tip(__('Your PHP environment is set to 1000 max_input_vars. This parameter should have the same value or lower.', ini_get('max_input_vars')), true); $table->data[$i][0] = __('Limit for bulk operations');
$table->data[$i++][1] = html_print_input_text( $table->data[$i++][1] = html_print_input_text(
'limit_parameters_massive', 'limit_parameters_massive',
$config['limit_parameters_massive'], $config['limit_parameters_massive'],
@ -340,13 +329,13 @@ $table->data[$i++][1] = html_print_input_text(
$table->data[$i][0] = __('Include agents manually disabled'); $table->data[$i][0] = __('Include agents manually disabled');
$table->data[$i++][1] = html_print_checkbox_switch('include_agents', 1, $config['include_agents'], true); $table->data[$i++][1] = html_print_checkbox_switch('include_agents', 1, $config['include_agents'], true);
$table->data[$i][0] = __('Audit log directory').ui_print_help_tip(__('Directory where audit log is stored.'), true); $table->data[$i][0] = __('Audit log directory');
$table->data[$i++][1] = html_print_input_text('auditdir', io_safe_output($config['auditdir']), '', 30, 100, true); $table->data[$i++][1] = html_print_input_text('auditdir', io_safe_output($config['auditdir']), '', 30, 100, true);
$table->data[$i][0] = __('Set alias as name by default in agent creation'); $table->data[$i][0] = __('Set alias as name by default in agent creation');
$table->data[$i++][1] = html_print_checkbox_switch('alias_as_name', 1, $config['alias_as_name'], true); $table->data[$i++][1] = html_print_checkbox_switch('alias_as_name', 1, $config['alias_as_name'], true);
$table->data[$i][0] = __('Unique IP').ui_print_help_tip(__('Set the primary IP address as the unique IP, preventing the same primary IP address from being used in more than one agent'), true); $table->data[$i][0] = __('Unique IP');
$table->data[$i++][1] = html_print_checkbox_switch('unique_ip', 1, $config['unique_ip'], true); $table->data[$i++][1] = html_print_checkbox_switch('unique_ip', 1, $config['unique_ip'], true);
echo '<form id="form_setup" method="post" action="index.php?sec=gsetup&sec2=godmode/setup/setup&amp;section=general&amp;pure='.$config['pure'].'">'; echo '<form id="form_setup" method="post" action="index.php?sec=gsetup&sec2=godmode/setup/setup&amp;section=general&amp;pure='.$config['pure'].'">';
@ -392,7 +381,7 @@ $table_mail_conf->data[6][1] = html_print_input_password('email_password', io_ou
$uniqid = uniqid(); $uniqid = uniqid();
$table_mail_conf->data[7][0] = html_print_button(__('Email test'), 'email_test_dialog', false, "show_email_test('$uniqid');", 'class="sub next"', true).ui_print_help_tip(__('Check the current saved email configuration by sending a test email to a desired account.'), true); $table_mail_conf->data[7][0] = html_print_button(__('Email test'), 'email_test_dialog', false, "show_email_test('$uniqid');", 'class="sub next"', true);
print_email_test_modal_window($uniqid); print_email_test_modal_window($uniqid);
@ -420,7 +409,7 @@ function print_email_test_modal_window($id)
$table_mail_test->style[0] = 'font-weight: bold'; $table_mail_test->style[0] = 'font-weight: bold';
$table_mail_test->colspan[1][0] = 2; $table_mail_test->colspan[1][0] = 2;
$table_mail_test->data[0][0] = __('Address').ui_print_help_tip(__('Email address to which the test email will be sent. Please check your inbox after email is sent.'), true); $table_mail_test->data[0][0] = __('Address');
$table_mail_test->data[0][1] = html_print_input_text('email_test_address', '', '', 40, 100, true); $table_mail_test->data[0][1] = html_print_input_text('email_test_address', '', '', 40, 100, true);
$table_mail_test->data[1][0] = html_print_button(__('Send'), 'email_test', false, '', 'class="sub next"', true).'&nbsp&nbsp<span id="email_test_sent_message" style="display:none;">Email sent</span><span id="email_test_failure_message" style="display:none;">Email could not been sent</span>'; $table_mail_test->data[1][0] = html_print_button(__('Send'), 'email_test', false, '', 'class="sub next"', true).'&nbsp&nbsp<span id="email_test_sent_message" style="display:none;">Email sent</span><span id="email_test_failure_message" style="display:none;">Email could not been sent</span>';

View File

@ -227,21 +227,18 @@ $table_remote->data['integria_pass'] = $row;
$row = []; $row = [];
$row['name'] = __('API Hostname'); $row['name'] = __('API Hostname');
$row['control'] = html_print_input_text('integria_hostname', $config['integria_hostname'], '', 30, 100, true); $row['control'] = html_print_input_text('integria_hostname', $config['integria_hostname'], '', 30, 100, true);
$row['control'] .= ui_print_help_tip(__('Hostname of Integria IMS\' API (scheme must be specified. Example: http://192.168.0.0)'), true);
$table_remote->data['integria_hostname'] = $row; $table_remote->data['integria_hostname'] = $row;
// API password. // API password.
$row = []; $row = [];
$row['name'] = __('API Password'); $row['name'] = __('API Password');
$row['control'] = html_print_input_password('integria_api_pass', io_output_password($config['integria_api_pass']), '', 30, 100, true); $row['control'] = html_print_input_password('integria_api_pass', io_output_password($config['integria_api_pass']), '', 30, 100, true);
$row['control'] .= ui_print_help_tip(__('Password of Integria IMS\' API'), true);
$table_remote->data['integria_api_pass'] = $row; $table_remote->data['integria_api_pass'] = $row;
// Request timeout. // Request timeout.
$row = []; $row = [];
$row['name'] = __('Request timeout'); $row['name'] = __('Request timeout');
$row['control'] = html_print_input_text('integria_req_timeout', $config['integria_req_timeout'], '', 3, 10, true); $row['control'] = html_print_input_text('integria_req_timeout', $config['integria_req_timeout'], '', 3, 10, true);
$row['control'] .= ui_print_help_tip(__('Time in seconds to set the maximum time of the requests to the Integria API').'. '.__('0 to disable'), true);
$table_remote->data['integria_req_timeout'] = $row; $table_remote->data['integria_req_timeout'] = $row;
// Alert settings. // Alert settings.

View File

@ -43,10 +43,10 @@ $table->class = 'databox filters';
$table->data = []; $table->data = [];
$table->data[0][0] = '<b>'.__('Data storage path').'</b>'.ui_print_help_tip(__('Directory where netflow data will be stored.'), true); $table->data[0][0] = '<b>'.__('Data storage path').'</b>';
$table->data[0][1] = html_print_input_text('netflow_path', $config['netflow_path'], false, 50, 200, true); $table->data[0][1] = html_print_input_text('netflow_path', $config['netflow_path'], false, 50, 200, true);
$table->data[1][0] = '<b>'.__('Daemon interval').'</b>'.ui_print_help_tip(__('Specifies the time interval in seconds to rotate netflow data files.'), true); $table->data[1][0] = '<b>'.__('Daemon interval').'</b>';
$table->data[1][1] = html_print_input_text('netflow_interval', $config['netflow_interval'], false, 50, 200, true); $table->data[1][1] = html_print_input_text('netflow_interval', $config['netflow_interval'], false, 50, 200, true);
$table->data[2][0] = '<b>'.__('Daemon binary path').'</b>'; $table->data[2][0] = '<b>'.__('Daemon binary path').'</b>';
@ -58,15 +58,15 @@ $table->data[3][1] = html_print_input_text('netflow_nfdump', $config['netflow_nf
$table->data[4][0] = '<b>'.__('Nfexpire binary path').'</b>'; $table->data[4][0] = '<b>'.__('Nfexpire binary path').'</b>';
$table->data[4][1] = html_print_input_text('netflow_nfexpire', $config['netflow_nfexpire'], false, 50, 200, true); $table->data[4][1] = html_print_input_text('netflow_nfexpire', $config['netflow_nfexpire'], false, 50, 200, true);
$table->data[5][0] = '<b>'.__('Maximum chart resolution').'</b>'.ui_print_help_tip(__('Maximum number of points that a netflow area chart will display. The higher the resolution the performance. Values between 50 and 100 are recommended.'), true); $table->data[5][0] = '<b>'.__('Maximum chart resolution').'</b>';
$table->data[5][1] = html_print_input_text('netflow_max_resolution', $config['netflow_max_resolution'], false, 50, 200, true); $table->data[5][1] = html_print_input_text('netflow_max_resolution', $config['netflow_max_resolution'], false, 50, 200, true);
$table->data[6][0] = '<b>'.__('Disable custom live view filters').'</b>'.ui_print_help_tip(__('Disable the definition of custom filters in the live view. Only existing filters can be used.'), true); $table->data[6][0] = '<b>'.__('Disable custom live view filters').'</b>';
$table->data[6][1] = html_print_checkbox_switch('netflow_disable_custom_lvfilters', 1, $config['netflow_disable_custom_lvfilters'], true); $table->data[6][1] = html_print_checkbox_switch('netflow_disable_custom_lvfilters', 1, $config['netflow_disable_custom_lvfilters'], true);
$table->data[7][0] = '<b>'.__('Netflow max lifetime').'</b>'.ui_print_help_tip(__('Sets the maximum lifetime for netflow data in days.'), true); $table->data[7][0] = '<b>'.__('Netflow max lifetime').'</b>';
$table->data[7][1] = html_print_input_text('netflow_max_lifetime', $config['netflow_max_lifetime'], false, 50, 200, true); $table->data[7][1] = html_print_input_text('netflow_max_lifetime', $config['netflow_max_lifetime'], false, 50, 200, true);
$table->data[8][0] = '<b>'.__('Name resolution for IP address').'</b>'.ui_print_help_tip(__('Resolve the IP addresses to get their hostnames.'), true); $table->data[8][0] = '<b>'.__('Name resolution for IP address').'</b>';
$onclick = "if (!confirm('".__('Warning').'. '.__('IP address resolution can take a lot of time')."')) return false;"; $onclick = "if (!confirm('".__('Warning').'. '.__('IP address resolution can take a lot of time')."')) return false;";
$table->data[8][1] = html_print_checkbox_switch_extended('netflow_get_ip_hostname', 1, $config['netflow_get_ip_hostname'], false, $onclick, '', true); $table->data[8][1] = html_print_checkbox_switch_extended('netflow_get_ip_hostname', 1, $config['netflow_get_ip_hostname'], false, $onclick, '', true);

View File

@ -97,7 +97,7 @@ $table_behaviour->data[$row][1] = html_print_input_text('render_proc_fail', $con
$row++; $row++;
// Daniel maya 02/06/2016 Display menu with click --INI // Daniel maya 02/06/2016 Display menu with click --INI
$table_behaviour->data[$row][0] = __('Click to display lateral menus').ui_print_help_tip(__('When enabled, the lateral menus are shown when left clicking them, instead of hovering over them'), true); $table_behaviour->data[$row][0] = __('Click to display lateral menus');
$table_behaviour->data[$row][1] = html_print_checkbox_switch( $table_behaviour->data[$row][1] = html_print_checkbox_switch(
'click_display', 'click_display',
1, 1,
@ -111,7 +111,7 @@ if (enterprise_installed()) {
$table_behaviour->data[$row][1] = html_print_input_text('service_label_font_size', $config['service_label_font_size'], '', 5, 5, true); $table_behaviour->data[$row][1] = html_print_input_text('service_label_font_size', $config['service_label_font_size'], '', 5, 5, true);
$row++; $row++;
$table_behaviour->data[$row][0] = __('Space between items in Service maps').ui_print_help_tip(__('It must be bigger than 80'), true); $table_behaviour->data[$row][0] = __('Space between items in Service maps');
$table_behaviour->data[$row][1] = html_print_input_text('service_item_padding_size', $config['service_item_padding_size'], '', 5, 5, true, false, false, 'onChange="change_servicetree_nodes_padding()"'); $table_behaviour->data[$row][1] = html_print_input_text('service_item_padding_size', $config['service_item_padding_size'], '', 5, 5, true, false, false, 'onChange="change_servicetree_nodes_padding()"');
$row++; $row++;
} }
@ -159,7 +159,7 @@ $table_styles->data[$row][1] = html_print_select(
$table_styles->data[$row][1] .= '&nbsp;'.html_print_button(__('View'), 'status_set_preview', false, '', 'class="sub camera logo_preview"', true); $table_styles->data[$row][1] .= '&nbsp;'.html_print_button(__('View'), 'status_set_preview', false, '', 'class="sub camera logo_preview"', true);
$row++; $row++;
// Divs to show icon status Colours (Default) // Divs to show icon status Colours (Default).
$icon_unknown_ball = ui_print_status_image(STATUS_AGENT_UNKNOWN_BALL, '', true); $icon_unknown_ball = ui_print_status_image(STATUS_AGENT_UNKNOWN_BALL, '', true);
$icon_unknown = ui_print_status_image(STATUS_AGENT_UNKNOWN, '', true); $icon_unknown = ui_print_status_image(STATUS_AGENT_UNKNOWN, '', true);
$icon_ok_ball = ui_print_status_image(STATUS_AGENT_OK_BALL, '', true); $icon_ok_ball = ui_print_status_image(STATUS_AGENT_OK_BALL, '', true);
@ -168,8 +168,8 @@ $icon_warning_ball = ui_print_status_image(STATUS_AGENT_WARNING_BALL, '', true);
$icon_warning = ui_print_status_image(STATUS_AGENT_WARNING, '', true); $icon_warning = ui_print_status_image(STATUS_AGENT_WARNING, '', true);
$icon_bad_ball = ui_print_status_image(STATUS_AGENT_CRITICAL_BALL, '', true); $icon_bad_ball = ui_print_status_image(STATUS_AGENT_CRITICAL_BALL, '', true);
$icon_bad = ui_print_status_image(STATUS_AGENT_CRITICAL, '', true); $icon_bad = ui_print_status_image(STATUS_AGENT_CRITICAL, '', true);
// End - Divs to show icon status Colours (Default) // End - Divs to show icon status Colours (Default).
$table_styles->data[$row][0] = __('Login background').ui_print_help_tip(__('You can place your custom images into the folder images/backgrounds/'), true); $table_styles->data[$row][0] = __('Login background');
$backgrounds_list_jpg = list_files('images/backgrounds', 'jpg', 1, 0); $backgrounds_list_jpg = list_files('images/backgrounds', 'jpg', 1, 0);
$backgrounds_list_gif = list_files('images/backgrounds', 'gif', 1, 0); $backgrounds_list_gif = list_files('images/backgrounds', 'gif', 1, 0);
$backgrounds_list_png = list_files('images/backgrounds', 'png', 1, 0); $backgrounds_list_png = list_files('images/backgrounds', 'png', 1, 0);
@ -181,10 +181,9 @@ if (!enterprise_installed()) {
$open = true; $open = true;
} }
// Custom favicon // Custom favicon.
$files = list_files('images/custom_favicon', 'ico', 1, 0); $files = list_files('images/custom_favicon', 'ico', 1, 0);
$table_styles->data[$row][0] = __('Custom favicon'); $table_styles->data[$row][0] = __('Custom favicon');
$table_styles->data[$row][0] .= ui_print_help_tip(__('You can place your favicon into the folder images/custom_favicon/. This file should be in .ico format with a size of 16x16.'), true);
$table_styles->data[$row][1] = html_print_select( $table_styles->data[$row][1] = html_print_select(
$files, $files,
'custom_favicon', 'custom_favicon',
@ -383,12 +382,11 @@ if (enterprise_installed()) {
} }
if (enterprise_installed()) { if (enterprise_installed()) {
// Get all the custom logos // Get all the custom logos.
$files = list_files('enterprise/images/custom_general_logos', 'png', 1, 0); $files = list_files('enterprise/images/custom_general_logos', 'png', 1, 0);
// Custom docs icon // Custom docs icon.
$table_styles->data[$row][0] = __('Custom documentation logo'); $table_styles->data[$row][0] = __('Custom documentation logo');
$table_styles->data[$row][0] .= ui_print_help_tip(__('You can place your custom logos into the folder enterprise/images/custom_general_logos/'), true);
$table_styles->data[$row][1] = html_print_select( $table_styles->data[$row][1] = html_print_select(
$files, $files,
@ -407,9 +405,8 @@ if (enterprise_installed()) {
$table_styles->data[$row][1] .= '&nbsp;'.html_print_button(__('View'), 'custom_docs_logo_preview', $open, '', 'class="sub camera logo_preview"', true, false, $open, 'visualmodal'); $table_styles->data[$row][1] .= '&nbsp;'.html_print_button(__('View'), 'custom_docs_logo_preview', $open, '', 'class="sub camera logo_preview"', true, false, $open, 'visualmodal');
$row++; $row++;
// Custom support icon // Custom support icon.
$table_styles->data[$row][0] = __('Custom support logo'); $table_styles->data[$row][0] = __('Custom support logo');
$table_styles->data[$row][0] .= ui_print_help_tip(__('You can place your custom logos into the folder enterprise/images/custom_general_logos/'), true);
$table_styles->data[$row][1] = html_print_select( $table_styles->data[$row][1] = html_print_select(
$files, $files,
'custom_support_logo', 'custom_support_logo',
@ -427,9 +424,8 @@ if (enterprise_installed()) {
$table_styles->data[$row][1] .= '&nbsp;'.html_print_button(__('View'), 'custom_support_logo_preview', $open, '', 'class="sub camera logo_preview"', true, false, $open, 'visualmodal'); $table_styles->data[$row][1] .= '&nbsp;'.html_print_button(__('View'), 'custom_support_logo_preview', $open, '', 'class="sub camera logo_preview"', true, false, $open, 'visualmodal');
$row++; $row++;
// Custom center networkmap icon // Custom center networkmap icon.
$table_styles->data[$row][0] = __('Custom networkmap center logo'); $table_styles->data[$row][0] = __('Custom networkmap center logo');
$table_styles->data[$row][0] .= ui_print_help_tip(__('You can place your custom logos into the folder enterprise/images/custom_general_logos/'), true);
$table_styles->data[$row][1] = html_print_select( $table_styles->data[$row][1] = html_print_select(
$files, $files,
'custom_network_center_logo', 'custom_network_center_logo',
@ -447,9 +443,8 @@ if (enterprise_installed()) {
$table_styles->data[$row][1] .= '&nbsp;'.html_print_button(__('View'), 'custom_network_center_logo_preview', $open, '', 'class="sub camera logo_preview"', true, false, $open, 'visualmodal'); $table_styles->data[$row][1] .= '&nbsp;'.html_print_button(__('View'), 'custom_network_center_logo_preview', $open, '', 'class="sub camera logo_preview"', true, false, $open, 'visualmodal');
$row++; $row++;
// Custom center mobile console icon // Custom center mobile console icon.
$table_styles->data[$row][0] = __('Custom mobile console icon'); $table_styles->data[$row][0] = __('Custom mobile console icon');
$table_styles->data[$row][0] .= ui_print_help_tip(__('You can place your custom logos into the folder enterprise/images/custom_general_logos/'), true);
$table_styles->data[$row][1] = html_print_select( $table_styles->data[$row][1] = html_print_select(
$files, $files,
'custom_mobile_console_logo', 'custom_mobile_console_logo',
@ -589,7 +584,7 @@ $row++;
$table_gis->size[0] = '50%'; $table_gis->size[0] = '50%';
$table_gis->data = []; $table_gis->data = [];
$table_gis->data[$row][0] = __('GIS Labels').ui_print_help_tip(__('This enabling this, you get a label with agent name in GIS maps. If you have lots of agents in the map, will be unreadable. Disabled by default.'), true); $table_gis->data[$row][0] = __('GIS Labels');
$table_gis->data[$row][1] = html_print_checkbox_switch( $table_gis->data[$row][1] = html_print_checkbox_switch(
'gis_label', 'gis_label',
1, 1,
@ -604,7 +599,7 @@ $row++;
$arraySelectIcon[$index] = $index; $arraySelectIcon[$index] = $index;
} }
$table_gis->data[$row][0] = __('Default icon in GIS').ui_print_help_tip(__('Agent icon for GIS Maps. If set to "none", group icon will be used'), true); $table_gis->data[$row][0] = __('Default icon in GIS');
$table_gis->data[$row][1] = html_print_select( $table_gis->data[$row][1] = html_print_select(
$arraySelectIcon, $arraySelectIcon,
'gis_default_icon', 'gis_default_icon',
@ -693,21 +688,21 @@ $row++;
); );
$row++; $row++;
$table_font->data[$row][0] = __('Agent size text').ui_print_help_tip(__('When the agent name has a lot of characters, it is needed to truncate it into N characters in some sections in %s Console', get_product_name()), true); $table_font->data[$row][0] = __('Agent size text');
$table_font->data[$row][1] = __('Small:').html_print_input_text('agent_size_text_small', $config['agent_size_text_small'], '', 3, 3, true); $table_font->data[$row][1] = __('Small:').html_print_input_text('agent_size_text_small', $config['agent_size_text_small'], '', 3, 3, true);
$table_font->data[$row][1] .= ' '.__('Normal:').html_print_input_text('agent_size_text_medium', $config['agent_size_text_medium'], '', 3, 3, true); $table_font->data[$row][1] .= ' '.__('Normal:').html_print_input_text('agent_size_text_medium', $config['agent_size_text_medium'], '', 3, 3, true);
$row++; $row++;
$table_font->data[$row][0] = __('Module size text').ui_print_help_tip(__('When the module name has a lot of characters, it is needed to truncate it into N characters in some sections in %s Console', get_product_name()), true); $table_font->data[$row][0] = __('Module size text');
$table_font->data[$row][1] = __('Small:').html_print_input_text('module_size_text_small', $config['module_size_text_small'], '', 3, 3, true); $table_font->data[$row][1] = __('Small:').html_print_input_text('module_size_text_small', $config['module_size_text_small'], '', 3, 3, true);
$table_font->data[$row][1] .= ' '.__('Normal:').html_print_input_text('module_size_text_medium', $config['module_size_text_medium'], '', 3, 3, true); $table_font->data[$row][1] .= ' '.__('Normal:').html_print_input_text('module_size_text_medium', $config['module_size_text_medium'], '', 3, 3, true);
$row++; $row++;
$table_font->data[$row][0] = __('Description size text').ui_print_help_tip(__('If the description name has a lot of characters, in some places in %s Console it is necessary to truncate it to N characters.', get_product_name()), true); $table_font->data[$row][0] = __('Description size text');
$table_font->data[$row][1] = html_print_input_text('description_size_text', $config['description_size_text'], '', 3, 3, true); $table_font->data[$row][1] = html_print_input_text('description_size_text', $config['description_size_text'], '', 3, 3, true);
$row++; $row++;
$table_font->data[$row][0] = __('Item title size text').ui_print_help_tip(__('When the item title name has a lot of characters, it is needed to truncate it into N characters in some sections in %s Console.', get_product_name()), true); $table_font->data[$row][0] = __('Item title size text');
$table_font->data[$row][1] = html_print_input_text( $table_font->data[$row][1] = html_print_input_text(
'item_title_size_text', 'item_title_size_text',
$config['item_title_size_text'], $config['item_title_size_text'],
@ -718,7 +713,7 @@ $row++;
); );
$row++; $row++;
$table_font->data[$row][0] = __('Show unit along with value in reports').ui_print_help_tip(__('This enabling this, max, min and avg values will be shown with units.'), true); $table_font->data[$row][0] = __('Show unit along with value in reports');
$table_font->data[$row][1] = html_print_checkbox_switch( $table_font->data[$row][1] = html_print_checkbox_switch(
'simple_module_value', 'simple_module_value',
1, 1,
@ -792,7 +787,6 @@ $row++;
} }
$table_chars->data[$row][0] = __('Data precision'); $table_chars->data[$row][0] = __('Data precision');
$table_chars->data[$row][0] .= ui_print_help_tip(__('Number of decimals shown. It must be a number between 0 and 5, except in graphs.'), true);
$table_chars->data[$row][1] = html_print_input_text('graph_precision', $config['graph_precision'], '', 5, 5, true, $disabled_graph_precision, false, 'onChange="change_precision()"'); $table_chars->data[$row][1] = html_print_input_text('graph_precision', $config['graph_precision'], '', 5, 5, true, $disabled_graph_precision, false, 'onChange="change_precision()"');
$row++; $row++;
@ -801,7 +795,6 @@ $row++;
} }
$table_chars->data[$row][0] = __('Data precision in graphs'); $table_chars->data[$row][0] = __('Data precision in graphs');
$table_chars->data[$row][0] .= ui_print_help_tip(__('Number of decimals shown. If the field is empty, it will show all the decimals'), true);
$table_chars->data[$row][1] = html_print_input_text('short_module_graph_data', $config['short_module_graph_data'], '', 5, 5, true, $disabled_graph_precision, false, 'onChange="change_precision()"'); $table_chars->data[$row][1] = html_print_input_text('short_module_graph_data', $config['short_module_graph_data'], '', 5, 5, true, $disabled_graph_precision, false, 'onChange="change_precision()"');
$row++; $row++;
@ -860,12 +853,10 @@ $row++;
$row++; $row++;
$table_chars->data[$row][0] = __('Percentile'); $table_chars->data[$row][0] = __('Percentile');
$table_chars->data[$row][0] .= ui_print_help_tip(__('Show percentile 95 in graphs'), true);
$table_chars->data[$row][1] = html_print_input_text('percentil', $config['percentil'], '', 20, 20, true); $table_chars->data[$row][1] = html_print_input_text('percentil', $config['percentil'], '', 20, 20, true);
$row++; $row++;
$table_chars->data[$row][0] = __('Graph TIP view:'); $table_chars->data[$row][0] = __('Graph TIP view:');
$table_chars->data[$row][0] .= ui_print_help_tip(__('This option may cause performance issues'), true);
$options_full_escale = []; $options_full_escale = [];
$options_full_escale[0] = __('None'); $options_full_escale[0] = __('None');
@ -877,7 +868,6 @@ $row++;
$table_chars->data[$row][0] = __('Show only average'); $table_chars->data[$row][0] = __('Show only average');
$table_chars->data[$row][0] .= ui_print_help_tip(__('If enabled, the module graphs will only show the average value, otherwise it will show three sets of data showing maximums, averages and minimums.'), true);
$options_soft_graphs = []; $options_soft_graphs = [];
$options_soft_graphs[0] = __('Standard mode'); $options_soft_graphs[0] = __('Standard mode');
@ -924,10 +914,6 @@ $row++;
// Remove when the new view reaches rock solid stability. // Remove when the new view reaches rock solid stability.
$table_vc->data[$row][0] = __('Legacy Visual Console View'); $table_vc->data[$row][0] = __('Legacy Visual Console View');
$table_vc->data[$row][0] .= ui_print_help_tip(
__('To use the old view when using the Visual Console visor'),
true
);
$table_vc->data[$row][1] = html_print_checkbox_switch( $table_vc->data[$row][1] = html_print_checkbox_switch(
'legacy_vc', 'legacy_vc',
1, 1,
@ -962,21 +948,21 @@ $row++;
); );
$row++; $row++;
$table_vc->data[$row][0] = __('Default interval for refresh on Visual Console').ui_print_help_tip(__('This interval will affect to Visual Console pages'), true); $table_vc->data[$row][0] = __('Default interval for refresh on Visual Console');
$table_vc->data[$row][1] = html_print_select($values, 'vc_refr', (int) $config['vc_refr'], '', 'N/A', 0, true, false, false); $table_vc->data[$row][1] = html_print_select($values, 'vc_refr', (int) $config['vc_refr'], '', 'N/A', 0, true, false, false);
$row++; $row++;
$vc_favourite_view_array[0] = __('Classic view'); $vc_favourite_view_array[0] = __('Classic view');
$vc_favourite_view_array[1] = __('View of favorites'); $vc_favourite_view_array[1] = __('View of favorites');
$table_vc->data[$row][0] = __('Type of view of visual consoles').ui_print_help_tip(__('Allows you to directly display the list of favorite visual consoles'), true); $table_vc->data[$row][0] = __('Type of view of visual consoles');
$table_vc->data[$row][1] = html_print_select($vc_favourite_view_array, 'vc_favourite_view', $config['vc_favourite_view'], '', '', 0, true); $table_vc->data[$row][1] = html_print_select($vc_favourite_view_array, 'vc_favourite_view', $config['vc_favourite_view'], '', '', 0, true);
$row++; $row++;
$table_vc->data[$row][0] = __('Number of favorite visual consoles to show in the menu').ui_print_help_tip(__('If the number is 0 it will not show the pull-down menu and maximum 25 favorite consoles'), true); $table_vc->data[$row][0] = __('Number of favorite visual consoles to show in the menu');
$table_vc->data[$row][1] = "<input type ='number' value=".$config['vc_menu_items']." size='5' name='vc_menu_items' min='0' max='25'>"; $table_vc->data[$row][1] = "<input type ='number' value=".$config['vc_menu_items']." size='5' name='vc_menu_items' min='0' max='25'>";
$row++; $row++;
$table_vc->data[$row][0] = __('Default line thickness for the Visual Console').ui_print_help_tip(__('This interval will affect to the lines between elements on the Visual Console'), true); $table_vc->data[$row][0] = __('Default line thickness for the Visual Console');
$table_vc->data[$row][1] = html_print_input_text('vc_line_thickness', (int) $config['vc_line_thickness'], '', 5, 5, true); $table_vc->data[$row][1] = html_print_input_text('vc_line_thickness', (int) $config['vc_line_thickness'], '', 5, 5, true);
@ -995,7 +981,7 @@ $row++;
$table_ser->size[0] = '50%'; $table_ser->size[0] = '50%';
$table_ser->data = []; $table_ser->data = [];
$table_ser->data['number'][0] = __('Number of favorite services to show in the menu').ui_print_help_tip(__('If the number is 0 it will not show the pull-down menu and maximum 25 favorite services'), true); $table_ser->data['number'][0] = __('Number of favorite services to show in the menu');
$table_ser->data['number'][1] = "<input type ='number' value=".$config['ser_menu_items']." size='5' name='ser_menu_items' min='0' max='25'>"; $table_ser->data['number'][1] = "<input type ='number' value=".$config['ser_menu_items']." size='5' name='ser_menu_items' min='0' max='25'>";
echo '<fieldset>'; echo '<fieldset>';
@ -1014,10 +1000,7 @@ $row++;
$table_report->data = []; $table_report->data = [];
$table_report->data[$row][0] = __('Show report info with description').ui_print_help_tip( $table_report->data[$row][0] = __('Show report info with description');
__('Custom report description info. It will be applied to all reports and templates by default.'),
true
);
$table_report->data[$row][1] = html_print_checkbox_switch( $table_report->data[$row][1] = html_print_checkbox_switch(
'custom_report_info', 'custom_report_info',
1, 1,
@ -1026,10 +1009,7 @@ $row++;
); );
$row++; $row++;
$table_report->data[$row][0] = __('Custom report front page').ui_print_help_tip( $table_report->data[$row][0] = __('Custom report front page');
__('Custom report front page. It will be applied to all reports and templates by default.'),
true
);
$table_report->data[$row][1] = html_print_checkbox_switch( $table_report->data[$row][1] = html_print_checkbox_switch(
'custom_report_front', 'custom_report_front',
1, 1,
@ -1064,10 +1044,6 @@ $row++;
$table_report->data[$row][0] = __('Graph image height for HTML reports'); $table_report->data[$row][0] = __('Graph image height for HTML reports');
$table_report->data[$row][0] .= ui_print_help_tip(
__('This is the height in pixels of the module graph or custom graph in the reports (only: HTML)'),
true
);
$table_report->data[$row][1] = html_print_input_text('graph_image_height', $config['graph_image_height'], '', 20, 20, true); $table_report->data[$row][1] = html_print_input_text('graph_image_height', $config['graph_image_height'], '', 20, 20, true);
$row++; $row++;
@ -1077,10 +1053,6 @@ $row++;
'tiny' => 'Short', 'tiny' => 'Short',
]; ];
$table_report->data[$row][0] = __('Interval description'); $table_report->data[$row][0] = __('Interval description');
$table_report->data[$row][0] .= ui_print_help_tip(
__('A long interval description is for example 10 hours, 20 minutes 33 seconds”, a short one is 10h 20m 33s'),
true
);
$table_report->data[$row][1] = html_print_select($interval_description, 'interval_description', $config['interval_description'], '', '', '', true, false, false); $table_report->data[$row][1] = html_print_select($interval_description, 'interval_description', $config['interval_description'], '', '', '', true, false, false);
$row++; $row++;
@ -1094,10 +1066,7 @@ $row++;
} }
// Logo // Logo
$table_report->data['custom_report_front-logo'][0] = __('Custom report front').' - '.__('Custom logo').ui_print_help_tip( $table_report->data['custom_report_front-logo'][0] = __('Custom report front').' - '.__('Custom logo');
__("The dir of custom logos is in your www Console in 'images/custom_logo'. You can upload more files (ONLY JPEG AND PNG) in upload tool in console."),
true
);
$table_report->data['custom_report_front-logo'][1] = html_print_select( $table_report->data['custom_report_front-logo'][1] = html_print_select(
$customLogos, $customLogos,
'custom_report_front_logo', 'custom_report_front_logo',
@ -1154,7 +1123,7 @@ $row++;
); );
echo '<fieldset>'; echo '<fieldset>';
echo '<legend>'.__('Reports configuration').'</legend>'; echo '<legend>'.__('Reports configuration ').ui_print_help_icon('reports_configuration_tab', true).'</legend>';
html_print_table($table_report); html_print_table($table_report);
echo '</fieldset>'; echo '</fieldset>';
@ -1171,7 +1140,7 @@ $row++;
$table_other->size[3] = '12%'; $table_other->size[3] = '12%';
$table_other->data = []; $table_other->data = [];
$table_other->data[$row][0] = __('Custom graphviz directory').ui_print_help_tip(__('Custom directory where the graphviz binaries are stored.'), true); $table_other->data[$row][0] = __('Custom graphviz directory');
$table_other->data[$row][1] = html_print_input_text( $table_other->data[$row][1] = html_print_input_text(
'graphviz_bin_dir', 'graphviz_bin_dir',
$config['graphviz_bin_dir'], $config['graphviz_bin_dir'],
@ -1195,10 +1164,6 @@ $row++;
$row++; $row++;
$table_other->data[$row][0] = __('Show only the group name'); $table_other->data[$row][0] = __('Show only the group name');
$table_other->data[$row][0] .= ui_print_help_tip(
__('Show the group name instead the group icon.'),
true
);
$table_other->data[$row][1] = html_print_checkbox_switch( $table_other->data[$row][1] = html_print_checkbox_switch(
'show_group_name', 'show_group_name',
1, 1,

View File

@ -64,10 +64,7 @@ $t->data[1][2] = html_print_input_text(
true true
); );
$t->data[2][0] = __('WebSocket proxy url').ui_print_help_tip( $t->data[2][0] = __('WebSocket proxy url');
__('If you had configured a wsproxy set here target URL (for instance ws://your.public.fqdn/ws).'),
true
);
$t->data[2][2] = html_print_input_text( $t->data[2][2] = html_print_input_text(
'ws_proxy_url', 'ws_proxy_url',
$config['ws_proxy_url'], $config['ws_proxy_url'],

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