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-7060-gestion-basica-de-configuracion-de-equipos-de-red

This commit is contained in:
fbsanchez 2021-10-08 15:51:05 +02:00
parent 81e696a045 16f2c776f2
commit 8652648824
37 changed files with 81 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_agents/unix/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix
Version: 7.0NG.757-211006
Version: 7.0NG.757-211008
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.757-211006"
pandora_version="7.0NG.757-211008"
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.757';
use constant AGENT_BUILD => '211006';
use constant AGENT_BUILD => '211008';
# 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.757
%define release 211006
%define release 211008
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.757
%define release 211006
%define release 211008
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.757"
PI_BUILD="211006"
PI_BUILD="211008"
OS_NAME=`uname -s`
FORCE=0

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

@ -186,7 +186,7 @@ UpgradeApplicationID
{}
Version
{211006}
{211008}
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.757 Build 211006")
#define PANDORA_VERSION ("7.0NG.757 Build 211008")
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.757(Build 211006))"
VALUE "ProductVersion", "(7.0NG.757(Build 211008))"
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.757-211006
Version: 7.0NG.757-211008
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.757-211006"
pandora_version="7.0NG.757-211008"
package_pear=0
package_pandora=1

2
pandora_console/godmode/agentes/modificar_agente.php
View File

@ -910,7 +910,7 @@ if ($agents !== false) {
echo ' onClick="if (!confirm(\' '.__('You are going to enable a cluster agent. Are you sure?').'\')) return false;">';
}
echo html_print_image('images/lightbulb_off.png', true, ['alt' => __('Enable agent'), 'title' => __('Enable agent')]).'</a>';
echo html_print_image('images/lightbulb_off.png', true, ['alt' => __('Enable agent'), 'title' => __('Enable agent'), 'class' => 'filter_none']).'</a>';
} else {
echo "<a href='index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&
disable_agent=".$agent['id_agente']."&group_id=$ag_group&recursion=$recursion&search=$search&offset=$offsetArg&sort_field=$sortField&sort=$sort&disabled=$disabled'";

2
pandora_console/godmode/agentes/module_manager.php
View File

@ -1130,6 +1130,7 @@ foreach ($modules as $module) {
[
'alt' => __('Enable module'),
'title' => __('Enable module'),
'class' => 'filter_none',
]
).'</a>';
} else {
@ -1139,7 +1140,6 @@ foreach ($modules as $module) {
[
'alt' => __('Disable module'),
'title' => __('Disable module'),
'class' => 'invert_filter',
]
).'</a>';
}

6
pandora_console/godmode/alerts/alert_list.list.php
View File

@ -811,7 +811,7 @@ foreach ($simple_alerts as $alert) {
1,
'padding:0px',
true,
['class' => 'invert_filter']
['class' => 'filter_none']
);
$data[4] .= html_print_input_hidden('enable_alert', 1, true);
} else {
@ -998,7 +998,7 @@ if (! $id_agente) {
echo '"'.html_print_image(
'images/lightbulb_off.png',
true,
false,
['class' => 'filter_none'],
true
).'"';
?>
@ -1037,7 +1037,7 @@ if (! $id_agente) {
echo '"'.html_print_image(
'images/lightbulb_off.png',
true,
false,
['class' => 'filter_none'],
true
).'"';
?>

2
pandora_console/godmode/extensions.php
View File

@ -254,7 +254,7 @@ foreach ($extensions as $file => $extension) {
if ($file != 'update_manager.php') {
$table->cellclass[][10] = 'action_buttons';
if (!$extension['enabled']) {
$data[] = '<a title="'.__('Delete').'" href="index.php?sec=godmode/extensions&amp;sec2=godmode/extensions&enterprise='.(int) $extension['enterprise'].'&delete='.$file.'" class="mn">'.html_print_image('images/cross.disabled.png', true).'</a>'.' <a title="'.__('Enable').'" href="index.php?sec=godmode/extensions&amp;sec2=godmode/extensions&enterprise='.(int) $extension['enterprise'].'&enabled='.$file.'" class="mn">'.html_print_image('images/lightbulb_off.png', true).'</a>';
$data[] = '<a title="'.__('Delete').'" href="index.php?sec=godmode/extensions&amp;sec2=godmode/extensions&enterprise='.(int) $extension['enterprise'].'&delete='.$file.'" class="mn">'.html_print_image('images/cross.disabled.png', true, ['class' => 'filter_none']).'</a>'.' <a title="'.__('Enable').'" href="index.php?sec=godmode/extensions&amp;sec2=godmode/extensions&enterprise='.(int) $extension['enterprise'].'&enabled='.$file.'" class="mn">'.html_print_image('images/lightbulb_off.png', true, ['class' => 'filter_none']).'</a>';
} else {
$data[] = '<a title="'.__('Delete').'" href="index.php?sec=godmode/extensions&amp;sec2=godmode/extensions&enterprise='.(int) $extension['enterprise'].'&delete='.$file.'" class="mn">'.html_print_image('images/cross.png', true, ['class' => 'invert_filter']).'</a>'.' <a title="'.__('Disable').'" href="index.php?sec=godmode/extensions&amp;sec2=godmode/extensions&enterprise='.(int) $extension['enterprise'].'&disabled='.$file.'" class="mn">'.html_print_image('images/lightbulb.png', true).'</a>';
}

6
pandora_console/godmode/users/configure_user.php
View File

@ -721,6 +721,7 @@ if ($update_user) {
);
}
if ($values['strict_acl']) {
$count_groups = 0;
$count_tags = 0;
@ -1226,7 +1227,10 @@ $session_time .= html_print_input_text(
'class="input_line_small"'
).'</div>';
$event_filter_data = db_get_all_rows_sql('SELECT id_name, id_filter FROM tevent_filter');
$user_groups = implode(',', array_keys((users_get_groups($id, 'AR', $display_all_group))));
$event_filter_data = db_get_all_rows_sql('SELECT id_name, id_filter FROM tevent_filter WHERE id_group_filter IN ('.$user_groups.')');
if ($event_filter_data === false) {
$event_filter_data = [];
}

4
pandora_console/godmode/users/user_list.php
View File

@ -716,10 +716,12 @@ foreach ($info as $user_id => $user_info) {
$toDoString = __('Disable');
$toDoAction = '1';
$toDoImage = 'images/lightbulb.png';
$toDoClass = '';
} else {
$toDoString = __('Enable');
$toDoAction = '0';
$toDoImage = 'images/lightbulb_off.png';
$toDoClass = 'filter_none';
}
$data[6] = '<form method="POST" action="index.php?sec='.$sec.'&amp;sec2=godmode/users/user_list&amp;pure='.$pure.'" class="inline">';
@ -742,7 +744,7 @@ foreach ($info as $user_id => $user_info) {
[
'data-title' => $toDoString,
'data-use_title_for_force_title' => '1',
'class' => 'forced_title no-padding',
'class' => 'forced_title no-padding '.$toDoClass,
]
);
$data[6] .= '</form>';

5
pandora_console/godmode/wizards/DiscoveryTaskList.class.php
View File

@ -961,7 +961,10 @@ class DiscoveryTaskList extends HTML
).'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image(
'images/lightbulb_off.png',
true,
['title' => __('enable task')]
[
'title' => __('enable task'),
'class' => 'filter_none',
]
).'</a>';
} else if ($task['disabled'] == 0) {
$data[9] .= '<a href="'.ui_get_full_url(

2
pandora_console/include/config_process.php
View File

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

33
pandora_console/include/functions_ui.php
View File

@ -4315,18 +4315,28 @@ function ui_get_full_url($url='', $no_proxy=false, $add_name_php_file=false, $me
}
}
$skip_meta_tag = false;
if ($url === '') {
if ($proxy) {
$url = '';
} else {
if ($proxy === false) {
$url = $_SERVER['REQUEST_URI'];
}
} else if ($url === false) {
if ($proxy) {
$url = '';
// Already inserted in request_uri.
$skip_meta_tag = true;
} else {
// Only add the home url.
// Redirect to main.
$url = '?'.$_SERVER['QUERY_STRING'];
}
} else if (empty($url) === true) {
if ($proxy === false) {
$url = $config['homeurl_static'].'/';
if ($metaconsole_root === true
&& is_metaconsole()
) {
$url = $config['homeurl_static'].'/'.ENTERPRISE_DIR.'/meta/';
}
$skip_meta_tag = true;
} else {
$url = '';
}
} else if (!strstr($url, '.php')) {
if ($proxy) {
@ -4354,8 +4364,11 @@ function ui_get_full_url($url='', $no_proxy=false, $add_name_php_file=false, $me
$url = substr($url, 1);
}
if (is_metaconsole() && $metaconsole_root) {
$fullurl .= 'enterprise/meta/';
if ($skip_meta_tag === false
&& $metaconsole_root
&& is_metaconsole()
) {
$fullurl .= ENTERPRISE_DIR.'/meta/';
}
return $fullurl.$url;

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

@ -965,9 +965,12 @@ var TreeController = {
$content.append($statusImage);
}
element.name = htmlDecode(element.name);
// Name max 42 chars.
$content.append(
'<span class="module-name">' +
'<span title="' +
element.name +
'" class="module-name">' +
element.name.substring(0, 42) +
(element.name.length > 42 ? "..." : "") +
"</span>"

8
pandora_console/include/styles/pandora_black.css
View File

@ -1202,3 +1202,11 @@ a.pandora_pagination,
.bg_ccc {
background-color: #50505050 !important;
}
.filter_none {
filter: brightness(0) contrast(50%) !important;
}
input[type="image"] {
background-color: transparent !important;
}

2
pandora_console/install.php
View File

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

2
pandora_console/operation/search_alerts.php
View File

@ -52,7 +52,7 @@ if ($alerts === false || $totalAlerts == 0 || !$searchAlerts) {
$table->data = [];
foreach ($alerts as $alert) {
if ($alert['disabled']) {
$disabledCell = html_print_image('images/lightbulb_off.png', true, ['title' => 'disable', 'alt' => 'disable']);
$disabledCell = html_print_image('images/lightbulb_off.png', true, ['title' => 'disable', 'alt' => 'disable', 'class' => 'filter_none']);
} else {
$disabledCell = html_print_image('images/lightbulb.png', true, ['alt' => 'enable', 'title' => 'enable']);
}

3
pandora_console/operation/users/user_edit.php
View File

@ -438,8 +438,9 @@ if (isset($double_authentication)) {
if (check_acl($config['id_user'], 0, 'ER')) {
$event_filter = '<div class="label_select"><p class="edit_user_labels">'.__('Event filter').'</p>';
$user_groups = implode(',', array_keys((users_get_groups($config['id_user'], 'AR', $display_all_group))));
$event_filter .= html_print_select_from_sql(
'SELECT id_filter, id_name FROM tevent_filter',
'SELECT id_filter, id_name FROM tevent_filter WHERE id_group_filter IN ('.$user_groups.')',
'event_filter',
$user_info['default_event_filter'],
'',

2
pandora_console/pandora_console.redhat.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.757
%define release 211006
%define release 211008
# 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.757
%define release 211006
%define release 211008
# 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.757
%define release 211006
%define release 211008
%define httpd_name httpd
# User and Group under which Apache is running
%define httpd_name apache2

2
pandora_server/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-server
Version: 7.0NG.757-211006
Version: 7.0NG.757-211008
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.757-211006"
pandora_version="7.0NG.757-211008"
package_cpan=0
package_pandora=1

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

@ -46,7 +46,7 @@ our @EXPORT = qw(
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.757";
my $pandora_build = "211006";
my $pandora_build = "211008";
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.757";
my $pandora_build = "211006";
my $pandora_build = "211008";
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.757
%define release 211006
%define release 211008
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.757
%define release 211006
%define release 211008
Summary: Pandora FMS Server
Name: %{name}

2
pandora_server/pandora_server_installer
View File

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

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.757 Build 211006";
my $version = "7.0NG.757 Build 211008";
# 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.757 Build 211006";
my $version = "7.0NG.757 Build 211008";
# save program name for logging
my $progname = basename($0);