Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF
Conflicts: pandora_console/general/header.php
This commit is contained in:
fbsanchez
commit
b11dbc639f
|
|
@ -1,5 +1,5 @@
|
|||
package: pandorafms-agent-unix
|
||||
Version: 7.0NG.740-191029
|
||||
Version: 7.0NG.740-191113
|
||||
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.740-191029"
|
||||
pandora_version="7.0NG.740-191113"
|
||||
|
||||
echo "Test if you has the tools for to make the packages."
|
||||
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ my $Sem = undef;
|
|||
my $ThreadSem = undef;
|
||||
|
||||
use constant AGENT_VERSION => '7.0NG.740';
|
||||
use constant AGENT_BUILD => '191029';
|
||||
use constant AGENT_BUILD => '191113';
|
||||
|
||||
# Agent log default file size maximum and instances
|
||||
use constant DEFAULT_MAX_LOG_SIZE => 600000;
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
%define name pandorafms_agent_unix
|
||||
%define version 7.0NG.740
|
||||
%define release 191029
|
||||
%define release 191113
|
||||
|
||||
Summary: Pandora FMS Linux agent, PERL version
|
||||
Name: %{name}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
%define name pandorafms_agent_unix
|
||||
%define version 7.0NG.740
|
||||
%define release 191029
|
||||
%define release 191113
|
||||
|
||||
Summary: Pandora FMS Linux agent, PERL version
|
||||
Name: %{name}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
# **********************************************************************
|
||||
|
||||
PI_VERSION="7.0NG.740"
|
||||
PI_BUILD="191029"
|
||||
PI_BUILD="191113"
|
||||
OS_NAME=`uname -s`
|
||||
|
||||
FORCE=0
|
||||
|
|
|
|||
|
|
@ -186,7 +186,7 @@ UpgradeApplicationID
|
|||
{}
|
||||
|
||||
Version
|
||||
{191029}
|
||||
{191113}
|
||||
|
||||
ViewReadme
|
||||
{Yes}
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ using namespace Pandora;
|
|||
using namespace Pandora_Strutils;
|
||||
|
||||
#define PATH_SIZE _MAX_PATH+1
|
||||
#define PANDORA_VERSION ("7.0NG.740(Build 191029)")
|
||||
#define PANDORA_VERSION ("7.0NG.740(Build 191113)")
|
||||
|
||||
string pandora_path;
|
||||
string pandora_dir;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ BEGIN
|
|||
VALUE "LegalCopyright", "Artica ST"
|
||||
VALUE "OriginalFilename", "PandoraAgent.exe"
|
||||
VALUE "ProductName", "Pandora FMS Windows Agent"
|
||||
VALUE "ProductVersion", "(7.0NG.740(Build 191029))"
|
||||
VALUE "ProductVersion", "(7.0NG.740(Build 191113))"
|
||||
VALUE "FileVersion", "1.0.0.0"
|
||||
END
|
||||
END
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
package: pandorafms-console
|
||||
Version: 7.0NG.740-191029
|
||||
Version: 7.0NG.740-191113
|
||||
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.740-191029"
|
||||
pandora_version="7.0NG.740-191113"
|
||||
|
||||
package_pear=0
|
||||
package_pandora=1
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ fi
|
|||
|
||||
# Install pandora_websocket_engine service.
|
||||
cp -pf %{prefix}/pandora_console/pandora_websocket_engine /etc/init.d/
|
||||
chmod +x /etc/init.d/pandora_websocket_engine
|
||||
|
||||
echo "You can now start the Pandora FMS Websocket service by executing"
|
||||
echo " /etc/init.d/pandora_websocket_engine start"
|
||||
|
|
|
|||
|
|
@ -333,12 +333,12 @@ function quickShellSettings()
|
|||
|
||||
$gotty_user = get_parameter(
|
||||
'gotty_user',
|
||||
$config['gotty_user']
|
||||
''
|
||||
);
|
||||
|
||||
$gotty_pass = get_parameter(
|
||||
'gotty_pass',
|
||||
io_output_password($config['gotty_pass'])
|
||||
''
|
||||
);
|
||||
|
||||
$gotty_pass = io_input_password($gotty_pass);
|
||||
|
|
@ -373,6 +373,7 @@ function quickShellSettings()
|
|||
}
|
||||
|
||||
if ($config['gotty_pass'] != $gotty_pass) {
|
||||
$gotty_pass = io_input_password($gotty_pass);
|
||||
config_update_value('gotty_pass', $gotty_pass);
|
||||
$changes++;
|
||||
$critical++;
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ if (check_login()) {
|
|||
|
||||
echo __(
|
||||
"This is the online help for %s console. This help is -in best cases- just a brief contextual help, not intented to teach you how to use %s. Official documentation of %s is about 900 pages, and you probably don't need to read it entirely, but sure, you should download it and take a look.<br><br>
|
||||
<a href='%s' target='_blanck' style='color: #82b92e; font-size: 10pt; text-decoration: underline;'>Download the official documentation</a>",
|
||||
<a href='%s' target='_blanck' class='pandora_green_text' style='font-size: 10pt; text-decoration: underline;'>Download the official documentation</a>",
|
||||
get_product_name(),
|
||||
get_product_name(),
|
||||
get_product_name(),
|
||||
|
|
|
|||
|
|
@ -348,7 +348,7 @@ if ($config['menu_type'] == 'classic') {
|
|||
|
||||
|
||||
// Support.
|
||||
if (defined('PANDORA_ENTERPRISE')) {
|
||||
if (enterprise_installed()) {
|
||||
$header_support_link = $config['custom_support_url'];
|
||||
} else {
|
||||
$header_support_link = 'https://pandorafms.com/forums/';
|
||||
|
|
@ -635,12 +635,6 @@ if ($config['menu_type'] == 'classic') {
|
|||
* Loads modal from AJAX to add feedback.
|
||||
*/
|
||||
function show_feedback() {
|
||||
<?php
|
||||
// Require specific CSS and JS.
|
||||
ui_require_css_file('wizard');
|
||||
ui_require_css_file('discovery');
|
||||
ui_require_css_file('diagnostics');
|
||||
?>
|
||||
var btn_ok_text = '<?php echo __('Send'); ?>';
|
||||
var btn_cancel_text = '<?php echo __('Cancel'); ?>';
|
||||
var title = '<?php echo __('Report an issue'); ?>';
|
||||
|
|
@ -719,13 +713,15 @@ if ($config['menu_type'] == 'classic') {
|
|||
$("#agent_access").css("display","");
|
||||
});
|
||||
|
||||
// Feedback.
|
||||
$("#feedback-header").click(function () {
|
||||
// Clean DOM.
|
||||
$("#feedback-header").empty();
|
||||
// Function charge Modal.
|
||||
show_feedback();
|
||||
});
|
||||
<?php if (enterprise_installed()) { ?>
|
||||
// Feedback.
|
||||
$("#feedback-header").click(function () {
|
||||
// Clean DOM.
|
||||
$("#feedback-header").empty();
|
||||
// Function charge Modal.
|
||||
show_feedback();
|
||||
});
|
||||
<?php } ?>
|
||||
|
||||
function blinkpubli(){
|
||||
$(".publienterprise").delay(100).fadeTo(300,0.2).delay(100).fadeTo(300,1, blinkpubli);
|
||||
|
|
|
|||
|
|
@ -88,6 +88,24 @@ if (!empty($config['login_background'])) {
|
|||
$login_body_style = "style=\"background:linear-gradient(74deg, #02020255 36%, transparent 36%), url('".$background_url."');\"";
|
||||
}
|
||||
|
||||
// Get alternative custom in case of db fail.
|
||||
$custom_fields = [
|
||||
'custom_logo_login',
|
||||
'custom_splash_login',
|
||||
'custom_title1_login',
|
||||
'custom_title2_login',
|
||||
'rb_product_name',
|
||||
];
|
||||
|
||||
foreach ($custom_fields as $field) {
|
||||
if (!isset($config[$field])) {
|
||||
if (isset($config[$field.'_alt'])) {
|
||||
$config[$field] = $config[$field.'_alt'];
|
||||
$custom_conf_enabled = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Get the custom icons.
|
||||
$docs_logo = ui_get_docs_logo();
|
||||
$support_logo = ui_get_support_logo();
|
||||
|
|
@ -96,16 +114,16 @@ echo '<div id="header_login">';
|
|||
|
||||
echo '<div id="list_icon_docs_support"><ul>';
|
||||
if ($docs_logo !== false) {
|
||||
echo '<li><a href="'.ui_get_full_external_url($config['custom_docs_url']).'" target="_blank"><img src="'.$docs_logo.'" alt="docs"></a></li>';
|
||||
echo '<li><a href="'.$config['custom_docs_url'].'" target="_blank"><img src="'.$docs_logo.'" alt="docs"></a></li>';
|
||||
}
|
||||
|
||||
echo '<li><a href="'.ui_get_full_external_url($config['custom_docs_url']).'" target="_blank">'.__('Docs').'</li>';
|
||||
echo '<li><a href="'.$config['custom_docs_url'].'" target="_blank">'.__('Docs').'</li>';
|
||||
if (file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) {
|
||||
if ($support_logo !== false) {
|
||||
echo '<li id="li_margin_left"><a href="'.ui_get_full_external_url($config['custom_docs_url']).'" target="_blank"><img src="'.$support_logo.'" alt="support"></a></li>';
|
||||
echo '<li id="li_margin_left"><a href="'.$config['custom_docs_url'].'" target="_blank"><img src="'.$support_logo.'" alt="support"></a></li>';
|
||||
}
|
||||
|
||||
echo '<li><a href="'.ui_get_full_external_url($config['custom_support_url']).'" target="_blank">'.__('Support').'</li>';
|
||||
echo '<li><a href="'.$config['custom_support_url'].'" target="_blank">'.__('Support').'</li>';
|
||||
} else {
|
||||
echo '<li id="li_margin_left"><a href="https://pandorafms.com/monitoring-services/support/" target="_blank"><img src="'.$support_logo.'" alt="support"></a></li>';
|
||||
echo '<li>'.__('Support').'</li>';
|
||||
|
|
@ -133,7 +151,7 @@ if (defined('METACONSOLE')) {
|
|||
html_print_image('enterprise/images/custom_logo_login/'.$config['custom_logo_login'], false, ['class' => 'login_logo', 'alt' => 'logo', 'border' => 0, 'title' => $logo_title], false, true);
|
||||
}
|
||||
} else {
|
||||
if (!isset($config['custom_logo_login']) || $config['custom_logo_login'] == 0) {
|
||||
if (!isset($config['custom_logo_login']) || $config['custom_logo_login'] === 0) {
|
||||
html_print_image('images/custom_logo_login/pandora_logo.png', false, ['class' => 'login_logo', 'alt' => 'logo', 'border' => 0, 'title' => $logo_title], false, true);
|
||||
} else {
|
||||
html_print_image('images/custom_logo_login/'.$config['custom_logo_login'], false, ['class' => 'login_logo', 'alt' => 'logo', 'border' => 0, 'title' => $logo_title], false, true);
|
||||
|
|
@ -423,9 +441,14 @@ if ($login_screen == 'logout') {
|
|||
}
|
||||
|
||||
switch ($login_screen) {
|
||||
case 'error_authconfig':
|
||||
case 'error_dbconfig':
|
||||
$title = __('Problem with %s database', get_product_name());
|
||||
case 'error_authconfig':
|
||||
if (!isset($config['rb_product_name_alt'])) {
|
||||
$title = __('Problem with %s database', get_product_name());
|
||||
} else {
|
||||
$title = __('Problem with %s database', $config['rb_product_name_alt']);
|
||||
}
|
||||
|
||||
$message = __(
|
||||
'Cannot connect to the database, please check your database setup in the <b>include/config.php</b> file.<i><br/><br/>
|
||||
Probably your database, hostname, user or password values are incorrect or
|
||||
|
|
|
|||
|
|
@ -83,7 +83,6 @@ background:black;opacity:0.1;left:0px;top:0px;width:100%;height:100%;
|
|||
</style>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<div id="alert_messages_na">
|
||||
|
||||
<div class='modalheade'>
|
||||
|
|
@ -100,10 +99,29 @@ background:black;opacity:0.1;left:0px;top:0px;width:100%;height:100%;
|
|||
?>
|
||||
</div>
|
||||
</div>
|
||||
<a href='https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Configuration' target='_blank'>
|
||||
<div class='modalwikibutto cerrar'>
|
||||
<span class='modalwikibuttontex'> <?php echo __('Documentation'); ?></span>
|
||||
</div>
|
||||
<?php
|
||||
$custom_conf_enabled = false;
|
||||
foreach ($config as $key => $value) {
|
||||
if (preg_match('/._alt/i', $key)) {
|
||||
$custom_conf_enabled = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!$custom_conf_enabled) {
|
||||
echo '
|
||||
<a href="https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Configuration" target="_blank">
|
||||
<div class="modalwikibutto cerrar">
|
||||
<span class="modalwikibuttontex">'.__('Documentation').'
|
||||
</span>
|
||||
</div>
|
||||
</a>
|
||||
';
|
||||
}
|
||||
|
||||
?>
|
||||
|
||||
|
||||
</a>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -290,7 +290,7 @@ $table_aux = new stdClass();
|
|||
foreach ($result_graphs as $graph) {
|
||||
$data = [];
|
||||
|
||||
$data[0] = '<a href="index.php?sec=reporting&sec2=operation/reporting/graph_viewer&view_graph=1&id='.$graph['id_graph'].'">'.ui_print_truncate_text($graph['name'], 70).'</a>';
|
||||
$data[0] = '<a href="index.php?sec=reporting&sec2=operation/reporting/graph_viewer&view_graph=1&id='.$graph['id_graph'].'">'.ui_print_truncate_text(io_safe_output($graph['name']), 70).'</a>';
|
||||
|
||||
$data[1] = ui_print_truncate_text($graph['description'], 70);
|
||||
|
||||
|
|
|
|||
|
|
@ -557,7 +557,7 @@ $row++;
|
|||
|
||||
|
||||
// For 5.1 Autohidden menu feature
|
||||
$table_styles->data['autohidden'][0] = __('Autohidden menu');
|
||||
$table_styles->data['autohidden'][0] = __('Automatically hide submenu');
|
||||
$table_styles->data['autohidden'][1] = html_print_checkbox_switch(
|
||||
'autohidden_menu',
|
||||
1,
|
||||
|
|
@ -1032,6 +1032,12 @@ $row++;
|
|||
);
|
||||
|
||||
$row++;
|
||||
|
||||
$table_other->data[$row][0] = __('Font size for items reports');
|
||||
$table_other->data[$row][1] = "<input type ='number' value=".$config['font_size_item_report']." size='1' name='font_size_item_report' min='1' max='9' step='0.1'>";
|
||||
|
||||
$row++;
|
||||
|
||||
// ----------------------------------------------------------------------
|
||||
$dirItems = scandir($config['homedir'].'/images/custom_logo');
|
||||
foreach ($dirItems as $entryDir) {
|
||||
|
|
|
|||
|
|
@ -706,18 +706,34 @@ class Diagnostics extends Wizard
|
|||
$bytes = 1048576;
|
||||
$mega = 1024;
|
||||
switch ($item['Variable_name']) {
|
||||
case 'sql_mode':
|
||||
$name = __('Sql mode');
|
||||
$value = ($item['Value']);
|
||||
$status = (empty($item['Value']) === true) ? 1 : 0;
|
||||
$message = __('Must be empty');
|
||||
case 'innodb_buffer_pool_size':
|
||||
$name = __('InnoDB buffer pool size');
|
||||
$value = ($item['Value'] / $bytes);
|
||||
$status = (($item['Value'] / $bytes) >= 250) ? 1 : 0;
|
||||
$message = __(
|
||||
'It has to be 40% of the server memory not recommended to be greater or less'
|
||||
);
|
||||
break;
|
||||
|
||||
case 'innodb_log_file_size':
|
||||
$name = __('InnoDB log file size');
|
||||
$value = ($item['Value'] / $bytes);
|
||||
$status = (($item['Value'] / $bytes) >= 64) ? 1 : 0;
|
||||
$message = __('Min. Recommended Value').' 64M';
|
||||
case 'innodb_file_per_table':
|
||||
$name = __('InnoDB file per table');
|
||||
$value = $item['Value'];
|
||||
$status = ($item['Value'] === 'ON') ? 1 : 0;
|
||||
$message = __('Recommended ON');
|
||||
break;
|
||||
|
||||
case 'innodb_flush_log_at_trx_commit':
|
||||
$name = __('InnoDB flush log at trx-commit');
|
||||
$value = $item['Value'];
|
||||
$status = ($item['Value'] == 2) ? 1 : 0;
|
||||
$message = __('Recommended Value').' 2';
|
||||
break;
|
||||
|
||||
case 'innodb_lock_wait_timeout':
|
||||
$name = __('InnoDB lock wait timeout');
|
||||
$value = $item['Value'];
|
||||
$status = ($item['Value'] >= 90) ? 1 : 0;
|
||||
$message = __('Min. Recommended Value').' 90s';
|
||||
break;
|
||||
|
||||
case 'innodb_log_buffer_size':
|
||||
|
|
@ -727,13 +743,29 @@ class Diagnostics extends Wizard
|
|||
$message = __('Min. Recommended Value').' 16M';
|
||||
break;
|
||||
|
||||
case 'innodb_flush_log_at_trx_commit':
|
||||
$name = __('InnoDB flush log at trx-commit');
|
||||
$value = $item['Value'];
|
||||
$status = (($item['Value'] / $bytes) >= 0) ? 1 : 0;
|
||||
$message = __('Min. Recommended Value').' 0';
|
||||
case 'innodb_log_file_size':
|
||||
$name = __('InnoDB log file size');
|
||||
$value = ($item['Value'] / $bytes);
|
||||
$status = (($item['Value'] / $bytes) >= 64) ? 1 : 0;
|
||||
$message = __('Min. Recommended Value').' 64M';
|
||||
break;
|
||||
|
||||
/*
|
||||
case 'join_buffer_size':
|
||||
$name = __('Join buffer size');
|
||||
$value = ($item['Value'] / $bytes);
|
||||
$status = (($item['Value'] / $bytes) >= 265) ? 1 : 0;
|
||||
$message = __('Min. Recommended Value 265');
|
||||
break;
|
||||
|
||||
case 'key_buffer_size':
|
||||
$name = __('Key buffer size');
|
||||
$value = ($item['Value'] / $bytes);
|
||||
$status = (($item['Value'] / $bytes) >= 256) ? 1 : 0;
|
||||
$message = __('Min. Recommended Value').' 256';
|
||||
break;
|
||||
*/
|
||||
|
||||
case 'max_allowed_packet':
|
||||
$name = __('Maximun allowed packet');
|
||||
$value = ($item['Value'] / $bytes);
|
||||
|
|
@ -741,27 +773,34 @@ class Diagnostics extends Wizard
|
|||
$message = __('Min. Recommended Value').' 32M';
|
||||
break;
|
||||
|
||||
case 'innodb_buffer_pool_size':
|
||||
$name = __('InnoDB buffer pool size');
|
||||
$value = ($item['Value'] / $mega);
|
||||
$status = (($item['Value'] / $mega) >= 250) ? 1 : 0;
|
||||
$message = __(
|
||||
'It has to be 40% of the server memory not recommended to be greater or less'
|
||||
);
|
||||
case 'max_connections':
|
||||
$name = __('Maximun connections');
|
||||
$value = $item['Value'];
|
||||
$status = (($item['Value']) >= 90) ? 1 : 0;
|
||||
$message = __('Min. Recommended Value');
|
||||
$message .= ' 90 ';
|
||||
$message .= __('conections');
|
||||
break;
|
||||
|
||||
case 'sort_buffer_size':
|
||||
$name = __('Sort buffer size');
|
||||
$value = number_format(($item['Value'] / $mega), 2);
|
||||
case 'query_cache_limit':
|
||||
$name = __('Query cache limit');
|
||||
$value = ($item['Value'] / $bytes);
|
||||
$status = (($item['Value'] / $bytes) >= 8) ? 1 : 0;
|
||||
$message = __('Min. Recommended Value').' 8M';
|
||||
break;
|
||||
|
||||
case 'query_cache_min_res_unit':
|
||||
$name = __('Query cache min-res-unit');
|
||||
$value = ($item['Value'] / $mega);
|
||||
$status = (($item['Value'] / $mega) >= 2) ? 1 : 0;
|
||||
$message = __('Min. Recommended Value').' 2M';
|
||||
break;
|
||||
|
||||
case 'query_cache_size':
|
||||
$name = __('Query cache size');
|
||||
$value = ($item['Value'] / $bytes);
|
||||
$status = (($item['Value'] / $bytes) >= 32) ? 1 : 0;
|
||||
$message = __('Min. Recommended Value').' 32';
|
||||
break;
|
||||
|
||||
case 'join_buffer_size':
|
||||
$name = __('Join buffer size');
|
||||
$value = ($item['Value'] / $mega);
|
||||
$status = (($item['Value'] / $bytes) >= 265) ? 1 : 0;
|
||||
$message = __('Min. Recommended Value 265');
|
||||
$message = __('Min. Recommended Value').' 32M';
|
||||
break;
|
||||
|
||||
case 'query_cache_type':
|
||||
|
|
@ -771,83 +810,48 @@ class Diagnostics extends Wizard
|
|||
$message = __('Recommended ON');
|
||||
break;
|
||||
|
||||
case 'query_cache_size':
|
||||
$name = __('Query cache size');
|
||||
$value = ($item['Value'] / $bytes);
|
||||
$status = (($item['Value'] / $bytes) >= 32) ? 1 : 0;
|
||||
$message = __('Min. Recommended Value').' 32MB';
|
||||
case 'read_buffer_size':
|
||||
$name = __('Read buffer size');
|
||||
$value = ($item['Value'] / $mega);
|
||||
$status = (($item['Value'] / $mega) >= 32) ? 1 : 0;
|
||||
$message = __('Min. Recommended Value').' 32K';
|
||||
break;
|
||||
|
||||
case 'query_cache_limit':
|
||||
$name = __('Query cache limit');
|
||||
$value = ($item['Value'] / $bytes);
|
||||
$status = (($item['Value'] / $bytes) >= 256) ? 1 : 0;
|
||||
$message = __('Min. Recommended Value').' 256K';
|
||||
case 'read_rnd_buffer_size':
|
||||
$name = __('Read rnd-buffer size');
|
||||
$value = ($item['Value'] / $mega);
|
||||
$status = (($item['Value'] / $mega) >= 32) ? 1 : 0;
|
||||
$message = __('Min. Recommended Value').' 32K';
|
||||
break;
|
||||
|
||||
case 'innodb_lock_wait_timeout':
|
||||
$name = __('InnoDB lock wait timeout');
|
||||
$value = $item['Value'];
|
||||
$status = (($item['Value'] / $bytes) >= 90) ? 1 : 0;
|
||||
$message = __('Min. Recommended Value').' 90s';
|
||||
case 'sort_buffer_size':
|
||||
$name = __('Sort buffer size');
|
||||
$value = ($item['Value'] / $mega);
|
||||
$status = (($item['Value'] / $mega) >= 32) ? 1 : 0;
|
||||
$message = __('Min. Recommended Value').' 32K';
|
||||
break;
|
||||
|
||||
case 'sql_mode':
|
||||
$name = __('Sql mode');
|
||||
$value = ($item['Value']);
|
||||
$status = (empty($item['Value']) === true) ? 1 : 0;
|
||||
$message = __('Must be empty');
|
||||
break;
|
||||
|
||||
case 'thread_cache_size':
|
||||
$name = __('Thread cache size');
|
||||
$value = $item['Value'];
|
||||
$status = (($item['Value'] / $bytes) >= 8) ? 1 : 0;
|
||||
$status = ($item['Value'] >= 8) ? 1 : 0;
|
||||
$message = __('Min. Recommended Value').' 8';
|
||||
break;
|
||||
|
||||
case 'thread_stack':
|
||||
$name = __('Thread stack');
|
||||
$value = ($item['Value'] / $bytes);
|
||||
$status = (($item['Value'] / $bytes) >= 256) ? 1 : 0;
|
||||
$message = __('Min. Recommended Value').' 256K';
|
||||
break;
|
||||
|
||||
case 'max_connections':
|
||||
$name = __('Maximun connections');
|
||||
$value = $item['Value'];
|
||||
$status = (($item['Value'] / $bytes) >= 90) ? 1 : 0;
|
||||
$message = __('Min. Recommended Value').' 90';
|
||||
break;
|
||||
|
||||
case 'key_buffer_size':
|
||||
$name = __('Key buffer size');
|
||||
$value = ($item['Value'] / $bytes);
|
||||
$status = (($item['Value'] / $bytes) >= 256) ? 1 : 0;
|
||||
$value = ($item['Value'] / $mega);
|
||||
$status = (($item['Value'] / $mega) >= 256) ? 1 : 0;
|
||||
$message = __('Min. Recommended Value').' 256';
|
||||
break;
|
||||
|
||||
case 'read_buffer_size':
|
||||
$name = __('Read buffer size');
|
||||
$value = ($item['Value'] / $bytes);
|
||||
$status = (($item['Value'] / $bytes) >= 32) ? 1 : 0;
|
||||
$message = __('Min. Recommended Value').' 32';
|
||||
break;
|
||||
|
||||
case 'read_rnd_buffer_size':
|
||||
$name = __('Read rnd-buffer size');
|
||||
$value = ($item['Value'] / $bytes);
|
||||
$status = (($item['Value'] / $bytes) >= 32) ? 1 : 0;
|
||||
$message = __('Min. Recommended Value').' 32';
|
||||
break;
|
||||
|
||||
case 'query_cache_min_res_unit':
|
||||
$name = __('Query cache min-res-unit');
|
||||
$value = ($item['Value'] / $bytes);
|
||||
$status = (($item['Value'] / $bytes) >= 2) ? 1 : 0;
|
||||
$message = __('Min. Recommended Value').' 2k';
|
||||
break;
|
||||
|
||||
case 'innodb_file_per_table':
|
||||
$name = __('InnoDB file per table');
|
||||
$value = $item['Value'];
|
||||
$status = ($item['Value'] === 'ON') ? 1 : 0;
|
||||
$message = __('Recommended ON');
|
||||
break;
|
||||
|
||||
default:
|
||||
$name = '';
|
||||
$value = 0;
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
/**
|
||||
* Pandora build version and version
|
||||
*/
|
||||
$build_version = 'PC191029';
|
||||
$build_version = 'PC191113';
|
||||
$pandora_version = 'v7.0NG.740';
|
||||
|
||||
// Do not overwrite default timezone set if defined.
|
||||
|
|
@ -148,8 +148,6 @@ if (!isset($config['homeurl_static'])) {
|
|||
}
|
||||
}
|
||||
|
||||
db_select_engine();
|
||||
$config['dbconnection'] = db_connect();
|
||||
|
||||
|
||||
if (! defined('EXTENSIONS_DIR')) {
|
||||
|
|
@ -160,6 +158,9 @@ if (! defined('ENTERPRISE_DIR')) {
|
|||
define('ENTERPRISE_DIR', 'enterprise');
|
||||
}
|
||||
|
||||
db_select_engine();
|
||||
$config['dbconnection'] = db_connect();
|
||||
|
||||
require_once $ownDir.'functions_config.php';
|
||||
|
||||
date_default_timezone_set('Europe/Madrid');
|
||||
|
|
|
|||
|
|
@ -1281,6 +1281,10 @@ function config_update_config()
|
|||
}
|
||||
|
||||
// Juanma (06/05/2014) New feature: Custom front page for reports.
|
||||
if (!config_update_value('font_size_item_report', get_parameter('font_size_item_report', 2))) {
|
||||
$error_update[] = __('Font size for items reports');
|
||||
}
|
||||
|
||||
if (!config_update_value('custom_report_front', get_parameter('custom_report_front'))) {
|
||||
$error_update[] = __('Custom report front');
|
||||
}
|
||||
|
|
@ -2809,6 +2813,10 @@ function config_process_config()
|
|||
config_update_value('custom_report_front', 0);
|
||||
}
|
||||
|
||||
if (!isset($config['font_size_item_report'])) {
|
||||
config_update_value('font_size_item_report', 2);
|
||||
}
|
||||
|
||||
if (!isset($config['custom_report_front_font'])) {
|
||||
config_update_value('custom_report_front_font', 'FreeSans.ttf');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -447,7 +447,7 @@ function reporting_html_SLA($table, $item, $mini, $pdf=0)
|
|||
if ($mini) {
|
||||
$font_size = '1.5';
|
||||
} else {
|
||||
$font_size = '3';
|
||||
$font_size = $config['font_size_item_report'];
|
||||
}
|
||||
|
||||
$metaconsole_on = is_metaconsole();
|
||||
|
|
@ -2493,7 +2493,7 @@ function reporting_html_monitor_report($table, $item, $mini, $pdf=0)
|
|||
if ($mini) {
|
||||
$font_size = '1.5';
|
||||
} else {
|
||||
$font_size = '3';
|
||||
$font_size = $config['font_size_item_report'];
|
||||
}
|
||||
|
||||
$table->colspan['module']['cell'] = 3;
|
||||
|
|
@ -2735,10 +2735,12 @@ function reporting_html_min_value(&$table, $item, $mini)
|
|||
|
||||
function reporting_html_value(&$table, $item, $mini, $only_value=false, $check_empty=false)
|
||||
{
|
||||
global $config;
|
||||
|
||||
if ($mini) {
|
||||
$font_size = '1.5';
|
||||
} else {
|
||||
$font_size = '3';
|
||||
$font_size = $config['font_size_item_report'];
|
||||
}
|
||||
|
||||
if (isset($item['visual_format']) && $item['visual_format'] != 0
|
||||
|
|
|
|||
|
|
@ -3169,6 +3169,9 @@ function ui_print_datatable(array $parameters)
|
|||
);
|
||||
}
|
||||
|
||||
// Languages.
|
||||
$processing = __('Processing');
|
||||
|
||||
// Extra html.
|
||||
$extra = '';
|
||||
if (isset($parameters['extra_html']) && !empty($parameters['extra_html'])) {
|
||||
|
|
@ -3233,6 +3236,9 @@ function ui_print_datatable(array $parameters)
|
|||
searching: false,
|
||||
responsive: true,
|
||||
dom: "plfrtiBp",
|
||||
language: {
|
||||
processing:"'.$processing.'"
|
||||
},
|
||||
buttons: [
|
||||
{
|
||||
extend: "csv",
|
||||
|
|
|
|||
|
|
@ -17,6 +17,10 @@
|
|||
text-align: justify;
|
||||
}
|
||||
|
||||
.dataTables_wrapper {
|
||||
min-height: 150px;
|
||||
}
|
||||
|
||||
.datatables-td-title {
|
||||
width: 25% !important;
|
||||
font-weight: bolder;
|
||||
|
|
|
|||
|
|
@ -5917,6 +5917,47 @@ table.table_modal_alternate tr td:first-child {
|
|||
width: 101%;
|
||||
}
|
||||
|
||||
/*Font header feedback*/
|
||||
form#modal_form_feedback {
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
form#modal_form_feedback label {
|
||||
margin-bottom: 10px;
|
||||
color: #343434;
|
||||
font-weight: bold;
|
||||
font-size: 10pt;
|
||||
}
|
||||
|
||||
form#modal_form_feedback input[type="email"] {
|
||||
background-color: transparent;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
border-bottom: 1px solid #ccc;
|
||||
font-family: "lato-bolder", "Open Sans", sans-serif;
|
||||
font-weight: lighter;
|
||||
padding: 0px 0px 2px 0px;
|
||||
box-sizing: border-box;
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
|
||||
form#modal_form_feedback ul.wizard li {
|
||||
padding-bottom: 10px;
|
||||
padding-top: 10px;
|
||||
}
|
||||
|
||||
form#modal_form_feedback ul.wizard li > label:not(.p-switch) {
|
||||
width: 250px;
|
||||
vertical-align: top;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
form#modal_form_feedback ul.wizard li > textarea {
|
||||
width: 600px;
|
||||
height: 15em;
|
||||
display: inline-block;
|
||||
font-family: monospace;
|
||||
}
|
||||
/*
|
||||
* ---------------------------------------------------------------------
|
||||
* - FONT SIZES IN AGENT VIEW. This changes the font size of the agent
|
||||
|
|
@ -5928,3 +5969,12 @@ table.table_modal_alternate tr td:first-child {
|
|||
font-size: 14px;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
/* Generic classes to reuse and facilitate the creation of custom themes */
|
||||
.pandora_green_text {
|
||||
color: #82b92e;
|
||||
}
|
||||
|
||||
.pandora_green_bg {
|
||||
background-color: #82b92e;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@
|
|||
<div style='height: 10px'>
|
||||
<?php
|
||||
$version = '7.0NG.740';
|
||||
$build = '191029';
|
||||
$build = '191113';
|
||||
$banner = "v$version Build $build";
|
||||
|
||||
error_reporting(0);
|
||||
|
|
@ -872,7 +872,16 @@ function install_step4()
|
|||
$config["dbuser"]="pandora"; // DB User
|
||||
$config["dbpass"]="'.$random_password.'"; // DB Password
|
||||
$config["dbhost"]="'.$dbhost.'"; // DB Host
|
||||
$config["homedir"]="'.$path.'"; // Config homedir
|
||||
$config["homedir"]="'.$path.'"; // Config homedir
|
||||
// ----------Rebranding--------------------
|
||||
// Uncomment this lines and add your customs text and paths.
|
||||
// $config["custom_logo_login_alt"] ="login_logo.png";
|
||||
// $config["custom_splash_login_alt"] = "splash_image_default.png";
|
||||
// $config["custom_title1_login_alt"] = "WELCOME TO Pandora FMS";
|
||||
// $config["custom_title2_login_alt"] = "NEXT GENERATION";
|
||||
// $config["rb_product_name_alt"] = "Pandora FMS";
|
||||
|
||||
|
||||
/*
|
||||
----------Attention--------------------
|
||||
Please note that in certain installations:
|
||||
|
|
@ -974,7 +983,15 @@ function install_step4()
|
|||
$config["dbuser"]="pandora"; // DB User
|
||||
$config["dbpass"]="'.$random_password.'"; // DB Password
|
||||
$config["dbhost"]="'.$dbhost.'"; // DB Host
|
||||
$config["homedir"]="'.$path.'"; // Config homedir
|
||||
$config["homedir"]="'.$path.'"; // Config homedir
|
||||
// ----------Rebranding--------------------
|
||||
// Uncomment this lines and add your customs text and paths.
|
||||
// $config["custom_logo_login_alt"] ="login_logo.png";
|
||||
// $config["custom_splash_login_alt"] = "splash_image_default.png";
|
||||
// $config["custom_title1_login_alt"] = "WELCOME TO Pandora FMS";
|
||||
// $config["custom_title2_login_alt"] = "NEXT GENERATION";
|
||||
// $config["rb_product_name_alt"] = "Pandora FMS";
|
||||
|
||||
/*
|
||||
----------Attention--------------------
|
||||
Please note that in certain installations:
|
||||
|
|
|
|||
|
|
@ -432,7 +432,7 @@ if (!empty($addresses)) {
|
|||
// $data_opcional = [];
|
||||
$data_opcional[] = '<b>'.__('Other IP addresses').'</b>';
|
||||
if (!empty($addresses)) {
|
||||
$data_opcional[] = '<div style="overflow-y: scroll;">'.implode('<br>', $addresses).'</div>';
|
||||
$data_opcional[] = '<div style="overflow-y: scroll; max-height:50px;">'.implode('<br>', $addresses).'</div>';
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
%define name pandorafms_console
|
||||
%define version 7.0NG.740
|
||||
%define release 191029
|
||||
%define release 191113
|
||||
|
||||
# User and Group under which Apache is running
|
||||
%define httpd_name httpd
|
||||
|
|
@ -57,6 +57,13 @@ install -m 0644 pandora_console_logrotate_centos $RPM_BUILD_ROOT%{_sysconfdir}/l
|
|||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%post
|
||||
# Install pandora_websocket_engine service.
|
||||
cp -pf %{prefix}/pandora_console/pandora_websocket_engine /etc/init.d/
|
||||
chmod +x /etc/init.d/pandora_websocket_engine
|
||||
|
||||
echo "You can now start the Pandora FMS Websocket service by executing"
|
||||
echo " /etc/init.d/pandora_websocket_engine start"
|
||||
|
||||
# Has an install already been done, if so we only want to update the files
|
||||
# push install.php aside so that the console works immediately using existing
|
||||
# configuration.
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
%define name pandorafms_console
|
||||
%define version 7.0NG.740
|
||||
%define release 191029
|
||||
%define release 191113
|
||||
|
||||
# User and Group under which Apache is running
|
||||
%define httpd_name httpd
|
||||
|
|
@ -59,6 +59,7 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%post
|
||||
# Install pandora_websocket_engine service.
|
||||
cp -pf %{prefix}/pandora_console/pandora_websocket_engine /etc/init.d/
|
||||
chmod +x /etc/init.d/pandora_websocket_engine
|
||||
|
||||
echo "You can now start the Pandora FMS Websocket service by executing"
|
||||
echo " /etc/init.d/pandora_websocket_engine start"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
%define name pandorafms_console
|
||||
%define version 7.0NG.740
|
||||
%define release 191029
|
||||
%define release 191113
|
||||
%define httpd_name httpd
|
||||
# User and Group under which Apache is running
|
||||
%define httpd_name apache2
|
||||
|
|
@ -60,6 +60,7 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%post
|
||||
# Install pandora_websocket_engine service.
|
||||
cp -pf %{prefix}/pandora_console/pandora_websocket_engine /etc/init.d/
|
||||
chmod +x /etc/init.d/pandora_websocket_engine
|
||||
|
||||
echo "You can now start the Pandora FMS Websocket service by executing"
|
||||
echo " /etc/init.d/pandora_websocket_engine start"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
package: pandorafms-server
|
||||
Version: 7.0NG.740-191029
|
||||
Version: 7.0NG.740-191113
|
||||
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.740-191029"
|
||||
pandora_version="7.0NG.740-191113"
|
||||
|
||||
package_cpan=0
|
||||
package_pandora=1
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ our @EXPORT = qw(
|
|||
|
||||
# version: Defines actual version of Pandora Server for this module only
|
||||
my $pandora_version = "7.0NG.740";
|
||||
my $pandora_build = "191029";
|
||||
my $pandora_build = "191113";
|
||||
our $VERSION = $pandora_version." ".$pandora_build;
|
||||
|
||||
# Setup hash
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ our @ISA = qw(Exporter);
|
|||
|
||||
# version: Defines actual version of Pandora Server for this module only
|
||||
my $pandora_version = "7.0NG.740";
|
||||
my $pandora_build = "191029";
|
||||
my $pandora_build = "191113";
|
||||
our $VERSION = $pandora_version." ".$pandora_build;
|
||||
|
||||
our %EXPORT_TAGS = ( 'all' => [ qw() ] );
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
%define name pandorafms_server
|
||||
%define version 7.0NG.740
|
||||
%define release 191029
|
||||
%define release 191113
|
||||
|
||||
Summary: Pandora FMS Server
|
||||
Name: %{name}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
%define name pandorafms_server
|
||||
%define version 7.0NG.740
|
||||
%define release 191029
|
||||
%define release 191113
|
||||
|
||||
Summary: Pandora FMS Server
|
||||
Name: %{name}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
# **********************************************************************
|
||||
|
||||
PI_VERSION="7.0NG.740"
|
||||
PI_BUILD="191029"
|
||||
PI_BUILD="191113"
|
||||
|
||||
MODE=$1
|
||||
if [ $# -gt 1 ]; then
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ use PandoraFMS::Config;
|
|||
use PandoraFMS::DB;
|
||||
|
||||
# version: define current version
|
||||
my $version = "7.0NG.740 PS191029";
|
||||
my $version = "7.0NG.740 PS191113";
|
||||
|
||||
# Pandora server configuration
|
||||
my %conf;
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ use Encode::Locale;
|
|||
Encode::Locale::decode_argv;
|
||||
|
||||
# version: define current version
|
||||
my $version = "7.0NG.740 PS191029";
|
||||
my $version = "7.0NG.740 PS191113";
|
||||
|
||||
# save program name for logging
|
||||
my $progname = basename($0);
|
||||
|
|
|
|||
Loading…
Reference in New Issue