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

Merge branch 'develop' into ent-13402-widget-basic-chart-esta-roto

This commit is contained in:
Pablo Aragon 2024-04-15 11:37:03 +02:00
parent d4bb6e8b01 f8833e8f98
commit 998402a6ea
35 changed files with 68 additions and 41 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.776-240412
Version: 7.0NG.776-240415
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.776-240412"
pandora_version="7.0NG.776-240415"
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

@ -1039,7 +1039,7 @@ my $Sem = undef;
my $ThreadSem = undef;
use constant AGENT_VERSION => '7.0NG.776';
use constant AGENT_BUILD => '240412';
use constant AGENT_BUILD => '240415';
# 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

@ -4,7 +4,7 @@
%global __os_install_post %{nil}
%define name pandorafms_agent_linux
%define version 7.0NG.776
%define release 240412
%define release 240415
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}

2
pandora_agents/unix/pandora_agent.redhat_bin.el8.spec
View File

@ -5,7 +5,7 @@
%define name pandorafms_agent_linux_bin
%define source_name pandorafms_agent_linux
%define version 7.0NG.776
%define release 240412
%define release 240415
%define debug_package %{nil}
Summary: Pandora FMS Linux agent, binary version

2
pandora_agents/unix/pandora_agent.redhat_bin.el9.spec
View File

@ -5,7 +5,7 @@
%define name pandorafms_agent_linux_bin
%define source_name pandorafms_agent_linux
%define version 7.0NG.776
%define release 240412
%define release 240415
%define debug_package %{nil}
Summary: Pandora FMS Linux agent, binary version

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

@ -5,7 +5,7 @@
%define name pandorafms_agent_linux_bin
%define source_name pandorafms_agent_linux
%define version 7.0NG.776
%define release 240412
%define release 240415
Summary: Pandora FMS Linux agent, binary version
Name: %{name}

2
pandora_agents/unix/pandora_agent.spec
View File

@ -4,7 +4,7 @@
%global __os_install_post %{nil}
%define name pandorafms_agent_linux
%define version 7.0NG.776
%define release 240412
%define release 240415
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.776"
PI_BUILD="240412"
PI_BUILD="240415"
OS_NAME=`uname -s`
FORCE=0

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

@ -186,7 +186,7 @@ UpgradeApplicationID
{}
Version
{240412}
{240415}
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.776 Build 240412")
#define PANDORA_VERSION ("7.0NG.776 Build 240415")
string pandora_path;
string pandora_dir;

2
pandora_agents/win32/versioninfo.rc
View File

@ -11,7 +11,7 @@ BEGIN
VALUE "LegalCopyright", "Pandora FMS"
VALUE "OriginalFilename", "PandoraAgent.exe"
VALUE "ProductName", "Pandora FMS Windows Agent"
VALUE "ProductVersion", "(7.0NG.776(Build 240412))"
VALUE "ProductVersion", "(7.0NG.776(Build 240415))"
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.776-240412
Version: 7.0NG.776-240415
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.776-240412"
pandora_version="7.0NG.776-240415"
package_pear=0
package_pandora=1

2
pandora_console/godmode/menu.php
View File

@ -738,7 +738,7 @@ if ($access_console_node === true) {
$sub['operation/agentes/exportdata']['id'] = 'export_data';
}
if ((bool) check_acl($config['id_user'], 0, 'PM') === true) {
if ((bool) check_acl($config['id_user'], 0, 'PM') === true || enterprise_hook('enterprise_acl', [$config['id_user'], 'tools', 'operation/extensions', false]) === true) {
$sub['godmode/files_repo/files_repo']['text'] = __('File repository');
$sub['godmode/files_repo/files_repo']['id'] = 'file_repository';
}

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

@ -426,12 +426,12 @@ class OrderInterpreter extends Wizard
echo $this->loadJS();
echo '</ul>';
if ($iterator > 10) {
echo '<div class="more_results"><span class="invert_filter">
echo '<div class="more_results"><span class="">
+ '.$more_results.' '.__('results found').'</span></div>';
}
if ($iterator === 0) {
echo '<span class="invert_filter">'.__('Press enter to search').'</span>';
echo '<span class="">'.__('Press enter to search').'</span>';
}
echo '</div>';

2
pandora_console/include/config_process.php
View File

@ -22,7 +22,7 @@ use DI\ContainerBuilder;
/*
* Pandora build version and version
*/
$build_version = 'PC240412';
$build_version = 'PC240415';
$pandora_version = 'v7.0NG.776';
// Do not overwrite default timezone set if defined.

6
pandora_console/include/functions_events.php
View File

@ -1674,6 +1674,12 @@ function events_get_all(
}
}
if (!$user_is_admin && users_can_manage_group_all('ER') === false) {
if (str_contains($fields[0], 'te.id_grupo') === false) {
$fields[0] .= ', te.id_grupo';
}
}
if (((int) $filter['group_rep'] === EVENT_GROUP_REP_EVENTS
|| (int) $filter['group_rep'] === EVENT_GROUP_REP_EXTRAIDS) && $count === false
) {

25
pandora_console/include/javascript/pandora.js
View File

@ -2407,7 +2407,9 @@ $(document).ready(function() {
closeOnEscape: true,
width: 700,
height: 450,
close: function() {
closeAboutModal();
},
create: function() {
$("#about-tabs").tabs({});
$(".ui-dialog-titlebar").remove();
@ -2415,7 +2417,6 @@ $(document).ready(function() {
$("#about-close").click(function() {
$("#about-tabs").dialog("close");
$("div.ui-dialog").remove();
$("#icon_about").removeClass("selected");
});
}
});
@ -2436,7 +2437,9 @@ $(document).ready(function() {
closeOnEscape: true,
width: 700,
height: 450,
close: function() {
closeAboutModal();
},
create: function() {
$("#about-tabs").tabs({});
$(".ui-dialog-titlebar").remove();
@ -2444,7 +2447,6 @@ $(document).ready(function() {
$("#about-close").click(function() {
$("#about-tabs").dialog("close");
$("div.ui-dialog").remove();
$("#icon_about_operation").removeClass("selected");
});
}
});
@ -2738,6 +2740,17 @@ function menuTabsShowHide() {
}
function resizeSearchHeader() {
$(".show_result_interpreter").width($("#keywords").outerWidth() - 12);
$(".show_result_interpreter").css("left", $("#keywords").position().left + 2);
if ($(".show_result_interpreter").width() && $("#keywords").position()) {
$(".show_result_interpreter").width($("#keywords").outerWidth() - 12);
$(".show_result_interpreter").css(
"left",
$("#keywords").position().left + 2
);
}
}
function closeAboutModal() {
$("#icon_about_operation").removeClass("selected");
$("#icon_about").removeClass("selected");
$("#icon_about_div").removeClass("selected");
}

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

@ -1000,3 +1000,7 @@ input.resize_button {
.grid-stack-item-content .visual-console-container-dashboard {
text-align: initial;
}
ul.select2-selection__rendered > li.select2-selection__choice {
box-sizing: border-box !important;
}

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

@ -12283,7 +12283,7 @@ ul.tag-editor {
cursor: text;
font: normal 14px sans-serif;
color: #333333;
background: #f6f7fb;
background: var(--secondary-color);
line-height: 20px;
}

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

@ -24,6 +24,7 @@ Description: The default Pandora FMS theme layout
--primary-color: #14524f;
--primary-color-hover: #14524f;
--secondary-color: #222;
--tertiary-color: #333;
--text-color: #fff;
--text-color-2: #ededed;
@ -758,7 +759,6 @@ div#main_pure {
margin-top: 30px;
margin-left: 10px;
margin-right: 10px;
height: 1000px;
width: 98%;
position: static;
}
@ -1221,13 +1221,13 @@ li > input[type="text"]:not(.search_input),
li > input[type="email"],
li > input[type="password"] {
background-color: transparent;
border: none;
/*border: none;
border-radius: 0;
border-bottom: 1px solid #ccc;
font-weight: inherit;
padding: 0px 0px 2px 0px;
box-sizing: border-box;
margin-bottom: 4px;
margin-bottom: 4px;*/
}
a:hover {
@ -2083,6 +2083,10 @@ li.agent-autocomplete-li-text-color a {
color: var(--text-color) !important;
}
select option:checked {
background-color: var(--tertiary-color);
}
.basic-chart-widget .flot-base {
background-color: unset;
}

2
pandora_console/install.php
View File

@ -131,7 +131,7 @@
<div style='padding-bottom: 50px'>
<?php
$version = '7.0NG.776';
$build = '240412';
$build = '240415';
$banner = "v$version Build $build";
error_reporting(0);

2
pandora_console/pandora_console.redhat.spec
View File

@ -6,7 +6,7 @@
%define debug_package %{nil}
%define name pandorafms_console
%define version 7.0NG.776
%define release 240412
%define release 240415
# User and Group under which Apache is running
%define httpd_name httpd

2
pandora_console/pandora_console.rhel7.spec
View File

@ -6,7 +6,7 @@
%define debug_package %{nil}
%define name pandorafms_console
%define version 7.0NG.776
%define release 240412
%define release 240415
# 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.776
%define release 240412
%define release 240415
%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.776-240412
Version: 7.0NG.776-240415
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.776-240412"
pandora_version="7.0NG.776-240415"
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.776";
my $pandora_build = "240412";
my $pandora_build = "240415";
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.776";
my $pandora_build = "240412";
my $pandora_build = "240415";
our $VERSION = $pandora_version." ".$pandora_build;
our %EXPORT_TAGS = ( 'all' => [ qw() ] );

2
pandora_server/pandora_server.redhat.spec
View File

@ -7,7 +7,7 @@
%define debug_package %{nil}
%define name pandorafms_server
%define version 7.0NG.776
%define release 240412
%define release 240415
Summary: Pandora FMS Server
Name: %{name}

2
pandora_server/pandora_server.spec
View File

@ -4,7 +4,7 @@
%global __os_install_post %{nil}
%define name pandorafms_server
%define version 7.0NG.776
%define release 240412
%define release 240415
Summary: Pandora FMS Server
Name: %{name}

2
pandora_server/pandora_server_installer
View File

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

2
pandora_server/util/pandora_db.pl
View File

@ -38,7 +38,7 @@ use PandoraFMS::Config;
use PandoraFMS::DB;
# version: define current version
my $version = "7.0NG.776 Build 240412";
my $version = "7.0NG.776 Build 240415";
# 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.776 Build 240412";
my $version = "7.0NG.776 Build 240415";
# save program name for logging
my $progname = basename($0);