var treeController = TreeController.getController();
-
+
processTreeSearch();
$("form#tree_search").submit(function(e) {
diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index 6c93b10a71..0a682d3046 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -186,6 +186,8 @@ if (isset($_GET['modified']) && !$view_mode) {
} else {
if (!empty($password_new) && !empty($password_confirm)) {
$success_msg = __('Password successfully updated');
+ } else if ($upd_info['id_skin'] !== $user_info['id_skin']) {
+ $success_msg = __('Skin successfully updated');
} else {
$return = false;
$error_msg = __('No changes have been made');
@@ -549,13 +551,13 @@ $table_ichanges = '
'.html_print_image(
- 'images/darrowright_green.png',
- true,
- [
- 'id' => 'right_autorefreshlist',
- 'alt' => __('Push selected pages into autorefresh list'),
- 'title' => __('Push selected pages into autorefresh list'),
- ]
+ 'images/darrowright_green.png',
+ true,
+ [
+ 'id' => 'right_autorefreshlist',
+ 'alt' => __('Push selected pages into autorefresh list'),
+ 'title' => __('Push selected pages into autorefresh list'),
+ ]
).'
'.html_print_image(
'images/darrowleft_green.png',
diff --git a/pandora_console/operation/visual_console/view.php b/pandora_console/operation/visual_console/view.php
index 33a860ef22..8b51d0a8f6 100644
--- a/pandora_console/operation/visual_console/view.php
+++ b/pandora_console/operation/visual_console/view.php
@@ -398,6 +398,17 @@ if ($pure === false) {
echo ' ';
if ($aclWrite === true || $aclManage === true) {
+ if (!is_metaconsole()) {
+ echo '
'.html_print_image(
+ 'images/target.png',
+ true,
+ [
+ 'title' => __('Force remote checks'),
+ 'class' => 'invert_filter',
+ ]
+ ).'';
+ }
+
echo html_print_checkbox_switch('edit-mode', 1, false, true);
}
@@ -671,12 +682,14 @@ if ($edit_capable === true) {
if ($(this).prop('checked')) {
visualConsoleManager.visualConsole.enableEditMode();
visualConsoleManager.changeUpdateInterval(0);
+ $('#force_check').hide();
$('#edit-controls').css('visibility', '');
} else {
visualConsoleManager.visualConsole.disableEditMode();
visualConsoleManager.visualConsole.unSelectItems();
visualConsoleManager.changeUpdateInterval(); // To ms.
$('#edit-controls').css('visibility', 'hidden');
+ $('#force_check').show();
}
});
';
+ $.ajax({
+ type: "GET",
+ url: "ajax.php",
+ dataType: "json",
+ data: {
+ page: "include/ajax/visual_console.ajax",
+ force_remote_check: true,
+ id_layout: id_layout
+ },
+ success: function (data) {
+ if (data == 1) {
+ visualConsoleManager.changeUpdateInterval(5000);
+ setTimeout(resetInterval, 6000);
+ } else {
+ resetInterval();
+ }
+ },
+ error: function (data) {
+ resetInterval();
+ }
+ });
+ });
+
+ function resetInterval() {
+ visualConsoleManager.changeUpdateInterval();
+ }
+
/**
* Process ajax responses and shows a dialog with results.
*/
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index d56eb17253..97807397a1 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.759
-%define release 220105
+%define release 220113
# 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 6f0ce7e5c9..3256cbcfd8 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.759
-%define release 220105
+%define release 220113
# 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 363f64caed..8a7899ec92 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.759
-%define release 220105
+%define release 220113
%define httpd_name httpd
# User and Group under which Apache is running
%define httpd_name apache2
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index 62cb177d3e..0f766eea65 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -2856,7 +2856,8 @@ CREATE TABLE IF NOT EXISTS `tservice_element` (
`id_service_child` int(10) unsigned NOT NULL default 0,
`id_server_meta` int(10) unsigned NOT NULL default 0,
`rules` text,
- PRIMARY KEY (`id`)
+ PRIMARY KEY (`id`),
+ INDEX `IDX_tservice_element` (`id_service`,`id_agente_modulo`)
) ENGINE=InnoDB
COMMENT = 'Table to define the modules and the weights of the modules that define a service'
DEFAULT CHARSET=utf8;
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 475d1951a6..33c12ca9e0 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
package: pandorafms-server
-Version: 7.0NG.759-220105
+Version: 7.0NG.759-220113
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 59c9eb7e3c..cf3a7e7c27 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.759-220105"
+pandora_version="7.0NG.759-220113"
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 7e53d28c39..7dc311915c 100644
--- a/pandora_server/conf/pandora_server.conf.new
+++ b/pandora_server/conf/pandora_server.conf.new
@@ -348,6 +348,9 @@ fsnmp /usr/bin/pandorafsnmp
autocreate_group 10
+# Works like autocreate_group, except the name of the group is specified (instead of its id). Do not set both.
+#autocreate_group_name Unknown
+
# If set to 1, new agents will be added to the group specified by autocreate_group (the group specified by the agent will be used as fallback).
# If set to 0, new agents will be added to the group specified by the agent (the group specified by autocreate_group will be used as fallback).
diff --git a/pandora_server/conf/pandora_server.conf.windows b/pandora_server/conf/pandora_server.conf.windows
index 9d953cfa94..0a2717793c 100644
--- a/pandora_server/conf/pandora_server.conf.windows
+++ b/pandora_server/conf/pandora_server.conf.windows
@@ -274,6 +274,9 @@ dataserver_threads 2
autocreate_group 10
+# Works like autocreate_group, except the name of the group is specified (instead of its id). Do not set both.
+#autocreate_group_name Unknown
+
# If set to 1, new agents will be added to the group specified by autocreate_group (the group specified by the agent will be used as fallback).
# If set to 0, new agents will be added to the group specified by the agent (the group specified by autocreate_group will be used as fallback).
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 1c38f4a355..4c20438422 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.759";
-my $pandora_build = "220105";
+my $pandora_build = "220113";
our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash
@@ -398,6 +398,7 @@ sub pandora_load_config {
$pa_config->{'autocreate_group'} = -1;
$pa_config->{'autocreate_group_force'} = 1;
+ $pa_config->{'autocreate_group_name'} = '';
$pa_config->{'autocreate'} = 1;
# max log size (bytes)
@@ -942,6 +943,9 @@ sub pandora_load_config {
elsif ($parametro =~ m/^autocreate_group_force\s+([0-1])/i) {
$pa_config->{'autocreate_group_force'}= clean_blank($1);
}
+ elsif ($parametro =~ m/^autocreate_group_name\s(.*)/i) {
+ $pa_config->{'autocreate_group_name'}= clean_blank($1);
+ }
elsif ($parametro =~ m/^discovery_threads\s+([0-9]*)/i) {
$pa_config->{'discovery_threads'}= clean_blank($1);
}
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 9058d83e96..9d1736266f 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -3846,7 +3846,8 @@ sub pandora_get_agent_group {
my ($pa_config, $dbh, $agent_name, $agent_group, $agent_group_password) = @_;
my $group_id;
- my @groups = $pa_config->{'autocreate_group_force'} == 1 ? ($pa_config->{'autocreate_group'}, $agent_group) : ($agent_group, $pa_config->{'autocreate_group'});
+ my $auto_group = $pa_config->{'autocreate_group_name'} ne '' ? $pa_config->{'autocreate_group_name'} : $pa_config->{'autocreate_group'};
+ my @groups = $pa_config->{'autocreate_group_force'} == 1 ? ($auto_group, $agent_group) : ($agent_group, $auto_group);
foreach my $group (@groups) {
next unless defined($group);
diff --git a/pandora_server/lib/PandoraFMS/DataServer.pm b/pandora_server/lib/PandoraFMS/DataServer.pm
index f3b6fd63aa..2bd398cfda 100644
--- a/pandora_server/lib/PandoraFMS/DataServer.pm
+++ b/pandora_server/lib/PandoraFMS/DataServer.pm
@@ -89,11 +89,20 @@ sub new ($$;$) {
}
}
- if ($config->{'autocreate_group'} > 0 && !defined(get_group_name ($dbh, $config->{'autocreate_group'}))) {
- my $msg = "Group id " . $config->{'autocreate_group'} . " does not exist (check autocreate_group config token).";
- logger($config, $msg, 3);
- print_message($config, $msg, 1);
- pandora_event ($config, $msg, 0, 0, 0, 0, 0, 'error', 0, $dbh);
+ if ($config->{'autocreate_group_name'} ne '') {
+ if (get_group_id($dbh, $config->{'autocreate_group_name'}) == -1) {
+ my $msg = "Group '" . $config->{'autocreate_group_name'} . "' does not exist (check autocreate_group_name config token).";
+ logger($config, $msg, 3);
+ print_message($config, $msg, 1);
+ pandora_event ($config, $msg, 0, 0, 0, 0, 0, 'error', 0, $dbh);
+ }
+ } elsif ($config->{'autocreate_group'} > 0) {
+ if (!defined(get_group_name ($dbh, $config->{'autocreate_group'}))) {
+ my $msg = "Group id " . $config->{'autocreate_group'} . " does not exist (check autocreate_group config token).";
+ logger($config, $msg, 3);
+ print_message($config, $msg, 1);
+ pandora_event ($config, $msg, 0, 0, 0, 0, 0, 'error', 0, $dbh);
+ }
}
bless $self, $class;
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index ca12f4e204..13121c0a90 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.759";
-my $pandora_build = "220105";
+my $pandora_build = "220113";
our $VERSION = $pandora_version." ".$pandora_build;
our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 607e4c5f2f..c826a174c9 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 7.0NG.759
-%define release 220105
+%define release 220113
Summary: Pandora FMS Server
Name: %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 36961c491b..bd72417d4c 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 7.0NG.759
-%define release 220105
+%define release 220113
Summary: Pandora FMS Server
Name: %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 86ed18ed21..193a048ff7 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
# **********************************************************************
PI_VERSION="7.0NG.759"
-PI_BUILD="220105"
+PI_BUILD="220113"
MODE=$1
if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 737d7acaf3..b073a3623b 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -35,7 +35,7 @@ use PandoraFMS::Config;
use PandoraFMS::DB;
# version: define current version
-my $version = "7.0NG.759 Build 220105";
+my $version = "7.0NG.759 Build 220113";
# Pandora server configuration
my %conf;
@@ -391,11 +391,11 @@ sub pandora_purgedb ($$) {
# Delete old log data
log_message ('PURGE', "Deleting old network configuration manager data.");
- if (defined($conf->{'days_purge_ncm'}) && $conf->{'days_purge_ncm'} > 0) {
- log_message ('PURGE', 'Deleting NCM data older than ' . $conf->{'days_purge_ncm'} . ' days.');
- enterprise_hook ('pandora_purge_ncm', [$dbh, \&log_message, $conf->{'days_purge_ncm'}, $conf->{'_history_db_step'}, $conf->{'_history_db_delay'}]);
+ if (defined($conf->{'_days_purge'}) && $conf->{'_days_purge'} > 0) {
+ log_message ('PURGE', 'Deleting NCM data older than ' . $conf->{'_days_purge'} . ' days.');
+ enterprise_hook ('pandora_purge_ncm', [$dbh, \&log_message, $conf->{'_days_purge'}, $conf->{'_history_db_step'}, $conf->{'_history_db_delay'}]);
} else {
- log_message ('PURGE', 'days_purge_ncm is set to 0. Old network configuration manager data will not be deleted.');
+ log_message ('PURGE', '_days_purge is set to 0. Old network configuration manager data will not be deleted.');
}
# Delete old special days
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 6163c0fef7..3b3a173061 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.759 Build 220105";
+my $version = "7.0NG.759 Build 220113";
# save program name for logging
my $progname = basename($0);