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-7074-Command-Center

This commit is contained in:
Daniel Barbero Martin 2021-06-10 08:51:48 +02:00
parent a9864f7d87 5ad364cc4a
commit 9e27843b19
41 changed files with 55 additions and 37 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.754-210609
Version: 7.0NG.754-210610
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.754-210609"
pandora_version="7.0NG.754-210610"
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.754';
use constant AGENT_BUILD => '210609';
use constant AGENT_BUILD => '210610';
# 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.754
%define release 210609
%define release 210610
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.754
%define release 210609
%define release 210610
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.754"
PI_BUILD="210609"
PI_BUILD="210610"
OS_NAME=`uname -s`
FORCE=0

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

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

16
pandora_console/godmode/agentes/planned_downtime.editor.php
View File

@ -1015,7 +1015,21 @@ $table->data['module'][1] = "
'',
'',
0,
true
true,
false,
true,
'',
false,
false,
false,
false,
false,
'',
false,
false,
false,
false,
false
)."</td>
<td class='datos2 button_cell' style='text-align: right; width:10%;' id=''>".'<div id="add_button_div">'.'<a class="add_button" href="">'.html_print_image(
'images/add.png',

4
pandora_console/godmode/reporting/reporting_builder.php
View File

@ -272,6 +272,8 @@ if ($idReport != 0) {
}
}
$helpers = ($helpers ?? '');
switch ($action) {
case 'sort_items':
switch ($activeTab) {
@ -548,7 +550,7 @@ switch ($action) {
$subsection = $data_tab['subsection'];
$buttons = $data_tab['buttons'];
$helpers = $data_tab['helpers'];
$helpers = $data_tab['helper'];
break;
}

7
pandora_console/godmode/setup/setup_ehorus.php
View File

@ -116,7 +116,12 @@ $table_remote->data['ehorus_test'] = $row;
// Print.
echo '<div class="center pdd_b_20px">';
echo '<a target="_blank" rel="noopener noreferrer" href="http://ehorus.com">';
html_print_image('include/ehorus/images/ehorus-logo-grey.png');
if ($config['style'] === 'pandora_black') {
html_print_image('include/ehorus/images/ehorus-logo.png');
} else {
html_print_image('include/ehorus/images/ehorus-logo-grey.png');
}
echo '</a>';
echo '<br />';
echo '<div class="ehorus_title">';

BIN
pandora_console/images/ehorus/ehorus-blue.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 893 B

BIN
pandora_console/images/ehorus/ehorus.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 510 B

After

Width:  |  Height:  |  Size: 892 B

BIN
pandora_console/images/first_task/aws.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
pandora_console/images/first_task/icono_aws_white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.2 KiB

BIN
pandora_console/images/oracle_database_white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

2
pandora_console/include/ajax/planned_downtime.ajax.php
View File

@ -65,7 +65,7 @@ if ($get_modules_downtime) {
$downtime_module_ids = extract_column($downtime_modules, 'id_agent_module');
$downtime_modules = array_fill_keys($downtime_module_ids, true);
$filter = ['id_agente' => $id_agent];
$filter = ['id_agente' => $id_agent, 'delete_pending' => 0];
$modules = db_get_all_rows_filter('tagente_modulo', $filter);
if (empty($modules)) {
$modules = [];

2
pandora_console/include/config_process.php
View File

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

BIN
pandora_console/include/ehorus/images/ehorus-logo-grey.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 38 KiB

BIN
pandora_console/include/ehorus/images/ehorus-logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 37 KiB

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

@ -44,7 +44,8 @@ div.data_container {
}
div.data_container:hover {
box-shadow: 2px 2px 10px #ddd;
box-shadow: 2px 2px 10px #777777;
border-radius: 10px;
}
/*

2
pandora_console/include/styles/form.css
View File

@ -44,7 +44,7 @@ div.data_container {
}
div.data_container:hover {
box-shadow: 2px 2px 10px #ddd;
box-shadow: 2px 2px 10px #777777;
}
/*

2
pandora_console/include/styles/omnishell.css
View File

@ -234,7 +234,7 @@ div.data_container {
}
div.data_container:hover {
box-shadow: 2px 2px 10px #ddd;
box-shadow: 2px 2px 10px #777777;
}
/*

2
pandora_console/include/styles/pandora.css
View File

@ -8177,7 +8177,7 @@ span,
.wmware_div {
margin: 0 auto;
width: 500px;
opacity: 0.1;
opacity: 0.8;
clear: both;
}

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

@ -534,10 +534,6 @@ div#form_activate_licence #code {
border-color: #707070;
}
div.data_container:not(:hover) {
box-shadow: 2px 2px 10px #80ba27;
}
input[type="submit"].submit-next:hover,
button.submit-next.ui-button.ui-corner-all.ui-widget:hover,
input[type="button"].submit-next:hover {

2
pandora_console/install.php
View File

@ -129,7 +129,7 @@
<div style='height: 10px'>
<?php
$version = '7.0NG.754';
$build = '210609';
$build = '210610';
$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.754
%define release 210609
%define release 210610
# 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.754
%define release 210609
%define release 210610
# 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.754
%define release 210609
%define release 210610
%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.754-210609
Version: 7.0NG.754-210610
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.754-210609"
pandora_version="7.0NG.754-210610"
package_cpan=0
package_pandora=1

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.754";
my $pandora_build = "210609";
my $pandora_build = "210610";
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.754";
my $pandora_build = "210609";
my $pandora_build = "210610";
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.754
%define release 210609
%define release 210610
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.754
%define release 210609
%define release 210610
Summary: Pandora FMS Server
Name: %{name}

2
pandora_server/pandora_server_installer
View File

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