This commit is contained in:
fbsanchez 2019-05-29 12:06:05 +02:00
parent 5ec162e058
commit 37af0ad612
6 changed files with 70 additions and 21 deletions

View File

@ -823,7 +823,6 @@ if (check_login()) {
$table->head[6] = __('Thresholds');
$table->head[7] = __('Data');
$table->head[8] = __('Graph');
$table->headstyle[8] = 'min-width: 60px';
$table->head[9] = __('Last contact').ui_get_sorting_arrows($url_up_last, $url_down_last, $selectLastContactUp, $selectLastContactDown);
$table->align = [
'left',
@ -837,6 +836,12 @@ if (check_login()) {
'left',
];
$table->headstyle[2] = 'min-width: 60px';
$table->headstyle[3] = 'min-width: 100px';
$table->headstyle[5] = 'min-width: 60px';
$table->headstyle[8] = 'min-width: 85px';
$table->headstyle[9] = 'min-width: 100px';
$last_modulegroup = 0;
$rowIndex = 0;

View File

@ -5,3 +5,15 @@ text.text-tooltip {
div#bullets_modules span {
font-family: "lato-bolder", "Open Sans", sans-serif !important;
}
table#agent_interface_info .noresizevc.graph {
width: 500px !important;
}
div.agent_details_agent_alias {
flex: 1;
}
div.agent_details_agent_alias * {
font-family: "lato-bolder", "Open Sans", sans-serif !important;
}

View File

@ -4,7 +4,7 @@ div.criticity {
color: #fff;
text-align: center;
border-radius: 5px;
font-size: 1.4em;
font-size: 1.2em;
padding: 0;
margin: 0;
display: table-cell;

View File

@ -5994,6 +5994,18 @@ div#status_pie {
flex-wrap: wrap;
}
.white_table_graph_content.min-height-100 {
min-height: 100px;
}
.white_table_graph_content.min-height-50 {
min-height: 50px;
}
.white_table_graph_content.min-height-200 {
min-height: 200px;
}
.white_table_graph_content div.pagination {
width: 100%;
padding: 0 1em;

View File

@ -101,7 +101,6 @@ $in_planned_downtime = db_get_sql(
WHERE tplanned_downtime_agents.id_agent = '.$agent['id_agente'].' AND tplanned_downtime.executed = 1'
);
if ($agent['disabled']) {
if ($in_planned_downtime) {
$agent_name = '<em>'.$agent_name.ui_print_help_tip(__('Disabled'), true);
@ -134,7 +133,10 @@ if ($in_planned_downtime && !$agent['disabled'] && !$agent['quiet']) {
).'</em>';
}
$table_agent_header = '<div class="agent_details_agent_name">';
$table_agent_header = '<div class="agent_details_agent_alias">';
$table_agent_header .= $agent_name;
$table_agent_header .= '</div>';
$table_agent_header .= '<div class="agent_details_agent_name">';
if (!$config['show_group_name']) {
$table_agent_header .= ui_print_group_icon(
$agent['id_grupo'],
@ -239,18 +241,20 @@ if ($has_remote_conf) {
// $table_agent_count_modules .= ui_print_help_tip(__('Agent statuses are re-calculated by the server, they are not shown in real time.'), true);
$table_agent = '
<div class="agent_details_header">'.$table_agent_header.'</div>
<div class="agent_details_content">
<div class="agent_details_graph">
'.$table_agent_graph.'
<div class="agent_details_bullets">
'.$table_agent_count_modules.'
</div>
<div class="agent_details_header">
'.$table_agent_header.'
</div>
<div class="agent_details_content">
<div class="agent_details_graph">
'.$table_agent_graph.'
<div class="agent_details_bullets">
'.$table_agent_count_modules.'
</div>
<div class="agent_details_info">
'.$table_agent_os.$table_agent_ip.$table_agent_version.$table_agent_description.$remote_cfg.'
</div>
</div>';
</div>
<div class="agent_details_info">
'.$table_agent_os.$table_agent_ip.$table_agent_version.$table_agent_description.$remote_cfg.'
</div>
</div>';
/*
* END: TABLE AGENT BUILD.
@ -505,7 +509,8 @@ if ($config['agentaccess'] && $access_agent > 0) {
'images/arrow_down_green.png',
true
).'<span>'.__('Agent access rate (24h)').'</span></div>
<div class="white_table_graph_content">'.graphic_agentaccess(
<div class="white_table_graph_content min-height-100">
'.graphic_agentaccess(
$id_agente,
'95%',
100,
@ -624,7 +629,14 @@ if (!empty($network_interfaces)) {
$params_json = json_encode($params);
$params_encoded = base64_encode($params_json);
$win_handle = dechex(crc32($interface['status_module_id'].$interface_name));
$graph_link = "<a href=\"javascript:winopeng_var('operation/agentes/interface_traffic_graph_win.php?params=$params_encoded','$win_handle', 1000, 650)\">".html_print_image('images/chart_curve.png', true, ['title' => __('Interface traffic')]).'</a>';
$graph_link = "<a href=\"javascript:winopeng_var('operation/agentes/interface_traffic_graph_win.php?params=";
$graph_link .= $params_encoded."','";
$graph_link .= $win_handle."', 1000, 650)\">";
$graph_link .= html_print_image(
'images/chart_curve.png',
true,
['title' => __('Interface traffic')]
).'</a>';
} else {
$graph_link = '';
}
@ -785,12 +797,19 @@ if (!empty($network_interfaces)) {
</script>
<?php
// EVENTS.
if ($config['agentaccess'] && $access_agent > 0) {
$extra_class = 'min-height-100';
} else {
$extra_class = '';
}
$table_events = '<div class="white_table_graph" id="table_events">
<div class="white_table_graph_header">'.html_print_image(
'images/arrow_down_green.png',
true
).'<span>'.__('Events (24h)').'</span></div>
<div class="white_table_graph_content">'.graph_graphic_agentevents(
<div class="white_table_graph_content '.$extra_class.'">
'.graph_graphic_agentevents(
$id_agente,
100,
45,

View File

@ -149,7 +149,9 @@ $sort = get_parameter('sort', 'up');
$modules_not_init = agents_monitor_notinit($id_agente);
if (!empty($modules_not_init)) {
echo clippy_context_help('modules_not_init');
$help_not_init = clippy_context_help('modules_not_init');
} else {
$help_not_init = '';
}
ob_start();
@ -161,7 +163,6 @@ print_form_filter_monitors(
$status_hierachy_mode
);
echo '<div class="white_table_graph_content" id="module_list_loading">'.html_print_image('images/spinner.gif', true).'</div>';
echo '<div class="white_table_graph_content" style="padding: 0;" id="module_list"></div>';
$html_toggle = ob_get_clean();
@ -171,7 +172,7 @@ ui_toggle(
__('List of modules').ui_print_help_tip(
__('To see the list of modules paginated, enable this option in the Styles Configuration.'),
true
).reporting_tiny_stats(
).$help_not_init.reporting_tiny_stats(
$agent,
true,
'modules',