mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-28 16:24:54 +02:00
Merge remote-tracking branch 'origin' into ent-7666-boxes-relations-nodo-mapa-red-no-funcionan
This commit is contained in:
commit
7c89b271ac
@ -1,5 +1,5 @@
|
|||||||
package: pandorafms-agent-unix
|
package: pandorafms-agent-unix
|
||||||
Version: 7.0NG.756-210816
|
Version: 7.0NG.756-210819
|
||||||
Architecture: all
|
Architecture: all
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Section: admin
|
Section: admin
|
||||||
|
@ -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.756-210816"
|
pandora_version="7.0NG.756-210819"
|
||||||
|
|
||||||
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
|
||||||
|
@ -1015,7 +1015,7 @@ my $Sem = undef;
|
|||||||
my $ThreadSem = undef;
|
my $ThreadSem = undef;
|
||||||
|
|
||||||
use constant AGENT_VERSION => '7.0NG.756';
|
use constant AGENT_VERSION => '7.0NG.756';
|
||||||
use constant AGENT_BUILD => '210816';
|
use constant AGENT_BUILD => '210819';
|
||||||
|
|
||||||
# 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;
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#
|
#
|
||||||
%define name pandorafms_agent_unix
|
%define name pandorafms_agent_unix
|
||||||
%define version 7.0NG.756
|
%define version 7.0NG.756
|
||||||
%define release 210816
|
%define release 210819
|
||||||
|
|
||||||
Summary: Pandora FMS Linux agent, PERL version
|
Summary: Pandora FMS Linux agent, PERL version
|
||||||
Name: %{name}
|
Name: %{name}
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#
|
#
|
||||||
%define name pandorafms_agent_unix
|
%define name pandorafms_agent_unix
|
||||||
%define version 7.0NG.756
|
%define version 7.0NG.756
|
||||||
%define release 210816
|
%define release 210819
|
||||||
|
|
||||||
Summary: Pandora FMS Linux agent, PERL version
|
Summary: Pandora FMS Linux agent, PERL version
|
||||||
Name: %{name}
|
Name: %{name}
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
# **********************************************************************
|
# **********************************************************************
|
||||||
|
|
||||||
PI_VERSION="7.0NG.756"
|
PI_VERSION="7.0NG.756"
|
||||||
PI_BUILD="210816"
|
PI_BUILD="210819"
|
||||||
OS_NAME=`uname -s`
|
OS_NAME=`uname -s`
|
||||||
|
|
||||||
FORCE=0
|
FORCE=0
|
||||||
|
@ -186,7 +186,7 @@ UpgradeApplicationID
|
|||||||
{}
|
{}
|
||||||
|
|
||||||
Version
|
Version
|
||||||
{210816}
|
{210819}
|
||||||
|
|
||||||
ViewReadme
|
ViewReadme
|
||||||
{Yes}
|
{Yes}
|
||||||
|
@ -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.756 Build 210816")
|
#define PANDORA_VERSION ("7.0NG.756 Build 210819")
|
||||||
|
|
||||||
string pandora_path;
|
string pandora_path;
|
||||||
string pandora_dir;
|
string pandora_dir;
|
||||||
|
@ -11,7 +11,7 @@ BEGIN
|
|||||||
VALUE "LegalCopyright", "Artica ST"
|
VALUE "LegalCopyright", "Artica ST"
|
||||||
VALUE "OriginalFilename", "PandoraAgent.exe"
|
VALUE "OriginalFilename", "PandoraAgent.exe"
|
||||||
VALUE "ProductName", "Pandora FMS Windows Agent"
|
VALUE "ProductName", "Pandora FMS Windows Agent"
|
||||||
VALUE "ProductVersion", "(7.0NG.756(Build 210816))"
|
VALUE "ProductVersion", "(7.0NG.756(Build 210819))"
|
||||||
VALUE "FileVersion", "1.0.0.0"
|
VALUE "FileVersion", "1.0.0.0"
|
||||||
END
|
END
|
||||||
END
|
END
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
package: pandorafms-console
|
package: pandorafms-console
|
||||||
Version: 7.0NG.756-210816
|
Version: 7.0NG.756-210819
|
||||||
Architecture: all
|
Architecture: all
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Section: admin
|
Section: admin
|
||||||
|
@ -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.756-210816"
|
pandora_version="7.0NG.756-210819"
|
||||||
|
|
||||||
package_pear=0
|
package_pear=0
|
||||||
package_pandora=1
|
package_pandora=1
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
START TRANSACTION;
|
START TRANSACTION;
|
||||||
|
|
||||||
|
ALTER TABLE `tevento` MODIFY `data` TINYTEXT default NULL;
|
||||||
|
ALTER TABLE `tmetaconsole_event` MODIFY `data` TINYTEXT default NULL;
|
||||||
ALTER TABLE `tmetaconsole_setup` ADD COLUMN `unified` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0;
|
ALTER TABLE `tmetaconsole_setup` ADD COLUMN `unified` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0;
|
||||||
ALTER TABLE `tlayout` ADD COLUMN `auto_adjust` INTEGER UNSIGNED NOT NULL default 0;
|
ALTER TABLE `tlayout` ADD COLUMN `auto_adjust` INTEGER UNSIGNED NOT NULL default 0;
|
||||||
ALTER TABLE `tlayout_data` ADD COLUMN `title` TEXT default '';
|
ALTER TABLE `tlayout_data` ADD COLUMN `title` TEXT default '';
|
||||||
|
@ -1028,6 +1028,7 @@ ALTER TABLE `tmetaconsole_event` ADD INDEX `tme_timestamp_idx` (`timestamp`);
|
|||||||
ALTER TABLE `tmetaconsole_event` ADD INDEX `tme_module_status_idx` (`module_status`);
|
ALTER TABLE `tmetaconsole_event` ADD INDEX `tme_module_status_idx` (`module_status`);
|
||||||
ALTER TABLE `tmetaconsole_event` ADD INDEX `tme_criticity_idx` (`criticity`);
|
ALTER TABLE `tmetaconsole_event` ADD INDEX `tme_criticity_idx` (`criticity`);
|
||||||
ALTER TABLE `tmetaconsole_event` ADD INDEX `tme_agent_name_idx` (`agent_name`);
|
ALTER TABLE `tmetaconsole_event` ADD INDEX `tme_agent_name_idx` (`agent_name`);
|
||||||
|
ALTER TABLE `tmetaconsole_event` MODIFY `data` TINYTEXT default NULL;
|
||||||
|
|
||||||
-- ---------------------------------------------------------------------
|
-- ---------------------------------------------------------------------
|
||||||
-- Table `tmetaconsole_event_history`
|
-- Table `tmetaconsole_event_history`
|
||||||
@ -2350,6 +2351,8 @@ ALTER TABLE `tevento` ADD COLUMN `data` double(50,5) default NULL;
|
|||||||
|
|
||||||
ALTER TABLE `tevento` ADD COLUMN `module_status` int(4) NOT NULL default '0';
|
ALTER TABLE `tevento` ADD COLUMN `module_status` int(4) NOT NULL default '0';
|
||||||
|
|
||||||
|
ALTER TABLE `tevento` MODIFY `data` TINYTEXT default NULL;
|
||||||
|
|
||||||
-- ---------------------------------------------------------------------
|
-- ---------------------------------------------------------------------
|
||||||
-- Table `tevent_extended`
|
-- Table `tevent_extended`
|
||||||
-- ---------------------------------------------------------------------
|
-- ---------------------------------------------------------------------
|
||||||
|
@ -23,13 +23,8 @@ ui_require_css_file('order_interpreter');
|
|||||||
// Global errors/warnings checking.
|
// Global errors/warnings checking.
|
||||||
config_check();
|
config_check();
|
||||||
|
|
||||||
|
echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
|
||||||
|
|
||||||
|
|
||||||
if ($config['menu_type'] == 'classic') {
|
|
||||||
echo '<div id="header_table" class="header_table_classic">';
|
|
||||||
} else {
|
|
||||||
echo '<div id="header_table" class="header_table_collapsed">';
|
|
||||||
}
|
|
||||||
?>
|
?>
|
||||||
<div id="header_table_inner">
|
<div id="header_table_inner">
|
||||||
<?php
|
<?php
|
||||||
|
@ -1,17 +1,33 @@
|
|||||||
<?php
|
<?php
|
||||||
|
/**
|
||||||
|
* Lateral Main Menu.
|
||||||
|
*
|
||||||
|
* @category Main Menu.
|
||||||
|
* @package Pandora FMS.
|
||||||
|
* @subpackage OpenSource.
|
||||||
|
* @version 1.0.0
|
||||||
|
* @license See below
|
||||||
|
*
|
||||||
|
* ______ ___ _______ _______ ________
|
||||||
|
* | __ \.-----.--.--.--| |.-----.----.-----. | ___| | | __|
|
||||||
|
* | __/| _ | | _ || _ | _| _ | | ___| |__ |
|
||||||
|
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
|
||||||
|
*
|
||||||
|
* ============================================================================
|
||||||
|
* Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
|
||||||
|
* Please see http://pandorafms.org for full contribution list
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU General Public License
|
||||||
|
* as published by the Free Software Foundation for version 2.
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
* ============================================================================
|
||||||
|
*/
|
||||||
|
|
||||||
// Pandora FMS - http://pandorafms.com
|
// Begin.
|
||||||
// ==================================================
|
if (isset($config['id_user']) === false) {
|
||||||
// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
|
|
||||||
// Please see http://pandorafms.org for full contribution list
|
|
||||||
// This program is free software; you can redistribute it and/or
|
|
||||||
// modify it under the terms of the GNU General Public License
|
|
||||||
// as published by the Free Software Foundation; version 2
|
|
||||||
// This program is distributed in the hope that it will be useful,
|
|
||||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
// GNU General Public License for more details.
|
|
||||||
if (! isset($config['id_user'])) {
|
|
||||||
include 'general/login_page.php';
|
include 'general/login_page.php';
|
||||||
exit();
|
exit();
|
||||||
}
|
}
|
||||||
@ -20,9 +36,9 @@ if (! isset($config['id_user'])) {
|
|||||||
<script type="text/javascript" language="javascript">
|
<script type="text/javascript" language="javascript">
|
||||||
|
|
||||||
$(document).ready(function(){
|
$(document).ready(function(){
|
||||||
var menuType_value = "<?php echo $config['menu_type']; ?>";
|
var menuType_value = "<?php echo $_SESSION['menu_type']; ?>";
|
||||||
|
|
||||||
if (menuType_value == 'classic') {
|
if (menuType_value === 'classic') {
|
||||||
$('ul.submenu').css('left', '214px');
|
$('ul.submenu').css('left', '214px');
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
@ -34,26 +50,22 @@ $(document).ready(function(){
|
|||||||
<?php
|
<?php
|
||||||
$autohidden_menu = 0;
|
$autohidden_menu = 0;
|
||||||
|
|
||||||
if (isset($config['autohidden_menu']) && $config['autohidden_menu']) {
|
if (isset($config['autohidden_menu']) === true && (bool) $config['autohidden_menu'] === true) {
|
||||||
$autohidden_menu = 1;
|
$autohidden_menu = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Menu container prepared to autohide menu
|
// Start of full lateral menu.
|
||||||
if ($config['menu_type'] == 'classic') {
|
echo sprintf('<div id="menu_full" class="menu_full_%s">', $menuTypeClass);
|
||||||
echo '<div id="menu_full" class="menu_full_classic">';
|
|
||||||
} else {
|
|
||||||
echo '<div id="menu_full" class="menu_full_collapsed">';
|
|
||||||
}
|
|
||||||
|
|
||||||
$custom_logo = 'images/custom_logo/'.$config['custom_logo'];
|
$custom_logo = 'images/custom_logo/'.$config['custom_logo'];
|
||||||
$custom_logo_collapsed = 'images/custom_logo/'.$config['custom_logo_collapsed'];
|
$custom_logo_collapsed = 'images/custom_logo/'.$config['custom_logo_collapsed'];
|
||||||
|
|
||||||
if (!defined('PANDORA_ENTERPRISE')) {
|
if (defined('PANDORA_ENTERPRISE') === false) {
|
||||||
$logo_title = get_product_name().' Opensource';
|
$logo_title = get_product_name().' Opensource';
|
||||||
$custom_logo = 'images/custom_logo/pandora_logo_head_3.png';
|
$custom_logo = 'images/custom_logo/pandora_logo_head_3.png';
|
||||||
$custom_logo_collapsed = 'images/custom_logo/pandora_logo_green_collapsed.png';
|
$custom_logo_collapsed = 'images/custom_logo/pandora_logo_green_collapsed.png';
|
||||||
} else {
|
} else {
|
||||||
if (file_exists(ENTERPRISE_DIR.'/'.$custom_logo)) {
|
if (file_exists(ENTERPRISE_DIR.'/'.$custom_logo) === true) {
|
||||||
$custom_logo = ENTERPRISE_DIR.'/'.$custom_logo;
|
$custom_logo = ENTERPRISE_DIR.'/'.$custom_logo;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -61,54 +73,48 @@ if (!defined('PANDORA_ENTERPRISE')) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
echo '<div class="logo_green"><a href="index.php?sec=main">';
|
echo '<div class="logo_green"><a href="index.php?sec=main">';
|
||||||
if (isset($config['custom_logo'])) {
|
|
||||||
if ($config['menu_type'] == 'classic') {
|
if (isset($config['custom_logo']) === true) {
|
||||||
echo html_print_image($custom_logo, true, ['border' => '0', 'width' => '215', 'alt' => $logo_title, 'class' => 'logo_full', 'style' => 'display:block']);
|
echo html_print_image(
|
||||||
} else {
|
$custom_logo,
|
||||||
echo html_print_image($custom_logo, true, ['border' => '0', 'width' => '215', 'alt' => $logo_title, 'class' => 'logo_full', 'style' => 'display:none']);
|
true,
|
||||||
}
|
[
|
||||||
|
'border' => '0',
|
||||||
|
'width' => '215',
|
||||||
|
'alt' => $logo_title,
|
||||||
|
'class' => 'logo_full',
|
||||||
|
'style' => ($menuCollapsed === true) ? 'display:none' : 'display:block',
|
||||||
|
]
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isset($config['custom_logo_collapsed'])) {
|
if (isset($config['custom_logo_collapsed']) === true) {
|
||||||
if ($config['menu_type'] == 'classic') {
|
echo html_print_image(
|
||||||
echo html_print_image($custom_logo_collapsed, true, ['border' => '0', 'width' => '60', 'alt' => $logo_title, 'class' => 'logo_icon', 'style' => 'display:none']);
|
$custom_logo_collapsed,
|
||||||
} else {
|
true,
|
||||||
echo html_print_image($custom_logo_collapsed, true, ['border' => '0', 'width' => '60', 'alt' => $logo_title, 'class' => 'logo_icon', 'style' => 'display:block']);
|
[
|
||||||
}
|
'border' => '0',
|
||||||
|
'width' => '60',
|
||||||
|
'alt' => $logo_title,
|
||||||
|
'class' => 'logo_icon',
|
||||||
|
'style' => ($menuCollapsed === true) ? 'display:block' : 'display:none',
|
||||||
|
]
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
echo '</a></div>';
|
echo '</a></div>';
|
||||||
|
|
||||||
// echo '<div class="tit bg titop">:: '.__('Operation').' ::</div>';
|
|
||||||
require 'operation/menu.php';
|
require 'operation/menu.php';
|
||||||
|
|
||||||
// Check all enterprise ACL used in godmenu items to print menu headers
|
|
||||||
if (check_acl($config['id_user'], 0, 'AW')
|
|
||||||
|| check_acl($config['id_user'], 0, 'PM')
|
|
||||||
|| check_acl($config['id_user'], 0, 'LM')
|
|
||||||
|| check_acl($config['id_user'], 0, 'UM')
|
|
||||||
|| check_acl($config['id_user'], 0, 'LW')
|
|
||||||
|| check_acl($config['id_user'], 0, 'EW')
|
|
||||||
|| check_acl($config['id_user'], 0, 'DW')
|
|
||||||
) {
|
|
||||||
// echo '<div class="tit bg3">:: '.__('Administration').' ::</div>';
|
|
||||||
}
|
|
||||||
|
|
||||||
require 'godmode/menu.php';
|
require 'godmode/menu.php';
|
||||||
|
|
||||||
if ($config['menu_type'] == 'classic') {
|
echo sprintf('<div id="button_collapse" class="button_%s button_collapse"></div>', $menuTypeClass);
|
||||||
echo '<div id="button_collapse" class="button_classic button_collapse"></div>';
|
|
||||||
} else {
|
|
||||||
echo '<div id="button_collapse" class="button_collapsed button_collapse"></div>';
|
|
||||||
}
|
|
||||||
|
|
||||||
// require ("links_menu.php");
|
|
||||||
echo '</div>';
|
echo '</div>';
|
||||||
// menu_container
|
// Menu_container.
|
||||||
ui_require_jquery_file('cookie');
|
ui_require_jquery_file('cookie');
|
||||||
|
|
||||||
$config_fixed_header = false;
|
$config_fixed_header = false;
|
||||||
if (isset($config['fixed_header'])) {
|
if (isset($config['fixed_header']) === true) {
|
||||||
$config_fixed_header = $config['fixed_header'];
|
$config_fixed_header = $config['fixed_header'];
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
@ -1120,6 +1120,12 @@ function show_add_action(id_alert) {
|
|||||||
opacity: 0.5,
|
opacity: 0.5,
|
||||||
background: "black"
|
background: "black"
|
||||||
},
|
},
|
||||||
|
open: function() {
|
||||||
|
$("#action_select, #action_select").select2({
|
||||||
|
tags: true,
|
||||||
|
dropdownParent: $("#add_action-div-" + id_alert)
|
||||||
|
});
|
||||||
|
},
|
||||||
width: 500,
|
width: 500,
|
||||||
height: 300
|
height: 300
|
||||||
})
|
})
|
||||||
@ -1150,6 +1156,12 @@ function show_display_update_action(id_module_action, alert_id, alert_id_agent_m
|
|||||||
opacity: 0.5,
|
opacity: 0.5,
|
||||||
background: "black"
|
background: "black"
|
||||||
},
|
},
|
||||||
|
open: function() {
|
||||||
|
$("#action_select_ajax, #action_select_ajax").select2({
|
||||||
|
tags: true,
|
||||||
|
dropdownParent: $("#update_action-div")
|
||||||
|
});
|
||||||
|
},
|
||||||
width: 500,
|
width: 500,
|
||||||
height: 300
|
height: 300
|
||||||
})
|
})
|
||||||
|
@ -34,7 +34,7 @@
|
|||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
if (typeof $ != "function") {
|
if (typeof $ != "function") {
|
||||||
// Dynamically include jquery if not added to this page.
|
// Dynamically include jquery if not added to this page.
|
||||||
document.write('<script type="text/javascript" src="<?php echo $asset('resources/javascript/jquery-3.3.1.min.js'); ?>"></'+'script>');
|
document.write('<script type="text/javascript" src="<?php echo $asset('resources/javascript/jquery.current.js'); ?>"></'+'script>');
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<script src="<?php $asset('resources/javascript/umc.js'); ?>" type="text/javascript"></script>
|
<script src="<?php $asset('resources/javascript/umc.js'); ?>" type="text/javascript"></script>
|
||||||
|
@ -34,7 +34,7 @@ $product_name = get_product_name(); ?>
|
|||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
if (typeof $ != "function") {
|
if (typeof $ != "function") {
|
||||||
// Dynamically include jquery if not added to this page.
|
// Dynamically include jquery if not added to this page.
|
||||||
document.write('<script type="text/javascript" src="<?php echo $asset('resources/javascript/jquery-3.3.1.min.js'); ?>"></'+'script>');
|
document.write('<script type="text/javascript" src="<?php echo $asset('resources/javascript/jquery.current.js'); ?>"></'+'script>');
|
||||||
document.write('<script type="text/javascript" src="<?php echo $asset('resources/javascript/jquery-ui.min.js'); ?>"></'+'script>');
|
document.write('<script type="text/javascript" src="<?php echo $asset('resources/javascript/jquery-ui.min.js'); ?>"></'+'script>');
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
@ -95,7 +95,7 @@ if (check_login(false) === false) {
|
|||||||
<link rel="stylesheet" href="styles/js/jquery-ui_custom.css" type="text/css" />
|
<link rel="stylesheet" href="styles/js/jquery-ui_custom.css" type="text/css" />
|
||||||
<script language="javascript" type='text/javascript' src='javascript/pandora.js'></script>
|
<script language="javascript" type='text/javascript' src='javascript/pandora.js'></script>
|
||||||
<script language="javascript" type='text/javascript' src='javascript/pandora_ui.js'></script>
|
<script language="javascript" type='text/javascript' src='javascript/pandora_ui.js'></script>
|
||||||
<script language="javascript" type='text/javascript' src='javascript/jquery-3.3.1.min.js'></script>
|
<script language="javascript" type='text/javascript' src='javascript/jquery.current.js'></script>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<h1>Access is not granted</h1>
|
<h1>Access is not granted</h1>
|
||||||
@ -153,7 +153,7 @@ if (file_exists('languages/'.$user_language.'.mo') === true) {
|
|||||||
<link rel="stylesheet" href="styles/js/jquery-ui_custom.css" type="text/css" />
|
<link rel="stylesheet" href="styles/js/jquery-ui_custom.css" type="text/css" />
|
||||||
<script language="javascript" type='text/javascript' src='javascript/pandora.js'></script>
|
<script language="javascript" type='text/javascript' src='javascript/pandora.js'></script>
|
||||||
<script language="javascript" type='text/javascript' src='javascript/pandora_ui.js'></script>
|
<script language="javascript" type='text/javascript' src='javascript/pandora_ui.js'></script>
|
||||||
<script language="javascript" type='text/javascript' src='javascript/jquery-3.3.1.min.js'></script>
|
<script language="javascript" type='text/javascript' src='javascript/jquery.current.js'></script>
|
||||||
<script language="javascript" type='text/javascript' src='javascript/jquery.pandora.js'></script>
|
<script language="javascript" type='text/javascript' src='javascript/jquery.pandora.js'></script>
|
||||||
<script language="javascript" type='text/javascript' src='javascript/jquery-ui.min.js'></script>
|
<script language="javascript" type='text/javascript' src='javascript/jquery-ui.min.js'></script>
|
||||||
<script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.js"></script>
|
<script language="javascript" type="text/javascript" src="graphs/flot/jquery.flot.js"></script>
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
/**
|
/**
|
||||||
* Pandora build version and version
|
* Pandora build version and version
|
||||||
*/
|
*/
|
||||||
$build_version = 'PC210816';
|
$build_version = 'PC210819';
|
||||||
$pandora_version = 'v7.0NG.756';
|
$pandora_version = 'v7.0NG.756';
|
||||||
|
|
||||||
// Do not overwrite default timezone set if defined.
|
// Do not overwrite default timezone set if defined.
|
||||||
@ -306,7 +306,7 @@ switch ($config['dbtype']) {
|
|||||||
|
|
||||||
// ======================================================================
|
// ======================================================================
|
||||||
// Menu display mode.
|
// Menu display mode.
|
||||||
if (isset($_SESSION['meny_type']) === true && $_SESSION['menu_type']) {
|
if (isset($_SESSION['meny_type']) === true && empty($_SESSION['menu_type']) === false) {
|
||||||
$config['menu_type'] = $_SESSION['menu_type'];
|
$config['menu_type'] = $_SESSION['menu_type'];
|
||||||
} else {
|
} else {
|
||||||
$config['menu_type'] = 'classic';
|
$config['menu_type'] = 'classic';
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
global $config;
|
global $config;
|
||||||
|
|
||||||
// Set variable to store menu type (classic or collapsed).
|
// Set variable to store menu type (classic or collapsed).
|
||||||
if (!empty(get_parameter('menuType'))) {
|
if (is_ajax() === true && empty(get_parameter('menuType')) === false) {
|
||||||
$_SESSION['menu_type'] = get_parameter('menuType', 'classic');
|
$_SESSION['menu_type'] = get_parameter('menuType', 'classic');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -108,7 +108,7 @@ function menu_print_menu(&$menu)
|
|||||||
|
|
||||||
$submenu = false;
|
$submenu = false;
|
||||||
|
|
||||||
if ($config['menu_type'] == 'classic') {
|
if ($_SESSION['menu_type'] === 'classic') {
|
||||||
$classes = [
|
$classes = [
|
||||||
'menu_icon',
|
'menu_icon',
|
||||||
'no_hidden_menu',
|
'no_hidden_menu',
|
||||||
@ -413,7 +413,7 @@ function menu_print_menu(&$menu)
|
|||||||
$length = strlen(__($main['text']));
|
$length = strlen(__($main['text']));
|
||||||
$padding_top = ( $length >= 18) ? 6 : 12;
|
$padding_top = ( $length >= 18) ? 6 : 12;
|
||||||
|
|
||||||
if ($config['menu_type'] == 'classic') {
|
if ($_SESSION['menu_type'] === 'classic') {
|
||||||
$output .= '<div id="title_menu" class="title_menu_classic">'.$main['text'].'</div>';
|
$output .= '<div id="title_menu" class="title_menu_classic">'.$main['text'].'</div>';
|
||||||
} else {
|
} else {
|
||||||
$output .= '<div id="title_menu" class="title_menu_collapsed">'.$main['text'].'</div>';
|
$output .= '<div id="title_menu" class="title_menu_collapsed">'.$main['text'].'</div>';
|
||||||
|
@ -2295,17 +2295,19 @@ function modules_get_agentmodule_data(
|
|||||||
$search_in_history_db = db_search_in_history_db($datelimit);
|
$search_in_history_db = db_search_in_history_db($datelimit);
|
||||||
|
|
||||||
switch ($module['id_tipo_modulo']) {
|
switch ($module['id_tipo_modulo']) {
|
||||||
// generic_data_string
|
// Generic_data_string.
|
||||||
case 3:
|
case 3:
|
||||||
// remote_tcp_string
|
// Remote_tcp_string.
|
||||||
case 10:
|
case 10:
|
||||||
// remote_snmp_string
|
// Remote_snmp_string.
|
||||||
case 17:
|
case 17:
|
||||||
// async_string
|
// Async_string.
|
||||||
case 36:
|
case 36:
|
||||||
// remote_cmd_string
|
// Remote_cmd_string.
|
||||||
case 23:
|
case 23:
|
||||||
// Free search is a json with value and exact modifier
|
// Web content string.
|
||||||
|
case 33:
|
||||||
|
// Free search is a json with value and exact modifier.
|
||||||
$freesearch = json_decode($freesearch, true);
|
$freesearch = json_decode($freesearch, true);
|
||||||
$freesearch_sql = '';
|
$freesearch_sql = '';
|
||||||
if (isset($freesearch['value']) && !empty($freesearch['value'])) {
|
if (isset($freesearch['value']) && !empty($freesearch['value'])) {
|
||||||
|
@ -817,7 +817,7 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
|
|||||||
$events_graph .= graph_graphic_agentevents(
|
$events_graph .= graph_graphic_agentevents(
|
||||||
$id_agente,
|
$id_agente,
|
||||||
'340px;margin:0',
|
'340px;margin:0',
|
||||||
45,
|
'130px',
|
||||||
SECONDS_1DAY,
|
SECONDS_1DAY,
|
||||||
'',
|
'',
|
||||||
true,
|
true,
|
||||||
|
@ -1869,7 +1869,7 @@ function ui_process_page_head($string, $bitfield)
|
|||||||
} else {
|
} else {
|
||||||
$config['jquery'] = array_merge(
|
$config['jquery'] = array_merge(
|
||||||
[
|
[
|
||||||
'jquery' => 'include/javascript/jquery-3.3.1.min.js',
|
'jquery' => 'include/javascript/jquery.current.js',
|
||||||
'pandora' => 'include/javascript/jquery.pandora.js',
|
'pandora' => 'include/javascript/jquery.pandora.js',
|
||||||
'jquery-ui' => 'include/javascript/jquery-ui.min.js',
|
'jquery-ui' => 'include/javascript/jquery-ui.min.js',
|
||||||
],
|
],
|
||||||
|
@ -118,6 +118,7 @@ function flot_area_graph(
|
|||||||
$array_events_alerts
|
$array_events_alerts
|
||||||
) {
|
) {
|
||||||
global $config;
|
global $config;
|
||||||
|
global $is_mobile;
|
||||||
|
|
||||||
// Get a unique identifier to graph.
|
// Get a unique identifier to graph.
|
||||||
$graph_id = uniqid('graph_');
|
$graph_id = uniqid('graph_');
|
||||||
@ -145,7 +146,7 @@ function flot_area_graph(
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($config['style'] === 'pandora_black' && ($params['pdf'] === false || $params['pdf'] === null )
|
if ($config['style'] === 'pandora_black' && ($params['pdf'] === false || $params['pdf'] === null) && (isset($is_mobile) === false || $is_mobile === false)
|
||||||
) {
|
) {
|
||||||
$background_style = '#222';
|
$background_style = '#222';
|
||||||
$params['grid_color'] = '#fff';
|
$params['grid_color'] = '#fff';
|
||||||
@ -760,11 +761,23 @@ function flot_slicesbar_graph(
|
|||||||
$graph_id = uniqid('graph_');
|
$graph_id = uniqid('graph_');
|
||||||
|
|
||||||
// Set some containers to legend, graph, timestamp tooltip, etc.
|
// Set some containers to legend, graph, timestamp tooltip, etc.
|
||||||
$height = ((int) $height + 15);
|
if (is_numeric($height) === true) {
|
||||||
|
$height = ((int) $height + 15);
|
||||||
|
}
|
||||||
|
|
||||||
$style = 'width:'.$width.'%;';
|
$style = 'width:'.$width.'%;';
|
||||||
|
|
||||||
// Fixed height size.
|
// Fixed height size.
|
||||||
$style .= 'height: 100%;';
|
if (empty($height) === true) {
|
||||||
|
$style .= 'height: 100%;';
|
||||||
|
} else {
|
||||||
|
if (is_numeric($height) === true) {
|
||||||
|
$style .= 'height: '.$height.'px;';
|
||||||
|
} else {
|
||||||
|
$style .= 'height: '.$height.';';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$return = "<div id='".$graph_id."' class='noresizevc graph ".$adapt_key."' style='".$style."'></div>";
|
$return = "<div id='".$graph_id."' class='noresizevc graph ".$adapt_key."' style='".$style."'></div>";
|
||||||
|
|
||||||
$return .= "<div id='value_".$graph_id."' class='flot_container'></div>";
|
$return .= "<div id='value_".$graph_id."' class='flot_container'></div>";
|
||||||
|
2
pandora_console/include/javascript/jquery-3.6.0.min.js
vendored
Normal file
2
pandora_console/include/javascript/jquery-3.6.0.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
pandora_console/include/javascript/jquery-3.6.0.min.map
Normal file
1
pandora_console/include/javascript/jquery-3.6.0.min.map
Normal file
File diff suppressed because one or more lines are too long
2
pandora_console/include/javascript/jquery.current.js
Normal file
2
pandora_console/include/javascript/jquery.current.js
Normal file
File diff suppressed because one or more lines are too long
1
pandora_console/include/javascript/jquery.current.map
Normal file
1
pandora_console/include/javascript/jquery.current.map
Normal file
File diff suppressed because one or more lines are too long
@ -416,11 +416,11 @@ ul li {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.menu_full_classic .title_menu_classic {
|
.menu_full_classic .title_menu_classic {
|
||||||
display: flex;
|
display: flex !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.menu_full_collapsed .title_menu_collapsed {
|
.menu_full_collapsed .title_menu_collapsed {
|
||||||
display: none;
|
display: none !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.button_classic {
|
.button_classic {
|
||||||
|
@ -1112,17 +1112,36 @@ if (get_parameter('login', 0) !== 0) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Header.
|
|
||||||
if ($config['pure'] == 0) {
|
|
||||||
echo '<div id="container"><div id="head">';
|
|
||||||
include 'general/header.php';
|
|
||||||
|
|
||||||
if ($config['menu_type'] == 'classic') {
|
if ((bool) $config['maintenance_mode'] === true
|
||||||
echo '</div><div id="page" class="page_classic"><div id="menu">';
|
&& (bool) users_is_admin() === false
|
||||||
} else {
|
) {
|
||||||
echo '</div><div id="page" class="page_collapsed"><div id="menu">';
|
// Show maintenance web-page. For non-admin users only.
|
||||||
|
include 'general/maintenance.php';
|
||||||
|
|
||||||
|
while (ob_get_length() > 0) {
|
||||||
|
ob_end_flush();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
exit('</html>');
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Pure.
|
||||||
|
if ($config['pure'] == 0) {
|
||||||
|
// Menu container prepared to autohide menu.
|
||||||
|
$menuCollapsed = (isset($_SESSION['menu_type']) === true && $_SESSION['menu_type'] !== 'classic');
|
||||||
|
$menuTypeClass = ($menuCollapsed === true) ? 'collapsed' : 'classic';
|
||||||
|
// Container.
|
||||||
|
echo '<div id="container">';
|
||||||
|
// Header.
|
||||||
|
echo '<div id="head">';
|
||||||
|
include 'general/header.php';
|
||||||
|
echo '</div>';
|
||||||
|
// Main menu.
|
||||||
|
echo sprintf('<div id="page" class="page_%s">', $menuTypeClass);
|
||||||
|
echo '<div id="menu">';
|
||||||
|
|
||||||
include 'general/main_menu.php';
|
include 'general/main_menu.php';
|
||||||
echo '</div>';
|
echo '</div>';
|
||||||
echo '<button onclick="topFunction()" id="top_btn" title="Go to top"></button>';
|
echo '<button onclick="topFunction()" id="top_btn" title="Go to top"></button>';
|
||||||
@ -1330,11 +1349,15 @@ if ($config['pure'] == 0) {
|
|||||||
// Main pure.
|
// Main pure.
|
||||||
}
|
}
|
||||||
|
|
||||||
echo '<div id="wiz_container">';
|
html_print_div(
|
||||||
echo '</div>';
|
['id' => 'wiz_container'],
|
||||||
|
true
|
||||||
|
);
|
||||||
|
|
||||||
echo '<div id="um_msg_receiver">';
|
html_print_div(
|
||||||
echo '</div>';
|
['id' => 'um_msg_receiver'],
|
||||||
|
true
|
||||||
|
);
|
||||||
|
|
||||||
// Connection lost alert.
|
// Connection lost alert.
|
||||||
ui_require_javascript_file('connection_check');
|
ui_require_javascript_file('connection_check');
|
||||||
|
@ -129,7 +129,7 @@
|
|||||||
<div style='height: 10px'>
|
<div style='height: 10px'>
|
||||||
<?php
|
<?php
|
||||||
$version = '7.0NG.756';
|
$version = '7.0NG.756';
|
||||||
$build = '210816';
|
$build = '210819';
|
||||||
$banner = "v$version Build $build";
|
$banner = "v$version Build $build";
|
||||||
|
|
||||||
error_reporting(0);
|
error_reporting(0);
|
||||||
|
@ -1,3 +1,37 @@
|
|||||||
|
/**
|
||||||
|
*
|
||||||
|
* Default mobile theme
|
||||||
|
*
|
||||||
|
* @category Stylesheet
|
||||||
|
* @package Pandora FMS
|
||||||
|
* @subpackage Community
|
||||||
|
* @version 1.0.0
|
||||||
|
* @license See below
|
||||||
|
*
|
||||||
|
* ______ ___ _______ _______ ________
|
||||||
|
* | __ \.-----.--.--.--| |.-----.----.-----. | ___| | | __|
|
||||||
|
* | __/| _ | | _ || _ | _| _ | | ___| |__ |
|
||||||
|
* |___| |___._|__|__|_____||_____|__| |___._| |___| |__|_|__|_______|
|
||||||
|
*
|
||||||
|
* ============================================================================
|
||||||
|
* Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
|
||||||
|
* Please see http://pandorafms.org for full contribution list
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU General Public License
|
||||||
|
* as published by the Free Software Foundation for version 2.
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
* ============================================================================
|
||||||
|
*/
|
||||||
|
|
||||||
|
@font-face {
|
||||||
|
font-family: "lato";
|
||||||
|
src: url("../../../fonts/lato.woff2") format("woff");
|
||||||
|
font-weight: 400;
|
||||||
|
}
|
||||||
|
|
||||||
* {
|
* {
|
||||||
text-decoration: none !important;
|
text-decoration: none !important;
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
@ -11,6 +45,8 @@ body {
|
|||||||
margin: 0;
|
margin: 0;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
vertical-align: top;
|
vertical-align: top;
|
||||||
|
font-weight: 400;
|
||||||
|
font-family: "Lato";
|
||||||
}
|
}
|
||||||
|
|
||||||
.small {
|
.small {
|
||||||
|
@ -96,7 +96,7 @@ if ($refresh > 0) {
|
|||||||
<link rel="stylesheet" href="../../include/styles/pandora_minimal.css" type="text/css" />
|
<link rel="stylesheet" href="../../include/styles/pandora_minimal.css" type="text/css" />
|
||||||
<link rel="stylesheet" href="../../include/styles/js/jquery-ui.min.css" type="text/css" />
|
<link rel="stylesheet" href="../../include/styles/js/jquery-ui.min.css" type="text/css" />
|
||||||
<script type='text/javascript' src='../../include/javascript/pandora.js'></script>
|
<script type='text/javascript' src='../../include/javascript/pandora.js'></script>
|
||||||
<script type='text/javascript' src='../../include/javascript/jquery-3.3.1.min.js'></script>
|
<script type='text/javascript' src='../../include/javascript/jquery.current.js'></script>
|
||||||
<script type='text/javascript' src='../../include/javascript/jquery.pandora.js'></script>
|
<script type='text/javascript' src='../../include/javascript/jquery.pandora.js'></script>
|
||||||
<script type='text/javascript' src='../../include/javascript/jquery-ui.min.js'></script>
|
<script type='text/javascript' src='../../include/javascript/jquery-ui.min.js'></script>
|
||||||
<?php
|
<?php
|
||||||
|
@ -87,7 +87,7 @@ echo '<link rel="stylesheet" href="../../include/styles/pandora.css" type="text/
|
|||||||
<link rel="stylesheet" href="../../include/styles/js/jquery-ui.min.css" type="text/css" />
|
<link rel="stylesheet" href="../../include/styles/js/jquery-ui.min.css" type="text/css" />
|
||||||
<script type='text/javascript' src='../../include/javascript/pandora.js'></script>
|
<script type='text/javascript' src='../../include/javascript/pandora.js'></script>
|
||||||
<script type='text/javascript' src='../../include/javascript/pandora_ui.js'></script>
|
<script type='text/javascript' src='../../include/javascript/pandora_ui.js'></script>
|
||||||
<script type='text/javascript' src='../../include/javascript/jquery-3.3.1.min.js'></script>
|
<script type='text/javascript' src='../../include/javascript/jquery.current.js'></script>
|
||||||
<script type='text/javascript' src='../../include/javascript/jquery.pandora.js'></script>
|
<script type='text/javascript' src='../../include/javascript/jquery.pandora.js'></script>
|
||||||
<script type='text/javascript' src='../../include/javascript/jquery-ui.min.js'></script>
|
<script type='text/javascript' src='../../include/javascript/jquery-ui.min.js'></script>
|
||||||
<?php
|
<?php
|
||||||
|
@ -86,7 +86,7 @@ if (!check_acl_one_of_groups($config['id_user'], $all_groups, 'AR')) {
|
|||||||
?>
|
?>
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||||
<title><?php echo __('%s Snapshot data view for module (%s)', get_product_name(), $label); ?></title>
|
<title><?php echo __('%s Snapshot data view for module (%s)', get_product_name(), $label); ?></title>
|
||||||
<script type='text/javascript' src='../../include/javascript/jquery-3.3.1.min.js'></script>
|
<script type='text/javascript' src='../../include/javascript/jquery.current.js'></script>
|
||||||
</head>
|
</head>
|
||||||
<body class=''>
|
<body class=''>
|
||||||
<?php
|
<?php
|
||||||
|
@ -119,7 +119,7 @@ ui_print_message_dialog(
|
|||||||
<link rel="stylesheet" href="../../include/styles/js/jquery-ui_custom.css" type="text/css" />
|
<link rel="stylesheet" href="../../include/styles/js/jquery-ui_custom.css" type="text/css" />
|
||||||
<script type='text/javascript' src='../../include/javascript/pandora.js'></script>
|
<script type='text/javascript' src='../../include/javascript/pandora.js'></script>
|
||||||
<script type='text/javascript' src='../../include/javascript/pandora_ui.js'></script>
|
<script type='text/javascript' src='../../include/javascript/pandora_ui.js'></script>
|
||||||
<script type='text/javascript' src='../../include/javascript/jquery-3.3.1.min.js'></script>
|
<script type='text/javascript' src='../../include/javascript/jquery.current.js'></script>
|
||||||
<script type='text/javascript' src='../../include/javascript/jquery.pandora.js'></script>
|
<script type='text/javascript' src='../../include/javascript/jquery.pandora.js'></script>
|
||||||
<script type='text/javascript' src='../../include/javascript/jquery-ui.min.js'></script>
|
<script type='text/javascript' src='../../include/javascript/jquery-ui.min.js'></script>
|
||||||
<?php
|
<?php
|
||||||
|
@ -391,10 +391,14 @@ if (is_ajax()) {
|
|||||||
true
|
true
|
||||||
);
|
);
|
||||||
|
|
||||||
$tmp->data = format_numeric(
|
if (is_numeric($tmp->data) === true) {
|
||||||
$tmp->data,
|
$tmp->data = format_numeric(
|
||||||
$config['graph_precision']
|
$tmp->data,
|
||||||
);
|
$config['graph_precision']
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
$tmp->data = ui_print_truncate_text($tmp->data, 10);
|
||||||
|
}
|
||||||
|
|
||||||
$tmp->instructions = events_get_instructions($item);
|
$tmp->instructions = events_get_instructions($item);
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#
|
#
|
||||||
%define name pandorafms_console
|
%define name pandorafms_console
|
||||||
%define version 7.0NG.756
|
%define version 7.0NG.756
|
||||||
%define release 210816
|
%define release 210819
|
||||||
|
|
||||||
# User and Group under which Apache is running
|
# User and Group under which Apache is running
|
||||||
%define httpd_name httpd
|
%define httpd_name httpd
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#
|
#
|
||||||
%define name pandorafms_console
|
%define name pandorafms_console
|
||||||
%define version 7.0NG.756
|
%define version 7.0NG.756
|
||||||
%define release 210816
|
%define release 210819
|
||||||
|
|
||||||
# User and Group under which Apache is running
|
# User and Group under which Apache is running
|
||||||
%define httpd_name httpd
|
%define httpd_name httpd
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#
|
#
|
||||||
%define name pandorafms_console
|
%define name pandorafms_console
|
||||||
%define version 7.0NG.756
|
%define version 7.0NG.756
|
||||||
%define release 210816
|
%define release 210819
|
||||||
%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
|
||||||
|
@ -694,7 +694,7 @@ CREATE TABLE IF NOT EXISTS `tevento` (
|
|||||||
`owner_user` VARCHAR(100) NOT NULL DEFAULT '',
|
`owner_user` VARCHAR(100) NOT NULL DEFAULT '',
|
||||||
`ack_utimestamp` BIGINT(20) NOT NULL DEFAULT '0',
|
`ack_utimestamp` BIGINT(20) NOT NULL DEFAULT '0',
|
||||||
`custom_data` TEXT NOT NULL,
|
`custom_data` TEXT NOT NULL,
|
||||||
`data` double(50,5) default NULL,
|
`data` tinytext default NULL,
|
||||||
`module_status` int(4) NOT NULL default '0',
|
`module_status` int(4) NOT NULL default '0',
|
||||||
PRIMARY KEY (`id_evento`),
|
PRIMARY KEY (`id_evento`),
|
||||||
KEY `idx_agente` (`id_agente`),
|
KEY `idx_agente` (`id_agente`),
|
||||||
@ -3291,7 +3291,7 @@ CREATE TABLE IF NOT EXISTS `tmetaconsole_event` (
|
|||||||
`ack_utimestamp` BIGINT(20) NOT NULL DEFAULT '0',
|
`ack_utimestamp` BIGINT(20) NOT NULL DEFAULT '0',
|
||||||
`server_id` int(10) NOT NULL,
|
`server_id` int(10) NOT NULL,
|
||||||
`custom_data` TEXT NOT NULL DEFAULT '',
|
`custom_data` TEXT NOT NULL DEFAULT '',
|
||||||
`data` double(50,5) default NULL,
|
`data` tinytext default NULL,
|
||||||
`module_status` int(4) NOT NULL default '0',
|
`module_status` int(4) NOT NULL default '0',
|
||||||
PRIMARY KEY (`id_evento`),
|
PRIMARY KEY (`id_evento`),
|
||||||
KEY `idx_agente` (`id_agente`),
|
KEY `idx_agente` (`id_agente`),
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
package: pandorafms-server
|
package: pandorafms-server
|
||||||
Version: 7.0NG.756-210816
|
Version: 7.0NG.756-210819
|
||||||
Architecture: all
|
Architecture: all
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Section: admin
|
Section: admin
|
||||||
|
@ -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.756-210816"
|
pandora_version="7.0NG.756-210819"
|
||||||
|
|
||||||
package_cpan=0
|
package_cpan=0
|
||||||
package_pandora=1
|
package_pandora=1
|
||||||
|
@ -17,6 +17,8 @@
|
|||||||
|
|
||||||
. "/etc/rc.subr"
|
. "/etc/rc.subr"
|
||||||
|
|
||||||
|
PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
|
||||||
|
|
||||||
name="pandora_ha"
|
name="pandora_ha"
|
||||||
rcvar=pandora_server_enable
|
rcvar=pandora_server_enable
|
||||||
|
|
||||||
|
@ -26,6 +26,8 @@ load_rc_config $name
|
|||||||
: ${tentacle_server_config="/usr/local/etc/tentacle/${name}.conf"}
|
: ${tentacle_server_config="/usr/local/etc/tentacle/${name}.conf"}
|
||||||
: ${tentacle_server_pidfile="/var/run/${name}.pid"}
|
: ${tentacle_server_pidfile="/var/run/${name}.pid"}
|
||||||
|
|
||||||
|
PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
|
||||||
|
|
||||||
command=/usr/local/bin/${name}
|
command=/usr/local/bin/${name}
|
||||||
command_interpreter=/usr/local/bin/perl
|
command_interpreter=/usr/local/bin/perl
|
||||||
tentacle_server_user=${tentacle_server_user:-"pandora"}
|
tentacle_server_user=${tentacle_server_user:-"pandora"}
|
||||||
|
@ -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.756";
|
my $pandora_version = "7.0NG.756";
|
||||||
my $pandora_build = "210816";
|
my $pandora_build = "210819";
|
||||||
our $VERSION = $pandora_version." ".$pandora_build;
|
our $VERSION = $pandora_version." ".$pandora_build;
|
||||||
|
|
||||||
# Setup hash
|
# Setup hash
|
||||||
|
@ -3683,7 +3683,7 @@ sub pandora_event ($$$$$$$$$$;$$$$$$$$$$$) {
|
|||||||
# Create the event
|
# Create the event
|
||||||
logger($pa_config, "Generating event '$evento' for agent ID $id_agente module ID $id_agentmodule.", 10);
|
logger($pa_config, "Generating event '$evento' for agent ID $id_agente module ID $id_agentmodule.", 10);
|
||||||
my $event_id = db_insert ($dbh, 'id_evento','INSERT INTO ' . $event_table . ' (id_agente, id_grupo, evento, timestamp, estado, utimestamp, event_type, id_agentmodule, id_alert_am, criticity, user_comment, tags, source, id_extra, id_usuario, critical_instructions, warning_instructions, unknown_instructions, ack_utimestamp, custom_data, data, module_status)
|
my $event_id = db_insert ($dbh, 'id_evento','INSERT INTO ' . $event_table . ' (id_agente, id_grupo, evento, timestamp, estado, utimestamp, event_type, id_agentmodule, id_alert_am, criticity, user_comment, tags, source, id_extra, id_usuario, critical_instructions, warning_instructions, unknown_instructions, ack_utimestamp, custom_data, data, module_status)
|
||||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)', $id_agente, $id_grupo, safe_input ($evento), $timestamp, $event_status, $utimestamp, $event_type, $id_agentmodule, $id_alert_am, $severity, $comment, $module_tags, $source, $id_extra, $user_name, $critical_instructions, $warning_instructions, $unknown_instructions, $ack_utimestamp, $custom_data, $module_data, $module_status);
|
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)', $id_agente, $id_grupo, safe_input ($evento), $timestamp, $event_status, $utimestamp, $event_type, $id_agentmodule, $id_alert_am, $severity, $comment, $module_tags, $source, $id_extra, $user_name, $critical_instructions, $warning_instructions, $unknown_instructions, $ack_utimestamp, $custom_data, safe_input($module_data), $module_status);
|
||||||
|
|
||||||
# Do not write to the event file
|
# Do not write to the event file
|
||||||
return $event_id if ($pa_config->{'event_file'} eq '');
|
return $event_id if ($pa_config->{'event_file'} eq '');
|
||||||
|
@ -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.756";
|
my $pandora_version = "7.0NG.756";
|
||||||
my $pandora_build = "210816";
|
my $pandora_build = "210819";
|
||||||
our $VERSION = $pandora_version." ".$pandora_build;
|
our $VERSION = $pandora_version." ".$pandora_build;
|
||||||
|
|
||||||
our %EXPORT_TAGS = ( 'all' => [ qw() ] );
|
our %EXPORT_TAGS = ( 'all' => [ qw() ] );
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#
|
#
|
||||||
%define name pandorafms_server
|
%define name pandorafms_server
|
||||||
%define version 7.0NG.756
|
%define version 7.0NG.756
|
||||||
%define release 210816
|
%define release 210819
|
||||||
|
|
||||||
Summary: Pandora FMS Server
|
Summary: Pandora FMS Server
|
||||||
Name: %{name}
|
Name: %{name}
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#
|
#
|
||||||
%define name pandorafms_server
|
%define name pandorafms_server
|
||||||
%define version 7.0NG.756
|
%define version 7.0NG.756
|
||||||
%define release 210816
|
%define release 210819
|
||||||
|
|
||||||
Summary: Pandora FMS Server
|
Summary: Pandora FMS Server
|
||||||
Name: %{name}
|
Name: %{name}
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
# **********************************************************************
|
# **********************************************************************
|
||||||
|
|
||||||
PI_VERSION="7.0NG.756"
|
PI_VERSION="7.0NG.756"
|
||||||
PI_BUILD="210816"
|
PI_BUILD="210819"
|
||||||
|
|
||||||
MODE=$1
|
MODE=$1
|
||||||
if [ $# -gt 1 ]; then
|
if [ $# -gt 1 ]; then
|
||||||
|
@ -35,7 +35,7 @@ use PandoraFMS::Config;
|
|||||||
use PandoraFMS::DB;
|
use PandoraFMS::DB;
|
||||||
|
|
||||||
# version: define current version
|
# version: define current version
|
||||||
my $version = "7.0NG.756 Build 210816";
|
my $version = "7.0NG.756 Build 210819";
|
||||||
|
|
||||||
# Pandora server configuration
|
# Pandora server configuration
|
||||||
my %conf;
|
my %conf;
|
||||||
|
@ -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.756 Build 210816";
|
my $version = "7.0NG.756 Build 210819";
|
||||||
|
|
||||||
# save program name for logging
|
# save program name for logging
|
||||||
my $progname = basename($0);
|
my $progname = basename($0);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user