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-13473-widgets-block-histogram-y-module-histogram-no-se-visualizan-cuando-usamos-un-usuario-limitado

This commit is contained in:
Pablo Aragon 2024-04-12 08:53:42 +02:00
parent d967b7076a e2fd1cfa2a
commit 4b46f09256
33 changed files with 65 additions and 39 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-240411
Version: 7.0NG.776-240412
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-240411"
pandora_version="7.0NG.776-240412"
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 => '240411';
use constant AGENT_BUILD => '240412';
# 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 240411
%define release 240412
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 240411
%define release 240412
%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 240411
%define release 240412
%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 240411
%define release 240412
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 240411
%define release 240412
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="240411"
PI_BUILD="240412"
OS_NAME=`uname -s`
FORCE=0

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

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

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

@ -1208,7 +1208,7 @@ $createModuleTable->data[1][] = html_print_label_input_block(
html_print_anchor(
[
'href' => 'https://pandorafms.com/Library/Library/',
'class' => 'color-black-grey invert_filter',
'class' => 'color-black-grey',
'content' => __('Get more modules on Monitoring Library'),
],
true

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

@ -442,7 +442,7 @@ $tableBasicThresholds->rowclass = [];
$tableBasicThresholds->data = [];
// WARNING THRESHOLD.
$tableBasicThresholds->rowclass['caption_warning_threshold'] = 'field_half_width pdd_t_10px';
$tableBasicThresholds->rowclass['caption_warning_threshold'] = 'field_half_width';
$tableBasicThresholds->rowclass['warning_threshold'] = 'field_half_width';
$tableBasicThresholds->data['caption_warning_threshold'][0] .= __('Warning threshold').' ';
@ -617,7 +617,7 @@ $tableBasicThresholds->data['critical_threshold'][0] .= html_print_input_text(
$classdisabledBecauseInPolicy
);
$table_simple->rowstyle['thresholds_table'] = 'margin-top: 15px;height: 400px;width: 100%';
$table_simple->rowstyle['thresholds_table'] = 'margin-top: 15px;height: 450px;width: 100%';
$table_simple->cellclass['thresholds_table'][0] = 'table_section half_section_left';
$table_simple->data['thresholds_table'][0] = html_print_table($tableBasicThresholds, true);
if (modules_is_string_type($id_module_type) === false || (bool) $edit === true) {
@ -896,7 +896,7 @@ $tagsAvailableData .= html_print_image(
[
'id' => 'right',
'title' => __('Add tags to module'),
'class' => 'main_menu_icon invert_filter clickable mrgn_lft_5px',
'class' => 'main_menu_icon invert_filter clickable mrgn_lft_5px black-and-white',
]
);

2
pandora_console/include/config_process.php
View File

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

13
pandora_console/include/styles/js/jquery-ui_custom.css
View File

@ -35,7 +35,8 @@
}
.ui-datepicker .ui-datepicker-title select,
.ui-datepicker .ui-datepicker-title option {
color: #111;
color: var(--text-color);
background-color: var(--secondary-color);
}
.ui-dialog .ui-dialog-title {
color: #fff;
@ -228,16 +229,16 @@ a.ui-state-default > span:hover {
margin-right: 25px !important;
}
.ui-widget-header {
background: white;
background: var(--secondary-color);
color: #ffffff;
}
.ui-datepicker-calendar th {
background-color: #fff;
background-color: var(--secondary-color);
padding-left: 15px;
text-align: initial;
}
.ui-datepicker-calendar th span {
color: #000;
color: var(--text-color);
}
.ui-widget-header {
height: fit-content !important;
@ -256,7 +257,7 @@ a.ui-state-default > span:hover {
margin: 0px 15px 0px 15px;
}
.ui-timepicker-div .ui-datepicker-title {
color: black;
color: var(--text-color);
}
.ui-timepicker-div dl {
margin-top: 0px !important;
@ -321,7 +322,7 @@ a.ui-button:active,
.ui-widget-header .ui-state-active {
border: 1px solid #aaaaaa;
border-bottom: 0;
background: #ffffff;
background: var(--secondary-color);
font-weight: normal;
color: #212121;
}

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

@ -12342,7 +12342,7 @@ div.relative > div > div#ui-datepicker-div {
}
#ui-datepicker-div .ui-datepicker-header {
background-color: white;
background-color: var(--secondary-color);
}
.ui-widget-overlay {
@ -14216,3 +14216,11 @@ button.ui-button-text-only.ui-widget.sub:hover,
#button_generate_code input.buttonButton {
box-shadow: none;
}
.black-and-white {
filter: saturate(0);
}
.invert_filter.black-and-white {
filter: invert(1) saturate(0) !important;
}

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

@ -2005,6 +2005,23 @@ div.show_result_interpreter {
border-top: 0;
}
.switch_radio_button input:checked + label {
color: var(--text-color) !important;
}
.tags_selected_container > span.select2 {
background-color: #111 !important;
}
.select2-container .select2-selection--single,
.select2-container .select2-selection--multiple {
border-color: #707070 !important;
}
.select2-container.select2-container--focus .select2-selection--multiple {
border-color: #8a96a6 !important;
}
th {
border-bottom: 1px solid var(--border-color);
}

2
pandora_console/install.php
View File

@ -131,7 +131,7 @@
<div style='padding-bottom: 50px'>
<?php
$version = '7.0NG.776';
$build = '240411';
$build = '240412';
$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 240411
%define release 240412
# 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 240411
%define release 240412
# 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 240411
%define release 240412
%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-240411
Version: 7.0NG.776-240412
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-240411"
pandora_version="7.0NG.776-240412"
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 = "240411";
my $pandora_build = "240412";
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 = "240411";
my $pandora_build = "240412";
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 240411
%define release 240412
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 240411
%define release 240412
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="240411"
PI_BUILD="240412"
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 240411";
my $version = "7.0NG.776 Build 240412";
# 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 240411";
my $version = "7.0NG.776 Build 240412";
# save program name for logging
my $progname = basename($0);