mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-04-08 18:55:09 +02:00
Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0
This commit is contained in:
daniel
commit
c0a2a4fdeb
@ -1,5 +1,5 @@
|
||||
package: pandorafms-agent-unix
|
||||
Version: 7.0NG.775-240126
|
||||
Version: 7.0NG.775-240207
|
||||
Architecture: all
|
||||
Priority: optional
|
||||
Section: admin
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
|
||||
pandora_version="7.0NG.775-240126"
|
||||
pandora_version="7.0NG.775-240207"
|
||||
|
||||
echo "Test if you has the tools for to make the packages."
|
||||
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
|
||||
|
||||
@ -1039,7 +1039,7 @@ my $Sem = undef;
|
||||
my $ThreadSem = undef;
|
||||
|
||||
use constant AGENT_VERSION => '7.0NG.775';
|
||||
use constant AGENT_BUILD => '240126';
|
||||
use constant AGENT_BUILD => '240207';
|
||||
|
||||
# Agent log default file size maximum and instances
|
||||
use constant DEFAULT_MAX_LOG_SIZE => 600000;
|
||||
@ -3678,9 +3678,21 @@ sub write_module_xml ($@) {
|
||||
return;
|
||||
}
|
||||
|
||||
if ($module->{'func'} == \&module_logger) {
|
||||
$Xml .= $data[0];
|
||||
return
|
||||
# Is it an extraction log module?
|
||||
if($module->{'type'} eq "log"){
|
||||
my $output = join('', @data);
|
||||
|
||||
if ($output eq "") {
|
||||
return;
|
||||
}
|
||||
|
||||
$Xml .="<log_module>\n";
|
||||
$Xml .= " <source><![CDATA[" . $module->{'name'} . "]]></source>\n";
|
||||
$Xml .= " <type><![CDATA[" . $module->{'type'} . "]]></type>\n";
|
||||
$Xml .= " <encoding>base64</encoding>\n";
|
||||
$Xml .= " <data><![CDATA[" . $output . "]]></data>\n";
|
||||
$Xml .= "</log_module>\n";
|
||||
return;
|
||||
}
|
||||
|
||||
# Critical section
|
||||
@ -3690,7 +3702,7 @@ sub write_module_xml ($@) {
|
||||
" <name><![CDATA[" . $module->{'name'} . "]]></name>\n" .
|
||||
" <description><![CDATA[" . $module->{'description'} . "]]></description>\n" .
|
||||
" <type>" . $module->{'type'} . "</type>\n";
|
||||
|
||||
|
||||
# Interval
|
||||
$Xml .= " <module_interval>" . $module->{'interval'} . "</module_interval>\n";
|
||||
|
||||
@ -3889,7 +3901,8 @@ sub module_logger ($) {
|
||||
my $status = grep_logs(
|
||||
$module->{'name'},
|
||||
$module->{'params'},
|
||||
$module->{'filter'}
|
||||
$module->{'filter'},
|
||||
$module->{'type'}
|
||||
);
|
||||
|
||||
return $status;
|
||||
@ -3926,20 +3939,25 @@ my $encode_sub = defined(&MIME::Base64::encode_base64) ? \&MIME::Base64::encode_
|
||||
};
|
||||
|
||||
sub grep_logs {
|
||||
my ($str_name, $str_file, $str_regex) = @_;
|
||||
my ($module_name, $log_file, $reg_exp, $module_type) = @_;
|
||||
|
||||
if(!$str_name){
|
||||
if(!$module_name){
|
||||
log_message("module_logger", "Missing module name");
|
||||
return;
|
||||
}
|
||||
|
||||
if(!$str_file){
|
||||
if(!$log_file){
|
||||
log_message("module_logger", "Missing file name");
|
||||
return;
|
||||
}
|
||||
|
||||
if(!$str_regex){
|
||||
$str_regex = '.*';
|
||||
if(!$module_type){
|
||||
log_message("module_logger", "Missing module type");
|
||||
return;
|
||||
}
|
||||
|
||||
if(!$reg_exp){
|
||||
$reg_exp = '.*';
|
||||
}
|
||||
|
||||
my $idx_dir = '/tmp/';
|
||||
@ -3947,9 +3965,6 @@ sub grep_logs {
|
||||
my $idx_pos = 0;
|
||||
my $idx_size = 0;
|
||||
my $idx_ino = '';
|
||||
my $module_name = $str_name;
|
||||
my $log_file = $str_file;
|
||||
my $reg_exp = $str_regex;
|
||||
|
||||
# Check that log file exists
|
||||
if (! -e $log_file) {
|
||||
@ -3975,7 +3990,7 @@ sub grep_logs {
|
||||
return if load_idx(\$idx_pos, \$idx_ino, \$idx_file, \$idx_size) == 1;
|
||||
my @data = parse_log(\$idx_pos, \$idx_ino, \$idx_file, \$log_file, \$module_name, \$reg_exp, \$idx_size);
|
||||
|
||||
my $output = create_log($module_name, @data);
|
||||
my $output = create_log($module_name, $module_type, @data);
|
||||
|
||||
return $output;
|
||||
}
|
||||
@ -4090,27 +4105,32 @@ sub grep_logs {
|
||||
}
|
||||
|
||||
sub create_log {
|
||||
my ($module_name, @data) = @_;
|
||||
my ($module_name, $module_type, @data) = @_;
|
||||
|
||||
# No data
|
||||
if ($#data < 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
# Log module
|
||||
my $output = "<log_module>\n";
|
||||
$output .= "<source><![CDATA[" . $module_name . "]]></source>\n";
|
||||
$output .= "<encoding>base64</encoding>\n";
|
||||
$output .= "<data><![CDATA[";
|
||||
$output .= &$encode_sub(join('', @data), '');
|
||||
$output .= "]]></data>\n";
|
||||
$output .= "</log_module>\n";
|
||||
my $data_content = process_log_monitoring($module_type, @data);
|
||||
|
||||
return $output;
|
||||
return $data_content;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
sub process_log_monitoring {
|
||||
my ($module_type, @data) = @_;
|
||||
my $output = "";
|
||||
|
||||
if ($module_type eq "log"){
|
||||
$output = &$encode_sub(join('', @data), '');
|
||||
} elsif ($module_type eq "generic_data") {
|
||||
$output = scalar @data;
|
||||
} elsif ($module_type eq "generic_proc"){
|
||||
$output = scalar @data > 0 ? 1 : 0;
|
||||
} elsif ($module_type eq "generic_data_string" || $module_type eq "async_string"){
|
||||
$output = join('', @data);
|
||||
}
|
||||
|
||||
return $output;
|
||||
}
|
||||
|
||||
################################################################################
|
||||
# TERM Handler
|
||||
################################################################################
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
%global __os_install_post %{nil}
|
||||
%define name pandorafms_agent_linux
|
||||
%define version 7.0NG.775
|
||||
%define release 240126
|
||||
%define release 240207
|
||||
|
||||
Summary: Pandora FMS Linux agent, PERL version
|
||||
Name: %{name}
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
%define name pandorafms_agent_linux_bin
|
||||
%define source_name pandorafms_agent_linux
|
||||
%define version 7.0NG.775
|
||||
%define release 240126
|
||||
%define release 240207
|
||||
%define debug_package %{nil}
|
||||
|
||||
Summary: Pandora FMS Linux agent, binary version
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
%define name pandorafms_agent_linux_bin
|
||||
%define source_name pandorafms_agent_linux
|
||||
%define version 7.0NG.775
|
||||
%define release 240126
|
||||
%define release 240207
|
||||
%define debug_package %{nil}
|
||||
|
||||
Summary: Pandora FMS Linux agent, binary version
|
||||
@ -13,23 +13,22 @@ Name: %{name}
|
||||
Version: %{version}
|
||||
Release: %{release}
|
||||
License: GPL
|
||||
Vendor: ArticaST <http://www.artica.es>
|
||||
Vendor: PandoraFMS <https://pandorafms.com>
|
||||
Source0: %{source_name}-%{version}.tar.gz
|
||||
URL: http://pandorafms.org
|
||||
URL: https://pandorafms.com
|
||||
Group: System/Monitoring
|
||||
Packager: Sancho Lerena <slerena@artica.es>
|
||||
Packager: PandoraFMS <info@pandorafms.com>
|
||||
Prefix: /usr/share
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
|
||||
BuildArch: x86_64
|
||||
Requires(pre): shadow-utils
|
||||
Requires(post): chkconfig /bin/ln
|
||||
Requires(preun): chkconfig /bin/rm /usr/sbin/userdel
|
||||
Requires(post): /bin/ln
|
||||
Requires(preun): /bin/rm /usr/sbin/userdel
|
||||
Requires: coreutils unzip
|
||||
Requires: util-linux procps grep
|
||||
Requires: /sbin/ip /bin/awk
|
||||
Requires: perl-interpreter
|
||||
Requires: perl-IO-Compress
|
||||
Requires: libnsl
|
||||
Requires: libxcrypt-compat
|
||||
AutoReq: 0
|
||||
Provides: %{name}-%{version}
|
||||
@ -50,7 +49,7 @@ mkdir -p $RPM_BUILD_ROOT%{prefix}/pandora_agent/
|
||||
mkdir -p $RPM_BUILD_ROOT/usr/bin/
|
||||
mkdir -p $RPM_BUILD_ROOT/usr/sbin/
|
||||
mkdir -p $RPM_BUILD_ROOT/etc/pandora/
|
||||
mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d/
|
||||
#mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d/
|
||||
mkdir -p $RPM_BUILD_ROOT/var/log/pandora/
|
||||
mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1/
|
||||
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/
|
||||
@ -58,7 +57,7 @@ cp -aRf * $RPM_BUILD_ROOT%{prefix}/pandora_agent/
|
||||
cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/tentacle_client $RPM_BUILD_ROOT/usr/bin/
|
||||
cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent $RPM_BUILD_ROOT/usr/bin/
|
||||
cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent_exec $RPM_BUILD_ROOT/usr/bin/
|
||||
cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent_daemon $RPM_BUILD_ROOT/etc/rc.d/init.d/pandora_agent_daemon
|
||||
#cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/pandora_agent_daemon $RPM_BUILD_ROOT/etc/rc.d/init.d/pandora_agent_daemon
|
||||
cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/man/man1/pandora_agent.1.gz $RPM_BUILD_ROOT/usr/share/man/man1/
|
||||
cp -aRf $RPM_BUILD_ROOT%{prefix}/pandora_agent/man/man1/tentacle_client.1.gz $RPM_BUILD_ROOT/usr/share/man/man1/
|
||||
|
||||
@ -119,21 +118,11 @@ then
|
||||
cp -f /usr/share/pandora_agent/pandora_agent_daemon.service /usr/lib/systemd/system/
|
||||
chmod -x /usr/lib/systemd/system/pandora_agent_daemon.service
|
||||
# Enable the services on SystemD
|
||||
systemctl daemon-reload
|
||||
systemctl enable pandora_agent_daemon.service
|
||||
else
|
||||
/sbin/chkconfig --add pandora_agent_daemon
|
||||
/sbin/chkconfig pandora_agent_daemon on
|
||||
fi
|
||||
|
||||
if [ "$1" -gt 1 ]
|
||||
then
|
||||
|
||||
echo "If Pandora Agent daemon was running with init.d script,"
|
||||
echo "please stop it manually and start the service with systemctl"
|
||||
|
||||
fi
|
||||
|
||||
|
||||
%preun
|
||||
|
||||
# Upgrading
|
||||
@ -141,8 +130,7 @@ if [ "$1" = "1" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
/sbin/chkconfig --del pandora_agent_daemon
|
||||
/etc/rc.d/init.d/pandora_agent_daemon stop >/dev/null 2>&1 || :
|
||||
systemctl stop pandora_agent_daemon.service > /dev/null 2>&1 || :
|
||||
|
||||
# Remove symbolic links
|
||||
pushd /etc/pandora
|
||||
@ -162,7 +150,6 @@ exit 0
|
||||
%defattr(755,root,root)
|
||||
/usr/bin/pandora_agent_exec
|
||||
/usr/bin/tentacle_client
|
||||
/etc/rc.d/init.d/pandora_agent_daemon
|
||||
|
||||
%defattr(644,root,root)
|
||||
/usr/share/man/man1/pandora_agent.1.gz
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
%define name pandorafms_agent_linux_bin
|
||||
%define source_name pandorafms_agent_linux
|
||||
%define version 7.0NG.775
|
||||
%define release 240126
|
||||
%define release 240207
|
||||
|
||||
Summary: Pandora FMS Linux agent, binary version
|
||||
Name: %{name}
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
%global __os_install_post %{nil}
|
||||
%define name pandorafms_agent_linux
|
||||
%define version 7.0NG.775
|
||||
%define release 240126
|
||||
%define release 240207
|
||||
|
||||
Summary: Pandora FMS Linux agent, PERL version
|
||||
Name: %{name}
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
# **********************************************************************
|
||||
|
||||
PI_VERSION="7.0NG.775"
|
||||
PI_BUILD="240126"
|
||||
PI_BUILD="240207"
|
||||
OS_NAME=`uname -s`
|
||||
|
||||
FORCE=0
|
||||
|
||||
@ -186,7 +186,7 @@ UpgradeApplicationID
|
||||
{}
|
||||
|
||||
Version
|
||||
{240126}
|
||||
{240207}
|
||||
|
||||
ViewReadme
|
||||
{Yes}
|
||||
|
||||
@ -30,7 +30,7 @@ using namespace Pandora;
|
||||
using namespace Pandora_Strutils;
|
||||
|
||||
#define PATH_SIZE _MAX_PATH+1
|
||||
#define PANDORA_VERSION ("7.0NG.775 Build 240126")
|
||||
#define PANDORA_VERSION ("7.0NG.775 Build 240207")
|
||||
|
||||
string pandora_path;
|
||||
string pandora_dir;
|
||||
|
||||
@ -11,7 +11,7 @@ BEGIN
|
||||
VALUE "LegalCopyright", "Pandora FMS"
|
||||
VALUE "OriginalFilename", "PandoraAgent.exe"
|
||||
VALUE "ProductName", "Pandora FMS Windows Agent"
|
||||
VALUE "ProductVersion", "(7.0NG.775(Build 240126))"
|
||||
VALUE "ProductVersion", "(7.0NG.775(Build 240207))"
|
||||
VALUE "FileVersion", "1.0.0.0"
|
||||
END
|
||||
END
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
package: pandorafms-console
|
||||
Version: 7.0NG.775-240126
|
||||
Version: 7.0NG.775-240207
|
||||
Architecture: all
|
||||
Priority: optional
|
||||
Section: admin
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
|
||||
pandora_version="7.0NG.775-240126"
|
||||
pandora_version="7.0NG.775-240207"
|
||||
|
||||
package_pear=0
|
||||
package_pandora=1
|
||||
|
||||
@ -768,7 +768,7 @@ $table_critical->tdid[0][0] = 'edit1-3-min';
|
||||
$table_critical->data[0][0] = html_print_label_input_block(
|
||||
__('Min.'),
|
||||
html_print_input_text(
|
||||
'min_warning',
|
||||
'min_critical',
|
||||
'',
|
||||
'',
|
||||
false,
|
||||
@ -781,7 +781,7 @@ $table_critical->tdid[0][1] = 'edit1-3-max';
|
||||
$table_critical->data[0][1] = html_print_label_input_block(
|
||||
__('Max.'),
|
||||
html_print_input_text(
|
||||
'max_warning',
|
||||
'max_critical',
|
||||
'',
|
||||
'',
|
||||
false,
|
||||
|
||||
@ -247,7 +247,7 @@ if ($favorite_array == false) {
|
||||
$url = 'index.php?sec=network&sec2=operation/visual_console/render_view&id='.$favourite_v['id'];
|
||||
}
|
||||
|
||||
echo "<a href='".$url."' title='Visual console".$favourite_v['name']."' alt='".$favourite_v['name']."'><li>";
|
||||
echo "<a href='".$url."' title='".io_safe_output($favourite_v['name'])."' alt='".io_safe_output($favourite_v['name'])."'><li>";
|
||||
echo "<div class='icon_img'>";
|
||||
echo html_print_image(
|
||||
'images/'.groups_get_icon($favourite_v['id_group']),
|
||||
@ -256,7 +256,7 @@ if ($favorite_array == false) {
|
||||
);
|
||||
echo '</div>';
|
||||
echo "<div class='text'>";
|
||||
echo $favourite_v['name'];
|
||||
echo io_safe_output($favourite_v['name']);
|
||||
echo '</div>';
|
||||
echo '</li></a>';
|
||||
}
|
||||
|
||||
@ -215,7 +215,7 @@ if ($create != '') {
|
||||
// =====================================================================
|
||||
if ($filemanager) {
|
||||
if ($edit_file) {
|
||||
$location_file = get_parameter('location_file', '');
|
||||
$location_file = io_safe_output(get_parameter('location_file', ''));
|
||||
$filename = array_pop(explode('/', $location_file));
|
||||
$file = file_get_contents($location_file);
|
||||
echo '<h4>'.__('Edit file').' '.$filename.'</h4>';
|
||||
@ -250,7 +250,7 @@ if ($filemanager) {
|
||||
echo '</form>';
|
||||
} else {
|
||||
if ($update_file) {
|
||||
$location_file = get_parameter('location_file', '');
|
||||
$location_file = io_safe_output(get_parameter('location_file', ''));
|
||||
$contentFile = io_safe_output(get_parameter('content_file', ''));
|
||||
$compatibility = get_parameter('compatibility', 'unix');
|
||||
$is_win_compatible = strpos($contentFile, "\r\n");
|
||||
@ -262,7 +262,12 @@ if ($filemanager) {
|
||||
$contentFile = str_replace("\n", "\r\n", $contentFile);
|
||||
}
|
||||
|
||||
$result = file_put_contents($location_file, $contentFile);
|
||||
if (empty($location_file) === false
|
||||
&& strpos($location_file, realpath('attachment/plugin')) !== false
|
||||
&& file_exists($location_file) === true
|
||||
) {
|
||||
$result = file_put_contents($location_file, $contentFile);
|
||||
}
|
||||
}
|
||||
|
||||
$id_plugin = (int) get_parameter('id_plugin', 0);
|
||||
|
||||
@ -2542,15 +2542,12 @@ if ($drawConsoleSound === true) {
|
||||
$output .= '<div id="progressbar_time"></div>';
|
||||
$output .= '<div class="buttons-sound-modal">';
|
||||
$output .= '<div class="container-button-play">';
|
||||
$output .= html_print_input(
|
||||
[
|
||||
'label' => __('Start'),
|
||||
'type' => 'button',
|
||||
'name' => 'start-search',
|
||||
'attributes' => [ 'class' => 'play secondary' ],
|
||||
'return' => true,
|
||||
],
|
||||
'div',
|
||||
$output .= html_print_button(
|
||||
__('Start'),
|
||||
'start-search',
|
||||
false,
|
||||
'',
|
||||
['icon' => 'play'],
|
||||
true
|
||||
);
|
||||
$output .= '</div>';
|
||||
|
||||
@ -27,6 +27,7 @@
|
||||
*/
|
||||
|
||||
use PandoraFMS\Tools\Files;
|
||||
use PandoraFMS\Agent;
|
||||
|
||||
global $config;
|
||||
|
||||
@ -1214,6 +1215,7 @@ class ConsoleSupervisor
|
||||
'',
|
||||
$config['num_files_attachment']
|
||||
);
|
||||
|
||||
if ($filecount > $config['num_files_attachment']) {
|
||||
$this->notify(
|
||||
[
|
||||
@ -1331,17 +1333,28 @@ class ConsoleSupervisor
|
||||
$MAX_FILES_DATA_IN = 1000;
|
||||
$MAX_BADXML_FILES_DATA_IN = 150;
|
||||
|
||||
$filecount = $this->countFiles(
|
||||
$remote_config_dir,
|
||||
'',
|
||||
$MAX_FILES_DATA_IN
|
||||
);
|
||||
$filecount = 0;
|
||||
|
||||
$agentId = db_get_value('id_agente', 'tagente', 'nombre', 'pandora.internals');
|
||||
if ($agentId !== false) {
|
||||
$agent = new Agent($agentId);
|
||||
|
||||
$moduleId = $agent->searchModules(
|
||||
['nombre' => 'Data_in_files'],
|
||||
1
|
||||
)->toArray()['id_agente_modulo'];
|
||||
|
||||
if ($moduleId > 0) {
|
||||
$filecount = (int) modules_get_last_value($moduleId);
|
||||
}
|
||||
}
|
||||
|
||||
// If cannot open directory, count is '-1', skip.
|
||||
if ($filecount > $MAX_FILES_DATA_IN) {
|
||||
$this->notify(
|
||||
[
|
||||
'type' => 'NOTIF.FILES.DATAIN',
|
||||
'title' => __('There are too much files in spool').'.',
|
||||
'title' => __('There are too many files in spool').'.',
|
||||
'message' => __(
|
||||
'There are more than %d files in %s. Consider checking DataServer performance',
|
||||
$MAX_FILES_DATA_IN,
|
||||
|
||||
@ -1637,7 +1637,7 @@ class CredentialStore extends Wizard
|
||||
$(".ui-dialog-content").dialog("close");
|
||||
$('.info').hide();
|
||||
cleanupDOM();
|
||||
dt_keystore.draw(false);
|
||||
window.location.reload();
|
||||
} else {
|
||||
$(this).dialog('close');
|
||||
}
|
||||
|
||||
@ -1257,8 +1257,8 @@ class WelcomeWindow extends Wizard
|
||||
draggable: true,
|
||||
modal: true,
|
||||
close: false,
|
||||
height: 375,
|
||||
width: 480,
|
||||
height: 400,
|
||||
width: 500,
|
||||
overlay: {
|
||||
opacity: 0.5,
|
||||
background: "black"
|
||||
@ -1274,7 +1274,7 @@ class WelcomeWindow extends Wizard
|
||||
draggable: true,
|
||||
modal: true,
|
||||
close: false,
|
||||
height: 265,
|
||||
height: 300,
|
||||
width: 480,
|
||||
overlay: {
|
||||
opacity: 0.5,
|
||||
|
||||
@ -22,7 +22,7 @@ use DI\ContainerBuilder;
|
||||
/*
|
||||
* Pandora build version and version
|
||||
*/
|
||||
$build_version = 'PC240126';
|
||||
$build_version = 'PC240207';
|
||||
$pandora_version = 'v7.0NG.775';
|
||||
|
||||
// Do not overwrite default timezone set if defined.
|
||||
|
||||
@ -1261,6 +1261,10 @@ function action_events_sound(mode, settings) {
|
||||
$("#button-start-search")
|
||||
.removeClass("play")
|
||||
.addClass("stop");
|
||||
$("#button-start-search")
|
||||
.find("div")
|
||||
.removeClass("play")
|
||||
.addClass("stop");
|
||||
// Change value button.
|
||||
$("#button-start-search").val(settings.stop);
|
||||
$("#button-start-search > span").text(settings.stop);
|
||||
@ -1277,6 +1281,10 @@ function action_events_sound(mode, settings) {
|
||||
$("#button-start-search")
|
||||
.removeClass("stop")
|
||||
.addClass("play");
|
||||
$("#button-start-search")
|
||||
.find("div")
|
||||
.removeClass("stop")
|
||||
.addClass("play");
|
||||
// Change value button.
|
||||
$("#button-start-search").val(settings.start);
|
||||
$("#button-start-search > span").text(settings.start);
|
||||
@ -1601,9 +1609,7 @@ $(document).ajaxSend(function(event, jqXHR, ajaxOptions) {
|
||||
|
||||
// Add the minimize icon to the minimize button
|
||||
$("<span>", {
|
||||
class: "ui-button-icon ui-icon",
|
||||
style:
|
||||
"background-color: rgb(51, 51, 51); -webkit-mask: url('images/arrow-down-white.png') no-repeat / contain !important;"
|
||||
class: "ui-button-icon ui-icon"
|
||||
}).appendTo(minimizeButton);
|
||||
|
||||
$("<span>", {
|
||||
@ -1617,23 +1623,9 @@ $(document).ajaxSend(function(event, jqXHR, ajaxOptions) {
|
||||
class:
|
||||
"ui-corner-all ui-widget ui-button-icon-only ui-dialog-titlebar-disengage disengage-buttom-image",
|
||||
type: "button",
|
||||
title: "Disengage",
|
||||
style: "float: right; position:relative;"
|
||||
title: "Disengage"
|
||||
}).insertBefore(minimizeButton);
|
||||
|
||||
// Add the disengage icon to the disengage button
|
||||
$("<span>", {
|
||||
class: "ui-button-icon ui-icon",
|
||||
style:
|
||||
"background-color: rgb(51, 51, 51); -webkit-mask: url('images/dashboard.menu.png') no-repeat center / contain !important;"
|
||||
}).appendTo(disengageButton);
|
||||
|
||||
$("<span>", {
|
||||
class: "ui-button-icon-space"
|
||||
})
|
||||
.html(" ")
|
||||
.appendTo(disengageButton);
|
||||
|
||||
minimizeButton.click(function(e) {
|
||||
if ($("#minimize_arrow_event_sound").hasClass("arrow_menu_up")) {
|
||||
$("#minimize_arrow_event_sound").removeClass("arrow_menu_up");
|
||||
|
||||
@ -82,6 +82,7 @@ function removeInputImage(e) {
|
||||
}
|
||||
}
|
||||
function render({ title, text, url, files, method }) {
|
||||
var positionButtonsBefore = $(".ui-dialog-buttonset").offset().top;
|
||||
$("#title_tip").html(title);
|
||||
$("#text_tip").html(text);
|
||||
if (url) {
|
||||
@ -123,6 +124,7 @@ function render({ title, text, url, files, method }) {
|
||||
}
|
||||
});
|
||||
activeCarousel();
|
||||
checkPositionButtons(positionButtonsBefore);
|
||||
}
|
||||
|
||||
function close_dialog() {
|
||||
@ -429,3 +431,20 @@ function validateImages() {
|
||||
});
|
||||
return validate;
|
||||
}
|
||||
|
||||
function checkPositionButtons(positionButtonsBefore) {
|
||||
// posicion actual botones
|
||||
var buttonsNow = $(".ui-dialog-buttonset").offset().top;
|
||||
// Position of dialog
|
||||
var dialogPosition = $(".dialog_tips").position().top;
|
||||
var positionFinal;
|
||||
if (positionButtonsBefore > buttonsNow) {
|
||||
positionFinal = dialogPosition + (positionButtonsBefore - buttonsNow);
|
||||
positionFinal = positionFinal < 0 ? "100" : positionFinal;
|
||||
$(".dialog_tips").css("top", positionFinal);
|
||||
} else if (positionButtonsBefore < buttonsNow) {
|
||||
positionFinal = dialogPosition - (buttonsNow - positionButtonsBefore);
|
||||
positionFinal = positionFinal < 0 ? "100" : positionFinal;
|
||||
$(".dialog_tips").css("top", positionFinal);
|
||||
}
|
||||
}
|
||||
|
||||
@ -585,3 +585,7 @@ div.container-filter-buttons {
|
||||
margin-right: 10px !important;
|
||||
}
|
||||
}
|
||||
|
||||
#button-start-search {
|
||||
width: 115px;
|
||||
}
|
||||
|
||||
@ -61,15 +61,11 @@
|
||||
}
|
||||
|
||||
.ui-dialog .ui-dialog-titlebar-disengage {
|
||||
position: absolute !important;
|
||||
right: 50px;
|
||||
top: -3px;
|
||||
width: 40px;
|
||||
margin: 0px 0 0 0;
|
||||
padding: 1px;
|
||||
height: 40px;
|
||||
height: 20px;
|
||||
bottom: 30%;
|
||||
background-color: #fff !important;
|
||||
background-color: white;
|
||||
}
|
||||
|
||||
.ui-dialog .ui-dialog-titlebar-disengage:hover {
|
||||
|
||||
@ -12819,9 +12819,9 @@ div.agents_custom_fields #datatables_wrapper div.bottom {
|
||||
|
||||
.actions-sound-modal .buttons-sound-modal button.play,
|
||||
.actions-sound-modal .buttons-sound-modal input[type="button"].play {
|
||||
background: url(../../images/play-white.png), transparent !important;
|
||||
/*background: url(../../images/play-white.png), transparent !important;
|
||||
background-repeat: no-repeat !important;
|
||||
background-position: 82px 14px !important;
|
||||
background-position: 82px 14px !important;*/
|
||||
color: #ffffff;
|
||||
padding-left: 20px;
|
||||
border: 0;
|
||||
|
||||
@ -1,9 +1,6 @@
|
||||
/*
|
||||
* Css Modal Sound events.
|
||||
*/
|
||||
div.container-button-play > button#button-start-search {
|
||||
transition: none !important;
|
||||
}
|
||||
.wizard {
|
||||
text-align: left;
|
||||
}
|
||||
@ -217,9 +214,9 @@ div.container-button-play > button#button-start-search {
|
||||
|
||||
.actions-sound-modal .buttons-sound-modal button.play,
|
||||
.actions-sound-modal .buttons-sound-modal input[type="button"].play {
|
||||
background: url(../../images/play-white.png), transparent !important;
|
||||
/*background: url(../../images/play-white.png), transparent !important;
|
||||
background-repeat: no-repeat !important;
|
||||
background-position: 82px 14px !important;
|
||||
background-position: 82px 14px !important;*/
|
||||
color: #ffffff !important;
|
||||
padding-left: 20px;
|
||||
border: 0;
|
||||
@ -263,11 +260,6 @@ button#button-no-alerts.silence-alerts:hover {
|
||||
background-position: 138px 4px !important;
|
||||
}
|
||||
|
||||
.actions-sound-modal .container-button-play {
|
||||
background-color: var(--primary-color);
|
||||
border-radius: 8px;
|
||||
}
|
||||
|
||||
.actions-sound-modal .container-button-alert.fired {
|
||||
background: #ee2132;
|
||||
border-radius: 8px;
|
||||
|
||||
@ -131,7 +131,7 @@
|
||||
<div style='padding-bottom: 50px'>
|
||||
<?php
|
||||
$version = '7.0NG.775';
|
||||
$build = '240126';
|
||||
$build = '240207';
|
||||
$banner = "v$version Build $build";
|
||||
error_reporting(0);
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
%define debug_package %{nil}
|
||||
%define name pandorafms_console
|
||||
%define version 7.0NG.775
|
||||
%define release 240126
|
||||
%define release 240207
|
||||
|
||||
# User and Group under which Apache is running
|
||||
%define httpd_name httpd
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
%define debug_package %{nil}
|
||||
%define name pandorafms_console
|
||||
%define version 7.0NG.775
|
||||
%define release 240126
|
||||
%define release 240207
|
||||
|
||||
# User and Group under which Apache is running
|
||||
%define httpd_name httpd
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
#
|
||||
%define name pandorafms_console
|
||||
%define version 7.0NG.775
|
||||
%define release 240126
|
||||
%define release 240207
|
||||
%define httpd_name httpd
|
||||
# User and Group under which Apache is running
|
||||
%define httpd_name apache2
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
package: pandorafms-server
|
||||
Version: 7.0NG.775-240126
|
||||
Version: 7.0NG.775-240207
|
||||
Architecture: all
|
||||
Priority: optional
|
||||
Section: admin
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
|
||||
pandora_version="7.0NG.775-240126"
|
||||
pandora_version="7.0NG.775-240207"
|
||||
|
||||
package_cpan=0
|
||||
package_pandora=1
|
||||
|
||||
@ -46,7 +46,7 @@ our @EXPORT = qw(
|
||||
|
||||
# version: Defines actual version of Pandora Server for this module only
|
||||
my $pandora_version = "7.0NG.775";
|
||||
my $pandora_build = "240126";
|
||||
my $pandora_build = "240207";
|
||||
our $VERSION = $pandora_version." ".$pandora_build;
|
||||
|
||||
# Setup hash
|
||||
|
||||
@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
|
||||
|
||||
# version: Defines actual version of Pandora Server for this module only
|
||||
my $pandora_version = "7.0NG.775";
|
||||
my $pandora_build = "240126";
|
||||
my $pandora_build = "240207";
|
||||
our $VERSION = $pandora_version." ".$pandora_build;
|
||||
|
||||
our %EXPORT_TAGS = ( 'all' => [ qw() ] );
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
%define debug_package %{nil}
|
||||
%define name pandorafms_server
|
||||
%define version 7.0NG.775
|
||||
%define release 240126
|
||||
%define release 240207
|
||||
|
||||
Summary: Pandora FMS Server
|
||||
Name: %{name}
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
%global __os_install_post %{nil}
|
||||
%define name pandorafms_server
|
||||
%define version 7.0NG.775
|
||||
%define release 240126
|
||||
%define release 240207
|
||||
|
||||
Summary: Pandora FMS Server
|
||||
Name: %{name}
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
# **********************************************************************
|
||||
|
||||
PI_VERSION="7.0NG.775"
|
||||
PI_BUILD="240126"
|
||||
PI_BUILD="240207"
|
||||
|
||||
MODE=$1
|
||||
if [ $# -gt 1 ]; then
|
||||
|
||||
@ -38,7 +38,7 @@ use PandoraFMS::Config;
|
||||
use PandoraFMS::DB;
|
||||
|
||||
# version: define current version
|
||||
my $version = "7.0NG.775 Build 240126";
|
||||
my $version = "7.0NG.775 Build 240207";
|
||||
|
||||
# Pandora server configuration
|
||||
my %conf;
|
||||
|
||||
@ -36,7 +36,7 @@ use Encode::Locale;
|
||||
Encode::Locale::decode_argv;
|
||||
|
||||
# version: define current version
|
||||
my $version = "7.0NG.775 Build 240126";
|
||||
my $version = "7.0NG.775 Build 240207";
|
||||
|
||||
# save program name for logging
|
||||
my $progname = basename($0);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user