tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into ent-6661-giss-agregar-elementos-en-servicios 

Conflicts:
	pandora_console/include/styles/meta_dashboards.css
This commit is contained in:
fbsanchez 2021-06-28 10:37:49 +02:00
parent 775ffa66f6 174b0a0a60
commit 36f6ad4ee2
55 changed files with 553 additions and 555 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -10,7 +10,7 @@ For community support you can visit our forums at http://forums.pandorafms.org.
### How to install Pandora FMS
Installing Pandora FMS is a very easy task. Please visit our wiki and follow all the steps described for a quick and proper installation. http://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Installing
Installing Pandora FMS is a very easy task. Please visit our wiki and follow all the steps described for a quick and proper installation. https://pandorafms.com/manual/en/documentation/02_installation/01_installing
### What is Pandora FMS?

2
pandora_agents/unix/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix
Version: 7.0NG.755-210623
Version: 7.0NG.755-210628
Architecture: all
Priority: optional
Section: admin

2
pandora_agents/unix/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="7.0NG.755-210623"
pandora_version="7.0NG.755-210628"
echo "Test if you has the tools for to make the packages."
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

2
pandora_agents/unix/pandora_agent
View File

@ -1015,7 +1015,7 @@ my $Sem = undef;
my $ThreadSem = undef;
use constant AGENT_VERSION => '7.0NG.755';
use constant AGENT_BUILD => '210623';
use constant AGENT_BUILD => '210628';
# Agent log default file size maximum and instances
use constant DEFAULT_MAX_LOG_SIZE => 600000;

2
pandora_agents/unix/pandora_agent.redhat.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_agent_unix
%define version 7.0NG.755
%define release 210623
%define release 210628
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}

2
pandora_agents/unix/pandora_agent.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_agent_unix
%define version 7.0NG.755
%define release 210623
%define release 210628
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}

2
pandora_agents/unix/pandora_agent_installer
View File

@ -10,7 +10,7 @@
# **********************************************************************
PI_VERSION="7.0NG.755"
PI_BUILD="210623"
PI_BUILD="210628"
OS_NAME=`uname -s`
FORCE=0

2
pandora_agents/win32/installer/pandora.mpi
View File

@ -186,7 +186,7 @@ UpgradeApplicationID
{}
Version
{210623}
{210628}
ViewReadme
{Yes}

2
pandora_agents/win32/pandora.cc
View File

@ -30,7 +30,7 @@ using namespace Pandora;
using namespace Pandora_Strutils;
#define PATH_SIZE _MAX_PATH+1
#define PANDORA_VERSION ("7.0NG.755 Build 210623")
#define PANDORA_VERSION ("7.0NG.755 Build 210628")
string pandora_path;
string pandora_dir;

2
pandora_agents/win32/versioninfo.rc
View File

@ -11,7 +11,7 @@ BEGIN
VALUE "LegalCopyright", "Artica ST"
VALUE "OriginalFilename", "PandoraAgent.exe"
VALUE "ProductName", "Pandora FMS Windows Agent"
VALUE "ProductVersion", "(7.0NG.755(Build 210623))"
VALUE "ProductVersion", "(7.0NG.755(Build 210628))"
VALUE "FileVersion", "1.0.0.0"
END
END

2
pandora_console/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-console
Version: 7.0NG.755-210623
Version: 7.0NG.755-210628
Architecture: all
Priority: optional
Section: admin

2
pandora_console/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="7.0NG.755-210623"
pandora_version="7.0NG.755-210628"
package_pear=0
package_pandora=1

37
pandora_console/extras/mr/48.sql
View File

File diff suppressed because one or more lines are too long

2
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
View File

@ -1496,7 +1496,7 @@ ALTER TABLE tplanned_downtime_agents ADD COLUMN `manually_disabled` tinyint(1) D
-- ---------------------------------------------------------------------
UPDATE `tlink` SET `link` = 'http://library.pandorafms.com/' WHERE `name` = 'Module library';
UPDATE `tlink` SET `name` = 'Enterprise Edition' WHERE `id_link` = 0000000002;
UPDATE `tlink` SET `name` = 'Documentation', `link` = 'http://wiki.pandorafms.com/' WHERE `id_link` = 0000000001;
UPDATE `tlink` SET `name` = 'Documentation', `link` = 'https://pandorafms.com/manual/' WHERE `id_link` = 0000000001;
UPDATE `tlink` SET `link` = 'http://forums.pandorafms.com/index.php?board=22.0' WHERE `id_link` = 0000000004;
UPDATE `tlink` SET `link` = 'https://github.com/pandorafms/pandorafms/issues' WHERE `id_link` = 0000000003;

4
pandora_console/general/header.php
View File

@ -77,9 +77,9 @@ if ($config['menu_type'] == 'classic') {
if ($check_minor_release_available) {
if (users_is_admin($config['id_user'])) {
if ($config['language'] == 'es') {
set_pandora_error_for_header('Hay una o mas revisiones menores en espera para ser actualizadas. <a id="aviable_updates" target="blank" href="http://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Actualizacion#Versi.C3.B3n_7.0NG_.28_Rolling_Release_.29">'.__('Sobre actualización de revisión menor').'</a>', 'Revisión/es menor/es disponible/s');
set_pandora_error_for_header('Hay una o mas revisiones menores en espera para ser actualizadas. <a id="aviable_updates" target="blank" href="https://pandorafms.com/manual/es/documentation/02_installation/02_anexo_upgrade#version_70ng_rolling_release">'.__('Sobre actualización de revisión menor').'</a>', 'Revisión/es menor/es disponible/s');
} else {
set_pandora_error_for_header('There are one or more minor releases waiting for update. <a id="aviable_updates" target="blank" href="http://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Anexo_Upgrade#Version_7.0NG_.28_Rolling_Release_.29">'.__('About minor release update').'</a>', 'minor release/s available');
set_pandora_error_for_header('There are one or more minor releases waiting for update. <a id="aviable_updates" target="blank" href="https://pandorafms.com/manual/en/documentation/02_installation/02_anexo_upgrade#version_70ng_rolling_release">'.__('About minor release update').'</a>', 'minor release/s available');
}
}
}

4
pandora_console/general/login_page.php
View File

@ -134,8 +134,8 @@ if (isset($config['custom_docs_url'])) {
echo '<li><a href="'.ui_get_full_external_url($config['custom_docs_url']).'" target="_blank">'.__('Docs').'</li>';
} else if (!$custom_conf_enabled) {
echo '<li><a href="http://wiki.pandorafms.com/" target="_blank"><img src="'.$docs_logo.'" alt="docs"></a></li>';
echo '<li><a href="http://wiki.pandorafms.com/" target="_blank">'.__('Docs').'</li>';
echo '<li><a href="https://pandorafms.com/manual/" target="_blank"><img src="'.$docs_logo.'" alt="docs"></a></li>';
echo '<li><a href="https://pandorafms.com/manual/" target="_blank">'.__('Docs').'</li>';
}
if (isset($config['custom_support_url'])) {

2
pandora_console/general/mysqlerr.php
View File

@ -133,7 +133,7 @@ img.modalclose {
if (isset($config['custom_docs_url_alt'])) {
$docs_url = $config['custom_docs_url_alt'];
} else {
$docs_url = 'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Configuration';
$docs_url = 'https://pandorafms.com/manual/en/documentation/02_installation/04_configuration';
}
echo '

4
pandora_console/general/php7_message.php
View File

@ -19,9 +19,9 @@
global $config;
if ($config['language'] == 'es') {
$url_help = 'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Instalaci%C3%B3n_y_actualizaci%C3%B3n_PHP_7';
$url_help = 'https://pandorafms.com/manual/es/documentation/07_technical_annexes/14_php_7';
} else {
$url_help = 'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:_PHP_7';
$url_help = 'https://pandorafms.com/manual/en/documentation/07_technical_annexes/14_php_7';
}
// Prints help dialog information

20
pandora_console/godmode/agentes/module_manager_editor_common.php
View File

@ -1442,14 +1442,14 @@ $(document).ready (function () {
){
if (language == 'es'){
window.open(
'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Operacion&printable=yes#Tipos_de_m.C3.B3dulos',
'https://pandorafms.com/manual/es/documentation/03_monitoring/02_operations#tipos_de_modulos',
'_blank',
'width=800,height=600'
);
}
else{
window.open(
'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Operations&printable=yes#Types_of_Modules',
'https://pandorafms.com/manual/en/documentation/03_monitoring/02_operations#types_of_modules',
'_blank',
'width=800,height=600'
);
@ -1462,14 +1462,14 @@ $(document).ready (function () {
){
if(language == 'es'){
window.open(
'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_remota&printable=yes#Monitorizaci.C3.B3n_ICMP',
'https://pandorafms.com/manual/es/documentation/03_monitoring/03_remote_monitoring#monitorizacion_icmp',
'_blank',
'width=800,height=600'
);
}
else{
window.open(
'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Remote_Monitoring&printable=yes#ICMP_Monitoring',
'https://pandorafms.com/manual/en/documentation/03_monitoring/03_remote_monitoring#icmp_monitoring',
'_blank',
'width=800,height=600'
);
@ -1484,14 +1484,14 @@ $(document).ready (function () {
){
if(language == 'es'){
window.open(
'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_remota&printable=yes#Monitorizando_con_m.C3.B3dulos_de_red_tipo_SNMP',
'https://pandorafms.com/manual/es/documentation/03_monitoring/03_remote_monitoring#monitorizando_con_modulos_de_red_tipo_snmp',
'_blank',
'width=800,height=600'
);
}
else{
window.open(
'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Remote_Monitoring&printable=yes#Monitoring_by_Network_Modules_with_SNMP',
'https://pandorafms.com/manual/en/documentation/03_monitoring/03_remote_monitorins#monitoring_through_network_modules_with_snmp',
'_blank',
'width=800,height=600'
);
@ -1506,14 +1506,14 @@ $(document).ready (function () {
){
if(language == 'es'){
window.open(
'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_remota&printable=yes#Monitorizaci.C3.B3n_TCP',
'https://pandorafms.com/manual/es/documentation/03_monitoring/03_remote_monitoring#monitorizacion_tcp',
'_blank',
'width=800,height=600'
);
}
else{
window.open(
'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Remote_Monitoring&printable=yes#TCP_Monitoring',
'https://pandorafms.com/manual/en/documentation/03_monitoring/03_remote_monitoring#tcp_monitoring',
'_blank',
'width=800,height=600'
);
@ -1526,14 +1526,14 @@ $(document).ready (function () {
){
if(language == 'es'){
window.open(
'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_web&printable=yes#Creaci.C3.B3n_de_m.C3.B3dulos_web',
'https://pandorafms.com/manual/es/documentation/03_monitoring/06_web_monitoring#creacion_de_modulos_web',
'_blank',
'width=800,height=600'
);
}
else{
window.open(
'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Web_Monitoring&printable=yes#Creating_Web_Modules',
'https://pandorafms.com/manual/en/documentation/03_monitoring/06_web_monitoring#creating_web_modules',
'_blank',
'width=800,height=600'
);

20
pandora_console/godmode/modules/manage_network_components_form_common.php
View File

@ -408,14 +408,14 @@ $next_row++;
){
if (language == 'es'){
window.open(
'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Operacion&printable=yes#Tipos_de_m.C3.B3dulos',
'https://pandorafms.com/manual/es/documentation/03_monitoring/02_operations#tipos_de_modulos',
'_blank',
'width=800,height=600'
);
}
else{
window.open(
'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Operations&printable=yes#Types_of_Modules',
'https://pandorafms.com/manual/en/documentation/03_monitoring/02_operations#types_of_modules',
'_blank',
'width=800,height=600'
);
@ -428,14 +428,14 @@ $next_row++;
){
if(language == 'es'){
window.open(
'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_remota&printable=yes#Monitorizaci.C3.B3n_ICMP',
'https://pandorafms.com/manual/es/documentation/03_monitoring/03_remote_monitoring#monitorizacion_icmp',
'_blank',
'width=800,height=600'
);
}
else{
window.open(
'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Remote_Monitoring&printable=yes#ICMP_Monitoring',
'https://pandorafms.com/manual/en/documentation/03_monitoring/03_remote_monitoring#icmp_monitoring',
'_blank',
'width=800,height=600'
);
@ -450,14 +450,14 @@ $next_row++;
){
if(language == 'es'){
window.open(
'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_remota&printable=yes#Monitorizando_con_m.C3.B3dulos_de_red_tipo_SNMP',
'https://pandorafms.com/manual/es/documentation/03_monitoring/03_remote_monitoring#monitorizando_con_modulos_de_red_tipo_snmp',
'_blank',
'width=800,height=600'
);
}
else{
window.open(
'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Remote_Monitoring&printable=yes#Monitoring_by_Network_Modules_with_SNMP',
'https://pandorafms.com/manual/en/documentation/03_monitoring/03_remote_monitoring&printable=yes#monitoring_through_network_modules_with_snmp',
'_blank',
'width=800,height=600'
);
@ -472,14 +472,14 @@ $next_row++;
){
if(language == 'es'){
window.open(
'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_remota&printable=yes#Monitorizaci.C3.B3n_TCP',
'https://pandorafms.com/manual/es/documentation/03_monitoring/03_remote_monitoring#monitorizacion_tcp',
'_blank',
'width=800,height=600'
);
}
else{
window.open(
'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Remote_Monitoring&printable=yes#TCP_Monitoring',
'https://pandorafms.com/manual/en/documentation/03_monitoring/03_remote_monitoring&printable=yes#tcp_monitoring',
'_blank',
'width=800,height=600'
);
@ -494,14 +494,14 @@ $next_row++;
){
if(language == 'es'){
window.open(
'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_web&printable=yes#Creaci.C3.B3n_de_m.C3.B3dulos_web',
'https://pandorafms.com/manual/es/documentation/03_monitoring/06_web_monitoring#creacion_de_modulos_web',
'_blank',
'width=800,height=600'
);
}
else{
window.open(
'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Web_Monitoring&printable=yes#Creating_Web_Modules',
'https://pandorafms.com/manual/en/documentation/03_monitoring/06_web_monitoring#creating_web_modules',
'_blank',
'width=800,height=600'
);

2
pandora_console/godmode/servers/plugin.php
View File

@ -627,7 +627,7 @@ if (($create != '') || ($view != '')) {
echo '<span>'.__('The previous configuration of plugins has been imported from the nodes. Please check that the definitions are correct.').'</br></br>'.'<b>'.__('Note:').'</b>'.__(
'These definitions will not be operational until you manually
copy the files from the nodes to the atachment/plugin/ directory of the meta console.'
).'</br></br>'.__('You can find more information at:')."<a href='https://wiki.pandorafms.com'>https://wiki.pandorafms.com</a>".'</span>';
).'</br></br>'.__('You can find more information at:')."<a href='https://pandorafms.com/manual'>https://pandorafms.com/manual</a>".'</span>';
echo '</div>';
?>
<script type="text/javascript">

2
pandora_console/godmode/setup/setup.php
View File

@ -306,7 +306,7 @@ switch ($section) {
case 'external_tools':
$buttons['external_tools']['active'] = true;
$subpage = ' &raquo '.__('External Tools');
$help_header = 'External_Tools';
$help_header = '';
break;
case 'enterprise':

58
pandora_console/include/class/AgentWizard.class.php
View File

@ -644,20 +644,6 @@ class AgentWizard extends HTML
'return' => true,
],
];
if (empty($this->idPolicy) === true) {
$inputs[] = [
'label' => __('Use agent IP'),
'id' => 'txt-use-agent-ip',
'arguments' => [
'name' => 'use-agent-ip',
'input_class' => 'flex-row',
'type' => 'checkbox',
'class' => '',
'return' => true,
],
];
}
}
if ($this->actionType === 'wmi') {
@ -1186,7 +1172,7 @@ class AgentWizard extends HTML
[
'arguments' => [
'type' => 'hidden',
'value' => json_encode($candidateModules),
'value' => htmlspecialchars(json_encode($candidateModules)),
'return' => true,
'name' => 'modules-definition',
],
@ -5694,30 +5680,28 @@ class AgentWizard extends HTML
selectedBlock
.parent()
.removeClass("alpha50");
if (selectedBlock.prop("checked")) {
if (selectedBlock.prop("checked")) {
// Set to active the values of fields.
$("[id*=hidden-module-active-"+blockNumber+"]")
.each(function(){
$(this).val('1');
});
// Set checked.
$("[id*=checkbox-sel_module_" + blockNumber + "]")
.each(function() {
$(this).prop("checked", true);
});
imageInfoModules.removeClass('hidden');
} else {
for (i = 0; i<=15; i++) {
document.getElementById("hidden-module-active-" + switchName[2] + "_"+i+"-"+i).value = 1;
}
// Set checked.
$("[id*=checkbox-sel_module_" + blockNumber + "]")
.each(function() {
$(this).prop("checked", true);
});
imageInfoModules.removeClass('hidden');
} else {
// Set to inactive the values of fields.
$("[id*=hidden-module-active-"+blockNumber+"]")
.each(function(){
$(this).val('0');
});
// Set unchecked.
$("[id*=checkbox-sel_module_" + blockNumber + "]")
.each(function() {
$(this).prop("checked", false);
});
imageInfoModules.addClass('hidden');
for (i = 0; i<=15; i++) {
document.getElementById("hidden-module-active-" + switchName[2] + "_"+i+"-"+i).value = 0;
}
// Set unchecked.
$("[id*=checkbox-sel_module_" + blockNumber + "]")
.each(function() {
$(this).prop("checked", false);
});
imageInfoModules.addClass('hidden');
}
} else if (type == 'module') {
// Getting the element.

24
pandora_console/include/class/ConsoleSupervisor.php
View File

@ -1238,9 +1238,9 @@ class ConsoleSupervisor
FROM tserver'
);
if ($nservers == 0) {
$url = 'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Configuration';
$url = 'https://pandorafms.com/manual/en/documentation/02_installation/04_configuration';
if ($config['language'] == 'es') {
$url = 'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Configuracion';
$url = 'https://pandorafms.com/manual/es/documentation/02_installation/04_configuration';
}
$this->notify(
@ -1355,9 +1355,9 @@ class ConsoleSupervisor
if ($n_masters <= 0) {
// No server running in master.
$url = 'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Configuration#master';
$url = 'https://pandorafms.com/manual/en/documentation/02_installation/04_configuration#master';
if ($config['language'] == 'es') {
$url = 'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Configuracion#master';
$url = 'https://pandorafms.com/manual/es/documentation/02_installation/04_configuration#master';
}
$this->notify(
@ -1539,9 +1539,9 @@ class ConsoleSupervisor
}
if (!isset($result_ejecution) || $result_ejecution == '') {
$url = 'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Configuration#Phantomjs';
$url = 'https://pandorafms.com/manual/en/documentation/02_installation/04_configuration#Phantomjs';
if ($config['language'] == 'es') {
$url = 'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Configuracion#Phantomjs';
$url = 'https://pandorafms.com/manual/es/documentation/02_installation/04_configuration#Phantomjs';
}
$this->notify(
@ -1557,9 +1557,9 @@ class ConsoleSupervisor
}
if ($php_version_array[0] < 7) {
$url = 'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:_PHP_7';
$url = 'https://pandorafms.com/manual/en/documentation/07_technical_annexes/14_php_7';
if ($config['language'] == 'es') {
$url = 'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Instalaci%C3%B3n_y_actualizaci%C3%B3n_PHP_7';
$url = 'https://pandorafms.com/manual/es/documentation/07_technical_annexes/14_php_7';
}
$this->notify(
@ -2300,9 +2300,9 @@ class ConsoleSupervisor
$check_minor_release_available = db_check_minor_relase_available();
if ($check_minor_release_available) {
$url = 'http://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Anexo_Upgrade#Version_7.0NG_.28_Rolling_Release_.29';
$url = 'https://pandorafms.com/manual/es/documentation/02_installation/02_anexo_upgrade#version_70ng_rolling_release';
if ($config['language'] == 'es') {
$url = 'http://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Actualizacion#Versi.C3.B3n_7.0NG_.28_Rolling_Release_.29';
$url = 'https://pandorafms.com/manual/en/documentation/02_installation/02_anexo_upgrade#version_70ng_rolling_release';
}
$this->notify(
@ -2583,9 +2583,9 @@ class ConsoleSupervisor
$config['homedir']
);
$url = 'https://wiki.pandorafms.com/index.php?title=Pandora:QuickGuides_EN:General_Quick_Guide#Solving_problems._Where_to_look_and_who_to_ask';
$url = 'https://pandorafms.com/manual/en/quickguides/general_quick_guide#solving_problems_where_to_look_and_who_to_ask';
if ($config['language'] == 'es') {
$url = 'https://wiki.pandorafms.com/index.php?title=Pandora:QuickGuides_ES:Guia_Rapida_General#Soluci.C3.B3n_de_problemas._D.C3.B3nde_mirar.2C_a_qui.C3.A9n_preguntar';
$url = 'https://pandorafms.com//manual/es/quickguides/general_quick_guide#solucion_de_problemas_donde_mirar_a_quien_preguntar';
}
$this->notify(

23
pandora_console/include/class/Tree.class.php
View File

@ -160,6 +160,21 @@ class Tree
}
/**
* Show disabled modules
*
* @return string Sql disabled.
*/
protected function getDisabledFilter()
{
if (empty($this->filter['showDisabled'])) {
return ' tam.disabled = 0 AND ta.disabled = 0';
}
return ' 1 = 1';
}
protected function getAgentStatusFilter($status=self::TV_DEFAULT_AGENT_STATUS)
{
if ($status == self::TV_DEFAULT_AGENT_STATUS) {
@ -1094,6 +1109,7 @@ class Tree
$agent_filter = 'AND ta.id_agente = '.$this->id;
$tag_condition = $this->getTagCondition();
$tag_join = empty($tag_condition) && (!$this->L3forceTagCondition) ? '' : $this->getTagJoin();
$show_disabled = $this->getDisabledFilter();
if ($this->avoid_condition === true) {
$condition = '';
@ -1107,6 +1123,10 @@ class Tree
tam.id_tipo_modulo, tam.id_modulo, tae.estado, tae.datos,
tam.parent_module_id AS parent, tatm.id AS alerts, tam.unit';
if ($show_disabled) {
$columns .= ', tam.disabled';
}
$sql = "SELECT $columns
FROM tagente_modulo tam
$tag_join
@ -1119,7 +1139,8 @@ class Tree
LEFT JOIN talert_template_modules tatm
ON tatm.id_agent_module = tam.id_agente_modulo
$inner
WHERE tam.disabled = 0 AND ta.disabled = 0
WHERE
$show_disabled
$condition
$agent_filter
$group_acl

4
pandora_console/include/class/TreeService.class.php
View File

@ -180,6 +180,7 @@ class TreeService extends Tree
} else if ($this->type == 'services') {
$this->getSecondLevel();
} else if ($this->type == 'agent') {
$this->filter['showDisabled'] = true;
$this->getThirdLevel();
}
@ -433,6 +434,7 @@ class TreeService extends Tree
$tmp['showEventsBtn'] = 1;
$tmp['eventAgent'] = $item->agent()->id_agente();
$tmp['disabled'] = (bool) $item->agent()->disabled();
break;
case SERVICE_ELEMENT_MODULE:
@ -495,6 +497,7 @@ class TreeService extends Tree
$tmp['showGraphs'] = 1;
$tmp['showEventsBtn'] = 1;
$tmp['eventAgent'] = $item->module()->id_agente();
$tmp['disabled'] = $item->module()->disabled();
$html = '<img src="';
$html .= ui_get_full_url(
@ -524,6 +527,7 @@ class TreeService extends Tree
$tmp['alias'] = $item->service()->name();
$tmp['description'] = $item->service()->description();
$tmp['elementDescription'] = $item->description();
$tmp['disabled'] = $item->service()->disabled();
if ($this->connectedToNode === false
&& is_metaconsole() === true

2
pandora_console/include/config_process.php
View File

@ -20,7 +20,7 @@
/**
* Pandora build version and version
*/
$build_version = 'PC210623';
$build_version = 'PC210628';
$pandora_version = 'v7.0NG.755';
// Do not overwrite default timezone set if defined.

752
pandora_console/include/functions.php
View File

File diff suppressed because it is too large Load Diff

2
pandora_console/include/functions_config.php
View File

@ -2374,7 +2374,7 @@ function config_process_config()
}
if (!isset($config['meta_custom_docs_url'])) {
config_update_value('meta_custom_docs_url', 'http://wiki.pandorafms.com/index.php?title=Main_Page');
config_update_value('meta_custom_docs_url', 'https://pandorafms.com/manual/');
}
if (!isset($config['meta_custom_support_url'])) {

18
pandora_console/include/javascript/tree/TreeController.js
View File

@ -508,6 +508,11 @@ var TreeController = {
// Content
$content.addClass("node-content");
var disabled = false;
if (element.disabled == true) {
disabled = true;
$content.addClass("disabled");
}
switch (element.type) {
case "group":
if (
@ -956,7 +961,10 @@ var TreeController = {
}
}
// If exist the detail container, show the data
if (typeof controller.detailRecipient !== "undefined") {
if (
typeof controller.detailRecipient !== "undefined" &&
disabled == false
) {
if (element.type == "agent" || element.type == "module") {
$content
.click(function(e) {
@ -990,7 +998,8 @@ var TreeController = {
if (
typeof element.children != "undefined" &&
element.children.length > 0
element.children.length > 0 &&
element.disabled == false
) {
$node.removeClass("leaf-empty").addClass("leaf-closed");
@ -1027,8 +1036,9 @@ var TreeController = {
element.searchChildren
) {
if (
element.rootType == "group_edition" &&
typeof element.children == "undefined"
(element.rootType == "group_edition" &&
typeof element.children == "undefined") ||
element.disabled == true
) {
$node.addClass("leaf-empty");
} else {

3
pandora_console/include/styles/meta_dashboards.css
View File

@ -8,7 +8,6 @@ li#select_multiple_modules_filtered {
.networkconsole {
height: 100%;
}
.networkconsole svg {
height: 100%;
}
@ -24,11 +23,9 @@ li#select_multiple_modules_filtered {
right: 50px;
top: 20px;
}
.select-dashboard-width {
width: 110%;
}
#menu_tab li.nomn form#form-select-dashboard {
margin-top: 0px !important;
}

4
pandora_console/include/styles/tree.css
View File

@ -179,3 +179,7 @@ div#tree-controller-recipient {
.tree-node > .node-content > div + div:not(.tree-node-counters) {
margin-left: 3px;
}
.tree-node .disabled {
filter: opacity(0.3);
}

2
pandora_console/install.php
View File

@ -129,7 +129,7 @@
<div style='height: 10px'>
<?php
$version = '7.0NG.755';
$build = '210623';
$build = '210628';
$banner = "v$version Build $build";
error_reporting(0);

2
pandora_console/operation/search_helps.php
View File

@ -16,7 +16,7 @@ global $config;
if ($helps === false || !$searchHelps) {
echo "<br><div class='nf'>".__('Zero results found.').sprintf(
__('You can find more help in the <a class="underline" href="%s">wiki</a>'),
'http://wiki.pandorafms.com/index.php?search='.$config['search_keywords']
'https://pandorafms.com/manual/start?do=search&id=start&q='.$config['search_keywords']
)."</div>\n";
} else {
$table->width = '98%';

2
pandora_console/operation/tree.php
View File

@ -156,7 +156,7 @@ if (is_metaconsole() === false) {
$header_title,
'images/extensions.png',
false,
'tree_view',
'',
false,
$tabs,
[

2
pandora_console/pandora_console.redhat.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.755
%define release 210623
%define release 210628
# User and Group under which Apache is running
%define httpd_name httpd

2
pandora_console/pandora_console.rhel7.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.755
%define release 210623
%define release 210628
# User and Group under which Apache is running
%define httpd_name httpd

2
pandora_console/pandora_console.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.755
%define release 210623
%define release 210628
%define httpd_name httpd
# User and Group under which Apache is running
%define httpd_name apache2

8
pandora_console/pandoradb_data.sql
View File

File diff suppressed because one or more lines are too long

2
pandora_server/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-server
Version: 7.0NG.755-210623
Version: 7.0NG.755-210628
Architecture: all
Priority: optional
Section: admin

2
pandora_server/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="7.0NG.755-210623"
pandora_version="7.0NG.755-210628"
package_cpan=0
package_pandora=1

4
pandora_server/conf/pandora_server.conf.new
View File

@ -116,7 +116,7 @@ snmp_pdu_address 0
#snmp_trapd manual
# SNMP Trap forwarding. Go to http://wiki.pandorafms.com for more information.
# SNMP Trap forwarding. Go to https://pandorafms.com/manual/ for more information.
#snmp_forward_trap 1
#snmp_forward_ip 192.168.1.145
#snmp_forward_version 1
@ -620,7 +620,7 @@ warmup_unknown_interval 300
enc_dir /usr/share/pandora_server/enc/
# The number of times dynamic_min and dynamic_max will be recalculated per dynamic_interval.
# Go to http://wiki.pandorafms.com/ for more information.
# Go to https://pandorafms.com/manual/ for more information.
dynamic_updates 5
#dynamic_warning
#dynamic_constant

2
pandora_server/conf/pandora_server.conf.windows
View File

@ -548,6 +548,6 @@ warmup_unknown_interval 300
enc_dir /usr/share/pandora_server/enc/
# The number of times dynamic_min and dynamic_max will be recalculated per dynamic_interval.
# Go to http://wiki.pandorafms.com/ for more information.
# Go to https://pandorafms.com/manual/ for more information.
dynamic_updates 5

2
pandora_server/conf/tentacle_server.conf.new
View File

@ -1,6 +1,6 @@
##########################################################################
# Tentacle Server Parameters
# See https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Tentacle
# See https://pandorafms.com/manual/en/documentation/08_technical_reference/09_tentacle
# for protocol description.
# Tentacle have IANA assigned port tpc/41121 as official port.
##########################################################################

2
pandora_server/lib/PandoraFMS/Config.pm
View File

@ -45,7 +45,7 @@ our @EXPORT = qw(
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.755";
my $pandora_build = "210623";
my $pandora_build = "210628";
our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash

2
pandora_server/lib/PandoraFMS/PluginTools.pm
View File

@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.755";
my $pandora_build = "210623";
my $pandora_build = "210628";
our $VERSION = $pandora_version." ".$pandora_build;
our %EXPORT_TAGS = ( 'all' => [ qw() ] );

2
pandora_server/pandora_server.redhat.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 7.0NG.755
%define release 210623
%define release 210628
Summary: Pandora FMS Server
Name: %{name}

2
pandora_server/pandora_server.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 7.0NG.755
%define release 210623
%define release 210628
Summary: Pandora FMS Server
Name: %{name}

2
pandora_server/pandora_server_installer
View File

@ -9,7 +9,7 @@
# **********************************************************************
PI_VERSION="7.0NG.755"
PI_BUILD="210623"
PI_BUILD="210628"
MODE=$1
if [ $# -gt 1 ]; then

17
pandora_server/util/chatops_integration/README.md
View File

@ -1,22 +1,25 @@
# Pandora FMS ChatOps plugins
A set of plugins for [Pandora FMS](https://github.com/pandorafms/pandorafms) to enable notifications to ChatOps solutions.
#Solutions covered
1. Slack
2. Mattermost
# Usage
Assuming you are using Pandora FMS 6.0, the steps are:
1. Create the [Alert command](http://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Alerts#The_Alert_Command_.28Pandora_Versions_5_and_above_only.29) in Pandora FMS console following the instructions of your solution inside this folder
1. Create the [Alert command](https://pandorafms.com/manual/en/documentation/04_using/01_alerts#the_alert_command) in Pandora FMS console following the instructions of your solution inside this folder
2. Define the [Alert Action](http://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Alerts#Alert_Actions_.28all_Pandora_FMS_versions_including_5.0.29) in Pandora FMS console following the instructions of your solution inside this folder
3. Assign the action to an existing module under Alerts -> [List of alerts](http://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Alerts#Assigning_Alerts_from_an_Alert.27s_Sub_Menu):
![assign template to module](help/images/3-assign-template-to-module.png?raw=true "Assign a template to a module")
2. Define the [Alert Action](https://pandorafms.com/manual/en/documentation/04_using/01_alerts#alert_actions) in Pandora FMS console following the instructions of your solution inside this folder
3. Assign the action to an existing module under Alerts -> [List of alerts](https://pandorafms.com/manual/en/documentation/04_using/01_alerts#assigning_alerts_from_alert_submenu):
![assign template to module](help/images/3-assign-template-to-module.png?raw=true "Assign a template to a module")
4. Optinionally, go to your agent and verify the alert has been created:
![Verify the alert creation](help/images/4-verify.png?raw=true "Verify the alert creation")
![Verify the alert creation](help/images/4-verify.png?raw=true "Verify the alert creation")
When the alert triggers, the result would be something like this:
![Mattermost-real-example](help/images/5-mattermost-result.png?raw=true "Mattermost real example")

16
pandora_server/util/chatops_integration/mattermost/README.md
View File

@ -1,20 +1,22 @@
# Pandora FMS Mattermost Plugin
A plugin for [Pandora FMS](https://github.com/pandorafms/pandorafms) to enable notifications to Mattermost Open Source Chat.
# Usage
Assuming you are using Pandora FMS 6.0, the steps are:
1. Create the [Alert command](http://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Alerts#The_Alert_Command_.28Pandora_Versions_5_and_above_only.29) going to Alerts -> Commands and clicking on "Create". Then:
![create command](help/images/1-set-up-the-mattermost-command.png?raw=true "Set up Mattermost Command")
1. Create the [Alert command](https://pandorafms.com/manual/en/documentation/04_using/01_alerts#the_alert_command) going to Alerts -> Commands and clicking on "Create". Then:
![create command](help/images/1-set-up-the-mattermost-command.png?raw=true "Set up Mattermost Command")
2. Define the [Alert Action](http://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Alerts#Alert_Actions_.28all_Pandora_FMS_versions_including_5.0.29) going to Alerts -> Actions and clicking on "Create". Then:
![create action](help/images/2-set-up-the-mattermost-action.png?raw=true "Set up Mattermost Action")
2. Define the [Alert Action](https://pandorafms.com/manual/en/documentation/04_using/01_alerts#alert_actions) going to Alerts -> Actions and clicking on "Create". Then:
![create action](help/images/2-set-up-the-mattermost-action.png?raw=true "Set up Mattermost Action")
3. Assign the action to an existing module under Alerts -> List of alerts:
![assign template to module](../help/images/3-assign-template-to-module.png?raw=true "Assign a template to a module")
![assign template to module](../help/images/3-assign-template-to-module.png?raw=true "Assign a template to a module")
4. Optinionally, go to your agent and verify the alert has been created:
![Verify the alert creation](../help/images/4-verify.png?raw=true "Verify the alert creation")
![Verify the alert creation](../help/images/4-verify.png?raw=true "Verify the alert creation")
When the alert triggers, the result would be something like this:
![Mattermost-real-example](../help/images/5-mattermost-result.png?raw=true "Mattermost real example")

16
pandora_server/util/chatops_integration/slack/README.md
View File

@ -1,20 +1,22 @@
# Pandora FMS Slack Plugin
A plugin for [Pandora FMS](https://github.com/pandorafms/pandorafms) to enable notifications to Slack Open Source Chat.
# Usage
Assuming you are using Pandora FMS 6.0, the steps are:
1. Create the [Alert command](http://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Alerts#The_Alert_Command_.28Pandora_Versions_5_and_above_only.29) going to Alerts -> Commands and clicking on "Create". Then:
![create command](help/images/1-set-up-the-slack-command.png?raw=true "Set up Slack Command")
1. Create the [Alert command](https://pandorafms.com/manual/en/documentation/04_using/01_alerts#the_alert_command) going to Alerts -> Commands and clicking on "Create". Then:
![create command](help/images/1-set-up-the-slack-command.png?raw=true "Set up Slack Command")
2. Define the [Alert Action](http://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Alerts#Alert_Actions_.28all_Pandora_FMS_versions_including_5.0.29) going to Alerts -> Actions and clicking on "Create". Then:
![create action](help/images/2-set-up-the-slack-action.png?raw=true "Set up Slack Action")
2. Define the [Alert Action](https://pandorafms.com/manual/en/documentation/04_using/01_alerts#alert_actions) going to Alerts -> Actions and clicking on "Create". Then:
![create action](help/images/2-set-up-the-slack-action.png?raw=true "Set up Slack Action")
3. Assign the action to an existing module under Alerts -> List of alerts:
![assign template to module](../help/images/3-assign-template-to-module.png?raw=true "Assign a template to a module")
![assign template to module](../help/images/3-assign-template-to-module.png?raw=true "Assign a template to a module")
4. Optinionally, go to your agent and verify the alert has been created:
![Verify the alert creation](../help/images/4-verify.png?raw=true "Verify the alert creation")
![Verify the alert creation](../help/images/4-verify.png?raw=true "Verify the alert creation")
When the alert triggers, the result would be something like this:
![Slack-real-example](../help/images/5-mattermost-result.png?raw=true "Slack real example")

2
pandora_server/util/pandora_db.pl
View File

@ -35,7 +35,7 @@ use PandoraFMS::Config;
use PandoraFMS::DB;
# version: define current version
my $version = "7.0NG.755 Build 210623";
my $version = "7.0NG.755 Build 210628";
# Pandora server configuration
my %conf;

2
pandora_server/util/pandora_manage.pl
View File

@ -36,7 +36,7 @@ use Encode::Locale;
Encode::Locale::decode_argv;
# version: define current version
my $version = "7.0NG.755 Build 210623";
my $version = "7.0NG.755 Build 210628";
# save program name for logging
my $progname = basename($0);

2
tentacle/tentacle_client
View File

@ -1091,7 +1091,7 @@ This is released under the GNU Lesser General Public License.
L<Getopt::Std>, L<IO::Select>, L<IO::Socket::INET>, L<File::Basename>
Protocol description and more info at: L<< https://pandorafms.com/docs/index.php?title=Pandora:Documentation_en:Tentacle >>
Protocol description and more info at: L<< https://pandorafms.com/manual/en/documentation/08_technical_reference/09_tentacle >>
=head1 COPYRIGHT