tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-27 15:54:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into ent-12268-dashboard-widget-de-eventos-no-se-puede-clickar

Browse Source
This commit is contained in:
Jonathan 2023-11-07 09:38:50 +01:00
commit 3674fd9880
34 changed files with 42 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extras/pandora_gotty/deb/pandora_gotty/DEBIAN/control
View File

@ -1,6 +1,6 @@
Source: pandora_gotty Source: pandora_gotty
Section: utils Section: utils
Version: 1.0.0 Version: 1.1.0
Priority: optional Priority: optional
Maintainer: PandoraFMS Maintainer: PandoraFMS
Build-Depends: debhelper (>= 12) Build-Depends: debhelper (>= 12)

2
extras/pandora_gotty/pandora_gotty.spec
View File

@ -1,5 +1,5 @@
%define name pandora_gotty %define name pandora_gotty
%define version 1.0 %define version 1.1
%define release 1%{?dist} %define release 1%{?dist}
Summary: pandora_gptty for Pandora FMS Summary: pandora_gptty for Pandora FMS
Name: %{name} Name: %{name}

4
extras/pandora_gotty/src/pandora_gotty_exec.py
View File

@ -74,7 +74,7 @@ def exec_ssh (user:str, add:str, port:int):
try: try:
print("> Starting SSH connection...") print("> Starting SSH connection...")
ssh_command = f"ssh {user}@{add} -p {port}" ssh_command = f"ssh {user}@{add} -p {port}"
subprocess.run(ssh_command, shell=True) subprocess.run(ssh_command, shell=True, encoding='utf-8', text=True)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
raise SystemExit(e) raise SystemExit(e)
@ -88,7 +88,7 @@ def exec_telnet (add:str, port:int):
try: try:
print("> Starting Telnet connection...") print("> Starting Telnet connection...")
ssh_command = f"telnet -E {add} {port}" ssh_command = f"telnet -E {add} {port}"
subprocess.run(ssh_command, shell=True) subprocess.run(ssh_command, shell=True, encoding='utf-8', text=True)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
raise SystemExit(e) raise SystemExit(e)

2
pandora_agents/unix/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix package: pandorafms-agent-unix
Version: 7.0NG.774 Version: 7.0NG.774-231107
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin 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 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="7.0NG.774" pandora_version="7.0NG.774-231107"
echo "Test if you has the tools for to make the packages." echo "Test if you has the tools for to make the packages."
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null 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; my $ThreadSem = undef;
use constant AGENT_VERSION => '7.0NG.774'; use constant AGENT_VERSION => '7.0NG.774';
use constant AGENT_BUILD => '231102'; use constant AGENT_BUILD => '231107';
# Agent log default file size maximum and instances # Agent log default file size maximum and instances
use constant DEFAULT_MAX_LOG_SIZE => 600000; 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} %global __os_install_post %{nil}
%define name pandorafms_agent_linux %define name pandorafms_agent_linux
%define version 7.0NG.774 %define version 7.0NG.774
%define release 1 %define release 231107
Summary: Pandora FMS Linux agent, PERL version Summary: Pandora FMS Linux agent, PERL version
Name: %{name} Name: %{name}

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

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

2
pandora_agents/unix/pandora_agent.spec
View File

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

2
pandora_agents/unix/pandora_agent_installer
View File

@ -10,7 +10,7 @@
# ********************************************************************** # **********************************************************************
PI_VERSION="7.0NG.774" PI_VERSION="7.0NG.774"
PI_BUILD="231102" PI_BUILD="231107"
OS_NAME=`uname -s` OS_NAME=`uname -s`
FORCE=0 FORCE=0

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

@ -186,7 +186,7 @@ UpgradeApplicationID
{} {}
Version Version
{231102} {231107}
ViewReadme ViewReadme
{Yes} {Yes}
@ -2387,7 +2387,7 @@ Windows,BuildSeparateArchives
{No} {No}
Windows,Executable Windows,Executable
{<%AppName%>-Setup<%Ext%>} {<%AppName%>-<%Version%>-Setup<%Ext%>}
Windows,FileDescription Windows,FileDescription
{<%AppName%> <%Version%> Setup} {<%AppName%> <%Version%> Setup}

2
pandora_agents/win32/pandora.cc
View File

@ -30,7 +30,7 @@ using namespace Pandora;
using namespace Pandora_Strutils; using namespace Pandora_Strutils;
#define PATH_SIZE _MAX_PATH+1 #define PATH_SIZE _MAX_PATH+1
#define PANDORA_VERSION ("7.0NG.774 Build 231102") #define PANDORA_VERSION ("7.0NG.774 Build 231107")
string pandora_path; string pandora_path;
string pandora_dir; string pandora_dir;

2
pandora_agents/win32/versioninfo.rc
View File

@ -11,7 +11,7 @@ BEGIN
VALUE "LegalCopyright", "Pandora FMS" VALUE "LegalCopyright", "Pandora FMS"
VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "OriginalFilename", "PandoraAgent.exe"
VALUE "ProductName", "Pandora FMS Windows Agent" VALUE "ProductName", "Pandora FMS Windows Agent"
VALUE "ProductVersion", "(7.0NG.774(Build 231102))" VALUE "ProductVersion", "(7.0NG.774(Build 231107))"
VALUE "FileVersion", "1.0.0.0" VALUE "FileVersion", "1.0.0.0"
END END
END END

2
pandora_console/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-console package: pandorafms-console
Version: 7.0NG.774 Version: 7.0NG.774-231107
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin 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 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="7.0NG.774" pandora_version="7.0NG.774-231107"
package_pear=0 package_pear=0
package_pandora=1 package_pandora=1

9
pandora_console/images/alert_recovered@svg.svg Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 61.2 (89653) - https://sketch.com -->
<title>Dark / 20 / alert@svg</title>
<desc>Created with Sketch.</desc>
<g id="Dark-/-20-/-alert" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M10,20 C11.4190985,20 12.5702076,18.8808594 12.5702076,17.5 L7.42979244,17.5 C7.42979244,18.8808594 8.5809015,20 10,20 Z M18.6540098,14.1519531 C17.8777645,13.3410156 16.425318,12.1210937 16.425318,8.125 C16.425318,5.08984375 14.2364028,2.66015625 11.2849029,2.0640625 L11.2849029,1.25 C11.2849029,0.559765625 10.7095493,0 10,0 C9.29045075,0 8.71509711,0.559765625 8.71509711,1.25 L8.71509711,2.0640625 C5.76359722,2.66015625 3.57468198,5.08984375 3.57468198,8.125 C3.57468198,12.1210938 2.12223547,13.3410156 1.3459902,14.1519531 C1.10492023,14.4039062 0.998045886,14.7050781 1.00002702,15 C1.00447442,15.640625 1.52156948,16.25 2.28977909,16.25 L17.7102209,16.25 C18.4784305,16.25 18.9959274,15.640625 18.999973,15 C19.0019541,14.7050781 18.8950798,14.4035156 18.6540098,14.1519531 L18.6540098,14.1519531 Z" id="Shape" fill="#82b92e"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

10
pandora_console/include/ajax/events.php
View File

@ -2065,14 +2065,6 @@ if ($table_events) {
// (propagate ACL funct!). // (propagate ACL funct!).
$groups = users_get_groups($config['id_user']); $groups = users_get_groups($config['id_user']);
$tags_condition = tags_get_acl_tags(
$config['id_user'],
array_keys($groups),
'ER',
'event_condition',
'AND'
);
$tableEvents24h = new stdClass(); $tableEvents24h = new stdClass();
$tableEvents24h->class = 'filter_table'; $tableEvents24h->class = 'filter_table';
$tableEvents24h->styleTable = 'border: 0;padding: 0;margin: 0 0 10px;'; $tableEvents24h->styleTable = 'border: 0;padding: 0;margin: 0 0 10px;';
@ -2107,7 +2099,7 @@ if ($table_events) {
); );
} else { } else {
events_print_event_table( events_print_event_table(
'estado <> 1 '.$tags_condition, 'estado <> 1',
200, 200,
'100%', '100%',
false, false,

2
pandora_console/include/config_process.php
View File

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

6
pandora_console/include/functions_events.php
View File

@ -2593,7 +2593,7 @@ function events_print_type_img(
switch ($type) { switch ($type) {
case 'alert_recovered': case 'alert_recovered':
$style .= ' alert_module_background_state icon_background_normal '; $icon = 'images/alert_recovered@svg.svg';
break; break;
case 'alert_manual_validation': case 'alert_manual_validation':
@ -2609,20 +2609,16 @@ function events_print_type_img(
case 'going_up_normal': case 'going_up_normal':
case 'going_down_normal': case 'going_down_normal':
// This is to be backwards compatible. // This is to be backwards compatible.
// $style .= ' event_module_background_state icon_background_normal';
$icon = 'images/module_ok.png'; $icon = 'images/module_ok.png';
break; break;
case 'going_up_warning': case 'going_up_warning':
$icon = 'images/module_warning.png'; $icon = 'images/module_warning.png';
// $style .= ' event_module_background_state icon_background_warning';
case 'going_down_warning': case 'going_down_warning':
$icon = 'images/module_warning.png'; $icon = 'images/module_warning.png';
// $style .= ' event_module_background_state icon_background_warning';
break; break;
case 'going_unknown': case 'going_unknown':
// $style .= ' event_module_background_state icon_background_unknown';
$icon = 'images/module_unknown.png'; $icon = 'images/module_unknown.png';
break; break;

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

@ -470,37 +470,6 @@ div.multi-response-buttons {
margin-bottom: 5px; margin-bottom: 5px;
} }
/*
.main_menu_icon_event {
height: 20px;
}
*/
.event_module_background_state {
mask: url(../../images/modules@svg.svg) no-repeat center / contain;
-webkit-mask: url(../../images/modules@svg.svg) no-repeat center / contain;
}
.alert_module_background_state {
mask: url(../../images/alert@svg.svg) no-repeat center / contain;
-webkit-mask: url(../../images/alert@svg.svg) no-repeat center / contain;
}
.icon_background_critical {
background-color: #e63c52;
}
.icon_background_warning {
background-color: #fcab10;
}
.icon_background_normal {
background-color: #82b92e;
}
.icon_background_unknown {
background-color: gray;
}
.events-refr { .events-refr {
width: 300px; width: 300px;
display: flex; display: flex;

2
pandora_console/install.php
View File

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

2
pandora_console/pandora_console.redhat.spec
View File

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

2
pandora_console/pandora_console.rhel7.spec
View File

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

2
pandora_console/pandora_console.spec
View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_console %define name pandorafms_console
%define version 7.0NG.774 %define version 7.0NG.774
%define release 1 %define release 231107
%define httpd_name httpd %define httpd_name httpd
# User and Group under which Apache is running # User and Group under which Apache is running
%define httpd_name apache2 %define httpd_name apache2

2
pandora_server/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-server package: pandorafms-server
Version: 7.0NG.774 Version: 7.0NG.774-231107
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin 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 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="7.0NG.774" pandora_version="7.0NG.774-231107"
package_cpan=0 package_cpan=0
package_pandora=1 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 # version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.774"; my $pandora_version = "7.0NG.774";
my $pandora_build = "231102"; my $pandora_build = "231107";
our $VERSION = $pandora_version." ".$pandora_build; our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash # 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 # version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.774"; my $pandora_version = "7.0NG.774";
my $pandora_build = "231102"; my $pandora_build = "231107";
our $VERSION = $pandora_version." ".$pandora_build; our $VERSION = $pandora_version." ".$pandora_build;
our %EXPORT_TAGS = ( 'all' => [ qw() ] ); our %EXPORT_TAGS = ( 'all' => [ qw() ] );

6
pandora_server/lib/PandoraFMS/Tools.pm
View File

@ -2735,12 +2735,6 @@ sub get_user_agent {
# Disable verify host certificate (only needed for self-signed cert) # Disable verify host certificate (only needed for self-signed cert)
$ua->ssl_opts( 'verify_hostname' => 0 ); $ua->ssl_opts( 'verify_hostname' => 0 );
$ua->ssl_opts( 'SSL_verify_mode' => 0x00 ); $ua->ssl_opts( 'SSL_verify_mode' => 0x00 );
# Disable library extra checks
BEGIN {
$ENV{PERL_NET_HTTPS_SSL_SOCKET_CLASS} = "Net::SSL";
$ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0;
}
} }
}; };
if($@) { if($@) {

2
pandora_server/pandora_server.redhat.spec
View File

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

2
pandora_server/pandora_server.spec
View File

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

2
pandora_server/pandora_server_installer
View File

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

2
pandora_server/util/pandora_db.pl
View File

@ -38,7 +38,7 @@ use PandoraFMS::Config;
use PandoraFMS::DB; use PandoraFMS::DB;
# version: define current version # version: define current version
my $version = "7.0NG.774 Build 231102"; my $version = "7.0NG.774 Build 231107";
# Pandora server configuration # Pandora server configuration
my %conf; my %conf;

2
pandora_server/util/pandora_manage.pl
View File

@ -36,7 +36,7 @@ use Encode::Locale;
Encode::Locale::decode_argv; Encode::Locale::decode_argv;
# version: define current version # version: define current version
my $version = "7.0NG.774 Build 231102"; my $version = "7.0NG.774 Build 231107";
# save program name for logging # save program name for logging
my $progname = basename($0); my $progname = basename($0);