| ';
$result_pdf .= $title;
diff --git a/pandora_console/include/styles/events.css b/pandora_console/include/styles/events.css
index 9a69ea8c56..4e3da3194c 100644
--- a/pandora_console/include/styles/events.css
+++ b/pandora_console/include/styles/events.css
@@ -569,3 +569,19 @@ div.container-filter-buttons {
.ui-dialog.modal-sound .ui-widget-header {
display: flex !important;
}
+
+.responsive_button_sound_events {
+ margin-right: 25% !important;
+}
+
+@media (max-width: 1640px) {
+ .responsive_button_sound_events {
+ margin-right: 10% !important;
+ }
+}
+
+@media (max-width: 1420px) {
+ .responsive_button_sound_events {
+ margin-right: 10px !important;
+ }
+}
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 8a361b187b..8a30f050be 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -776,6 +776,10 @@ select:-internal-list-box {
width: 80%;
}
+.w85p {
+ width: 85%;
+}
+
.w88p {
width: 88%;
}
@@ -12116,6 +12120,10 @@ div.relative > div > div#ui-datepicker-div {
width: 400px;
}
+.container-div-input-password {
+ display: block !important;
+}
+
#message_dialog_connection {
height: auto !important;
}
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 6d491a85cb..1e2252fbae 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -131,7 +131,7 @@
'responsive_button_sound_events',
'icon' => 'sound',
- 'style' => 'margin-right: 25% !important',
'minimize-arrow' => true,
'span_style' => 'width: 100%',
],
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 240363e351..4b7e8b0da0 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -6,7 +6,7 @@
%define debug_package %{nil}
%define name pandorafms_console
%define version 7.0NG.775
-%define release 240123
+%define release 240125
# User and Group under which Apache is running
%define httpd_name httpd
diff --git a/pandora_console/pandora_console.rhel7.spec b/pandora_console/pandora_console.rhel7.spec
index 4bc4adcc85..ca4ab9657e 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -6,7 +6,7 @@
%define debug_package %{nil}
%define name pandorafms_console
%define version 7.0NG.775
-%define release 240123
+%define release 240125
# User and Group under which Apache is running
%define httpd_name httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index e6969db9dc..977a58e4fe 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.775
-%define release 240123
+%define release 240125
%define httpd_name httpd
# User and Group under which Apache is running
%define httpd_name apache2
diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index 8fc17246d5..280bf8423b 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -91,7 +91,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
('sound_alert', 'include/sounds/air_shock_alarm.wav'),
('sound_critical', 'include/sounds/Star_Trek_emergency_simulation.wav'),
('sound_warning', 'include/sounds/negativebeep.wav'),
-('netflow_interval', '3600'),
+('netflow_interval', '1800'),
('netflow_daemon', '/usr/bin/nfcapd'),
('netflow_nfdump', '/usr/bin/nfdump'),
('netflow_max_resolution', '50'),
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 31213f6c47..4ea2ca557b 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
package: pandorafms-server
-Version: 7.0NG.775-240123
+Version: 7.0NG.775-240125
Architecture: all
Priority: optional
Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index dae47c3d07..ef81d3e503 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-pandora_version="7.0NG.775-240123"
+pandora_version="7.0NG.775-240125"
package_cpan=0
package_pandora=1
diff --git a/pandora_server/conf/pandora_server.conf.new b/pandora_server/conf/pandora_server.conf.new
index bddb11a293..1945cbd08f 100644
--- a/pandora_server/conf/pandora_server.conf.new
+++ b/pandora_server/conf/pandora_server.conf.new
@@ -816,3 +816,5 @@ madeserver_autofit 7d
# Model sensitivity. A lower value triggers less anomalies (PANDORA FMS ENTERPRISE ONLY).
madeserver_sensitivity 0.1
+# Encoding to use on mail subject (MIME-Header by default)
+# mail_subject_encoding MIME-Header-ISO_2022_JP
\ No newline at end of file
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index eb23fcce89..b25686ee4b 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -46,7 +46,7 @@ our @EXPORT = qw(
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.775";
-my $pandora_build = "240123";
+my $pandora_build = "240125";
our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash
@@ -140,7 +140,7 @@ sub pandora_get_sharedconfig ($$) {
# Netflow configuration options
$pa_config->{"activate_netflow"} = pandora_get_tconfig_token ($dbh, 'activate_netflow', 0);
$pa_config->{"netflow_path"} = pandora_get_tconfig_token ($dbh, 'netflow_path', '/var/spool/pandora/data_in/netflow');
- $pa_config->{"netflow_interval"} = pandora_get_tconfig_token ($dbh, 'netflow_interval', 3600);
+ $pa_config->{"netflow_interval"} = pandora_get_tconfig_token ($dbh, 'netflow_interval', 1800);
$pa_config->{"netflow_daemon"} = pandora_get_tconfig_token ($dbh, 'netflow_daemon', '/usr/bin/nfcapd');
# Sflow configuration options
@@ -589,6 +589,8 @@ sub pandora_load_config {
$pa_config->{"madeserver"} = 0; # 774.
+ $pa_config->{"mail_subject_encoding"} = 'MIME-Header'; # 776.
+
# Check for UID0
if ($pa_config->{"quiet"} != 0){
if ($> == 0){
@@ -691,6 +693,9 @@ sub pandora_load_config {
elsif ($parametro =~ m/^mail_in_separate\s+([0-9]*)/i) {
$pa_config->{'mail_in_separate'}= clean_blank($1);
}
+ elsif ($parametro =~ m/^mail_subject_encoding\s(.*)/i) {
+ $pa_config->{'mail_subject_encoding'}= clean_blank($1);
+ }
elsif ($parametro =~ m/^snmp_logfile\s(.*)/i) {
$pa_config->{'snmp_logfile'}= clean_blank($1);
}
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 2bd9b4ef98..21ba802908 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -7191,10 +7191,18 @@ Puts all autodisable agents with all modules unknown on disabled mode
sub pandora_disable_autodisable_agents ($$) {
my ($pa_config, $dbh) = @_;
- my $sql = 'SELECT id_agente FROM tagente
- WHERE disabled=0 AND
- tagente.unknown_count>0 AND
- tagente.modo=2';
+
+ my $sql = 'SELECT id_agente
+ FROM (
+ SELECT tm.id_agente, count(*) as sync_modules, ta.unknown_count
+ FROM tagente_modulo tm
+ JOIN tagente ta ON ta.id_agente = tm.id_agente
+ WHERE ta.disabled = 0
+ AND NOT ((id_tipo_modulo >= 21 AND id_tipo_modulo <= 23) OR id_tipo_modulo = 100)
+ GROUP BY tm.id_agente
+ ) AS subquery
+ WHERE subquery.unknown_count >= subquery.sync_modules;';
+
my @agents_autodisabled = get_db_rows ($dbh, $sql);
return if ($#agents_autodisabled < 0);
diff --git a/pandora_server/lib/PandoraFMS/DB.pm b/pandora_server/lib/PandoraFMS/DB.pm
index c0ee332f64..b417e44efd 100644
--- a/pandora_server/lib/PandoraFMS/DB.pm
+++ b/pandora_server/lib/PandoraFMS/DB.pm
@@ -1533,7 +1533,7 @@ sub get_agent_addr_id ($$$) {
########################################################################
sub db_do ($$;@) {
my ($dbh, $query, @values) = @_;
-
+
#DBI->trace( 3, '/tmp/dbitrace.log' );
eval {
$dbh->do($query, undef, @values);
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 02ea63cb23..020d69c4b3 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.775";
-my $pandora_build = "240123";
+my $pandora_build = "240125";
our $VERSION = $pandora_version." ".$pandora_build;
our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/lib/PandoraFMS/Tools.pm b/pandora_server/lib/PandoraFMS/Tools.pm
index 580344542c..543ea45556 100755
--- a/pandora_server/lib/PandoraFMS/Tools.pm
+++ b/pandora_server/lib/PandoraFMS/Tools.pm
@@ -748,6 +748,7 @@ sub pandora_sendmail {
my $subject = $_[2];
my $message = $_[3];
my $content_type = $_[4];
+ my $encoding = $pa_config->{"mail_subject_encoding"} || 'MIME-Header';
$subject = decode_entities ($subject);
@@ -758,7 +759,7 @@ sub pandora_sendmail {
my %mail = ( To => $to_address,
Message => $message,
- Subject => encode('MIME-Header', $subject),
+ Subject => encode($encoding, $subject),
'X-Mailer' => $pa_config->{"rb_product_name"},
Smtp => $pa_config->{"mta_address"},
Port => $pa_config->{"mta_port"},
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 251e09b74e..829d5ae091 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -7,7 +7,7 @@
%define debug_package %{nil}
%define name pandorafms_server
%define version 7.0NG.775
-%define release 240123
+%define release 240125
Summary: Pandora FMS Server
Name: %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 6c05f78ac2..c697aa9c8f 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -4,7 +4,7 @@
%global __os_install_post %{nil}
%define name pandorafms_server
%define version 7.0NG.775
-%define release 240123
+%define release 240125
Summary: Pandora FMS Server
Name: %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index d9a71e864f..03fa6a84d0 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
# **********************************************************************
PI_VERSION="7.0NG.775"
-PI_BUILD="240123"
+PI_BUILD="240125"
MODE=$1
if [ $# -gt 1 ]; then
@@ -191,7 +191,36 @@ install () {
esac
shift
done
-
+
+ # Alternative destdir has been selected
+ if [ ! -z "$DESTDIR" ]
+ then
+ # Files from previous installation were found
+ if [ -d "/usr/lib/perl5/PandoraFMS" ]
+ then
+ GREEN='\033[01;32m'
+ NONE='\033[0m'
+
+ echo -e -n "Files from a previous installation were found in ${GREEN}/usr/lib/perl5/PandoraFMS/${NONE}. "
+ read -p "That directory will be deleted in order to preserve integrity. Do you wish to proceed? (y/N): " USERAPPROVAL
+
+ if [ "${USERAPPROVAL,,}" = "y" ]; then
+ rm -rf "/usr/lib/perl5/PandoraFMS"
+ echo -e "Previous PandoraFMS directory deleted successfully"
+ else
+ echo -e -n "Files in ${GREEN}/usr/lib/perl5/PandoraFMS/${NONE} will not be deleted. This may cause issues. "
+ read -p "Do you want to proceed with the installation anyway? (y/N): " USERAPPROVAL
+
+ if [ "${USERAPPROVAL,,}" = "y" ]; then
+ echo "Proceeding with the installation anyway. This may cause problems in the future due to the existence of files from previous installations."
+ else
+ echo "Installation aborted. You chose not to proceed."
+ exit 1
+ fi
+ fi
+ fi
+ fi
+
if [ "$LINUX" = YES ]
then
echo "$DISTRO distribution detected"
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 2ab5d89b6a..66e75586cb 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -38,7 +38,7 @@ use PandoraFMS::Config;
use PandoraFMS::DB;
# version: define current version
-my $version = "7.0NG.775 Build 240123";
+my $version = "7.0NG.775 Build 240125";
# Pandora server configuration
my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 2d1eec0b82..b154b38ada 100755
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
Encode::Locale::decode_argv;
# version: define current version
-my $version = "7.0NG.775 Build 240123";
+my $version = "7.0NG.775 Build 240125";
# save program name for logging
my $progname = basename($0);
diff --git a/pandora_server/util/plugin/wizard_wmi_module.pl b/pandora_server/util/plugin/wizard_wmi_module.pl
index 23e49a7f83..fa25c26d0b 100755
--- a/pandora_server/util/plugin/wizard_wmi_module.pl
+++ b/pandora_server/util/plugin/wizard_wmi_module.pl
@@ -172,5 +172,5 @@ foreach my $k (keys %{$fields_values}){
# Get operation result
my $result = eval $operation;
if (defined($result)){
- print $result . "\n";
+ print $result, "\n";
}
|
|---|