mirror of
https://bitbucket.org/jsuto/piler.git
synced 2025-11-04 10:22:26 +01:00
Fixed #1296 formatting numbers on the admin health page
Signed-off-by: Janos SUTO <sj@acts.hu>
This commit is contained in:
Janos SUTO
@@ -274,6 +274,8 @@ $config['SIZE_Y'] = 250;
|
||||
$config['DATE_TEMPLATE'] = 'Y.m.d';
|
||||
$config['DATE_FORMAT'] = 'YYYY-MM-DD';
|
||||
$config['JQUERY_DATE_FORMAT'] = 'yy-mm-dd';
|
||||
$config['DECIMAL_SEPARATOR'] = "."; // See https://www.php.net/manual/en/function.number-format
|
||||
$config['THOUSANDS_SEPARATOR'] = ","; // for the format options
|
||||
|
||||
|
||||
$config['FROM_LENGTH_TO_SHOW'] = 28;
|
||||
|
||||
@@ -291,6 +291,11 @@ function my_qp_encode($s){
|
||||
}
|
||||
|
||||
|
||||
function format_number($n) {
|
||||
return number_format($n, 0, DECIMAL_SEPARATOR, THOUSANDS_SEPARATOR);
|
||||
}
|
||||
|
||||
|
||||
function nice_size($size = 0, $space = '') {
|
||||
if($size < 1000) return "1k";
|
||||
if($size < 1000000) return round($size/1000) . $space . "k";
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
<div class="container">
|
||||
<div class="alert alert-info"><strong><?php print $text_refresh_period; ?>:</strong> <?php print HEALTH_REFRESH; ?> sec</div>
|
||||
<div class="alert alert-info"><strong><?php print $text_refresh_period; ?>:</strong> <?php print HEALTH_REFRESH; ?> sec</div>
|
||||
|
||||
<div class="row">
|
||||
|
||||
<div class="span8">
|
||||
<div class="row">
|
||||
|
||||
<div class="span8">
|
||||
<h2><i class="icon-dashboard icon-2x pull-left"></i><?php print $health['sysinfo'][0]; ?> <small><?php print $text_status; ?></small></h2>
|
||||
<h3><strong>Up For:</strong> <?php print $health['uptime']; ?></h3>
|
||||
<table class="table table-striped">
|
||||
@@ -15,22 +15,22 @@
|
||||
<tr>
|
||||
<th class="span4"><?php print $text_server_operating_system; ?>:</th>
|
||||
<td class="span8"> <?php print $health['sysinfo'][1]; ?></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<th><?php print $text_cpu_usage; ?>:</th>
|
||||
<td><div class="progress <?php if($health['cpuinfo'] < HEALTH_RATIO) { ?>progress-success<?php } else { ?>progress-danger<?php } ?>"><div class="bar" style="width: <?php print $health['cpuinfo']; ?>%"></div> <?php print $health['cpuinfo']; ?>% <?php print $health['cpuload']; ?></div></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<th><?php print $text_memory_usage; ?>:</th>
|
||||
<td><div class="progress <?php if($health['meminfo'] < HEALTH_RATIO) { ?>progress-success<?php } else { ?>progress-danger<?php } ?>"><div class="bar" style="width: <?php print $health['meminfo']; ?>%"></div> <?php print $health['meminfo']; ?>% / <?php print $health['totalmem']; ?> MB</div></td>
|
||||
</tr>
|
||||
|
||||
<th><?php print $text_cpu_usage; ?>:</th>
|
||||
<td><div class="progress <?php if($health['cpuinfo'] < HEALTH_RATIO) { ?>progress-success<?php } else { ?>progress-danger<?php } ?>"><div class="bar" style="width: <?php print $health['cpuinfo']; ?>%"></div> <?php print $health['cpuinfo']; ?>% <?php print $health['cpuload']; ?></div></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<th><?php print $text_swap_usage; ?>:</th>
|
||||
<th><?php print $text_memory_usage; ?>:</th>
|
||||
<td><div class="progress <?php if($health['meminfo'] < HEALTH_RATIO) { ?>progress-success<?php } else { ?>progress-danger<?php } ?>"><div class="bar" style="width: <?php print $health['meminfo']; ?>%"></div> <?php print $health['meminfo']; ?>% / <?php print $health['totalmem']; ?> MB</div></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<th><?php print $text_swap_usage; ?>:</th>
|
||||
<td><div class="progress <?php if($health['swapinfo'] < HEALTH_RATIO) { ?>progress-success<?php } else { ?>progress-danger<?php } ?>"><div class="bar" style="width: <?php print $health['swapinfo']; ?>%"></div> <?php print $health['swapinfo']; ?>% / <?php print $health['totalswap']; ?> MB</div></td>
|
||||
</tr>
|
||||
</tr>
|
||||
|
||||
<?php if(ENABLE_SAAS == 1) { ?>
|
||||
<tr>
|
||||
@@ -38,18 +38,18 @@
|
||||
<td class="span8"><a href="index.php?route=stat/online"><?php print $health['num_of_online_users']; ?></a></td>
|
||||
</tr>
|
||||
<?php } ?>
|
||||
|
||||
</table>
|
||||
|
||||
<h2><i class="icon-hdd icon-2x pull-left"></i> <?php print $text_storage; ?></h2>
|
||||
<table class="table table-striped">
|
||||
<tr>
|
||||
<th><?php print $text_archive_size; ?>:</th>
|
||||
<td><?php print $health['archive_size']; ?>B (<?php print $health['archive_stored_size']; ?>B)</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<th><?php print $text_disk_usage; ?>:</th>
|
||||
</table>
|
||||
|
||||
<h2><i class="icon-hdd icon-2x pull-left"></i> <?php print $text_storage; ?></h2>
|
||||
<table class="table table-striped">
|
||||
<tr>
|
||||
<th><?php print $text_archive_size; ?>:</th>
|
||||
<td><?php print $health['archive_size']; ?>B (<?php print $health['archive_stored_size']; ?>B)</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<th><?php print $text_disk_usage; ?>:</th>
|
||||
<td>
|
||||
<table>
|
||||
<?php foreach($health['shortdiskinfo'] as $partition) { ?>
|
||||
@@ -64,32 +64,31 @@
|
||||
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<th><?php print $text_smtp_status; ?>:</th>
|
||||
<td>
|
||||
<?php foreach($health['health'] as $h) {
|
||||
if(preg_match("/^220/", $h[1])) {
|
||||
$status = 'OK'; $class = 'text-success';
|
||||
} else {
|
||||
$status = 'ERROR'; $class = 'text-error';
|
||||
}
|
||||
?>
|
||||
<div class="<?php print $class; ?>"><span onmouseover="Tip('<?php print preg_replace("/\'/", "\'", $h[1]); ?>, <?php print $h[2]; ?>', BALLOON, true, ABOVE, true)" onmouseout="UnTip()"><?php print $h[3]; ?>: <?php print $status; ?></span></div>
|
||||
<?php } ?>
|
||||
</td>
|
||||
</tr>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<th><?php print $text_periodic_purge; ?></th>
|
||||
<td>
|
||||
<tr>
|
||||
<th><?php print $text_smtp_status; ?>:</th>
|
||||
<td>
|
||||
<?php foreach($health['health'] as $h) {
|
||||
if(preg_match("/^220/", $h[1])) {
|
||||
$status = 'OK'; $class = 'text-success';
|
||||
} else {
|
||||
$status = 'ERROR'; $class = 'text-error';
|
||||
} ?>
|
||||
<div class="<?php print $class; ?>"><span onmouseover="Tip('<?php print preg_replace("/\'/", "\'", $h[1]); ?>, <?php print $h[2]; ?>', BALLOON, true, ABOVE, true)" onmouseout="UnTip()"><?php print $h[3]; ?>: <?php print $status; ?></span></div>
|
||||
<?php } ?>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<th><?php print $text_periodic_purge; ?></th>
|
||||
<td>
|
||||
<span class="<?php if($health['options']['enable_purge'] == 1) { ?>ok<?php } else { ?>error<?php } ?>"><?php if($health['options']['enable_purge'] == 1) { print $text_enabled; ?>. <a href="<?php print HEALTH_URL; ?>&toggle_enable_purge"><?php print $text_disable; ?></a>
|
||||
<?php if($health['purge_stat'][0]) { print $text_last; ?>: <?php print $health['purge_stat'][0]; ?>, <?php print $text_next; ?>: <?php print $health['purge_stat'][1]; } ?>
|
||||
<?php } else { print $text_disabled; ?>. <a href="<?php print HEALTH_URL; ?>&toggle_enable_purge"><?php print $text_enable; ?></a><?php } ?>
|
||||
</span>
|
||||
</td>
|
||||
</tr>
|
||||
</tr>
|
||||
|
||||
<?php if($health['indexer_stat'][0]) { ?>
|
||||
<tr>
|
||||
@@ -99,62 +98,61 @@
|
||||
</tr>
|
||||
<?php } ?>
|
||||
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="span4">
|
||||
<table class="table table-striped">
|
||||
<tr>
|
||||
<th colspan="2"><?php print $text_cumulative_counts; ?></th>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="span4">
|
||||
<table class="table table-striped">
|
||||
<tr>
|
||||
<th colspan="2"><?php print $text_cumulative_counts; ?></th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><?php print $text_oldest_record; ?></td>
|
||||
<td><?php print date(DATE_TEMPLATE, $health['oldestmessagets']); ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><?php print $text_processed_emails; ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><?php print $text_processed_emails; ?></td>
|
||||
<td>
|
||||
<?php print $health['processed_emails']['last_60_mins_count']; ?> (<?php print $text_60_minutes; ?>)<br />
|
||||
<?php print $health['processed_emails']['today_count']; ?> (<?php print $text_24_hours; ?>)<br />
|
||||
<?php print $health['processed_emails']['last_7_days_count']; ?> (<?php print $text_1_week; ?>)<br />
|
||||
<?php print $health['processed_emails']['last_30_days_count']; ?> (<?php print $text_30_days; ?>)
|
||||
<?php print format_number($health['processed_emails']['last_60_mins_count']); ?> (<?php print $text_60_minutes; ?>)<br />
|
||||
<?php print format_number($health['processed_emails']['today_count']); ?> (<?php print $text_24_hours; ?>)<br />
|
||||
<?php print format_number($health['processed_emails']['last_7_days_count']); ?> (<?php print $text_1_week; ?>)<br />
|
||||
<?php print format_number($health['processed_emails']['last_30_days_count']); ?> (<?php print $text_30_days; ?>)
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th colspan="2"><?php print $text_message_disposition; ?></th>
|
||||
</tr>
|
||||
<?php foreach($health['counters'] as $k => $v) {
|
||||
if(!is_numeric($k)) { ?>
|
||||
<tr>
|
||||
<td><?php $a = preg_replace("/^_piler\:/", "", $k); if(isset($$a)) { print $$a; } else { print $k; } ?></td>
|
||||
<td><?php print $v; ?></td>
|
||||
</tr>
|
||||
<?php } } ?>
|
||||
|
||||
</table>
|
||||
|
||||
</tr>
|
||||
<tr>
|
||||
<th colspan="2"><?php print $text_message_disposition; ?></th>
|
||||
</tr>
|
||||
<?php foreach($health['counters'] as $k => $v) { if(!is_numeric($k)) { ?>
|
||||
<tr>
|
||||
<td><?php $a = preg_replace("/^_piler\:/", "", $k); if(isset($$a)) { print $$a; } else { print $k; } ?></td>
|
||||
<td><?php print format_number($v); ?></td>
|
||||
</tr>
|
||||
<?php } } ?>
|
||||
|
||||
</table>
|
||||
|
||||
<h4><?php print $text_space_projection; ?></h4>
|
||||
<table class="table table-striped">
|
||||
<tr>
|
||||
<td><?php print $text_average_messages_day; ?></td>
|
||||
<td><?php print $health['averagemessages']; ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><?php print $text_average_message_size; ?></td>
|
||||
<td><?php print $health['averagemessagesize']; ?> + <?php print $health['averagesqlsize']; ?> + <?php print $health['averagesphinxsize']; ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><?php print $text_average_size_day; ?></td>
|
||||
<td><?php print $health['averagesizeday']; ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>"<?php print DATA_PARTITION; ?>" <?php print $text_partition_full; ?></td>
|
||||
<td><?php print $health['daysleftatcurrentrate'][0]; ?> years, <?php print $health['daysleftatcurrentrate'][1]; ?> months, <?php print $health['daysleftatcurrentrate'][2]; ?> days</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><?php print $text_usage_trend; ?></td>
|
||||
<td><?php if ($health['usagetrend'] > 0) { print $text_usage_increasing; } elseif($health['usagetrend'] < 0) { print $text_usage_decreasing; } else { print $text_usage_neutral; } ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><?php print $text_average_messages_day; ?></td>
|
||||
<td><?php print $health['averagemessages']; ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><?php print $text_average_message_size; ?></td>
|
||||
<td><?php print $health['averagemessagesize']; ?> + <?php print $health['averagesqlsize']; ?> + <?php print $health['averagesphinxsize']; ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><?php print $text_average_size_day; ?></td>
|
||||
<td><?php print $health['averagesizeday']; ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>"<?php print DATA_PARTITION; ?>" <?php print $text_partition_full; ?></td>
|
||||
<td><?php print $health['daysleftatcurrentrate'][0]; ?> years, <?php print $health['daysleftatcurrentrate'][1]; ?> months, <?php print $health['daysleftatcurrentrate'][2]; ?> days</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><?php print $text_usage_trend; ?></td>
|
||||
<td><?php if ($health['usagetrend'] > 0) { print $text_usage_increasing; } elseif($health['usagetrend'] < 0) { print $text_usage_decreasing; } else { print $text_usage_neutral; } ?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Sphinx main (total) index</td>
|
||||
<td<?php if($health['sphinx_current_main_size'] > SPHINX_MAIN_INDEX_THRESHOLD) { ?> class="text-error"<?php } ?>><?php print nice_size($health['sphinx_current_main_size']); ?> (<?php print nice_size($health['sphinx_total_size']); ?>) </td>
|
||||
|
||||
Reference in New Issue
Block a user