Merge remote-tracking branch 'origin/develop' into ent-9690-14344-alertas-con-threshold-propio-envian-correos-de-recuperacion-no-esperados
This commit is contained in:
Calvo
commit
da96d5bd1e
|
|
@ -1,73 +0,0 @@
|
|||
Name: xprobe2
|
||||
Version: 0.3
|
||||
Release: 2
|
||||
Summary: Tool to detect OS remotely by TCP/IP fingerprinting
|
||||
License: GPLv2
|
||||
Group: Network/Security
|
||||
URL: http://xprobe.sourceforge.net/
|
||||
Packager: Sancho Lerena <slerena@gmail.com>
|
||||
Source: http://dl.sf.net/xprobe/xprobe2-%{version}.tar.gz
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}
|
||||
Provides: %{name}-%{version}
|
||||
Requires: libpcap
|
||||
BuildRequires: gcc-c++ libpcap-devel
|
||||
|
||||
#This is for SUSE build service, to avoid enforce FHS paths
|
||||
#!BuildIgnore: post-build-checks
|
||||
|
||||
%description
|
||||
Xprobe is an alternative to some tools which are heavily dependent upon the
|
||||
usage of the TCP protocol for remote active operating system fingerprinting.
|
||||
|
||||
Xprobe I combines various remote active operating system fingerprinting methods
|
||||
using the ICMP protocol, which were discovered during the "ICMP Usage in
|
||||
Scanning" research project, into a simple, fast, efficient and a powerful way
|
||||
to detect an underlying operating system a targeted host is using.
|
||||
|
||||
Xprobe2 is an active operating system fingerprinting tool with a different
|
||||
approach to operating system fingerprinting. Xprobe2 rely on fuzzy signature
|
||||
matching, probabilistic guesses, multiple matches simultaneously, and a
|
||||
signature database.
|
||||
|
||||
%prep
|
||||
%setup
|
||||
|
||||
%build
|
||||
./configure --with-libpcap-libraries=/usr/lib --with-libpcap-includes=/usr/include/pcap --mandir=%{_mandir} --disable-schemas-install
|
||||
make
|
||||
|
||||
%install
|
||||
make DESTDIR=$RPM_BUILD_ROOT install
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%post
|
||||
ln -s /usr/local/bin/xprobe2 /usr/bin
|
||||
|
||||
%preun
|
||||
|
||||
%postun
|
||||
|
||||
%files
|
||||
|
||||
%defattr(755,root,root)
|
||||
/usr/local/etc
|
||||
/usr/local/etc/xprobe2
|
||||
|
||||
%defattr(644,root,root)
|
||||
%doc AUTHORS CHANGELOG COPYING CREDITS README TODO docs/*
|
||||
%doc /usr/share/man/man1/xprobe2.1.gz
|
||||
/usr/local/etc/xprobe2/xprobe2.conf
|
||||
|
||||
%defattr(755,root,root)
|
||||
/usr/local/bin/xprobe2
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Dec 18 2009 Sancho Lerena <slerena@gmail.com> 3.2-2
|
||||
- A lot of changes to be ready for all RPM plattforms available on build.opensuse.org
|
||||
|
||||
* Tue Dec 08 2009 Sancho Lerena <slerena@gmail.com> 3.2-1
|
||||
- First RPM Spec for SUSE Systems, based on CentOS Spec from Dag Wieers
|
||||
|
||||
|
|
@ -1,62 +0,0 @@
|
|||
Get the original xprobe2-0.3 from Sourceforge:
|
||||
|
||||
http://downloads.sourceforge.net/project/xprobe/xprobe2/Xprobe2%200.3/xprobe2-0.3.tar.gz
|
||||
|
||||
Uncompress it under, for example /tmp/xprobe2-0.3 directory
|
||||
|
||||
Copy the diff file at /tmp
|
||||
|
||||
Execute the patch command:
|
||||
|
||||
patch -p1 < ../xprobe2-0.3.diff.patch
|
||||
|
||||
This should look like:
|
||||
|
||||
patching file CHANGELOG
|
||||
patching file config.status
|
||||
patching file configure
|
||||
patching file libs-external/USI++/src/config.h
|
||||
patching file libs-external/USI++/src/config.log
|
||||
patching file libs-external/USI++/src/config.status
|
||||
patching file libs-external/USI++/src/ip.cc
|
||||
patching file libs-external/USI++/src/Makefile
|
||||
patching file libs-external/USI++/src/misc.cc
|
||||
patching file libs-external/USI++/src/usi++/arp.h
|
||||
patching file libs-external/USI++/src/usi++/config.h
|
||||
patching file libs-external/USI++/src/usi++/datalink.h
|
||||
patching file libs-external/USI++/src/usi++/icmp.h
|
||||
patching file libs-external/USI++/src/usi++/if.h
|
||||
patching file libs-external/USI++/src/usi++/ip.h
|
||||
patching file libs-external/USI++/src/usi++/Layer2.h
|
||||
patching file libs-external/USI++/src/usi++/README
|
||||
patching file libs-external/USI++/src/usi++/RX.h
|
||||
patching file libs-external/USI++/src/usi++/tcp.h
|
||||
patching file libs-external/USI++/src/usi++/TX.h
|
||||
patching file libs-external/USI++/src/usi++/TX_IP.h
|
||||
patching file libs-external/USI++/src/usi++/udp.h
|
||||
patching file libs-external/USI++/src/usi++/usi++
|
||||
patching file libs-external/USI++/src/usi++/usi++.h
|
||||
patching file libs-external/USI++/src/usi++/usi-structs.h
|
||||
patching file libs-external/USI++/usi++/config.h
|
||||
patching file libs-external/USI++/usi++/tcp.h
|
||||
patching file Makefile
|
||||
patching file src/config.h
|
||||
patching file src/defines.h
|
||||
patching file src/Makefile
|
||||
patching file src/xplib/Makefile
|
||||
patching file src/xpmodules/alive_probe/Makefile
|
||||
patching file src/xpmodules/alive_probe/portscanner/Makefile
|
||||
patching file src/xpmodules/alive_probe/ttl_calc/Makefile
|
||||
patching file src/xpmodules/Makefile
|
||||
patching file src/xpmodules/os_probe/icmp_addrmask/Makefile
|
||||
patching file src/xpmodules/os_probe/icmp_echo_id/Makefile
|
||||
patching file src/xpmodules/os_probe/icmp_inforeq/Makefile
|
||||
patching file src/xpmodules/os_probe/icmp_port_unreach/Makefile
|
||||
patching file src/xpmodules/os_probe/icmp_timestamp/Makefile
|
||||
patching file src/xpmodules/os_probe/Makefile
|
||||
patching file src/xpmodules/os_probe/smb/Makefile
|
||||
patching file src/xpmodules/os_probe/snmp/Makefile
|
||||
patching file src/xpmodules/os_probe/tcp_handshake/Makefile
|
||||
patching file src/xpmodules/os_probe/tcp_rst/Makefile
|
||||
|
||||
Your patched code is now ready to be used.
|
||||
|
|
@ -300,7 +300,6 @@ server_dependencies=" \
|
|||
bind-utils \
|
||||
whois \
|
||||
cpanminus \
|
||||
http://firefly.artica.es/centos7/xprobe2-0.3-12.2.x86_64.rpm \
|
||||
http://firefly.artica.es/centos7/wmic-1.4-1.el7.x86_64.rpm \
|
||||
https://firefly.artica.es/centos7/pandorawmic-1.0.0-1.x86_64.rpm"
|
||||
execute_cmd "yum install -y $server_dependencies" "Installing Pandora FMS Server dependencies"
|
||||
|
|
@ -328,7 +327,6 @@ execute_cmd "yum install -y $oracle_dependencies || yum reinstall -y $oracle_dep
|
|||
|
||||
#ipam dependencies
|
||||
ipam_dependencies=" \
|
||||
http://firefly.artica.es/centos7/xprobe2-0.3-12.2.x86_64.rpm \
|
||||
perl(NetAddr::IP) \
|
||||
perl(Sys::Syslog) \
|
||||
perl(DBI) \
|
||||
|
|
|
|||
|
|
@ -357,7 +357,6 @@ server_dependencies=" \
|
|||
java \
|
||||
bind-utils \
|
||||
whois \
|
||||
http://firefly.artica.es/centos7/xprobe2-0.3-12.2.x86_64.rpm \
|
||||
http://firefly.artica.es/centos7/wmic-1.4-1.el7.x86_64.rpm \
|
||||
https://firefly.artica.es/centos8/pandorawmic-1.0.0-1.x86_64.rpm"
|
||||
execute_cmd "dnf install -y $server_dependencies" "Installing Pandora FMS Server dependencies"
|
||||
|
|
@ -385,7 +384,6 @@ execute_cmd "dnf install -y $oracle_dependencies" "Installing Oracle Instant cli
|
|||
|
||||
#ipam dependencies
|
||||
ipam_dependencies=" \
|
||||
http://firefly.artica.es/centos7/xprobe2-0.3-12.2.x86_64.rpm \
|
||||
perl(NetAddr::IP) \
|
||||
perl(Sys::Syslog) \
|
||||
perl(DBI) \
|
||||
|
|
|
|||
|
|
@ -253,7 +253,6 @@ server_dependencies=" \
|
|||
openssh-client \
|
||||
postfix \
|
||||
unzip \
|
||||
xprobe \
|
||||
coreutils \
|
||||
libio-compress-perl \
|
||||
libmoosex-role-timer-perl \
|
||||
|
|
@ -358,7 +357,6 @@ source '/root/.profile' &>> "$LOGFILE"
|
|||
|
||||
#ipam dependencies
|
||||
ipam_dependencies=" \
|
||||
xprobe \
|
||||
libnetaddr-ip-perl \
|
||||
coreutils \
|
||||
libdbd-mysql-perl \
|
||||
|
|
|
|||
|
|
@ -125,7 +125,6 @@ RUN dnf install -y --setopt=tsflags=nodocs \
|
|||
bind-utils \
|
||||
whois \
|
||||
libnsl \
|
||||
http://firefly.artica.es/centos7/xprobe2-0.3-12.2.x86_64.rpm \
|
||||
http://firefly.artica.es/centos7/wmic-1.4-1.el7.x86_64.rpm \
|
||||
https://firefly.artica.es/centos8/pandorawmic-1.0.0-1.x86_64.rpm ; dnf clean all
|
||||
|
||||
|
|
@ -136,7 +135,7 @@ RUN dnf install -y http://firefly.artica.es/centos8/perl-Crypt-OpenSSL-AES-0.02-
|
|||
# Instant client Oracle
|
||||
RUN dnf install -y https://download.oracle.com/otn_software/linux/instantclient/19800/oracle-instantclient19.8-basic-19.8.0.0.0-1.x86_64.rpm https://download.oracle.com/otn_software/linux/instantclient/19800/oracle-instantclient19.8-sqlplus-19.8.0.0.0-1.x86_64.rpm
|
||||
# Install IPAM dependencies
|
||||
RUN dnf install -y http://firefly.artica.es/centos7/xprobe2-0.3-12.2.x86_64.rpm "perl(NetAddr::IP)" "perl(Sys::Syslog)" "perl(DBI)" "perl(XML::Simple)" "perl(Geo::IP)" "perl(IO::Socket::INET6)" "perl(XML::Twig)" "perl(DBD::mysql)" --setopt=tsflags=nodocs
|
||||
RUN dnf install -y "perl(NetAddr::IP)" "perl(Sys::Syslog)" "perl(DBI)" "perl(XML::Simple)" "perl(Geo::IP)" "perl(IO::Socket::INET6)" "perl(XML::Twig)" "perl(DBD::mysql)" --setopt=tsflags=nodocs
|
||||
|
||||
|
||||
EXPOSE 80 443 41121 162/udp
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
package: pandorafms-agent-unix
|
||||
Version: 7.0NG.770-230428
|
||||
Version: 7.0NG.770-230504
|
||||
Architecture: all
|
||||
Priority: optional
|
||||
Section: admin
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
|
||||
pandora_version="7.0NG.770-230428"
|
||||
pandora_version="7.0NG.770-230504"
|
||||
|
||||
echo "Test if you has the tools for to make the packages."
|
||||
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
|
||||
|
|
|
|||
|
|
@ -1023,7 +1023,7 @@ my $Sem = undef;
|
|||
my $ThreadSem = undef;
|
||||
|
||||
use constant AGENT_VERSION => '7.0NG.770';
|
||||
use constant AGENT_BUILD => '230428';
|
||||
use constant AGENT_BUILD => '230504';
|
||||
|
||||
# Agent log default file size maximum and instances
|
||||
use constant DEFAULT_MAX_LOG_SIZE => 600000;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
%global __os_install_post %{nil}
|
||||
%define name pandorafms_agent_linux
|
||||
%define version 7.0NG.770
|
||||
%define release 230428
|
||||
%define release 230504
|
||||
|
||||
Summary: Pandora FMS Linux agent, PERL version
|
||||
Name: %{name}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
%global __os_install_post %{nil}
|
||||
%define name pandorafms_agent_linux
|
||||
%define version 7.0NG.770
|
||||
%define release 230428
|
||||
%define release 230504
|
||||
|
||||
Summary: Pandora FMS Linux agent, PERL version
|
||||
Name: %{name}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
# **********************************************************************
|
||||
|
||||
PI_VERSION="7.0NG.770"
|
||||
PI_BUILD="230428"
|
||||
PI_BUILD="230504"
|
||||
OS_NAME=`uname -s`
|
||||
|
||||
FORCE=0
|
||||
|
|
|
|||
|
|
@ -186,7 +186,7 @@ UpgradeApplicationID
|
|||
{}
|
||||
|
||||
Version
|
||||
{230428}
|
||||
{230504}
|
||||
|
||||
ViewReadme
|
||||
{Yes}
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ using namespace Pandora;
|
|||
using namespace Pandora_Strutils;
|
||||
|
||||
#define PATH_SIZE _MAX_PATH+1
|
||||
#define PANDORA_VERSION ("7.0NG.770 Build 230428")
|
||||
#define PANDORA_VERSION ("7.0NG.770 Build 230504")
|
||||
|
||||
string pandora_path;
|
||||
string pandora_dir;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ BEGIN
|
|||
VALUE "LegalCopyright", "Artica ST"
|
||||
VALUE "OriginalFilename", "PandoraAgent.exe"
|
||||
VALUE "ProductName", "Pandora FMS Windows Agent"
|
||||
VALUE "ProductVersion", "(7.0NG.770(Build 230428))"
|
||||
VALUE "ProductVersion", "(7.0NG.770(Build 230504))"
|
||||
VALUE "FileVersion", "1.0.0.0"
|
||||
END
|
||||
END
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
package: pandorafms-console
|
||||
Version: 7.0NG.770-230428
|
||||
Version: 7.0NG.770-230504
|
||||
Architecture: all
|
||||
Priority: optional
|
||||
Section: admin
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
|
||||
pandora_version="7.0NG.770-230428"
|
||||
pandora_version="7.0NG.770-230504"
|
||||
|
||||
package_pear=0
|
||||
package_pandora=1
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
START TRANSACTION;
|
||||
|
||||
ALTER TABLE tpolicy_group_agents CONVERT TO CHARACTER SET UTF8MB4;
|
||||
ALTER TABLE tevent_sound CONVERT TO CHARACTER SET UTF8MB4;
|
||||
ALTER TABLE tsesion_filter CONVERT TO CHARACTER SET UTF8MB4;
|
||||
CREATE TABLE IF NOT EXISTS `tsesion_filter` (
|
||||
`id_filter` INT NOT NULL AUTO_INCREMENT,
|
||||
`id_name` TEXT NULL,
|
||||
|
|
|
|||
|
|
@ -73,6 +73,8 @@ $table->headstyle[8] = 'text-align:right;width: 120px;';
|
|||
$table->titleclass = 'tabletitle';
|
||||
$table->titlestyle = 'text-transform:uppercase;';
|
||||
|
||||
$table->style[6] = 'display: flex;align-items: center;';
|
||||
|
||||
$table->head = [];
|
||||
$table->head[0] = __('Name');
|
||||
$table->head[1] = __('Status');
|
||||
|
|
@ -166,8 +168,16 @@ foreach ($servers as $server) {
|
|||
}
|
||||
|
||||
$data[6] = $server['threads'].' : '.$server['queued_modules'];
|
||||
if ($server['queued_modules'] > 200) {
|
||||
$data[6] .= clippy_context_help('server_queued_modules');
|
||||
if ($server['queued_modules'] > 500) {
|
||||
$data[6] .= ' <div class="inline"><a onclick="show_dialog();" >'.html_print_image(
|
||||
'images/info-warning.svg',
|
||||
true,
|
||||
[
|
||||
'width' => 16,
|
||||
'heght' => 16,
|
||||
'class' => 'pulsate clickable',
|
||||
]
|
||||
).'</a></div>';
|
||||
}
|
||||
|
||||
$data[7] = ui_print_timestamp($server['keepalive'], true);
|
||||
|
|
@ -306,3 +316,26 @@ if ($tiny) {
|
|||
} else {
|
||||
html_print_table($table);
|
||||
}
|
||||
|
||||
?>
|
||||
<script type="text/javascript">
|
||||
function show_dialog() {
|
||||
confirmDialog({
|
||||
title: "<?php echo __('Excesive Queued.'); ?>",
|
||||
message: "<?php echo __('You have too many items in the processing queue. This can happen if your server is overloaded and/or improperly configured. This could be something temporary, or a bottleneck. If it is associated with a delay in monitoring, with modules going to unknown, try increasing the number of threads.'); ?>",
|
||||
strOKButton: "<?php echo __('Close'); ?>",
|
||||
hideCancelButton: true,
|
||||
size: 675,
|
||||
});
|
||||
}
|
||||
|
||||
function runIt() {
|
||||
$('.pulsate').animate({
|
||||
opacity: '1'
|
||||
}, 1000);
|
||||
$('.pulsate').animate({
|
||||
opacity: '0.6'
|
||||
}, 1000, runIt);
|
||||
}
|
||||
runIt();
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<!-- Generator: Sketch 61.2 (89653) - https://sketch.com -->
|
||||
<title>Dark / 14 / info@svg</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<g id="Dark-/-14-/-info" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
||||
<g id="Icons/Elements/Help-mini" fill="#f3b200">
|
||||
<path d="M7,0 C10.8659932,0 14,3.13400675 14,7 C14,10.8659932 10.8659932,14 7,14 C3.13400675,14 0,10.8659932 0,7 C0,3.13400675 3.13400675,0 7,0 Z M7,6 C6.44771525,6 6,6.44771525 6,7 L6,7 L6,10 C6,10.5522847 6.44771525,11 7,11 C7.55228475,11 8,10.5522847 8,10 L8,10 L8,7 C8,6.44771525 7.55228475,6 7,6 Z M7,3 C6.44771525,3 6,3.44771525 6,4 C6,4.55228475 6.44771525,5 7,5 C7.55228475,5 8,4.55228475 8,4 C8,3.44771525 7.55228475,3 7,3 Z" id="Elements-/-Help-mini"></path>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 959 B |
|
|
@ -570,7 +570,7 @@ class TipsWindow
|
|||
$sql = sprintf(
|
||||
'SELECT id, name AS language, title, text, url, enable
|
||||
FROM twelcome_tip t
|
||||
LEFT JOIN tlanguage l ON t.id_lang = l.id_language COLLATE utf8mb4_unicode_ci
|
||||
LEFT JOIN tlanguage l ON t.id_lang COLLATE utf8mb4_unicode_ci = CONVERT(l.id_language USING utf8mb4) COLLATE utf8mb4_unicode_ci
|
||||
%s %s %s',
|
||||
$filter,
|
||||
$order,
|
||||
|
|
@ -582,7 +582,7 @@ class TipsWindow
|
|||
$sqlCount = sprintf(
|
||||
'SELECT count(*)
|
||||
FROM twelcome_tip t
|
||||
LEFT JOIN tlanguage l ON t.id_lang = l.id_language COLLATE utf8mb4_unicode_ci
|
||||
LEFT JOIN tlanguage l ON t.id_lang COLLATE utf8mb4_unicode_ci = CONVERT(l.id_language USING utf8mb4) COLLATE utf8mb4_unicode_ci
|
||||
%s',
|
||||
$filter
|
||||
);
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
/**
|
||||
* Pandora build version and version
|
||||
*/
|
||||
$build_version = 'PC230428';
|
||||
$build_version = 'PC230504';
|
||||
$pandora_version = 'v7.0NG.770';
|
||||
|
||||
// Do not overwrite default timezone set if defined.
|
||||
|
|
|
|||
|
|
@ -5241,7 +5241,7 @@ function graph_monitor_wheel($width=550, $height=600, $filter=false)
|
|||
'name' => __('Main node'),
|
||||
'type' => 'center_node',
|
||||
'children' => iterate_group_array($data_groups, $data_agents),
|
||||
'color' => '#3F3F3F',
|
||||
'color' => ($config['style'] === 'pandora_black') ? '#111' : '#FFF',
|
||||
];
|
||||
|
||||
if (empty($graph_data['children'])) {
|
||||
|
|
|
|||
|
|
@ -1770,7 +1770,7 @@ function ui_require_javascript_file($name, $path='include/javascript/', $echo_ta
|
|||
|
||||
if (is_metaconsole()
|
||||
&& (isset($config['requirements_use_base_url']) === false
|
||||
|| $config['requirements_use_base_url'] === false) && $filename !== 'include/javascript/select2.min.js'
|
||||
|| $config['requirements_use_base_url'] === false)
|
||||
) {
|
||||
$config['js'][$name] = '../../'.$filename;
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -825,8 +825,7 @@ function sunburst(recipient, data, width, height, tooltip = true) {
|
|||
if (height === "auto") {
|
||||
height = width;
|
||||
}
|
||||
// var width = 960,
|
||||
// height = 700;
|
||||
|
||||
var radius = Math.min(width, height) / 2;
|
||||
|
||||
var x = d3.scale.linear().range([0, 2 * Math.PI]);
|
||||
|
|
@ -857,7 +856,11 @@ function sunburst(recipient, data, width, height, tooltip = true) {
|
|||
return Math.max(0, y(d.y));
|
||||
})
|
||||
.outerRadius(function(d) {
|
||||
return Math.max(0, y(d.y + d.dy));
|
||||
if (d.children || d.depth === 4) {
|
||||
return Math.max(0, y(d.y + d.dy));
|
||||
} else {
|
||||
return Math.max(0, y(d.y + d.dy)) + 20;
|
||||
}
|
||||
});
|
||||
|
||||
var g = svg
|
||||
|
|
@ -879,6 +882,7 @@ function sunburst(recipient, data, width, height, tooltip = true) {
|
|||
: color((d.children ? d : d.parent).name);
|
||||
})
|
||||
.style("cursor", "pointer")
|
||||
.style("stroke-width", "0.2")
|
||||
.on("click", click)
|
||||
.on("mouseover", tooltip === "1" ? over_user : "")
|
||||
.on("mouseout", out_user)
|
||||
|
|
@ -888,23 +892,38 @@ function sunburst(recipient, data, width, height, tooltip = true) {
|
|||
if (d.type === "central_service") {
|
||||
return 0;
|
||||
}
|
||||
|
||||
var ang = ((x(d.x + d.dx / 2) - Math.PI / 2) / Math.PI) * 180;
|
||||
return ang > 90 ? 180 + ang : ang;
|
||||
if (calculate_angle(d) < 20) {
|
||||
return ang;
|
||||
} else {
|
||||
return Math.trunc(ang) == 90 || Math.trunc(ang) == 89
|
||||
? ang - 90
|
||||
: 90 + ang;
|
||||
}
|
||||
}
|
||||
|
||||
var text = g
|
||||
.append("text")
|
||||
.attr("transform", function(d) {
|
||||
return (
|
||||
"translate(" +
|
||||
arc.centroid(d) +
|
||||
")rotate(" +
|
||||
computeTextRotation(d) +
|
||||
")"
|
||||
);
|
||||
if (typeof d.show_name != "undefined" && d.show_name) {
|
||||
return (
|
||||
"translate(" +
|
||||
arc.centroid(d) +
|
||||
")rotate(" +
|
||||
computeTextRotation(d) +
|
||||
")"
|
||||
);
|
||||
}
|
||||
})
|
||||
.attr("x", function(d) {
|
||||
return computeTextRotation(d) > 180 ? -40 : -30;
|
||||
if (typeof d.show_name != "undefined" && d.show_name) {
|
||||
if (calculate_angle(d) < 20) {
|
||||
return (d.name.length + 15) * -1;
|
||||
} else {
|
||||
return (d.name.length + 25) * -1;
|
||||
}
|
||||
}
|
||||
})
|
||||
.attr("dx", "6") // margin
|
||||
.attr("dy", function(d) {
|
||||
|
|
@ -914,17 +933,30 @@ function sunburst(recipient, data, width, height, tooltip = true) {
|
|||
return ".35em";
|
||||
}) // vertical-align
|
||||
.attr("opacity", function(d) {
|
||||
if (
|
||||
(typeof d.show_name != "undefined" && d.show_name) ||
|
||||
d.type === "central_service"
|
||||
)
|
||||
if (typeof d.show_name != "undefined" && d.show_name) {
|
||||
return 1;
|
||||
else return 0;
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
})
|
||||
.text(function(d) {
|
||||
if (d.name.length > 20) {
|
||||
var resta = d.name.length - 12;
|
||||
var string = d.name.slice(
|
||||
d.name.length / 2 - resta / 2,
|
||||
d.name.length / 2 + resta / 2
|
||||
);
|
||||
var split = d.name.split(`${string}`);
|
||||
return `${split[0]}...${split[1]}`;
|
||||
}
|
||||
return d.name;
|
||||
})
|
||||
.style("font-size", "10px")
|
||||
.style("font-size", "11px")
|
||||
.style("fill", function(d) {
|
||||
if (d.color !== "#82b92e") {
|
||||
return "white";
|
||||
}
|
||||
})
|
||||
// Makes svg elements invisible to events
|
||||
.style("pointer-events", "none");
|
||||
|
||||
|
|
@ -972,7 +1004,11 @@ function sunburst(recipient, data, width, height, tooltip = true) {
|
|||
);
|
||||
})
|
||||
.attr("x", function(d) {
|
||||
return computeTextRotation(d) > 180 ? -40 : -30;
|
||||
if (calculate_angle(d) < 20) {
|
||||
return (d.name.length + 15) * -1;
|
||||
} else {
|
||||
return (d.name.length + 25) * -1;
|
||||
}
|
||||
})
|
||||
.transition()
|
||||
.duration(250)
|
||||
|
|
@ -1074,6 +1110,15 @@ function sunburst(recipient, data, width, height, tooltip = true) {
|
|||
function hide_tooltip() {
|
||||
$("#tooltip").hide();
|
||||
}
|
||||
|
||||
function calculate_angle(d) {
|
||||
var start_angle = Math.max(0, Math.min(2 * Math.PI, x(d.x)));
|
||||
start_angle = (start_angle * 180) / Math.PI;
|
||||
var end_angle = Math.max(0, Math.min(2 * Math.PI, x(d.x + d.dx)));
|
||||
end_angle = (end_angle * 180) / Math.PI;
|
||||
|
||||
return end_angle - start_angle;
|
||||
}
|
||||
}
|
||||
|
||||
function createGauge(
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@
|
|||
<div style='padding-bottom: 50px'>
|
||||
<?php
|
||||
$version = '7.0NG.770';
|
||||
$build = '230428';
|
||||
$build = '230504';
|
||||
$banner = "v$version Build $build";
|
||||
error_reporting(0);
|
||||
|
||||
|
|
|
|||
|
|
@ -55,15 +55,24 @@ if (check_acl($config['id_user'], 0, 'ER') === false
|
|||
return;
|
||||
}
|
||||
|
||||
ob_start('ui_process_page_head');
|
||||
ob_start();
|
||||
echo '<html>';
|
||||
echo '<head>';
|
||||
|
||||
echo '<title>'.__('Accoustic console').'</title>';
|
||||
ui_require_css_file('wizard');
|
||||
ui_require_css_file('discovery');
|
||||
?>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||
<title><?php echo __('Accoustic console'); ?>)</title>
|
||||
<link rel="stylesheet" href="../../include/styles/pandora_minimal.css?v=<?php echo $config['current_package']; ?>" type="text/css" />
|
||||
<link rel="stylesheet" href="../../include/styles/js/jquery-ui.min.css?v=<?php echo $config['current_package']; ?>" type="text/css" />
|
||||
<link rel="stylesheet" href="../../include/styles/js/jquery-ui_custom.css?v=<?php echo $config['current_package']; ?>" type="text/css" />
|
||||
<link rel="stylesheet" href="../../include/styles/select2.min.css?v=<?php echo $config['current_package']; ?>" type="text/css" />
|
||||
<link rel="stylesheet" href="../../include/styles/wizard.css?v=<?php echo $config['current_package']; ?>" type="text/css" />
|
||||
<link rel="stylesheet" href="../../include/styles/discovery.css?v=<?php echo $config['current_package']; ?>" type="text/css" />
|
||||
<script type='text/javascript' src='../../include/javascript/pandora_ui.js?v=<?php echo $config['current_package']; ?>'></script>
|
||||
<script type='text/javascript' src='../../include/javascript/jquery.current.js?v=<?php echo $config['current_package']; ?>'></script>
|
||||
<script type='text/javascript' src='../../include/javascript/jquery.pandora.js?v=<?php echo $config['current_package']; ?>'></script>
|
||||
<script type='text/javascript' src='../../include/javascript/jquery-ui.min.js?v=<?php echo $config['current_package']; ?>'></script>
|
||||
<script type='text/javascript' src='../../include/javascript/select2.min.js?v=<?php echo $config['current_package']; ?>'></script>
|
||||
<script type='text/javascript' src='../../include/javascript/pandora.js?v=<?php echo $config['current_package']; ?>'></script>
|
||||
|
||||
<style type='text/css'>
|
||||
* {
|
||||
margin: 0;
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
%define name pandorafms_console
|
||||
%define version 7.0NG.770
|
||||
%define release 230428
|
||||
%define release 230504
|
||||
|
||||
# User and Group under which Apache is running
|
||||
%define httpd_name httpd
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
%define name pandorafms_console
|
||||
%define version 7.0NG.770
|
||||
%define release 230428
|
||||
%define release 230504
|
||||
|
||||
# User and Group under which Apache is running
|
||||
%define httpd_name httpd
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
%define name pandorafms_console
|
||||
%define version 7.0NG.770
|
||||
%define release 230428
|
||||
%define release 230504
|
||||
%define httpd_name httpd
|
||||
# User and Group under which Apache is running
|
||||
%define httpd_name apache2
|
||||
|
|
|
|||
|
|
@ -2610,7 +2610,7 @@ CREATE TABLE IF NOT EXISTS `tpolicy_group_agents` (
|
|||
ON DELETE CASCADE ON UPDATE CASCADE,
|
||||
FOREIGN KEY (`id_agent`) REFERENCES `tagente`(`id_agente`)
|
||||
ON DELETE CASCADE ON UPDATE CASCADE
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
|
||||
|
||||
-- ---------------------------------------------------------------------
|
||||
-- Table `tdashboard`
|
||||
|
|
@ -4237,7 +4237,7 @@ CREATE TABLE `tevent_sound` (
|
|||
`name` TEXT NULL,
|
||||
`sound` TEXT NULL,
|
||||
`active` TINYINT NOT NULL DEFAULT '1',
|
||||
PRIMARY KEY (`id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
PRIMARY KEY (`id`)) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
|
||||
|
||||
-- ---------------------------------------------------------------------
|
||||
-- Table `tsesion_filter`
|
||||
|
|
@ -4251,7 +4251,7 @@ CREATE TABLE IF NOT EXISTS `tsesion_filter` (
|
|||
`type` TEXT NULL,
|
||||
`user` TEXT NULL,
|
||||
PRIMARY KEY (`id_filter`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
|
||||
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `twelcome_tip` (
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
package: pandorafms-server
|
||||
Version: 7.0NG.770-230428
|
||||
Version: 7.0NG.770-230504
|
||||
Architecture: all
|
||||
Priority: optional
|
||||
Section: admin
|
||||
Installed-Size: 640
|
||||
Maintainer: ÁRTICA ST <info@artica.es>
|
||||
Homepage: http://pandorafms.org/
|
||||
Depends: perl (>= 5.8), libdbi-perl, libdbd-mysql-perl, libtime-format-perl, libnetaddr-ip-perl, libtime-format-perl, libxml-simple-perl, libxml-twig-perl, libhtml-parser-perl, snmp, snmpd, traceroute, xprobe2, nmap, sudo, libwww-perl, libsocket6-perl, libio-socket-inet6-perl, libio-socket-ssl-perl, snmp-mibs-downloader, libjson-perl, libnet-telnet-perl, libencode-locale-perl, libgeo-ip-perl
|
||||
Depends: perl (>= 5.8), libdbi-perl, libdbd-mysql-perl, libtime-format-perl, libnetaddr-ip-perl, libtime-format-perl, libxml-simple-perl, libxml-twig-perl, libhtml-parser-perl, snmp, snmpd, traceroute, nmap, sudo, libwww-perl, libsocket6-perl, libio-socket-inet6-perl, libio-socket-ssl-perl, snmp-mibs-downloader, libjson-perl, libnet-telnet-perl, libencode-locale-perl, libgeo-ip-perl
|
||||
Description: Pandora FMS is a monitoring system for big IT environments. It uses remote tests, or local agents to grab information. Pandora supports all standard OS (Linux, AIX, HP-UX, Solaris and Windows XP,2000/2003), and support multiple setups in HA enviroments. This is the server package. Server makes the remote checks and process information transfer by Pandora FMS agents to the server.
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
|
||||
pandora_version="7.0NG.770-230428"
|
||||
pandora_version="7.0NG.770-230504"
|
||||
|
||||
package_cpan=0
|
||||
package_pandora=1
|
||||
|
|
|
|||
|
|
@ -242,13 +242,6 @@ mta_address localhost
|
|||
# Set 0 if want eMail deliver shared mail by all destination.
|
||||
mail_in_separate 1
|
||||
|
||||
|
||||
# xprobe2: Optional package to detect OS types using advanced TCP/IP
|
||||
# fingerprinting tecniques, much more accurates than stadard nmap.
|
||||
# If not provided, nmap is used insted xprobe2
|
||||
|
||||
xprobe2 /usr/local/bin/xprobe2
|
||||
|
||||
# nmap: If provided, is used to detect OS type with recon server using
|
||||
# advanded OS fingerprint technique. Xprobe2 gives more accurate results
|
||||
# Nmap is also used to do TCP port scanning in detected host.
|
||||
|
|
|
|||
|
|
@ -238,13 +238,6 @@ mta_address localhost
|
|||
# Set 0 if want eMail deliver shared mail by all destination.
|
||||
mail_in_separate 1
|
||||
|
||||
|
||||
# xprobe2: Optional package to detect OS types using advanced TCP/IP
|
||||
# fingerprinting tecniques, much more accurates than stadard nmap.
|
||||
# If not provided, nmap is used insted xprobe2
|
||||
|
||||
xprobe2 /usr/local/bin/xprobe2
|
||||
|
||||
# nmap: If provided, is used to detect OS type with recon server using
|
||||
# advanded OS fingerprint technique. Xprobe2 gives more accurate results
|
||||
# Nmap is also used to do TCP port scanning in detected host.
|
||||
|
|
|
|||
|
|
@ -302,13 +302,6 @@ dataserver_threads 1
|
|||
# Set 0 if want eMail deliver shared mail by all destination.
|
||||
mail_in_separate 1
|
||||
|
||||
|
||||
# xprobe2: Optional package to detect OS types using advanced TCP/IP
|
||||
# fingerprinting tecniques, much more accurates than stadard nmap.
|
||||
# If not provided, nmap is used insted xprobe2
|
||||
|
||||
xprobe2 /usr/bin/xprobe2
|
||||
|
||||
# nmap: If provided, is used to detect OS type with recon server using
|
||||
# advanded OS fingerprint technique. Xprobe2 gives more accurate results
|
||||
# Nmap is also used to do TCP port scanning in detected host.
|
||||
|
|
|
|||
|
|
@ -252,12 +252,6 @@ dataserver_threads 2
|
|||
|
||||
#mta_encryption none
|
||||
|
||||
# xprobe2: Optional package to detect OS types using advanced TCP/IP
|
||||
# fingerprinting tecniques, much more accurates than stadard nmap.
|
||||
# If not provided, nmap is used insted xprobe2
|
||||
|
||||
#xprobe2 c:\pandora_server\bin\xprobe2
|
||||
|
||||
# nmap: If provided, is used to detect OS type with recon server using
|
||||
# advanded OS fingerprint technique. Xprobe2 gives more accurate results
|
||||
# Nmap is also used to do TCP port scanning in detected host.
|
||||
|
|
|
|||
|
|
@ -302,13 +302,6 @@ dataserver_threads 1
|
|||
# Set 0 if want eMail deliver shared mail by all destination.
|
||||
mail_in_separate 1
|
||||
|
||||
|
||||
# xprobe2: Optional package to detect OS types using advanced TCP/IP
|
||||
# fingerprinting tecniques, much more accurates than stadard nmap.
|
||||
# If not provided, nmap is used insted xprobe2
|
||||
|
||||
xprobe2 /usr/bin/xprobe2
|
||||
|
||||
# nmap: If provided, is used to detect OS type with recon server using
|
||||
# advanded OS fingerprint technique. Xprobe2 gives more accurate results
|
||||
# Nmap is also used to do TCP port scanning in detected host.
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ our @EXPORT = qw(
|
|||
|
||||
# version: Defines actual version of Pandora Server for this module only
|
||||
my $pandora_version = "7.0NG.770";
|
||||
my $pandora_build = "230428";
|
||||
my $pandora_build = "230504";
|
||||
our $VERSION = $pandora_version." ".$pandora_build;
|
||||
|
||||
# Setup hash
|
||||
|
|
@ -371,9 +371,6 @@ sub pandora_load_config {
|
|||
|
||||
# SNMP enterprise retries (for braa)
|
||||
$pa_config->{"braa_retries"} = 3; # 5.0
|
||||
|
||||
# Xprobe2 for recon OS fingerprinting and tcpscan (optional)
|
||||
$pa_config->{"xprobe2"} = "/usr/bin/xprobe2";
|
||||
|
||||
# Winexe allows to exec commands on remote windows systems (optional)
|
||||
$pa_config->{"winexe"} = "/usr/bin/winexe";
|
||||
|
|
@ -927,9 +924,6 @@ sub pandora_load_config {
|
|||
elsif ($parametro =~ m/^braa_retries\s+([0-9]*)/i) {
|
||||
$pa_config->{"braa_retries"} = clean_blank($1);
|
||||
}
|
||||
elsif ($parametro =~ m/^xprobe2\s(.*)/i) {
|
||||
$pa_config->{'xprobe2'}= clean_blank($1);
|
||||
}
|
||||
elsif ($parametro =~ m/^winexe\s(.*)/i) {
|
||||
$pa_config->{'winexe'}= clean_blank($1);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6679,40 +6679,40 @@ sub pandora_get_os ($$) {
|
|||
return 10;
|
||||
}
|
||||
|
||||
if ($os =~ m/Windows/i) {
|
||||
if ($os =~ m/Windows.*?(?=\(\d+%\))/i) {
|
||||
return 9;
|
||||
}
|
||||
if ($os =~ m/Cisco/i) {
|
||||
if ($os =~ m/Cisco.*?(?=\(\d+%\))/i) {
|
||||
return 7;
|
||||
}
|
||||
if ($os =~ m/SunOS/i || $os =~ m/Solaris/i) {
|
||||
if ($os =~ m/SunOS.*?(?=\(\d+%\))/i || $os =~ m/Solaris.*?(?=\(\d+%\))/i) {
|
||||
return 2;
|
||||
}
|
||||
if ($os =~ m/AIX/i) {
|
||||
if ($os =~ m/AIX.*?(?=\(\d+%\))/i) {
|
||||
return 3;
|
||||
}
|
||||
if ($os =~ m/HP\-UX/i) {
|
||||
if ($os =~ m/HP\-UX.*?(?=\(\d+%\))/i) {
|
||||
return 5;
|
||||
}
|
||||
if ($os =~ m/Apple/i || $os =~ m/Darwin/i) {
|
||||
if ($os =~ m/Apple.*?(?=\(\d+%\))/i || $os =~ m/Darwin.*?(?=\(\d+%\))/i) {
|
||||
return 8;
|
||||
}
|
||||
if ($os =~ m/Linux/i) {
|
||||
if ($os =~ m/Linux.*?(?=\(\d+%\))/i) {
|
||||
return 1;
|
||||
}
|
||||
if ($os =~ m/Enterasys/i || $os =~ m/3com/i) {
|
||||
if ($os =~ m/Enterasys.*?(?=\(\d+%\))/i || $os =~ m/3com.*?(?=\(\d+%\))/i) {
|
||||
return 11;
|
||||
}
|
||||
if ($os =~ m/Octopods/i) {
|
||||
if ($os =~ m/Octopods.*?(?=\(\d+%\))/i) {
|
||||
return 13;
|
||||
}
|
||||
if ($os =~ m/embedded/i) {
|
||||
if ($os =~ m/embedded.*?(?=\(\d+%\))/i) {
|
||||
return 14;
|
||||
}
|
||||
if ($os =~ m/android/i) {
|
||||
if ($os =~ m/android.*?(?=\(\d+%\))/i) {
|
||||
return 15;
|
||||
}
|
||||
if ($os =~ m/BSD/i) {
|
||||
if ($os =~ m/BSD.*?(?=\(\d+%\))/i) {
|
||||
return 4;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -407,7 +407,7 @@ sub exec_recon_script ($$$) {
|
|||
}
|
||||
|
||||
################################################################################
|
||||
# Guess the OS using xprobe2 or nmap.
|
||||
# Guess the OS using nmap.
|
||||
################################################################################
|
||||
sub PandoraFMS::Recon::Base::guess_os($$;$) {
|
||||
my ($self, $device, $string_flag) = @_;
|
||||
|
|
@ -426,26 +426,18 @@ sub PandoraFMS::Recon::Base::guess_os($$;$) {
|
|||
return OS_SWITCH if ($device_type eq 'switch');
|
||||
return OS_OTHER;
|
||||
}
|
||||
|
||||
# Use xprobe2 if available
|
||||
if (-x $self->{'pa_config'}->{'xprobe2'}) {
|
||||
my $return = `"$self->{pa_config}->{xprobe2}" $device 2>$DEVNULL`;
|
||||
if ($? == 0) {
|
||||
if($return =~ /Running OS:(.*)/) {
|
||||
my $str_os = $1;
|
||||
return $str_os if is_enabled($string_flag);
|
||||
return pandora_get_os($self->{'dbh'}, $str_os);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
# Use nmap by default
|
||||
if (-x $self->{'pa_config'}->{'nmap'}) {
|
||||
my $return = `"$self->{pa_config}->{nmap}" -F -O $device 2>$DEVNULL`;
|
||||
my $return = `"$self->{pa_config}->{nmap}" -sSU -T5 -F -O --osscan-limit $device 2>$DEVNULL`;
|
||||
return OS_OTHER if ($? != 0);
|
||||
|
||||
if ($return =~ /Aggressive OS guesses:\s*(.*)/) {
|
||||
my $str_os = $1;
|
||||
my $str_os;
|
||||
if ($return =~ /Aggressive OS guesses:\s*(.*)|OS details:\s(.*)/) {
|
||||
if($1 ne "") {
|
||||
$str_os = $1;
|
||||
} else {
|
||||
$str_os = $2;
|
||||
}
|
||||
return $str_os if is_enabled($string_flag);
|
||||
return pandora_get_os($self->{'dbh'}, $str_os);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
|
|||
|
||||
# version: Defines actual version of Pandora Server for this module only
|
||||
my $pandora_version = "7.0NG.770";
|
||||
my $pandora_build = "230428";
|
||||
my $pandora_build = "230504";
|
||||
our $VERSION = $pandora_version." ".$pandora_build;
|
||||
|
||||
our %EXPORT_TAGS = ( 'all' => [ qw() ] );
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
%global __os_install_post %{nil}
|
||||
%define name pandorafms_server
|
||||
%define version 7.0NG.770
|
||||
%define release 230428
|
||||
%define release 230504
|
||||
|
||||
Summary: Pandora FMS Server
|
||||
Name: %{name}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
%global __os_install_post %{nil}
|
||||
%define name pandorafms_server
|
||||
%define version 7.0NG.770
|
||||
%define release 230428
|
||||
%define release 230504
|
||||
|
||||
Summary: Pandora FMS Server
|
||||
Name: %{name}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
# **********************************************************************
|
||||
|
||||
PI_VERSION="7.0NG.770"
|
||||
PI_BUILD="230428"
|
||||
PI_BUILD="230504"
|
||||
|
||||
MODE=$1
|
||||
if [ $# -gt 1 ]; then
|
||||
|
|
@ -214,7 +214,7 @@ install () {
|
|||
echo "The complete installation guide is at: https://pandorafms.com/docs/"
|
||||
echo " "
|
||||
echo "Debian-based distribution do:"
|
||||
echo " # apt-get install snmp snmpd libjson-perllibio-socket-inet6-perl libsocket6-perl libxml-simple-perl libxml-twig-perl libnetaddr-ip-perl libdbi-perl libnetaddr-ip-perl libhtml-parser-perl wmi-client xprobe2 snmp-mibs-downloader"
|
||||
echo " # apt-get install snmp snmpd libjson-perllibio-socket-inet6-perl libsocket6-perl libxml-simple-perl libxml-twig-perl libnetaddr-ip-perl libdbi-perl libnetaddr-ip-perl libhtml-parser-perl wmi-client snmp-mibs-downloader"
|
||||
echo " "
|
||||
echo "For CentOS / RHEL do: "
|
||||
echo " "
|
||||
|
|
@ -226,13 +226,13 @@ install () {
|
|||
perl-HTML-Encoding perl-HTML-Tree perl-NetAddr-IP perl-IO-Socket-INET6 perl-Socket6
|
||||
perl-TimeDate perl-XML-Simple perl-XML-Twig perl-libwww-perl mysql-client"
|
||||
echo " "
|
||||
echo " You also will need to install (optionally) xprobe2 and wmiclient from rpm (download from our website)"
|
||||
echo " You also will need to install (optionally) wmiclient from rpm (download from our website)"
|
||||
echo " "
|
||||
echo "For FreeBSD do : "
|
||||
echo " "
|
||||
echo " Install following tools from ports or packages."
|
||||
echo " Recommended: p5-DBI p5-NetAddr-IP p5-XML-Simple p5-XML-Twig p5-HTML-Parser p5-DBD-mysql p5-Socket6 p5-IO-Socket-INET6 p5-JSON"
|
||||
echo " Optional: nmap xprobe"
|
||||
echo " Optional: nmap"
|
||||
echo " "
|
||||
echo " And install Geo::IP manually."
|
||||
echo " "
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ use PandoraFMS::Config;
|
|||
use PandoraFMS::DB;
|
||||
|
||||
# version: define current version
|
||||
my $version = "7.0NG.770 Build 230428";
|
||||
my $version = "7.0NG.770 Build 230504";
|
||||
|
||||
# Pandora server configuration
|
||||
my %conf;
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ use Encode::Locale;
|
|||
Encode::Locale::decode_argv;
|
||||
|
||||
# version: define current version
|
||||
my $version = "7.0NG.770 Build 230428";
|
||||
my $version = "7.0NG.770 Build 230504";
|
||||
|
||||
# save program name for logging
|
||||
my $progname = basename($0);
|
||||
|
|
|
|||
|
|
@ -54,7 +54,6 @@ RUN dnf install -y vim wget bzip2 curl && \
|
|||
php-zip \
|
||||
php-xmlrpc \
|
||||
nmap \
|
||||
xprobe2 \
|
||||
mysql-server \
|
||||
mysql \
|
||||
htop \
|
||||
|
|
@ -76,7 +75,6 @@ RUN dnf install -y vim wget bzip2 curl && \
|
|||
perl-IO-Socket-SSL \
|
||||
nmap \
|
||||
sudo \
|
||||
xprobe2 \
|
||||
make \
|
||||
perl-CPAN \
|
||||
perl-JSON \
|
||||
|
|
|
|||
Loading…
Reference in New Issue