', $menuTypeClass);
});
});
/* ]]> */
+
+$(window).resize(function () {
+ resizeSearchHeader()
+});
diff --git a/pandora_console/godmode/setup/file_manager.php b/pandora_console/godmode/setup/file_manager.php
index 4aac87d770..8ccddde606 100644
--- a/pandora_console/godmode/setup/file_manager.php
+++ b/pandora_console/godmode/setup/file_manager.php
@@ -75,8 +75,8 @@ if (isset($text) === false) {
}
$directory = (string) get_parameter('directory');
-$directory = str_replace('<', '', $text);
-$directory = str_replace('>', '', $text);
+$directory = str_replace('<', '', $directory);
+$directory = str_replace('>', '', $directory);
if (empty($directory) === true) {
$directory = $fallback_directory;
} else {
diff --git a/pandora_console/godmode/setup/setup.php b/pandora_console/godmode/setup/setup.php
index 6518470811..8624146692 100644
--- a/pandora_console/godmode/setup/setup.php
+++ b/pandora_console/godmode/setup/setup.php
@@ -111,11 +111,8 @@ if (enterprise_installed()) {
array_push($menu_tabs, $menu_tab_url);
$menu_tab_url = ''.__('History database').'';
array_push($menu_tabs, $menu_tab_url);
-
- if ($config['log_collector']) {
- $menu_tab_url = ''.__('Log collector').'';
- array_push($menu_tabs, $menu_tab_url);
- }
+ $menu_tab_url = ''.__('Log collector').'';
+ array_push($menu_tabs, $menu_tab_url);
}
$buttons['auth'] = [
@@ -422,8 +419,14 @@ switch ($section) {
$help_header = '';
break;
+ case 'log':
+ $buttons['log']['active'] = true;
+ $subpage = __('Log Collector');
+ $help_header = 'opensearch_installation';
+ break;
+
default:
- $subpage = 'seccion: ';
+ $subpage = '';
// Default.
break;
}
@@ -432,7 +435,7 @@ $dots = dot_tab($menu_tabs);
// Header.
ui_print_standard_header(
- __('Setup').' » '.$subpage,
+ $subpage,
'',
false,
$help_header,
diff --git a/pandora_console/include/class/ConsoleSupervisor.php b/pandora_console/include/class/ConsoleSupervisor.php
index b7c9498973..884991c9f2 100644
--- a/pandora_console/include/class/ConsoleSupervisor.php
+++ b/pandora_console/include/class/ConsoleSupervisor.php
@@ -250,6 +250,13 @@ class ConsoleSupervisor
$this->checkAllowOverrideEnabled();
+ /*
+ * Check if OpenSearch is configured and log collector enabled
+ * NOTIF.OPENSEARCH.CONSOLELOG
+ */
+
+ $this->checkOpenSearchLogCollector();
+
/*
* Check if the Pandora Console log
* file remains in old location.
@@ -540,6 +547,12 @@ class ConsoleSupervisor
$this->checkUpdateManagerRegistration();
+ /*
+ * Check if OpenSearch is configured and log collector enabled
+ * NOTIF.OPENSEARCH.CONSOLELOG
+ */
+ $this->checkOpenSearchLogCollector();
+
/*
* Check if has API access.
* NOTIF.API.ACCESS
@@ -2540,6 +2553,35 @@ class ConsoleSupervisor
}
+ /**
+ * Check if OpenSearch is configured and log collector enabled.
+ *
+ * @return void
+ */
+ public function checkOpenSearchLogCollector()
+ {
+ global $config;
+ include_once $config['homedir'].'/include/functions_update_manager.php';
+ $login = get_parameter('login', false);
+
+ if ($config['log_collector'] !== '1' && empty($config['elasticsearch_ip']) === false && empty($config['elasticsearch_port']) === false) {
+ if (update_manager_verify_registration() === false) {
+ $this->notify(
+ [
+ 'type' => 'NOTIF.OPENSEARCH.CONSOLELOG',
+ 'title' => __('The Log collector is not enabled'),
+ 'message' => __('The OpenSearch is defined but the log collector is not enabled.'),
+ 'url' => '__url__/index.php?sec=gsetup&sec2=godmode/setup/setup§ion=log',
+ 'icon_notification' => self::ICON_QUESTION,
+ ]
+ );
+ } else {
+ $this->cleanNotifications('NOTIF.OPENSEARCH.CONSOLELOG');
+ }
+ }
+ }
+
+
/**
* Check if has access to the API
*
diff --git a/pandora_console/include/class/OrderInterpreter.class.php b/pandora_console/include/class/OrderInterpreter.class.php
index b96ad6e510..0936c40d86 100644
--- a/pandora_console/include/class/OrderInterpreter.class.php
+++ b/pandora_console/include/class/OrderInterpreter.class.php
@@ -404,7 +404,7 @@ class OrderInterpreter extends Wizard
if ($iterator <= 9 && $this->canShowItem($enterprise, $this->pages_menu[$key]['url'])) {
echo '';
echo '
- Go to
+ Go to
';
echo '
diff --git a/pandora_console/include/class/SnmpConsole.class.php b/pandora_console/include/class/SnmpConsole.class.php
index 160e020e07..d166f03590 100644
--- a/pandora_console/include/class/SnmpConsole.class.php
+++ b/pandora_console/include/class/SnmpConsole.class.php
@@ -240,27 +240,27 @@ class SnmpConsole extends HTML
'status',
[
'text' => 'snmp_agent',
- 'class' => 'snmp-td datos_green',
+ 'class' => 'snmp-td',
],
[
'text' => 'enterprise_string',
- 'class' => 'snmp-td datos_green',
+ 'class' => 'snmp-td',
],
[
'text' => 'count',
- 'class' => 'snmp-td datos_green',
+ 'class' => 'snmp-td',
],
[
'text' => 'trap_subtype',
- 'class' => 'snmp-td datos_green',
+ 'class' => 'snmp-td',
],
[
'text' => 'user_id',
- 'class' => 'snmp-td datos_green',
+ 'class' => 'snmp-td',
],
[
'text' => 'timestamp',
- 'class' => 'snmp-td datos_green',
+ 'class' => 'snmp-td',
],
'alert',
[
@@ -791,7 +791,7 @@ class SnmpConsole extends HTML
// SNMP Agent.
$agent = agents_get_agent_with_ip($tmp->source);
if ($agent === false) {
- $tmp->snmp_agent .= ''.$tmp->source.'';
+ $tmp->snmp_agent .= 'source.'" title="'.__('Create agent').'">'.$tmp->source.'';
} else {
$tmp->snmp_agent .= '