tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-30 01:05:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-7205-fallos-visuales-en-monitoring' into 'develop'

Browse Source 
fixed visual error

See merge request artica/pandorafms!3955
This commit is contained in:
Daniel Rodriguez 2021-03-26 09:32:30 +00:00
commit b9f0ac8239
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/godmode/agentes/status_monitor_custom_fields.php
View File

@ -27,8 +27,6 @@ if (! check_acl($config['id_user'], 0, 'AR')
return; return;
} }
$update = get_parameter('upd_button', ''); $update = get_parameter('upd_button', '');
$default = (int) get_parameter('default', 0); $default = (int) get_parameter('default', 0);
@ -49,7 +47,7 @@ if ($default != 0) {
'value' => $status_monitor_fields, 'value' => $status_monitor_fields,
]; ];
// update 'status_monitor_fields' in tconfig table to keep the value at update. // Update 'status_monitor_fields' in tconfig table to keep the value at update.
$result = db_process_sql_update( $result = db_process_sql_update(
'tconfig', 'tconfig',
$values, $values,
@ -67,7 +65,7 @@ $fields_selected = explode(',', $config['status_monitor_fields']);
$result_selected = []; $result_selected = [];
// show list of fields selected. // Show list of fields selected.
if ($fields_selected[0] != '') { if ($fields_selected[0] != '') {
foreach ($fields_selected as $field_selected) { foreach ($fields_selected as $field_selected) {
switch ($field_selected) { switch ($field_selected) {
@ -239,7 +237,7 @@ $(document).ready (function () {
if(selected_fields_total === current_fields_size){ if(selected_fields_total === current_fields_size){
display_confirm_dialog( display_confirm_dialog(
"<?php echo '<span class="transform_none">'.__('There must be at least one custom field. Timestamp will be set by default').'</span>'; ?>", "<?php echo '<span style=text-transform:none;font-size:9.5pt;>'.__('There must be at least one custom field. Timestamp will be set by default').'</span>'; ?>",
"<?php echo __('Confirm'); ?>", "<?php echo __('Confirm'); ?>",
"<?php echo __('Cancel'); ?>", "<?php echo __('Cancel'); ?>",
function () { function () {

2
pandora_console/include/functions_reporting.php
View File

@ -12807,7 +12807,7 @@ function reporting_get_stats_servers()
$tdata[0] = html_print_image('images/database.png', true, ['title' => __('Local modules'), 'class' => 'invert_filter']); $tdata[0] = html_print_image('images/database.png', true, ['title' => __('Local modules'), 'class' => 'invert_filter']);
$tdata[1] = '<span class="big_data">'.format_numeric($server_performance['total_local_modules']).'</span>'; $tdata[1] = '<span class="big_data">'.format_numeric($server_performance['total_local_modules']).'</span>';
$tdata[2] = '<span class="med_data">'.format_numeric($server_performance['local_modules_rate'], 2).'</span>'; $tdata[2] = '<span class="med_data">'.format_numeric($server_performance['local_modules_rate'], 2).'</span>';
$tdata[3] = html_print_image('images/database.png', true, ['title' => __('Ratio').': '.__('Modules by second'), 'class' => 'invert_filter']).'/sec </span>'; $tdata[3] = html_print_image('images/module.png', true, ['title' => __('Ratio').': '.__('Modules by second'), 'class' => 'invert_filter']).'/sec </span>';
$table_srv->rowclass[] = ''; $table_srv->rowclass[] = '';
$table_srv->data[] = $tdata; $table_srv->data[] = $tdata;

13
pandora_console/operation/agentes/tactical.php
View File

@ -120,18 +120,23 @@ echo '<td class="tactical_left_column" id="leftcolumn">';
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
// The status horizontal bars (Global health, Monitor sanity... // The status horizontal bars (Global health, Monitor sanity...
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
$bg_color = 'background-color: #222';
if ($config['style'] !== 'pandora_black') {
$bg_color = 'background-color: #fff';
}
$table = new stdClass(); $table = new stdClass();
$table->width = '100%'; $table->width = '100%';
$table->class = 'info_table no-td-borders td-bg-white'; $table->class = 'info_table no-td-borders';
$table->cellpadding = 2; $table->cellpadding = 2;
$table->cellspacing = 2; $table->cellspacing = 2;
$table->border = 0; $table->border = 0;
$table->head = []; $table->head = [];
$table->data = []; $table->data = [];
$table->style = []; $table->style = [$bg_color];
$stats = reporting_get_stats_indicators($data, 120, 10, false); $stats = reporting_get_stats_indicators($data, 120, 10, false);
$status = '<table class="status_tactical">'; $status = '<table class="status_tactical bg_white">';
foreach ($stats as $stat) { foreach ($stats as $stat) {
$status .= '<tr><td><b>'.$stat['title'].'</b>'.'</td><td>'.$stat['graph'].'</td></tr>'; $status .= '<tr><td><b>'.$stat['title'].'</b>'.'</td><td>'.$stat['graph'].'</td></tr>';
} }
@ -175,7 +180,7 @@ ui_toggle(
echo '</td>'; echo '</td>';
// Left column // Left column
echo '<td class="align-top w75p pdd_t_0px" id="rightcolumn">'; echo '<td class="w75p pdd_t_0px" id="rightcolumn">';
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
// Last events information // Last events information