mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-28 16:24:54 +02:00
Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha
This commit is contained in:
Jonathan
commit
c7a55e6a0b
@ -1,5 +1,5 @@
|
|||||||
# Base config file for Pandora FMS agents
|
# Base config file for Pandora FMS agents
|
||||||
# Version 7.0NG.773.1, AIX version
|
# Version 7.0NG.773.2, AIX version
|
||||||
# Licensed under GPL license v2,
|
# Licensed under GPL license v2,
|
||||||
# Copyright (c) 2003-2023 Pandora FMS
|
# Copyright (c) 2003-2023 Pandora FMS
|
||||||
# http://www.pandorafms.com
|
# http://www.pandorafms.com
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
# Base config file for Pandora FMS agents
|
# Base config file for Pandora FMS agents
|
||||||
# Version 7.0NG.773.1, FreeBSD Version
|
# Version 7.0NG.773.2, FreeBSD Version
|
||||||
# Licensed under GPL license v2,
|
# Licensed under GPL license v2,
|
||||||
# Copyright (c) 2003-2023 Pandora FMS
|
# Copyright (c) 2003-2023 Pandora FMS
|
||||||
# http://www.pandorafms.com
|
# http://www.pandorafms.com
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
# Base config file for Pandora FMS agents
|
# Base config file for Pandora FMS agents
|
||||||
# Version 7.0NG.773.1, HP-UX Version
|
# Version 7.0NG.773.2, HP-UX Version
|
||||||
# Licensed under GPL license v2,
|
# Licensed under GPL license v2,
|
||||||
# Copyright (c) 2003-2023 Pandora FMS
|
# Copyright (c) 2003-2023 Pandora FMS
|
||||||
# http://www.pandorafms.com
|
# http://www.pandorafms.com
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
# Base config file for Pandora FMS agents
|
# Base config file for Pandora FMS agents
|
||||||
# Version 7.0NG.773.1, GNU/Linux
|
# Version 7.0NG.773.2, GNU/Linux
|
||||||
# Licensed under GPL license v2,
|
# Licensed under GPL license v2,
|
||||||
# Copyright (c) 2003-2023 Pandora FMS
|
# Copyright (c) 2003-2023 Pandora FMS
|
||||||
# http://www.pandorafms.com
|
# http://www.pandorafms.com
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
# Base config file for Pandora FMS agents
|
# Base config file for Pandora FMS agents
|
||||||
# Version 7.0NG.773.1, GNU/Linux
|
# Version 7.0NG.773.2, GNU/Linux
|
||||||
# Licensed under GPL license v2,
|
# Licensed under GPL license v2,
|
||||||
# Copyright (c) 2003-2023 Pandora FMS
|
# Copyright (c) 2003-2023 Pandora FMS
|
||||||
# http://www.pandorafms.com
|
# http://www.pandorafms.com
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
# Base config file for Pandora FMS agents
|
# Base config file for Pandora FMS agents
|
||||||
# Version 7.0NG.773.1, Solaris Version
|
# Version 7.0NG.773.2, Solaris Version
|
||||||
# Licensed under GPL license v2,
|
# Licensed under GPL license v2,
|
||||||
# Copyright (c) 2003-2023 Pandora FMS
|
# Copyright (c) 2003-2023 Pandora FMS
|
||||||
# http://www.pandorafms.com
|
# http://www.pandorafms.com
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
# Base config file for Pandora FMS Windows Agent
|
# Base config file for Pandora FMS Windows Agent
|
||||||
# (c) 2006-2023 Pandora FMS
|
# (c) 2006-2023 Pandora FMS
|
||||||
# Version 7.0NG.773.1
|
# Version 7.0NG.773.2
|
||||||
# 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
|
||||||
# Foundation; either version 2 of the Licence or any later version
|
# Foundation; either version 2 of the Licence or any later version
|
||||||
|
|||||||
@ -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.773.1, AIX version
|
# Version 7.0NG.773.2, AIX version
|
||||||
|
|
||||||
# General Parameters
|
# General Parameters
|
||||||
# ==================
|
# ==================
|
||||||
|
|||||||
@ -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.773.1
|
# Version 7.0NG.773.2
|
||||||
# FreeBSD/IPSO version
|
# FreeBSD/IPSO version
|
||||||
# Licenced under GPL licence, 2003-2007 Sancho Lerena
|
# Licenced under GPL licence, 2003-2007 Sancho Lerena
|
||||||
|
|
||||||
|
|||||||
@ -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.773.1, HPUX Version
|
# Version 7.0NG.773.2, HPUX Version
|
||||||
|
|
||||||
# General Parameters
|
# General Parameters
|
||||||
# ==================
|
# ==================
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
# Base config file for Pandora FMS agents
|
# Base config file for Pandora FMS agents
|
||||||
# Version 7.0NG.773.1
|
# Version 7.0NG.773.2
|
||||||
# Licensed under GPL license v2,
|
# Licensed under GPL license v2,
|
||||||
# (c) 2003-2023 Pandora FMS
|
# (c) 2003-2023 Pandora FMS
|
||||||
# please visit http://pandora.sourceforge.net
|
# please visit http://pandora.sourceforge.net
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
# Base config file for Pandora FMS agents
|
# Base config file for Pandora FMS agents
|
||||||
# Version 7.0NG.773.1
|
# Version 7.0NG.773.2
|
||||||
# Licensed under GPL license v2,
|
# Licensed under GPL license v2,
|
||||||
# (c) 2003-2023 Pandora FMS
|
# (c) 2003-2023 Pandora FMS
|
||||||
# please visit http://pandora.sourceforge.net
|
# please visit http://pandora.sourceforge.net
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
# Base config file for Pandora FMS agents
|
# Base config file for Pandora FMS agents
|
||||||
# Version 7.0NG.773.1
|
# Version 7.0NG.773.2
|
||||||
# Licensed under GPL license v2,
|
# Licensed under GPL license v2,
|
||||||
# please visit http://pandora.sourceforge.net
|
# please visit http://pandora.sourceforge.net
|
||||||
|
|
||||||
|
|||||||
@ -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.773.1, Solaris version
|
# Version 7.0NG.773.2, Solaris version
|
||||||
|
|
||||||
# General Parameters
|
# General Parameters
|
||||||
# ==================
|
# ==================
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
# Base config file for Pandora FMS agents
|
# Base config file for Pandora FMS agents
|
||||||
# Version 7.0NG.773.1, AIX version
|
# Version 7.0NG.773.2, AIX version
|
||||||
# Licensed under GPL license v2,
|
# Licensed under GPL license v2,
|
||||||
# Copyright (c) 2003-2023 Pandora FMS
|
# Copyright (c) 2003-2023 Pandora FMS
|
||||||
# http://www.pandorafms.com
|
# http://www.pandorafms.com
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
package: pandorafms-agent-unix
|
package: pandorafms-agent-unix
|
||||||
Version: 7.0NG.773.1-230823
|
Version: 7.0NG.773.2-230824
|
||||||
Architecture: all
|
Architecture: all
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Section: admin
|
Section: admin
|
||||||
|
|||||||
@ -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.773.1-230823"
|
pandora_version="7.0NG.773.2-230824"
|
||||||
|
|
||||||
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
|
||||||
|
|||||||
@ -31,7 +31,7 @@ fi
|
|||||||
if [ "$#" -ge 2 ]; then
|
if [ "$#" -ge 2 ]; then
|
||||||
VERSION="$2"
|
VERSION="$2"
|
||||||
else
|
else
|
||||||
VERSION="7.0NG.773.1"
|
VERSION="7.0NG.773.2"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Path for the generated DMG file
|
# Path for the generated DMG file
|
||||||
|
|||||||
@ -19,11 +19,11 @@
|
|||||||
<choice id="com.pandorafms.pandorafms_src" visible="false">
|
<choice id="com.pandorafms.pandorafms_src" visible="false">
|
||||||
<pkg-ref id="com.pandorafms.pandorafms_src"/>
|
<pkg-ref id="com.pandorafms.pandorafms_src"/>
|
||||||
</choice>
|
</choice>
|
||||||
<pkg-ref id="com.pandorafms.pandorafms_src" version="7.0NG.773.1" onConclusion="none">pandorafms_src.pdk</pkg-ref>
|
<pkg-ref id="com.pandorafms.pandorafms_src" version="7.0NG.773.2" onConclusion="none">pandorafms_src.pdk</pkg-ref>
|
||||||
<choice id="com.pandorafms.pandorafms_uninstall" visible="true" customLocation="/Applications">
|
<choice id="com.pandorafms.pandorafms_uninstall" visible="true" customLocation="/Applications">
|
||||||
<pkg-ref id="com.pandorafms.pandorafms_uninstall"/>
|
<pkg-ref id="com.pandorafms.pandorafms_uninstall"/>
|
||||||
</choice>
|
</choice>
|
||||||
<pkg-ref id="com.pandorafms.pandorafms_uninstall" version="7.0NG.773.1" onConclusion="none">pandorafms_uninstall.pdk</pkg-ref>
|
<pkg-ref id="com.pandorafms.pandorafms_uninstall" version="7.0NG.773.2" onConclusion="none">pandorafms_uninstall.pdk</pkg-ref>
|
||||||
<!-- <installation-check script="check()" />
|
<!-- <installation-check script="check()" />
|
||||||
<script>
|
<script>
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
|
|||||||
@ -5,9 +5,9 @@
|
|||||||
<key>CFBundleIconFile</key> <string>pandorafms.icns</string>
|
<key>CFBundleIconFile</key> <string>pandorafms.icns</string>
|
||||||
<key>CFBundleIdentifier</key> <string>com.pandorafms.pandorafms_uninstall</string>
|
<key>CFBundleIdentifier</key> <string>com.pandorafms.pandorafms_uninstall</string>
|
||||||
|
|
||||||
<key>CFBundleVersion</key> <string>7.0NG.773.1</string>
|
<key>CFBundleVersion</key> <string>7.0NG.773.2</string>
|
||||||
<key>CFBundleGetInfoString</key> <string>7.0NG.773.1 Pandora FMS on Aug 2020</string>
|
<key>CFBundleGetInfoString</key> <string>7.0NG.773.2 Pandora FMS on Aug 2020</string>
|
||||||
<key>CFBundleShortVersionString</key> <string>7.0NG.773.1</string>
|
<key>CFBundleShortVersionString</key> <string>7.0NG.773.2</string>
|
||||||
|
|
||||||
<key>NSPrincipalClass</key><string>NSApplication</string>
|
<key>NSPrincipalClass</key><string>NSApplication</string>
|
||||||
<key>NSMainNibFile</key><string>MainMenu</string>
|
<key>NSMainNibFile</key><string>MainMenu</string>
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
# Base config file for Pandora FMS agents
|
# Base config file for Pandora FMS agents
|
||||||
# Version 7.0NG.773.1, GNU/Linux
|
# Version 7.0NG.773.2, GNU/Linux
|
||||||
# Licensed under GPL license v2,
|
# Licensed under GPL license v2,
|
||||||
# Copyright (c) 2003-2023 Pandora FMS
|
# Copyright (c) 2003-2023 Pandora FMS
|
||||||
# http://www.pandorafms.com
|
# http://www.pandorafms.com
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
# Base config file for Pandora FMS agents
|
# Base config file for Pandora FMS agents
|
||||||
# Version 7.0NG.773.1, FreeBSD Version
|
# Version 7.0NG.773.2, FreeBSD Version
|
||||||
# Licensed under GPL license v2,
|
# Licensed under GPL license v2,
|
||||||
# Copyright (c) 2003-2023 Pandora FMS
|
# Copyright (c) 2003-2023 Pandora FMS
|
||||||
# http://www.pandorafms.com
|
# http://www.pandorafms.com
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
# Base config file for Pandora FMS agents
|
# Base config file for Pandora FMS agents
|
||||||
# Version 7.0NG.773.1, HP-UX Version
|
# Version 7.0NG.773.2, HP-UX Version
|
||||||
# Licensed under GPL license v2,
|
# Licensed under GPL license v2,
|
||||||
# Copyright (c) 2003-2023 Pandora FMS
|
# Copyright (c) 2003-2023 Pandora FMS
|
||||||
# http://www.pandorafms.com
|
# http://www.pandorafms.com
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
# Base config file for Pandora FMS agents
|
# Base config file for Pandora FMS agents
|
||||||
# Version 7.0NG.773.1
|
# Version 7.0NG.773.2
|
||||||
# Licensed under GPL license v2,
|
# Licensed under GPL license v2,
|
||||||
# Copyright (c) 2004-2023 Pandora FMS
|
# Copyright (c) 2004-2023 Pandora FMS
|
||||||
# https://pandorafms.com
|
# https://pandorafms.com
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
# Base config file for Pandora FMS agents
|
# Base config file for Pandora FMS agents
|
||||||
# Version 7.0NG.773.1, GNU/Linux
|
# Version 7.0NG.773.2, GNU/Linux
|
||||||
# Licensed under GPL license v2,
|
# Licensed under GPL license v2,
|
||||||
# Copyright (c) 2003-2023 Pandora FMS
|
# Copyright (c) 2003-2023 Pandora FMS
|
||||||
# http://www.pandorafms.com
|
# http://www.pandorafms.com
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
# Base config file for Pandora FMS agents
|
# Base config file for Pandora FMS agents
|
||||||
# Version 7.0NG.773.1, NetBSD Version
|
# Version 7.0NG.773.2, NetBSD Version
|
||||||
# Licensed under GPL license v2,
|
# Licensed under GPL license v2,
|
||||||
# Copyright (c) 2003-2023 Pandora FMS
|
# Copyright (c) 2003-2023 Pandora FMS
|
||||||
# http://www.pandorafms.com
|
# http://www.pandorafms.com
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
# Base config file for Pandora FMS agents
|
# Base config file for Pandora FMS agents
|
||||||
# Version 7.0NG.773.1, Solaris Version
|
# Version 7.0NG.773.2, Solaris Version
|
||||||
# Licensed under GPL license v2,
|
# Licensed under GPL license v2,
|
||||||
# Copyright (c) 2003-2023 Pandora FMS
|
# Copyright (c) 2003-2023 Pandora FMS
|
||||||
# http://www.pandorafms.com
|
# http://www.pandorafms.com
|
||||||
|
|||||||
@ -1030,8 +1030,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.773.1';
|
use constant AGENT_VERSION => '7.0NG.773.2';
|
||||||
use constant AGENT_BUILD => '230823';
|
use constant AGENT_BUILD => '230824';
|
||||||
|
|
||||||
# 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;
|
||||||
|
|||||||
@ -3,8 +3,8 @@
|
|||||||
#
|
#
|
||||||
%global __os_install_post %{nil}
|
%global __os_install_post %{nil}
|
||||||
%define name pandorafms_agent_linux
|
%define name pandorafms_agent_linux
|
||||||
%define version 7.0NG.773.1
|
%define version 7.0NG.773.2
|
||||||
%define release 230823
|
%define release 230824
|
||||||
|
|
||||||
Summary: Pandora FMS Linux agent, PERL version
|
Summary: Pandora FMS Linux agent, PERL version
|
||||||
Name: %{name}
|
Name: %{name}
|
||||||
|
|||||||
@ -3,8 +3,8 @@
|
|||||||
#
|
#
|
||||||
%global __os_install_post %{nil}
|
%global __os_install_post %{nil}
|
||||||
%define name pandorafms_agent_linux
|
%define name pandorafms_agent_linux
|
||||||
%define version 7.0NG.773.1
|
%define version 7.0NG.773.2
|
||||||
%define release 230823
|
%define release 230824
|
||||||
|
|
||||||
Summary: Pandora FMS Linux agent, PERL version
|
Summary: Pandora FMS Linux agent, PERL version
|
||||||
Name: %{name}
|
Name: %{name}
|
||||||
|
|||||||
@ -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.773.1"
|
PI_VERSION="7.0NG.773.2"
|
||||||
PI_BUILD="230823"
|
PI_BUILD="230824"
|
||||||
OS_NAME=`uname -s`
|
OS_NAME=`uname -s`
|
||||||
|
|
||||||
FORCE=0
|
FORCE=0
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
# Base config file for Pandora FMS Windows Agent
|
# Base config file for Pandora FMS Windows Agent
|
||||||
# (c) 2006-2023 Pandora FMS
|
# (c) 2006-2023 Pandora FMS
|
||||||
# Version 7.0NG.773.1
|
# Version 7.0NG.773.2
|
||||||
# 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
|
||||||
# Foundation; either version 2 of the Licence or any later version
|
# Foundation; either version 2 of the Licence or any later version
|
||||||
@ -523,3 +523,10 @@ module_plugin "%PROGRAMFILES%\Pandora_Agent\util\autodiscover.exe" --default
|
|||||||
#module_exec echo Bordón
|
#module_exec echo Bordón
|
||||||
#module_native_encoding OEM
|
#module_native_encoding OEM
|
||||||
#module_end
|
#module_end
|
||||||
|
|
||||||
|
# Hardening plugin for security compliance analysis.
|
||||||
|
#module_begin
|
||||||
|
#module_plugin "%PROGRAMFILES%\Pandora_Agent\util\pandora_sca.exe"
|
||||||
|
#module_absoluteinterval 7d
|
||||||
|
#module_end
|
||||||
|
|
||||||
|
|||||||
3
pandora_agents/win32/bin/util/pandora_sca.exe
Executable file
3
pandora_agents/win32/bin/util/pandora_sca.exe
Executable file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:6d93bd9d56c938063045fa2093198d324746f84df2b74567648f3baebd635657
|
||||||
|
size 5248006
|
||||||
@ -3,7 +3,7 @@ AllowLanguageSelection
|
|||||||
{Yes}
|
{Yes}
|
||||||
|
|
||||||
AppName
|
AppName
|
||||||
{Pandora FMS Windows Agent v7.0NG.773.1}
|
{Pandora FMS Windows Agent v7.0NG.773.2}
|
||||||
|
|
||||||
ApplicationID
|
ApplicationID
|
||||||
{17E3D2CF-CA02-406B-8A80-9D31C17BD08F}
|
{17E3D2CF-CA02-406B-8A80-9D31C17BD08F}
|
||||||
@ -186,7 +186,7 @@ UpgradeApplicationID
|
|||||||
{}
|
{}
|
||||||
|
|
||||||
Version
|
Version
|
||||||
{230823}
|
{230824}
|
||||||
|
|
||||||
ViewReadme
|
ViewReadme
|
||||||
{Yes}
|
{Yes}
|
||||||
|
|||||||
@ -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.773.1 Build 230823")
|
#define PANDORA_VERSION ("7.0NG.773.2 Build 230824")
|
||||||
|
|
||||||
string pandora_path;
|
string pandora_path;
|
||||||
string pandora_dir;
|
string pandora_dir;
|
||||||
|
|||||||
@ -11,7 +11,7 @@ BEGIN
|
|||||||
VALUE "LegalCopyright", "Pandora FMS"
|
VALUE "LegalCopyright", "Pandora FMS"
|
||||||
VALUE "OriginalFilename", "PandoraAgent.exe"
|
VALUE "OriginalFilename", "PandoraAgent.exe"
|
||||||
VALUE "ProductName", "Pandora FMS Windows Agent"
|
VALUE "ProductName", "Pandora FMS Windows Agent"
|
||||||
VALUE "ProductVersion", "(7.0NG.773.1(Build 230823))"
|
VALUE "ProductVersion", "(7.0NG.773.2(Build 230824))"
|
||||||
VALUE "FileVersion", "1.0.0.0"
|
VALUE "FileVersion", "1.0.0.0"
|
||||||
END
|
END
|
||||||
END
|
END
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
package: pandorafms-console
|
package: pandorafms-console
|
||||||
Version: 7.0NG.773.1-230823
|
Version: 7.0NG.773.2-230824
|
||||||
Architecture: all
|
Architecture: all
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Section: admin
|
Section: admin
|
||||||
|
|||||||
@ -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.773.1-230823"
|
pandora_version="7.0NG.773.2-230824"
|
||||||
|
|
||||||
package_pear=0
|
package_pear=0
|
||||||
package_pandora=1
|
package_pandora=1
|
||||||
|
|||||||
@ -20,8 +20,8 @@
|
|||||||
/**
|
/**
|
||||||
* Pandora build version and version
|
* Pandora build version and version
|
||||||
*/
|
*/
|
||||||
$build_version = 'PC230823';
|
$build_version = 'PC230824';
|
||||||
$pandora_version = 'v7.0NG.773.1';
|
$pandora_version = 'v7.0NG.773.2';
|
||||||
|
|
||||||
// Do not overwrite default timezone set if defined.
|
// Do not overwrite default timezone set if defined.
|
||||||
$script_tz = @date_default_timezone_get();
|
$script_tz = @date_default_timezone_get();
|
||||||
|
|||||||
@ -2760,79 +2760,6 @@ function agents_delete_agent($id_agents, $disableACL=false)
|
|||||||
enterprise_include_once('include/functions_agents.php');
|
enterprise_include_once('include/functions_agents.php');
|
||||||
enterprise_hook('agent_delete_from_cache', [$id_agent]);
|
enterprise_hook('agent_delete_from_cache', [$id_agent]);
|
||||||
|
|
||||||
// Delete agent from visual console.
|
|
||||||
db_process_sql_delete(
|
|
||||||
'tlayout_data',
|
|
||||||
['id_agent' => $id_agent]
|
|
||||||
);
|
|
||||||
|
|
||||||
// Delete agent from visual dashboards.
|
|
||||||
db_process_sql(
|
|
||||||
'UPDATE twidget_dashboard
|
|
||||||
SET options = NULL
|
|
||||||
WHERE options LIKE ("%\"agentid\":\"'.$id_agent.'\"%")'
|
|
||||||
);
|
|
||||||
|
|
||||||
// Delete agent from treport.
|
|
||||||
db_process_sql_delete(
|
|
||||||
'treport_content',
|
|
||||||
['id_agent' => $id_agent]
|
|
||||||
);
|
|
||||||
|
|
||||||
// Delete rules from tevent alerts (correlative alerts)
|
|
||||||
db_process_sql_delete(
|
|
||||||
'tevent_rule',
|
|
||||||
[
|
|
||||||
'agent' => $id_agent,
|
|
||||||
'operator_agent' => '==',
|
|
||||||
]
|
|
||||||
);
|
|
||||||
|
|
||||||
db_process_sql_delete(
|
|
||||||
'tevent_rule',
|
|
||||||
[
|
|
||||||
'log_agent' => $id_agent,
|
|
||||||
'operator_log_agent' => '==',
|
|
||||||
]
|
|
||||||
);
|
|
||||||
|
|
||||||
// Delete from gis maps history
|
|
||||||
db_process_sql_delete(
|
|
||||||
'tgis_data_history',
|
|
||||||
['tagente_id_agente' => $id_agent]
|
|
||||||
);
|
|
||||||
|
|
||||||
// Delete from policies.
|
|
||||||
db_process_sql_delete(
|
|
||||||
'tpolicy_agents',
|
|
||||||
['id_agent' => $id_agent]
|
|
||||||
);
|
|
||||||
|
|
||||||
// Delete from tnetwork maps
|
|
||||||
db_process_sql_delete(
|
|
||||||
'titem',
|
|
||||||
['source_data' => $id_agent]
|
|
||||||
);
|
|
||||||
|
|
||||||
db_process_sql_delete(
|
|
||||||
'trel_item',
|
|
||||||
[
|
|
||||||
'id_parent_source_data' => $id_agent,
|
|
||||||
'id_child_source_data' => $id_agent,
|
|
||||||
],
|
|
||||||
'OR'
|
|
||||||
);
|
|
||||||
|
|
||||||
// Delete agent from fav menu.
|
|
||||||
db_process_sql_delete(
|
|
||||||
'tfavmenu_user',
|
|
||||||
[
|
|
||||||
'id_element' => $id_agent,
|
|
||||||
'section' => 'Agents',
|
|
||||||
'id_user' => $config['id_user'],
|
|
||||||
]
|
|
||||||
);
|
|
||||||
|
|
||||||
// Break the loop on error.
|
// Break the loop on error.
|
||||||
if ((bool) $error === true) {
|
if ((bool) $error === true) {
|
||||||
break;
|
break;
|
||||||
|
|||||||
@ -950,11 +950,14 @@ if (is_ajax()) {
|
|||||||
$dialog = '
|
$dialog = '
|
||||||
<div id="about-tabs" class="invisible overflow-hidden">
|
<div id="about-tabs" class="invisible overflow-hidden">
|
||||||
<ul>
|
<ul>
|
||||||
<li><a href="#tab-general-view">'.__('Information').'</a></li>
|
<li><a href="#tab-general-view">'.__('Information').'</a></li>';
|
||||||
<li><a href="#tab-database">'.__('Database').'</a></li>
|
if ((bool) check_acl($config['id_user'], 0, 'PM') === true || $config['is_admin']['admin'] === true) {
|
||||||
<li><a href="#tab-system-info">'.__('System Info').'</a></li>
|
$dialog .= '<li><a href="#tab-database">'.__('Database').'</a></li>
|
||||||
<li><a href="#tab-php-system">'.__('PHP System').'</a></li>
|
<li><a href="#tab-system-info">'.__('System Info').'</a></li>
|
||||||
<li class="ui-tabs-close-button" style="float:right!important;">
|
<li><a href="#tab-php-system">'.__('PHP System').'</a></li>';
|
||||||
|
}
|
||||||
|
|
||||||
|
$dialog .= '<li class="ui-tabs-close-button" style="float:right!important;">
|
||||||
<img id="about-close" style="cursor: pointer;" src="'.ui_get_full_url('/include/styles/images/dialog-titlebar-close.png', false, false, false).'" alt="'.__('Close').'" title="'.__('Close').'" width="25px">
|
<img id="about-close" style="cursor: pointer;" src="'.ui_get_full_url('/include/styles/images/dialog-titlebar-close.png', false, false, false).'" alt="'.__('Close').'" title="'.__('Close').'" width="25px">
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
@ -986,7 +989,7 @@ if (is_ajax()) {
|
|||||||
$dialog .= '<p><b><a href="https://pandorafms.com/contact/" target="_blank">'.__('Contact Pandora FMS for official support contract.').'</a></b></p>';
|
$dialog .= '<p><b><a href="https://pandorafms.com/contact/" target="_blank">'.__('Contact Pandora FMS for official support contract.').'</a></b></p>';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (((bool) check_acl($config['id_user'], 0, 'PM') === true) && (is_metaconsole() === false)) {
|
if (((bool) check_acl($config['id_user'], 0, 'PM') === true || $config['is_admin']['admin'] === true) && (is_metaconsole() === false)) {
|
||||||
$dialogButtons = [];
|
$dialogButtons = [];
|
||||||
|
|
||||||
$dialogButtons[] = html_print_button(
|
$dialogButtons[] = html_print_button(
|
||||||
@ -1028,222 +1031,224 @@ if (is_ajax()) {
|
|||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
<p class="trademark-copyright">Trademark and copyright 2004 - '.date('Y').' <a href="https://pandorafms.com/" target="_blank">Pandora FMS</a>. All rights reserved</p>
|
<p class="trademark-copyright">Trademark and copyright 2004 - '.date('Y').' <a href="https://pandorafms.com/" target="_blank">Pandora FMS</a>. All rights reserved</p>
|
||||||
</div>
|
</div>';
|
||||||
<div id="tab-database" class="div-scroll">
|
if ((bool) check_acl($config['id_user'], 0, 'PM') === true || $config['is_admin']['admin'] === true) {
|
||||||
<table class="table-about">
|
$dialog .= '<div id="tab-database" class="div-scroll">
|
||||||
<tbody style="text-align: left;">
|
<table class="table-about">
|
||||||
<tr>
|
<tbody style="text-align: left;">
|
||||||
<th colspan="2">
|
<tr>
|
||||||
<h2><span> - </span>'.__('Database health status').'</h2>
|
<th colspan="2">
|
||||||
</th>
|
<h2><span> - </span>'.__('Database health status').'</h2>
|
||||||
</tr>
|
</th>
|
||||||
<tr>
|
</tr>
|
||||||
<th style="width: 50%;">
|
<tr>
|
||||||
<p><span>'.$db_health->data->unknownAgents->name.'</span></p>
|
<th style="width: 50%;">
|
||||||
</th>
|
<p><span>'.$db_health->data->unknownAgents->name.'</span></p>
|
||||||
<th style="width: 50%;">
|
</th>
|
||||||
<p style="font-size: 10pt;">'.$db_health->data->unknownAgents->value.'</p>
|
<th style="width: 50%;">
|
||||||
</th>
|
<p style="font-size: 10pt;">'.$db_health->data->unknownAgents->value.'</p>
|
||||||
</tr>
|
</th>
|
||||||
<tr>
|
</tr>
|
||||||
<th style="width: 50%;">
|
<tr>
|
||||||
<p><span>'.$db_health->data->notInitAgents->name.'</span></p>
|
<th style="width: 50%;">
|
||||||
</th>
|
<p><span>'.$db_health->data->notInitAgents->name.'</span></p>
|
||||||
<th style="width: 50%;">
|
</th>
|
||||||
<p style="font-size: 10pt;">'.$db_health->data->notInitAgents->value.'</p>
|
<th style="width: 50%;">
|
||||||
</th>
|
<p style="font-size: 10pt;">'.$db_health->data->notInitAgents->value.'</p>
|
||||||
</tr>
|
</th>
|
||||||
<tr class="about-last-tr">
|
</tr>
|
||||||
<th style="width: 50%;">
|
<tr class="about-last-tr">
|
||||||
<p class="about-last-p"><span>'.$db_health->data->pandoraDbLastRun->name.'</span></p>
|
<th style="width: 50%;">
|
||||||
</th>
|
<p class="about-last-p"><span>'.$db_health->data->pandoraDbLastRun->name.'</span></p>
|
||||||
<th style="width: 50%;">
|
</th>
|
||||||
<p class="about-last-p" style="font-size: 10pt;">'.$db_health->data->pandoraDbLastRun->value.'</p>
|
<th style="width: 50%;">
|
||||||
</th>
|
<p class="about-last-p" style="font-size: 10pt;">'.$db_health->data->pandoraDbLastRun->value.'</p>
|
||||||
</tr>
|
</th>
|
||||||
|
</tr>
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
<th colspan="2">
|
<th colspan="2">
|
||||||
<h2><span> - </span>'.__('Database status info').'</h2>
|
<h2><span> - </span>'.__('Database status info').'</h2>
|
||||||
</th>
|
</th>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<th style="width: 50%;">
|
<th style="width: 50%;">
|
||||||
<p><span>'.$db_info->data->dbSchemeFirstVersion->name.'</span></p>
|
<p><span>'.$db_info->data->dbSchemeFirstVersion->name.'</span></p>
|
||||||
</th>
|
</th>
|
||||||
<th style="width: 50%;">
|
<th style="width: 50%;">
|
||||||
<p style="font-size: 10pt;">'.$db_info->data->dbSchemeFirstVersion->value.'</p>
|
<p style="font-size: 10pt;">'.$db_info->data->dbSchemeFirstVersion->value.'</p>
|
||||||
</th>
|
</th>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<th style="width: 50%;">
|
<th style="width: 50%;">
|
||||||
<p><span>'.$db_info->data->dbSchemeVersion->name.'</span></p>
|
<p><span>'.$db_info->data->dbSchemeVersion->name.'</span></p>
|
||||||
</th>
|
</th>
|
||||||
<th style="width: 50%;">
|
<th style="width: 50%;">
|
||||||
<p style="font-size: 10pt;">'.$db_info->data->dbSchemeVersion->value.'</p>
|
<p style="font-size: 10pt;">'.$db_info->data->dbSchemeVersion->value.'</p>
|
||||||
</th>
|
</th>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<th style="width: 50%;">
|
<th style="width: 50%;">
|
||||||
<p><span>'.$db_info->data->dbSchemeBuild->name.'</span></p>
|
<p><span>'.$db_info->data->dbSchemeBuild->name.'</span></p>
|
||||||
</th>
|
</th>
|
||||||
<th style="width: 50%;">
|
<th style="width: 50%;">
|
||||||
<p style="font-size: 10pt;">'.$db_info->data->dbSchemeBuild->value.'</p>
|
<p style="font-size: 10pt;">'.$db_info->data->dbSchemeBuild->value.'</p>
|
||||||
</th>
|
</th>
|
||||||
</tr>
|
</tr>
|
||||||
<tr class="about-last-tr">
|
<tr class="about-last-tr">
|
||||||
<th style="width: 50%;">
|
<th style="width: 50%;">
|
||||||
<p class="about-last-p"><span>'.$db_info->data->dbSize->name.'</span></p>
|
<p class="about-last-p"><span>'.$db_info->data->dbSize->name.'</span></p>
|
||||||
</th>
|
</th>
|
||||||
<th style="width: 50%;">
|
<th style="width: 50%;">
|
||||||
<p class="about-last-p" style="font-size: 10pt;">'.$db_info->data->dbSize->value.'</p>
|
<p class="about-last-p" style="font-size: 10pt;">'.$db_info->data->dbSize->value.'</p>
|
||||||
</th>
|
</th>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
<th colspan="2">
|
<th colspan="2">
|
||||||
<h2><span> - </span>'.__('Tables fragmentation in the %s database', $product_name).'</h2>
|
<h2><span> - </span>'.__('Tables fragmentation in the %s database', $product_name).'</h2>
|
||||||
</th>
|
</th>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<th style="width: 50%;">
|
<th style="width: 50%;">
|
||||||
<p><span>'.$db_fragmentation->data->tablesFragmentationMax->name.'</span></p>
|
<p><span>'.$db_fragmentation->data->tablesFragmentationMax->name.'</span></p>
|
||||||
</th>
|
</th>
|
||||||
<th style="width: 50%;">
|
<th style="width: 50%;">
|
||||||
<p style="font-size: 10pt;">'.$db_fragmentation->data->tablesFragmentationMax->value.'</p>
|
<p style="font-size: 10pt;">'.$db_fragmentation->data->tablesFragmentationMax->value.'</p>
|
||||||
</th>
|
</th>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<th style="width: 50%;">
|
<th style="width: 50%;">
|
||||||
<p><span>'.$db_fragmentation->data->tablesFragmentationValue->name.'</span></p>
|
<p><span>'.$db_fragmentation->data->tablesFragmentationValue->name.'</span></p>
|
||||||
</th>
|
</th>
|
||||||
<th style="width: 50%;">
|
<th style="width: 50%;">
|
||||||
<p style="font-size: 10pt;">'.$db_fragmentation->data->tablesFragmentationValue->value.'</p>
|
<p style="font-size: 10pt;">'.$db_fragmentation->data->tablesFragmentationValue->value.'</p>
|
||||||
</th>
|
</th>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<th style="width: 50%;">
|
<th style="width: 50%;">
|
||||||
<p><span>'.$db_fragmentation->data->tablesFragmentationStatus->name.'</span></p>
|
<p><span>'.$db_fragmentation->data->tablesFragmentationStatus->name.'</span></p>
|
||||||
</th>
|
</th>
|
||||||
<th style="width: 50%;">
|
<th style="width: 50%;">
|
||||||
<p>'.$fragmentation_status.'</p>
|
<p>'.$fragmentation_status.'</p>
|
||||||
</th>
|
</th>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
</div>
|
||||||
|
<div id="tab-system-info">
|
||||||
|
<table class="table-about">
|
||||||
|
<tbody style="text-align: left;">
|
||||||
|
<tr>
|
||||||
|
<th colspan="2">
|
||||||
|
<h2><span> - </span>'.__('System Info').'</h2>
|
||||||
|
</th>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<th style="width: 30%;">
|
||||||
|
<p><span>'.$sys_info->data->cpuInfo->name.'</span></p>
|
||||||
|
</th>
|
||||||
|
<th style="width: 85%;">
|
||||||
|
<p style="font-size: 10pt;">'.$sys_info->data->cpuInfo->value.'</p>
|
||||||
|
</th>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<th style="width: 15%;">
|
||||||
|
<p><span>'.$sys_info->data->ramInfo->name.'</span></p>
|
||||||
|
</th>
|
||||||
|
<th style="width: 85%;">
|
||||||
|
<p style="font-size: 10pt;">'.$sys_info->data->ramInfo->value.'</p>
|
||||||
|
</th>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<th style="width: 15%;">
|
||||||
|
<p><span>'.$sys_info->data->osInfo->name.'</span></p>
|
||||||
|
</th>
|
||||||
|
<th style="width: 85%;">
|
||||||
|
<p style="font-size: 10pt;">'.$sys_info->data->osInfo->value.'</p>
|
||||||
|
</th>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<th style="width: 15%;">
|
||||||
|
<p><span>'.$sys_info->data->hostnameInfo->name.'</span></p>
|
||||||
|
</th>
|
||||||
|
<th style="width: 85%;">
|
||||||
|
<p style="font-size: 10pt;">'.$sys_info->data->hostnameInfo->value.'</p>
|
||||||
|
</th>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<th style="width: 15%;">
|
||||||
|
<p><span>'.$sys_info->data->ipInfo->name.'</span></p>
|
||||||
|
</th>
|
||||||
|
<th style="width: 85%;">
|
||||||
|
<p style="font-size: 10pt;">'.$sys_info->data->ipInfo->value.'</p>
|
||||||
|
</th>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<th style="width: 15%;">
|
||||||
|
<p><span>'.$system_date->data->date->name.'</span></p>
|
||||||
|
</th>
|
||||||
|
<th style="width: 85%;">
|
||||||
|
<p style="font-size: 10pt;">'.$system_date->data->date->value.'</p>
|
||||||
|
</th>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
<div id="tab-php-system">
|
||||||
|
<table class="table-about">
|
||||||
|
<tbody style="text-align: left;">
|
||||||
|
<tr>
|
||||||
|
<th colspan="2">
|
||||||
|
<h2><span> - </span>'.__('PHP system').'</h2>
|
||||||
|
</th>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<th style="width: 50%;">
|
||||||
|
<p><span>'.$php_sys->data->phpVersion->name.'</span></p>
|
||||||
|
</th>
|
||||||
|
<th style="width: 65%;">
|
||||||
|
<p style="font-size: 10pt;">'.$php_sys->data->phpVersion->value.'</p>
|
||||||
|
</th>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<th style="width: 35%;">
|
||||||
|
<p><span>'.$php_sys->data->maxExecutionTime->name.'</span></p>
|
||||||
|
</th>
|
||||||
|
<th style="width: 65%;">
|
||||||
|
<p style="font-size: 10pt;">'.$php_sys->data->maxExecutionTime->value.'</p>
|
||||||
|
</th>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<th style="width: 35%;">
|
||||||
|
<p><span>'.$php_sys->data->maxInputTime->name.'</span></p>
|
||||||
|
</th>
|
||||||
|
<th style="width: 65%;">
|
||||||
|
<p style="font-size: 10pt;">'.$php_sys->data->maxInputTime->value.'</p>
|
||||||
|
</th>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<th style="width: 35%;">
|
||||||
|
<p><span>'.$php_sys->data->memoryLimit->name.'</span></p>
|
||||||
|
</th>
|
||||||
|
<th style="width: 65%;">
|
||||||
|
<p style="font-size: 10pt;">'.$php_sys->data->memoryLimit->value.'</p>
|
||||||
|
</th>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<th style="width: 35%;">
|
||||||
|
<p><span>'.$php_sys->data->sessionLifetime->name.'</span></p>
|
||||||
|
</th>
|
||||||
|
<th style="width: 65%;">
|
||||||
|
<p style="font-size: 10pt;">'.$php_sys->data->sessionLifetime->value.'</p>
|
||||||
|
</th>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div id="tab-system-info">
|
';
|
||||||
<table class="table-about">
|
}
|
||||||
<tbody style="text-align: left;">
|
|
||||||
<tr>
|
|
||||||
<th colspan="2">
|
|
||||||
<h2><span> - </span>'.__('System Info').'</h2>
|
|
||||||
</th>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<th style="width: 30%;">
|
|
||||||
<p><span>'.$sys_info->data->cpuInfo->name.'</span></p>
|
|
||||||
</th>
|
|
||||||
<th style="width: 85%;">
|
|
||||||
<p style="font-size: 10pt;">'.$sys_info->data->cpuInfo->value.'</p>
|
|
||||||
</th>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<th style="width: 15%;">
|
|
||||||
<p><span>'.$sys_info->data->ramInfo->name.'</span></p>
|
|
||||||
</th>
|
|
||||||
<th style="width: 85%;">
|
|
||||||
<p style="font-size: 10pt;">'.$sys_info->data->ramInfo->value.'</p>
|
|
||||||
</th>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<th style="width: 15%;">
|
|
||||||
<p><span>'.$sys_info->data->osInfo->name.'</span></p>
|
|
||||||
</th>
|
|
||||||
<th style="width: 85%;">
|
|
||||||
<p style="font-size: 10pt;">'.$sys_info->data->osInfo->value.'</p>
|
|
||||||
</th>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<th style="width: 15%;">
|
|
||||||
<p><span>'.$sys_info->data->hostnameInfo->name.'</span></p>
|
|
||||||
</th>
|
|
||||||
<th style="width: 85%;">
|
|
||||||
<p style="font-size: 10pt;">'.$sys_info->data->hostnameInfo->value.'</p>
|
|
||||||
</th>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<th style="width: 15%;">
|
|
||||||
<p><span>'.$sys_info->data->ipInfo->name.'</span></p>
|
|
||||||
</th>
|
|
||||||
<th style="width: 85%;">
|
|
||||||
<p style="font-size: 10pt;">'.$sys_info->data->ipInfo->value.'</p>
|
|
||||||
</th>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<th style="width: 15%;">
|
|
||||||
<p><span>'.$system_date->data->date->name.'</span></p>
|
|
||||||
</th>
|
|
||||||
<th style="width: 85%;">
|
|
||||||
<p style="font-size: 10pt;">'.$system_date->data->date->value.'</p>
|
|
||||||
</th>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
<div id="tab-php-system">
|
|
||||||
<table class="table-about">
|
|
||||||
<tbody style="text-align: left;">
|
|
||||||
<tr>
|
|
||||||
<th colspan="2">
|
|
||||||
<h2><span> - </span>'.__('PHP system').'</h2>
|
|
||||||
</th>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<th style="width: 50%;">
|
|
||||||
<p><span>'.$php_sys->data->phpVersion->name.'</span></p>
|
|
||||||
</th>
|
|
||||||
<th style="width: 65%;">
|
|
||||||
<p style="font-size: 10pt;">'.$php_sys->data->phpVersion->value.'</p>
|
|
||||||
</th>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<th style="width: 35%;">
|
|
||||||
<p><span>'.$php_sys->data->maxExecutionTime->name.'</span></p>
|
|
||||||
</th>
|
|
||||||
<th style="width: 65%;">
|
|
||||||
<p style="font-size: 10pt;">'.$php_sys->data->maxExecutionTime->value.'</p>
|
|
||||||
</th>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<th style="width: 35%;">
|
|
||||||
<p><span>'.$php_sys->data->maxInputTime->name.'</span></p>
|
|
||||||
</th>
|
|
||||||
<th style="width: 65%;">
|
|
||||||
<p style="font-size: 10pt;">'.$php_sys->data->maxInputTime->value.'</p>
|
|
||||||
</th>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<th style="width: 35%;">
|
|
||||||
<p><span>'.$php_sys->data->memoryLimit->name.'</span></p>
|
|
||||||
</th>
|
|
||||||
<th style="width: 65%;">
|
|
||||||
<p style="font-size: 10pt;">'.$php_sys->data->memoryLimit->value.'</p>
|
|
||||||
</th>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<th style="width: 35%;">
|
|
||||||
<p><span>'.$php_sys->data->sessionLifetime->name.'</span></p>
|
|
||||||
</th>
|
|
||||||
<th style="width: 65%;">
|
|
||||||
<p style="font-size: 10pt;">'.$php_sys->data->sessionLifetime->value.'</p>
|
|
||||||
</th>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
';
|
|
||||||
|
|
||||||
echo $dialog;
|
echo $dialog;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -130,8 +130,8 @@
|
|||||||
</div>
|
</div>
|
||||||
<div style='padding-bottom: 50px'>
|
<div style='padding-bottom: 50px'>
|
||||||
<?php
|
<?php
|
||||||
$version = '7.0NG.773.1';
|
$version = '7.0NG.773.2';
|
||||||
$build = '230823';
|
$build = '230824';
|
||||||
$banner = "v$version Build $build";
|
$banner = "v$version Build $build";
|
||||||
error_reporting(0);
|
error_reporting(0);
|
||||||
|
|
||||||
|
|||||||
@ -2,8 +2,8 @@
|
|||||||
# Pandora FMS Console
|
# Pandora FMS Console
|
||||||
#
|
#
|
||||||
%define name pandorafms_console
|
%define name pandorafms_console
|
||||||
%define version 7.0NG.773.1
|
%define version 7.0NG.773.2
|
||||||
%define release 230823
|
%define release 230824
|
||||||
|
|
||||||
# User and Group under which Apache is running
|
# User and Group under which Apache is running
|
||||||
%define httpd_name httpd
|
%define httpd_name httpd
|
||||||
|
|||||||
@ -2,8 +2,8 @@
|
|||||||
# Pandora FMS Console
|
# Pandora FMS Console
|
||||||
#
|
#
|
||||||
%define name pandorafms_console
|
%define name pandorafms_console
|
||||||
%define version 7.0NG.773.1
|
%define version 7.0NG.773.2
|
||||||
%define release 230823
|
%define release 230824
|
||||||
|
|
||||||
# User and Group under which Apache is running
|
# User and Group under which Apache is running
|
||||||
%define httpd_name httpd
|
%define httpd_name httpd
|
||||||
|
|||||||
@ -2,8 +2,8 @@
|
|||||||
# Pandora FMS Console
|
# Pandora FMS Console
|
||||||
#
|
#
|
||||||
%define name pandorafms_console
|
%define name pandorafms_console
|
||||||
%define version 7.0NG.773.1
|
%define version 7.0NG.773.2
|
||||||
%define release 230823
|
%define release 230824
|
||||||
%define httpd_name httpd
|
%define httpd_name httpd
|
||||||
# User and Group under which Apache is running
|
# User and Group under which Apache is running
|
||||||
%define httpd_name apache2
|
%define httpd_name apache2
|
||||||
|
|||||||
@ -9,7 +9,7 @@
|
|||||||
# This code is licensed under GPL 2.0 license.
|
# This code is licensed under GPL 2.0 license.
|
||||||
# **********************************************************************
|
# **********************************************************************
|
||||||
|
|
||||||
PI_VERSION="7.0NG.773.1"
|
PI_VERSION="7.0NG.773.2"
|
||||||
FORCE=0
|
FORCE=0
|
||||||
DESTDIR=""
|
DESTDIR=""
|
||||||
LOG_TIMESTAMP=`date +"%Y/%m/%d %H:%M:%S"`
|
LOG_TIMESTAMP=`date +"%Y/%m/%d %H:%M:%S"`
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
package: pandorafms-server
|
package: pandorafms-server
|
||||||
Version: 7.0NG.773.1-230823
|
Version: 7.0NG.773.2-230824
|
||||||
Architecture: all
|
Architecture: all
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Section: admin
|
Section: admin
|
||||||
|
|||||||
@ -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.773.1-230823"
|
pandora_version="7.0NG.773.2-230824"
|
||||||
|
|
||||||
package_cpan=0
|
package_cpan=0
|
||||||
package_pandora=1
|
package_pandora=1
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
#############################################################################
|
#############################################################################
|
||||||
# Pandora FMS Server Parameters
|
# Pandora FMS Server Parameters
|
||||||
# Pandora FMS, the Flexible Monitoring System.
|
# Pandora FMS, the Flexible Monitoring System.
|
||||||
# Version 7.0NG.773.1
|
# Version 7.0NG.773.2
|
||||||
# Licensed under GPL license v2,
|
# Licensed under GPL license v2,
|
||||||
# (c) 2003-2023 Pandora FMS
|
# (c) 2003-2023 Pandora FMS
|
||||||
# http://www.pandorafms.com
|
# http://www.pandorafms.com
|
||||||
|
|||||||
@ -45,8 +45,8 @@ our @EXPORT = qw(
|
|||||||
);
|
);
|
||||||
|
|
||||||
# version: Defines actual version of Pandora Server for this module only
|
# version: Defines actual version of Pandora Server for this module only
|
||||||
my $pandora_version = "7.0NG.773.1";
|
my $pandora_version = "7.0NG.773.2";
|
||||||
my $pandora_build = "230823";
|
my $pandora_build = "230824";
|
||||||
our $VERSION = $pandora_version." ".$pandora_build;
|
our $VERSION = $pandora_version." ".$pandora_build;
|
||||||
|
|
||||||
# Setup hash
|
# Setup hash
|
||||||
|
|||||||
@ -33,8 +33,8 @@ use base 'Exporter';
|
|||||||
our @ISA = qw(Exporter);
|
our @ISA = qw(Exporter);
|
||||||
|
|
||||||
# version: Defines actual version of Pandora Server for this module only
|
# version: Defines actual version of Pandora Server for this module only
|
||||||
my $pandora_version = "7.0NG.773.1";
|
my $pandora_version = "7.0NG.773.2";
|
||||||
my $pandora_build = "230823";
|
my $pandora_build = "230824";
|
||||||
our $VERSION = $pandora_version." ".$pandora_build;
|
our $VERSION = $pandora_version." ".$pandora_build;
|
||||||
|
|
||||||
our %EXPORT_TAGS = ( 'all' => [ qw() ] );
|
our %EXPORT_TAGS = ( 'all' => [ qw() ] );
|
||||||
|
|||||||
@ -3,8 +3,8 @@
|
|||||||
#
|
#
|
||||||
%global __os_install_post %{nil}
|
%global __os_install_post %{nil}
|
||||||
%define name pandorafms_server
|
%define name pandorafms_server
|
||||||
%define version 7.0NG.773.1
|
%define version 7.0NG.773.2
|
||||||
%define release 230823
|
%define release 230824
|
||||||
|
|
||||||
Summary: Pandora FMS Server
|
Summary: Pandora FMS Server
|
||||||
Name: %{name}
|
Name: %{name}
|
||||||
|
|||||||
@ -8,8 +8,8 @@
|
|||||||
# This code is licensed under GPL 2.0 license.
|
# This code is licensed under GPL 2.0 license.
|
||||||
# **********************************************************************
|
# **********************************************************************
|
||||||
|
|
||||||
PI_VERSION="7.0NG.773.1"
|
PI_VERSION="7.0NG.773.2"
|
||||||
PI_BUILD="230823"
|
PI_BUILD="230824"
|
||||||
|
|
||||||
MODE=$1
|
MODE=$1
|
||||||
if [ $# -gt 1 ]; then
|
if [ $# -gt 1 ]; then
|
||||||
|
|||||||
@ -35,7 +35,7 @@ use PandoraFMS::Config;
|
|||||||
use PandoraFMS::DB;
|
use PandoraFMS::DB;
|
||||||
|
|
||||||
# version: define current version
|
# version: define current version
|
||||||
my $version = "7.0NG.773.1 Build 230823";
|
my $version = "7.0NG.773.2 Build 230824";
|
||||||
|
|
||||||
# Pandora server configuration
|
# Pandora server configuration
|
||||||
my %conf;
|
my %conf;
|
||||||
@ -767,52 +767,6 @@ sub pandora_checkdb_integrity {
|
|||||||
# Delete orphan data_inc reference records
|
# Delete orphan data_inc reference records
|
||||||
db_do ($dbh, 'DELETE FROM tagente_datos_inc WHERE id_agente_modulo NOT IN (SELECT id_agente_modulo FROM tagente_modulo)');
|
db_do ($dbh, 'DELETE FROM tagente_datos_inc WHERE id_agente_modulo NOT IN (SELECT id_agente_modulo FROM tagente_modulo)');
|
||||||
|
|
||||||
# Delete orphan data from visual console.
|
|
||||||
log_message ('INTEGRITY', "Deleting orphan visual console items.");
|
|
||||||
db_do ($dbh, 'DELETE FROM tlayout_data WHERE id_agent <> 0 AND id_agent NOT IN (SELECT id_agente FROM tagente)');
|
|
||||||
db_do ($dbh, 'DELETE FROM tlayout_data WHERE id_agente_modulo <> 0 AND id_agente_modulo NOT IN (SELECT id_agente_modulo FROM tagente_modulo)');
|
|
||||||
|
|
||||||
# Delete orphan data form deleted agents.
|
|
||||||
# Clearl orphan data from dashboards
|
|
||||||
log_message ('INTEGRITY', "Deleting orphan dahsboard items.");
|
|
||||||
my @agents_ids = get_db_rows($dbh, 'SELECT id_agente FROM tagente');
|
|
||||||
my $where_condition;
|
|
||||||
foreach my $agent_id (@agents_ids) {
|
|
||||||
$where_condition .= 'options NOT LIKE ("%\\"agentid\\":\\"'.$agent_id->{'id_agente'}.'\\"%")';
|
|
||||||
if($agent_id == $agents_ids[-1]) {
|
|
||||||
last;
|
|
||||||
}
|
|
||||||
$where_condition .= ' AND ';
|
|
||||||
}
|
|
||||||
|
|
||||||
db_do ($dbh, 'UPDATE twidget_dashboard set options = NULL WHERE '.$where_condition);
|
|
||||||
|
|
||||||
$where_condition = '';
|
|
||||||
my @modules = get_db_rows($dbh, 'SELECT id_agente_modulo FROM tagente_modulo');
|
|
||||||
foreach my $id_agente_modulo (@modules) {
|
|
||||||
$where_condition .= 'options NOT LIKE ("%\\"moduleId\\":\\"'.$id_agente_modulo->{'id_agente_modulo'}.'\\"%")';
|
|
||||||
if($id_agente_modulo == $modules[-1]) {
|
|
||||||
last;
|
|
||||||
}
|
|
||||||
$where_condition .= ' AND ';
|
|
||||||
}
|
|
||||||
|
|
||||||
db_do ($dbh, 'UPDATE twidget_dashboard set options = NULL WHERE '.$where_condition);
|
|
||||||
|
|
||||||
# Delete orphan data from favorite agents
|
|
||||||
log_message ('INTEGRITY', "Deleting orphan favories items.");
|
|
||||||
db_do ($dbh, 'DELETE FROM tfavmenu_user WHERE section = "Agents" AND id_element NOT IN (SELECT id_agente FROM tagente)');
|
|
||||||
|
|
||||||
# Delete orphan data from gis maps
|
|
||||||
log_message ('INTEGRITY', "Deleting orphan GIS data.");
|
|
||||||
db_do ($dbh, 'DELETE FROM tgis_data_history WHERE tagente_id_agente NOT IN (SELECT id_agente FROM tagente)');
|
|
||||||
|
|
||||||
# Delete orphan tnetwork maps data
|
|
||||||
log_message ('INTEGRITY', "Deleting orphan networkmaps data.");
|
|
||||||
db_do ($dbh, 'DELETE FROM titem WHERE source_data NOT IN (SELECT id_agente FROM tagente)');
|
|
||||||
db_do ($dbh, 'DELETE FROM trel_item WHERE id_parent_source_data NOT IN (SELECT id_agente FROM tagente) OR id_child_source_data NOT IN (SELECT id_agente FROM tagente)');
|
|
||||||
|
|
||||||
|
|
||||||
# Check enterprise tables
|
# Check enterprise tables
|
||||||
enterprise_hook ('pandora_checkdb_integrity_enterprise', [$conf, $dbh]);
|
enterprise_hook ('pandora_checkdb_integrity_enterprise', [$conf, $dbh]);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -36,7 +36,7 @@ use Encode::Locale;
|
|||||||
Encode::Locale::decode_argv;
|
Encode::Locale::decode_argv;
|
||||||
|
|
||||||
# version: define current version
|
# version: define current version
|
||||||
my $version = "7.0NG.773.1 Build 230823";
|
my $version = "7.0NG.773.2 Build 230824";
|
||||||
|
|
||||||
# save program name for logging
|
# save program name for logging
|
||||||
my $progname = basename($0);
|
my $progname = basename($0);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user