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-8843-disabled-group-en-cli-meta

This commit is contained in:
Luis 2022-04-26 14:55:38 +02:00
parent 7190a797ec 08911d370f
commit 30de4b05fe
38 changed files with 97871 additions and 77029 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extras/deploy-scripts/pandora_deploy_community.sh
View File

@ -256,6 +256,7 @@ console_dependencies=" \
xorg-x11-fonts-misc \
poppler-data \
php-yaml \
mod_ssl \
http://firefly.artica.es/centos8/phantomjs-2.1.1-1.el7.x86_64.rpm"
execute_cmd "yum install -y $console_dependencies" "Installing Pandora FMS Console dependencies"
@ -281,7 +282,8 @@ server_dependencies=" \
openssh-clients \
java \
http://firefly.artica.es/centos7/xprobe2-0.3-12.2.x86_64.rpm \
http://firefly.artica.es/centos7/wmic-1.4-1.el7.x86_64.rpm"
http://firefly.artica.es/centos7/wmic-1.4-1.el7.x86_64.rpm \
https://firefly.artica.es/centos7/pandorawmic-1.0.0-1.x86_64.rpm"
execute_cmd "yum install -y $server_dependencies" "Installing Pandora FMS Server dependencies"
# SDK VMware perl dependencies

3
extras/deploy-scripts/pandora_deploy_community_el8.sh
View File

@ -321,7 +321,8 @@ server_dependencies=" \
openssh-clients \
java \
http://firefly.artica.es/centos7/xprobe2-0.3-12.2.x86_64.rpm \
http://firefly.artica.es/centos7/wmic-1.4-1.el7.x86_64.rpm"
http://firefly.artica.es/centos7/wmic-1.4-1.el7.x86_64.rpm \
https://firefly.artica.es/centos8/pandorawmic-1.0.0-1.x86_64.rpm"
execute_cmd "dnf install -y $server_dependencies" "Installing Pandora FMS Server dependencies"
# SDK VMware perl dependencies

2
pandora_agents/unix/DEBIAN/control
View File

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

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

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

6
pandora_console/extras/mr/53.sql
View File

@ -27,9 +27,9 @@ ALTER TABLE `treport_content` ADD COLUMN `render_definition` TEXT;
ALTER TABLE `treport_content_template` ADD COLUMN `macros_definition` TEXT;
ALTER TABLE `treport_content_template` ADD COLUMN `render_definition` TEXT;
DROP TABLE `tupdate_journal`;
DROP TABLE `tupdate`;
DROP TABLE `tupdate_package`;
DROP TABLE IF EXISTS `tupdate_journal`;
DROP TABLE IF EXISTS `tupdate`;
DROP TABLE IF EXISTS `tupdate_package`;
CREATE TABLE `tupdate_journal` (
`id` SERIAL,

2
pandora_console/godmode/reporting/reporting_builder.item_editor.php
View File

@ -2464,7 +2464,7 @@ $class = 'databox filters';
<td class="bolder">
<?php
echo __('Render definition').ui_print_help_tip(
__('Be aware because not all CSS inline styles are supported in the pdf library'),
__('Please note that not all CSS styles are supported by PDF reports.'),
true
);
?>

2
pandora_console/include/class/Diagnostics.class.php
View File

@ -1815,7 +1815,7 @@ class Diagnostics extends Wizard
'images/exito.png',
true,
[
'title' => __('Succesfuly'),
'title' => __('Successfully'),
'style' => 'width:15px;',
]
);

2
pandora_console/include/config_process.php
View File

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

2
pandora_console/include/functions_alerts.php
View File

@ -1165,7 +1165,7 @@ function alerts_create_alert_agent_module($id_agent_module, $id_alert_template,
implode(', ', array_values($values))
);
return @db_process_sql($sql);
return @db_process_sql($sql, 'insert_id');
}

22
pandora_console/include/functions_events.php
View File

@ -757,7 +757,7 @@ function events_get_all(
if (is_array($fields) === false && $fields === 'count'
|| (is_array($fields) === true && $fields[0] === 'count')
) {
$fields = ['te.*'];
$fields = ['te.id_evento'];
$count = true;
} else if (!is_array($fields)) {
error_log('[events_get_all] Fields must be an array or "count".');
@ -1406,17 +1406,15 @@ function events_get_all(
case '1':
// Group by events.
$group_by .= 'te.estado, te.evento, te.id_agente, te.id_agentmodule';
$group_by .= 'te.estado, te.event_type, te.id_agente, te.id_agentmodule';
$group_by .= $extra;
break;
case '2':
// Group by agents.
$tagente_join = 'INNER';
// $group_by .= 'te.id_agente, te.event_type';
// $group_by .= $extra;
$group_by = '';
$order_by = events_get_sql_order('id_agente', 'asc');
$order_by = events_get_sql_order('te.id_agente', 'asc');
if (isset($order, $sort_field)) {
$order_by .= ','.events_get_sql_order(
$sort_field,
@ -1477,13 +1475,13 @@ function events_get_all(
$group_selects = '';
if ($group_by != '') {
$group_selects = ',COUNT(id_evento) AS event_rep
,GROUP_CONCAT(DISTINCT user_comment SEPARATOR "<br>") AS comments,
MAX(utimestamp) as timestamp_last,
MIN(utimestamp) as timestamp_first,
MAX(id_evento) as max_id_evento';
if ($count === false) {
$group_selects = ',COUNT(id_evento) AS event_rep,
GROUP_CONCAT(DISTINCT user_comment SEPARATOR "<br>") AS comments,
MAX(utimestamp) as timestamp_last,
MIN(utimestamp) as timestamp_first,
MAX(id_evento) as max_id_evento';
$idx = array_search('te.user_comment', $fields);
if ($idx !== false) {
unset($fields[$idx]);
@ -1573,7 +1571,7 @@ function events_get_all(
('.$sql.') tbase';
}
if ($count) {
if ($count === true) {
$sql = 'SELECT count(*) as nitems FROM ('.$sql.') tt';
}

BIN
pandora_console/include/languages/es.mo
View File

Binary file not shown.

87307
pandora_console/include/languages/es.po
View File

File diff suppressed because it is too large Load Diff

BIN
pandora_console/include/languages/fr.mo
View File

Binary file not shown.

87497
pandora_console/include/languages/fr.po
View File

File diff suppressed because it is too large Load Diff

1
pandora_console/include/styles/events.css
View File

@ -181,6 +181,7 @@ fieldset {
color: #777;
border: none;
margin-top: -2em;
box-sizing: border-box;
}
/* Image open dialog in group events by agents*/

2
pandora_console/install.php
View File

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

2
pandora_console/pandora_console.redhat.spec
View File

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

4
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.761-220420
Version: 7.0NG.761-220426
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.761-220420"
pandora_version="7.0NG.761-220426"
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.761";
my $pandora_build = "220420";
my $pandora_build = "220426";
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.761";
my $pandora_build = "220420";
my $pandora_build = "220426";
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.761
%define release 220420
%define release 220426
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.761
%define release 220420
%define release 220426
Summary: Pandora FMS Server
Name: %{name}

2
pandora_server/pandora_server_installer
View File

@ -9,7 +9,7 @@
# **********************************************************************
PI_VERSION="7.0NG.761"
PI_BUILD="220420"
PI_BUILD="220426"
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.761 Build 220420";
my $version = "7.0NG.761 Build 220426";
# 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.761 Build 220425";
my $version = "7.0NG.761 Build 220426";
# save program name for logging
my $progname = basename($0);