'.$product_name.'
'.__('Version').' '.$pandora_version.$lts_name.' - '.(enterprise_installed() ? 'Enterprise' : 'Community').'
- '.__('MR version').' MR'.$config['MR'].'
+ '.__('Current package').' '.$config['current_package'].'
+ '.__('MR version').' MR'.$config['MR'].'
Build'.$build_version.' ';
if (enterprise_installed() === true) {
$dialog .= ''.__('Support expires').''.$license_expiry_date.' ';
diff --git a/pandora_console/include/javascript/pandora_ui.js b/pandora_console/include/javascript/pandora_ui.js
index 00ece1a178..cd71ef51c3 100644
--- a/pandora_console/include/javascript/pandora_ui.js
+++ b/pandora_console/include/javascript/pandora_ui.js
@@ -580,7 +580,6 @@ function confirmDialog(settings, idDialog = uniqId()) {
$(this).dialog("close");
$(this).remove();
}
- if (typeof settings.onDeny == "function") settings.onDeny();
}
},
{
diff --git a/pandora_console/include/lib/TacticalView/elements/LogStorage.php b/pandora_console/include/lib/TacticalView/elements/LogStorage.php
index 427b3c93c6..6ff1276394 100644
--- a/pandora_console/include/lib/TacticalView/elements/LogStorage.php
+++ b/pandora_console/include/lib/TacticalView/elements/LogStorage.php
@@ -170,7 +170,7 @@ class LogStorage extends Element
public function getStoredData():string
{
if ($this->isEnabled() === true) {
- $data = $this->valueMonitoring('Total lines of data');
+ $data = $this->valueMonitoring('Total documents');
$value = format_numeric($data[0]['datos']);
} else {
$value = __('N/A');
diff --git a/pandora_console/index.php b/pandora_console/index.php
index 4ca8f80a82..49bccd1b14 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -1515,6 +1515,15 @@ echo html_print_div(
true
);
+echo html_print_input_hidden(
+ 'flagEasternEgg',
+ $config['eastern_eggs_disabled'],
+ false,
+ '',
+ '',
+ 'flagEasternEgg'
+);
+
// Connection lost alert.
set_js_value('check_conexion_interval', $config['check_conexion_interval']);
set_js_value('title_conexion_interval', __('Connection with console has been lost'));
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 1864d06ed2..6ff3a4eb0b 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -131,7 +131,7 @@
connect();
- $result_server = db_get_all_rows_sql($sql);
+ $result_server = db_get_all_rows_sql($sql);
- if (empty($result_server) === false) {
- // Create HASH login info.
- $pwd = $server['auth_token'];
- $auth_serialized = json_decode($pwd, true);
+ if (empty($result_server) === false) {
+ // Create HASH login info.
+ $pwd = $server['auth_token'];
+ $auth_serialized = json_decode($pwd, true);
- if (is_array($auth_serialized)) {
- $pwd = $auth_serialized['auth_token'];
- $api_password = $auth_serialized['api_password'];
- $console_user = $auth_serialized['console_user'];
- $console_password = $auth_serialized['console_password'];
+ if (is_array($auth_serialized)) {
+ $pwd = $auth_serialized['auth_token'];
+ $api_password = $auth_serialized['api_password'];
+ $console_user = $auth_serialized['console_user'];
+ $console_password = $auth_serialized['console_password'];
+ }
+
+ $user = $config['id_user'];
+ $user_rot13 = str_rot13($config['id_user']);
+ $hashdata = $user.$pwd;
+ $hashdata = md5($hashdata);
+
+ foreach ($result_server as $result_element_key => $result_element_value) {
+ $result_server[$result_element_key]['server_id'] = $server['id'];
+ $result_server[$result_element_key]['server_name'] = $server['server_name'];
+ $result_server[$result_element_key]['server_url'] = $server['server_url'].'/';
+ $result_server[$result_element_key]['hashdata'] = $hashdata;
+ $result_server[$result_element_key]['user'] = $config['id_user'];
+ $result_server[$result_element_key]['groups_in_server'] = agents_get_all_groups_agent(
+ $result_element_value['id_agent'],
+ $result_element_value['id_group']
+ );
+
+ $count_modules++;
+ }
+
+ $result = array_merge($result, $result_server);
}
- $user = $config['id_user'];
- $user_rot13 = str_rot13($config['id_user']);
- $hashdata = $user.$pwd;
- $hashdata = md5($hashdata);
- $url_hash = '&'.'loginhash=auto&'.'loginhash_data='.$hashdata.'&'.'loginhash_user='.$user_rot13;
-
- foreach ($result_server as $result_element_key => $result_element_value) {
- $result_server[$result_element_key]['server_id'] = $server['id'];
- $result_server[$result_element_key]['server_name'] = $server['server_name'];
- $result_server[$result_element_key]['server_url'] = $server['server_url'].'/';
- $result_server[$result_element_key]['hashdata'] = $hashdata;
- $result_server[$result_element_key]['user'] = $config['id_user'];
- $result_server[$result_element_key]['groups_in_server'] = agents_get_all_groups_agent(
- $result_element_value['id_agent'],
- $result_element_value['id_group']
- );
-
- $count_modules++;
- }
-
- $result = array_merge($result, $result_server);
+ usort($result, arrayOutputSorting($sort, $fieldForSorting));
+ } catch (\Exception $e) {
+ $node->disconnect();
+ return;
+ } finally {
+ $node->disconnect();
}
-
- usort($result, arrayOutputSorting($sort, $fieldForSorting));
-
- metaconsole_restore_db();
}
if ($count_modules > $config['block_size']) {
diff --git a/pandora_console/operation/network/network_usage_map.php b/pandora_console/operation/network/network_usage_map.php
index 097241a610..2faadf4760 100644
--- a/pandora_console/operation/network/network_usage_map.php
+++ b/pandora_console/operation/network/network_usage_map.php
@@ -96,6 +96,7 @@ $date_init_less = (strtotime(date('Y/m/d')) - SECONDS_1DAY);
$date_init = get_parameter('date_init', date(DATE_FORMAT, $date_init_less));
$time_init = get_parameter('time_init', date(TIME_FORMAT, $date_init_less));
$datetime_init = strtotime($date_init.' '.$time_init);
+$default_date_netflow = false;
if ($custom_date === '1') {
if ($datetime_init >= $datetime_end) {
$datetime_init = $date_init_less;
@@ -137,6 +138,8 @@ if ($custom_date === '1') {
$date_end = date('Y/m/d H:i:s');
$date_init = date('Y/m/d H:i:s', (strtotime($date_end) - $range));
$period = (strtotime($date_end) - strtotime($date_init));
+ $top = 10;
+ $default_date_netflow = true;
}
$date_from = strtotime($date_init);
@@ -336,7 +339,7 @@ ui_toggle(
$has_data = false;
-if ((bool) get_parameter('update_netflow', 1) === true) {
+if ((bool) get_parameter('update_netflow', 1) === true || $default_date_netflow === true) {
$map_data = netflow_build_map_data(
$date_from,
$date_to,
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 221717d3fe..c991baca63 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.774
-%define release 231214
+%define release 231215
# 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 2ad566822c..8ae24a1a45 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.774
-%define release 231214
+%define release 231215
# 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 0f9ab3ccad..1f361f37da 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.774
-%define release 231214
+%define release 231215
%define httpd_name httpd
# User and Group under which Apache is running
%define httpd_name apache2
diff --git a/pandora_console/update_manager_client/lib/UpdateManager/Client.php b/pandora_console/update_manager_client/lib/UpdateManager/Client.php
index a0ca625009..8abe5f2f83 100644
--- a/pandora_console/update_manager_client/lib/UpdateManager/Client.php
+++ b/pandora_console/update_manager_client/lib/UpdateManager/Client.php
@@ -1829,13 +1829,6 @@ class Client
}
} else {
// Manually uploaded package.
- if (is_numeric($package['version']) !== true) {
- $this->lastError = 'Version does not match required format (numeric)';
- $this->notify(10, $this->lastError, false);
- $this->unlock();
- return false;
- }
-
$classic_open_packages = false;
$nextUpdate = [ 'version' => $package['version'] ];
$file_path = $package['file_path'];
diff --git a/pandora_console/update_manager_client/resources/javascript/umc_offline.js b/pandora_console/update_manager_client/resources/javascript/umc_offline.js
index a32dfc1e5c..ad2432a306 100644
--- a/pandora_console/update_manager_client/resources/javascript/umc_offline.js
+++ b/pandora_console/update_manager_client/resources/javascript/umc_offline.js
@@ -487,7 +487,6 @@ function updateOfflineProgress(url, auth) {
* Cancel update.
*/
function cancelUpdate(reason = "") {
- console.error(reason);
var taskStatusLogContainer = $("#result li");
taskStatusLogContainer.addClass("error");
taskStatusLogContainer.find("p").text(texts.rejectedUpdate + " " + reason);
diff --git a/pandora_console/views/tacticalView/view.php b/pandora_console/views/tacticalView/view.php
index 29b1c923fc..ae3eb3cc86 100644
--- a/pandora_console/views/tacticalView/view.php
+++ b/pandora_console/views/tacticalView/view.php
@@ -193,7 +193,7 @@
getStoredData(); ?>
-
+
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index fd95ec2981..d8a3838568 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
package: pandorafms-server
-Version: 7.0NG.774-231214
+Version: 7.0NG.774-231215
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 e53e8e8333..d414a23d60 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.774-231214"
+pandora_version="7.0NG.774-231215"
package_cpan=0
package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 7209ed0131..296771f7f5 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.774";
-my $pandora_build = "231214";
+my $pandora_build = "231215";
our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 771fd75075..8a311fc159 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.774";
-my $pandora_build = "231214";
+my $pandora_build = "231215";
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 08a0661437..3109a043df 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.774
-%define release 231214
+%define release 231215
Summary: Pandora FMS Server
Name: %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index cee1e6c579..aab88dca68 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.774
-%define release 231214
+%define release 231215
Summary: Pandora FMS Server
Name: %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index aed560fe90..b537662939 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
# **********************************************************************
PI_VERSION="7.0NG.774"
-PI_BUILD="231214"
+PI_BUILD="231215"
MODE=$1
if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index c08803df7c..42040bba40 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.774 Build 231214";
+my $version = "7.0NG.774 Build 231215";
# Pandora server configuration
my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 02a9532ce0..ae0081273f 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.774 Build 231214";
+my $version = "7.0NG.774 Build 231215";
# save program name for logging
my $progname = basename($0);
@@ -4509,7 +4509,9 @@ sub cli_create_event() {
# exist_check($id_agent,'agent',$agent_name);
if($id_agent == -1){
if($force_create_agent == 1){
- pandora_create_agent ($conf, '', $agent_name, '', $id_group, '', '', 'Created by cli_create_event', '', $dbh);
+ my $target_os = pandora_get_os($dbh, 'other');
+ my $target_server = $conf{'servername'};
+ pandora_create_agent ($conf, $target_server, $agent_name, '', $id_group, '', $target_os, 'Created by cli_create_event', '300', $dbh);
print_log "[INFO] Adding agent '$agent_name' \n\n";
$id_agent = get_agent_id($dbh,$agent_name);
}
|