diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index ce165fde19..2f579d46f1 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
package: pandorafms-agent-unix
-Version: 7.0NG.740-191029
+Version: 7.0NG.740-191113
Architecture: all
Priority: optional
Section: admin
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index a4a8dce448..f28fdab114 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/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.740-191029"
+pandora_version="7.0NG.740-191113"
echo "Test if you has the tools for to make the packages."
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 4bbac522b1..a3c40e50f0 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
my $ThreadSem = undef;
use constant AGENT_VERSION => '7.0NG.740';
-use constant AGENT_BUILD => '191029';
+use constant AGENT_BUILD => '191113';
# Agent log default file size maximum and instances
use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 79f2310c11..f5ed96e5d9 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_agent_unix
%define version 7.0NG.740
-%define release 191029
+%define release 191113
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index 392fa174ce..ea8efb582c 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_agent_unix
%define version 7.0NG.740
-%define release 191029
+%define release 191113
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index cc4b78b51c..316e2a03c2 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
# **********************************************************************
PI_VERSION="7.0NG.740"
-PI_BUILD="191029"
+PI_BUILD="191113"
OS_NAME=`uname -s`
FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 730edbe5de..be5a498d11 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
{}
Version
-{191029}
+{191113}
ViewReadme
{Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 823b486b0e..b268f7f436 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
using namespace Pandora_Strutils;
#define PATH_SIZE _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.740(Build 191029)")
+#define PANDORA_VERSION ("7.0NG.740(Build 191113)")
string pandora_path;
string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index d714543482..e2707bff53 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
VALUE "LegalCopyright", "Artica ST"
VALUE "OriginalFilename", "PandoraAgent.exe"
VALUE "ProductName", "Pandora FMS Windows Agent"
- VALUE "ProductVersion", "(7.0NG.740(Build 191029))"
+ VALUE "ProductVersion", "(7.0NG.740(Build 191113))"
VALUE "FileVersion", "1.0.0.0"
END
END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index cab514f37e..45e4ec20f1 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
package: pandorafms-console
-Version: 7.0NG.740-191029
+Version: 7.0NG.740-191113
Architecture: all
Priority: optional
Section: admin
diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh
index 64140d02ad..cf617bb4e3 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/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.740-191029"
+pandora_version="7.0NG.740-191113"
package_pear=0
package_pandora=1
diff --git a/pandora_console/DEBIAN/postinst b/pandora_console/DEBIAN/postinst
index eb8e4872f3..a899c6bf0a 100755
--- a/pandora_console/DEBIAN/postinst
+++ b/pandora_console/DEBIAN/postinst
@@ -11,4 +11,11 @@ echo Restart the apache.
/etc/init.d/apache2 restart
fi
+# Install pandora_websocket_engine service.
+cp -pf %{prefix}/pandora_console/pandora_websocket_engine /etc/init.d/
+chmod +x /etc/init.d/pandora_websocket_engine
+
+echo "You can now start the Pandora FMS Websocket service by executing"
+echo " /etc/init.d/pandora_websocket_engine start"
+
echo "Please, now, point your browser to http://your_IP_address/pandora_console/install.php and follow all the steps described on it."
diff --git a/pandora_console/extensions/quick_shell.php b/pandora_console/extensions/quick_shell.php
index 8c87577abc..13924f56e2 100644
--- a/pandora_console/extensions/quick_shell.php
+++ b/pandora_console/extensions/quick_shell.php
@@ -298,70 +298,86 @@ function quickShellSettings()
ui_require_css_file('wizard');
ui_require_css_file('discovery');
- // Parser.
// Gotty settings. Internal communication (WS).
- $gotty = get_parameter(
- 'gotty',
- $config['gotty']
- );
- $gotty_host = get_parameter(
- 'gotty_host',
- $config['gotty_host']
- );
- $gotty_ssh_port = get_parameter(
- 'gotty_ssh_port',
- $config['gotty_ssh_port']
- );
- $gotty_telnet_port = get_parameter(
- 'gotty_telnet_port',
- $config['gotty_telnet_port']
- );
-
- $gotty_user = get_parameter(
- 'gotty_user',
- $config['gotty_user']
- );
-
- $gotty_pass = get_parameter(
- 'gotty_pass',
- io_output_password($config['gotty_pass'])
- );
-
- $gotty_pass = io_input_password($gotty_pass);
-
- $changes = 0;
- $critical = 0;
- if ($config['gotty'] != $gotty) {
- config_update_value('gotty', $gotty);
- $changes++;
- $critical++;
+ if (isset($config['gotty_host']) === false) {
+ config_update_value('gotty_host', '127.0.0.1');
}
- if ($config['gotty_host'] != $gotty_host) {
- config_update_value('gotty_host', $gotty_host);
- $changes++;
+ if (isset($config['gotty_telnet_port']) === false) {
+ config_update_value('gotty_telnet_port', 8082);
}
- if ($config['gotty_telnet_port'] != $gotty_telnet_port) {
- config_update_value('gotty_telnet_port', $gotty_telnet_port);
- $changes++;
+ if (isset($config['gotty_ssh_port']) === false) {
+ config_update_value('gotty_ssh_port', 8081);
}
- if ($config['gotty_ssh_port'] != $gotty_ssh_port) {
- config_update_value('gotty_ssh_port', $gotty_ssh_port);
- $changes++;
- }
+ // Parser.
+ if (get_parameter('qs_update', false) !== false) {
+ // Gotty settings. Internal communication (WS).
+ $gotty = get_parameter(
+ 'gotty',
+ ''
+ );
+ $gotty_host = get_parameter(
+ 'gotty_host',
+ $config['gotty_host']
+ );
+ $gotty_ssh_port = get_parameter(
+ 'gotty_ssh_port',
+ $config['gotty_ssh_port']
+ );
+ $gotty_telnet_port = get_parameter(
+ 'gotty_telnet_port',
+ $config['gotty_telnet_port']
+ );
- if ($config['gotty_user'] != $gotty_user) {
- config_update_value('gotty_user', $gotty_user);
- $changes++;
- $critical++;
- }
+ $gotty_user = get_parameter(
+ 'gotty_user',
+ ''
+ );
- if ($config['gotty_pass'] != $gotty_pass) {
- config_update_value('gotty_pass', $gotty_pass);
- $changes++;
- $critical++;
+ $gotty_pass = get_parameter(
+ 'gotty_pass',
+ ''
+ );
+
+ $gotty_pass = io_input_password($gotty_pass);
+
+ $changes = 0;
+ $critical = 0;
+ if ($config['gotty'] != $gotty) {
+ config_update_value('gotty', $gotty);
+ $changes++;
+ $critical++;
+ }
+
+ if ($config['gotty_host'] != $gotty_host) {
+ config_update_value('gotty_host', $gotty_host);
+ $changes++;
+ }
+
+ if ($config['gotty_telnet_port'] != $gotty_telnet_port) {
+ config_update_value('gotty_telnet_port', $gotty_telnet_port);
+ $changes++;
+ }
+
+ if ($config['gotty_ssh_port'] != $gotty_ssh_port) {
+ config_update_value('gotty_ssh_port', $gotty_ssh_port);
+ $changes++;
+ }
+
+ if ($config['gotty_user'] != $gotty_user) {
+ config_update_value('gotty_user', $gotty_user);
+ $changes++;
+ $critical++;
+ }
+
+ if ($config['gotty_pass'] != $gotty_pass) {
+ $gotty_pass = io_input_password($gotty_pass);
+ config_update_value('gotty_pass', $gotty_pass);
+ $changes++;
+ $critical++;
+ }
}
// Interface.
@@ -392,7 +408,8 @@ function quickShellSettings()
'inputs' => [
[
'label' => __('Gotty path').ui_print_help_tip(
- __('Leave blank if using an external Gotty service')
+ __('Leave blank if using an external Gotty service'),
+ true
),
'arguments' => [
'type' => 'text',
@@ -426,7 +443,8 @@ function quickShellSettings()
],
[
'label' => __('Gotty user').ui_print_help_tip(
- __('Optional, set a user to access gotty service')
+ __('Optional, set a user to access gotty service'),
+ true
),
'arguments' => [
'type' => 'text',
@@ -436,7 +454,8 @@ function quickShellSettings()
],
[
'label' => __('Gotty password').ui_print_help_tip(
- __('Optional, set a password to access gotty service')
+ __('Optional, set a password to access gotty service'),
+ true
),
'arguments' => [
'type' => 'password',
@@ -444,6 +463,13 @@ function quickShellSettings()
'value' => io_output_password($config['gotty_pass']),
],
],
+ [
+ 'arguments' => [
+ 'type' => 'hidden',
+ 'name' => 'qs_update',
+ 'value' => 1,
+ ],
+ ],
[
'arguments' => [
'type' => 'submit',
diff --git a/pandora_console/general/alert_enterprise.php b/pandora_console/general/alert_enterprise.php
index 69a09d2998..4cb4a29740 100644
--- a/pandora_console/general/alert_enterprise.php
+++ b/pandora_console/general/alert_enterprise.php
@@ -105,7 +105,7 @@ if (check_login()) {
echo __(
"This is the online help for %s console. This help is -in best cases- just a brief contextual help, not intented to teach you how to use %s. Official documentation of %s is about 900 pages, and you probably don't need to read it entirely, but sure, you should download it and take a look.
- Download the official documentation",
+ Download the official documentation",
get_product_name(),
get_product_name(),
get_product_name(),
diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php
index 157388a43e..3a355a8f69 100644
--- a/pandora_console/general/header.php
+++ b/pandora_console/general/header.php
@@ -349,19 +349,19 @@ if ($config['menu_type'] == 'classic') {
// Support.
if (enterprise_installed()) {
- $header_support_link = 'https://support.artica.es/';
+ $header_support_link = $config['custom_support_url'];
} else {
$header_support_link = 'https://pandorafms.com/forums/';
}
$header_support = '
'.__('Alias').': '.ui_print_help_tip(__('Characters /,\,|,%,#,&,$ will be ignored'), true).'
'; $table_alias .= '