Commit version 24.12.13800
This commit is contained in:
@ -4,20 +4,20 @@
|
||||
*
|
||||
* This file is part of Observium.
|
||||
*
|
||||
* @package observium
|
||||
* @subpackage web
|
||||
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2021 Observium Limited
|
||||
* @package observium
|
||||
* @subpackage web
|
||||
* @copyright (C) Adam Armstrong
|
||||
*
|
||||
*/
|
||||
|
||||
if (!safe_empty($app_data['memory'])) {
|
||||
$memory_used = $app_data['memory']['used'] - $app_data['memory']['cache'];
|
||||
$memory_used_perc = round(float_div($memory_used, $app_data['memory']['total']) * 100, 2);
|
||||
$memory_used = $app_data['memory']['used'] - $app_data['memory']['cache'];
|
||||
$memory_used_perc = round(float_div($memory_used, $app_data['memory']['total']) * 100, 2);
|
||||
$memory_cached_perc = round(float_div($app_data['memory']['cache'], $app_data['memory']['total']) * 100, 2);
|
||||
$memory_free = $app_data['memory']['total'] - $app_data['memory']['used'];
|
||||
$memory_free_perc = round(float_div($memory_free, $app_data['memory']['total']) * 100, 2);
|
||||
$memory_free = $app_data['memory']['total'] - $app_data['memory']['used'];
|
||||
$memory_free_perc = round(float_div($memory_free, $app_data['memory']['total']) * 100, 2);
|
||||
|
||||
$graph_array = array();
|
||||
$graph_array = [];
|
||||
$graph_array['height'] = "100";
|
||||
$graph_array['width'] = "512";
|
||||
$graph_array['to'] = get_time();
|
||||
@ -25,49 +25,49 @@ if (!safe_empty($app_data['memory'])) {
|
||||
$graph_array['type'] = 'application_mssql_memory_usage';
|
||||
$graph_array['from'] = get_time('day');
|
||||
$graph_array['legend'] = "no";
|
||||
$graph = generate_graph_tag($graph_array);
|
||||
$graph = generate_graph_tag($graph_array);
|
||||
|
||||
$link_array = $graph_array;
|
||||
$link_array = $graph_array;
|
||||
$link_array['page'] = "graphs";
|
||||
unset($link_array['height'], $link_array['width'], $link_array['legend']);
|
||||
$link = generate_url($link_array);
|
||||
|
||||
$overlib_content = generate_overlib_content($graph_array, $app['app_instance'] . " - Memory Usage");
|
||||
|
||||
$percentage_bar = array();
|
||||
$percentage_bar = [];
|
||||
//$percentage_bar['border'] = "#EA8F00";
|
||||
$percentage_bar['border'] = "#E25A00";
|
||||
$percentage_bar['bg'] = "#f0f0f0";
|
||||
$percentage_bar['width'] = "100%";
|
||||
$percentage_bar['text'] = $memory_free_perc."%";
|
||||
$percentage_bar['text'] = $memory_free_perc . "%";
|
||||
$percentage_bar['text_c'] = "#E25A00";
|
||||
$percentage_bar['bars'][0] = array('percent' => $memory_used_perc, 'colour' => '#EE9955', 'text' => $memory_used_perc.'%');
|
||||
$percentage_bar['bars'][1] = array('percent' => $memory_cached_perc, 'colour' => '#f0e0a0', 'text' => '');
|
||||
$percentage_bar['bars'][0] = ['percent' => $memory_used_perc, 'colour' => '#EE9955', 'text' => $memory_used_perc . '%'];
|
||||
$percentage_bar['bars'][1] = ['percent' => $memory_cached_perc, 'colour' => '#f0e0a0', 'text' => ''];
|
||||
|
||||
echo(overlib_link($link, $graph, $overlib_content, NULL));
|
||||
|
||||
?>
|
||||
<div class="box box-solid">
|
||||
<div class="title"><i class="<?php echo $config['icon']['mempool']; ?>"></i> Memory</div>
|
||||
<div class="content">
|
||||
<table width="100%" class="table table-striped table-condensed-more ">
|
||||
<tr>
|
||||
<td colspan="7">
|
||||
<?php echo(percentage_bar($percentage_bar)); ?>
|
||||
</td>
|
||||
</tr>
|
||||
<tr class="small">
|
||||
<td><i style="font-size: 7px; line-height: 7px; background-color: #EE9955; border: 1px #aaa solid;"> </i> Used</td>
|
||||
<td><?php echo(formatStorage($memory_used).' ('.$memory_used_perc.'%)'); ?></td>
|
||||
<td><i style="font-size: 7px; line-height: 7px; background-color: #f0e0a0; border: 1px #aaa solid;"> </i> Cached</td>
|
||||
<td><?php echo(formatStorage($app_data['memory']['cache']).' ('.$memory_cached_perc.'%)'); ?></td>
|
||||
<td><i style="font-size: 7px; line-height: 7px; background-color: #f0f0f0; border: 1px #aaa solid;"> </i> Free</td>
|
||||
<td><?php echo(formatStorage($memory_free).' ('.$memory_free_perc.'%)'); ?></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<?php
|
||||
?>
|
||||
<div class="box box-solid">
|
||||
<div class="title"><i class="<?php echo $config['icon']['mempool']; ?>"></i> Memory</div>
|
||||
<div class="content">
|
||||
<table width="100%" class="table table-striped table-condensed-more ">
|
||||
<tr>
|
||||
<td colspan="7">
|
||||
<?php echo(percentage_bar($percentage_bar)); ?>
|
||||
</td>
|
||||
</tr>
|
||||
<tr class="small">
|
||||
<td><i style="font-size: 7px; line-height: 7px; background-color: #EE9955; border: 1px #aaa solid;"> </i> Used</td>
|
||||
<td><?php echo(format_bytes($memory_used) . ' (' . $memory_used_perc . '%)'); ?></td>
|
||||
<td><i style="font-size: 7px; line-height: 7px; background-color: #f0e0a0; border: 1px #aaa solid;"> </i> Cached</td>
|
||||
<td><?php echo(format_bytes($app_data['memory']['cache']) . ' (' . $memory_cached_perc . '%)'); ?></td>
|
||||
<td><i style="font-size: 7px; line-height: 7px; background-color: #f0f0f0; border: 1px #aaa solid;"> </i> Free</td>
|
||||
<td><?php echo(format_bytes($memory_free) . ' (' . $memory_free_perc . '%)'); ?></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<?php
|
||||
}
|
||||
|
||||
unset($percentage_bar, $graph_array, $overlib_content, $graph, $link, $link_array);
|
||||
|
||||
@ -4,51 +4,51 @@
|
||||
*
|
||||
* This file is part of Observium.
|
||||
*
|
||||
* @package observium
|
||||
* @subpackage web
|
||||
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2021 Observium Limited
|
||||
* @package observium
|
||||
* @subpackage web
|
||||
* @copyright (C) Adam Armstrong
|
||||
*
|
||||
*/
|
||||
|
||||
$cpu_counter = $app_data['cpu']['proc'];
|
||||
$time_counter = $app_data['cpu']['time'];
|
||||
$cpu_counter = $app_data['cpu']['proc'];
|
||||
$time_counter = $app_data['cpu']['time'];
|
||||
$cpu_load_percent = round(float_div($cpu_counter, $time_counter) * 100, 2);
|
||||
$background = get_percentage_colours($cpu_load_percent);
|
||||
$background = get_percentage_colours($cpu_load_percent);
|
||||
|
||||
$graph_array = array();
|
||||
$graph_array = [];
|
||||
$graph_array['height'] = "100";
|
||||
$graph_array['width'] = "512";
|
||||
$graph_array['to'] = $config['time']['now'];
|
||||
$graph_array['to'] = get_time();
|
||||
$graph_array['id'] = $app['app_id'];
|
||||
$graph_array['type'] = 'application_mssql_cpu_usage';
|
||||
$graph_array['from'] = $config['time']['day'];
|
||||
$graph_array['from'] = get_time('day');
|
||||
$graph_array['legend'] = "no";
|
||||
$graph = generate_graph_tag($graph_array);
|
||||
$graph = generate_graph_tag($graph_array);
|
||||
|
||||
$link_array = $graph_array;
|
||||
$link_array = $graph_array;
|
||||
$link_array['page'] = "graphs";
|
||||
unset($link_array['height'], $link_array['width'], $link_array['legend']);
|
||||
$link = generate_url($link_array);
|
||||
|
||||
$overlib_content = generate_overlib_content($graph_array, $app['app_instance'] . " - CPU Usage");
|
||||
|
||||
$percentage_bar = array();
|
||||
$percentage_bar['border'] = "#".$background['left'];
|
||||
$percentage_bar['bg'] = "#".$background['right'];
|
||||
$percentage_bar = [];
|
||||
$percentage_bar['border'] = "#" . $background['left'];
|
||||
$percentage_bar['bg'] = "#" . $background['right'];
|
||||
$percentage_bar['width'] = "100%";
|
||||
$percentage_bar['text'] = $cpu_load_percent."%";
|
||||
$percentage_bar['text'] = $cpu_load_percent . "%";
|
||||
$percentage_bar['text_c'] = "#FFFFFF";
|
||||
$percentage_bar['bars'][0] = array('percent' => $cpu_load_percent);
|
||||
$percentage_bar['bars'][0] = ['percent' => $cpu_load_percent];
|
||||
|
||||
echo(overlib_link($link, $graph, $overlib_content, NULL));
|
||||
?>
|
||||
<table width="100%" class="table table-striped table-condensed-more ">
|
||||
<tr>
|
||||
<td class="entity">Current CPU Load</td>
|
||||
<td style="width: 90px;"></td>
|
||||
<td style="width: 200px;"><?php echo percentage_bar($percentage_bar); ?></td>
|
||||
</tr>
|
||||
</table>
|
||||
<table width="100%" class="table table-striped table-condensed-more ">
|
||||
<tr>
|
||||
<td class="entity">Current CPU Load</td>
|
||||
<td style="width: 90px;"></td>
|
||||
<td style="width: 200px;"><?php echo percentage_bar($percentage_bar); ?></td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<?php
|
||||
|
||||
|
||||
Reference in New Issue
Block a user