deon/phptsmadmin
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Work on performance improvements with caching

Browse Source
This commit is contained in:
Deon George
2012-12-04 11:52:10 +11:00
parent eafb80f7fc
commit 1bf8a520e2
30 changed files with 877 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
application/views/node/filesystems.php
View File

@@ -7,7 +7,7 @@
<tr>
<td class="head" colspan="2"><?php echo $ctype; ?> Information</td>
</tr>
<?php if ($o->getStoragePools($btype)) { ?>
<?php if ($o->vols_bybtype($ctype)) { ?>
<tr>
<td class="spacer">&nbsp;</td>
</tr>
@@ -15,21 +15,17 @@
<td>File Space</td>
<td><?php echo ($btype == 'Bkup') ? 'Last Date' : '&nbsp'; ?></td>
<td class="right">Utilisation</td>
<?php foreach (Kohana::$config->load('config')->tsmpooltypes as $type)
if (count($pools = $o->getStoragePoolsType($btype,$type)))
foreach ($pools as $pool_name) { ?>
<td class="right"><?php echo $pool_name; ?> <span style="vertical-align: super; font-size: 60%;"><?echo $type; ?></span></td>
<?php foreach ($o->stgpools() as $spo) { ?>
<td class="right"><?php echo $spo->display('STGPOOL_NAME'); ?> <span style="vertical-align: super; font-size: 60%;"><?php echo $spo->display('POOLTYPE'); ?></span></td>
<?php } ?>
</tr>
<?php $i=0;foreach ($o->FILESPACE->find_all() as $fso) { ?>
<?php $i=0; foreach ($o->fs() as $fso) { ?>
<tr class="<?php echo $i++%2 ? 'odd' : 'even'; ?>">
<td class="data"><?php echo $fso->display('FILESPACE_NAME'); ?></td>
<td class="data"><?php echo ($btype == 'Bkup') ? $fso->display('BACKUP_END') : '&nbsp;'; ?></td>
<td class="data-right"><?php echo number_format($fso->utilsation(),2); ?></td>
<?php foreach (Kohana::$config->load('config')->tsmpooltypes as $type)
if (count($pools = $o->getStoragePoolsType($btype,$type)))
foreach ($pools as $pool_name) { ?>
<td class="data-right"><?php echo number_format($fso->pool_logical_util($pool_name,$btype),2); ?> (<?php echo $fso->pool_numvols($pool_name,$ctype); ?>)</td>
<?php foreach ($o->stgpools() as $spo) { ?>
<td class="data-right"><?php echo number_format($fso->pool_logical_util($spo->STGPOOL_NAME,$btype),2); ?> (<?php echo $fso->pool_numvols($spo->STGPOOL_NAME,$ctype); ?>)</td>
<?php } ?>
</tr>
<?php } ?>

2
application/views/node/info.php
View File

@@ -20,7 +20,7 @@
</tr>
<tr>
<td>TSM Client Version</td>
<td class="data"><?php echo $o->tsmclientversion(); ?></td>
<td class="data"><?php echo $o->version(); ?></td>
</tr>
<tr>
<td class="spacer">&nbsp;</td>

20
application/views/node/stgpool_summary.php
View File

@@ -1,32 +1,32 @@
<!-- $o = ORM::factory('NODE') -->
<table class="box-full">
<tr>
<td class="head" colspan="2">Storage Summary</td>
<td class="head" colspan="2">Storage By Pool Summary</td>
</tr>
<tr>
<td class="spacer">&nbsp;</td>
</tr>
<tr>
<td colspan="2">Storage Type</td>
<td colspan="2">Storage Pool and Type</td>
<td class="right">Vols</td>
<td class="right">Files</td>
<td class="right">MB</td>
</tr>
<?php $i=0; foreach (Kohana::$config->load('config')->tsmpooltypes as $type) { ?>
<?php $i=0; foreach ($o->stgpooltypes() as $type) { ?>
<tr class="<?php echo $i++%2 ? 'odd' : 'even'; ?>">
<td class="data" colspan="2"><?php echo $type; ?></td>
<td class="data-right"><?php echo count($o->getStorageTypeVols($type)); ?></td>
<td class="data-right"><?php echo $o->getStorageTypeFiles($type); ?></td>
<td class="data-right"><?php echo $o->getStorageTypeData($type); ?></td>
<td class="data-right"><?php echo number_format($o->file_byptype($type),0); ?></td>
<td class="data-right"><?php echo number_format($o->logmb_byptype($type),0); ?></td>
</tr>
<?php foreach ($o->getAllStoragePoolsType($type) as $spo) { ?>
<?php foreach ($o->stgpools_byptype($type) as $spo) { ?>
<tr class="<?php echo $i++%2 ? 'odd' : 'even'; ?>">
<td>&nbsp;</td>
<td><?php echo $spo; ?></td>
<td class="right"><?php echo count($o->getStorageTypeVols($type,$spo)); ?></td>
<td class="right"><?php echo $o->getStorageTypeFiles($type,$spo); ?></td>
<td class="right"><?php echo $o->getStorageTypeData($type,$spo); ?></td>
<td class="right"><?php echo count($o->vols_bypool($spo)); ?></td>
<td class="right"><?php echo number_format($o->file_bypool($spo),0); ?></td>
<td class="right"><?php echo number_format($o->logmb_bypool($spo),0); ?></td>
</tr>
<?php } ?>
<?php } ?>
<?php } ?>
</table>

21
application/views/node/volumes.php
View File

@@ -7,7 +7,7 @@
<tr>
<td class="head" colspan="2"><?php echo $ctype.' '._('Volumes'); ?></td>
</tr>
<?php if ($o->volumes($ctype)) { ?>
<?php if ($o->vols_bybtype($ctype)) { ?>
<tr>
<td class="spacer">&nbsp;</td>
</tr>
@@ -19,14 +19,14 @@
<td>Status</td>
<td class="right">Errors R/W</td>
<td class="right">Util %</td>
<td class="right">Reclaim</td>
<td class="right">Recl %</td>
<td class="right">Other FS</td>
<td class="right">Other Node</td>
</tr>
<?php $i=0; foreach ($o->volumes($ctype) as $stgpool => $vols) {
$spo = ORM::factory('STGPOOL',$stgpool); ?>
<?php $i=0; foreach ($o->stgpools_bybtype($ctype) as $spo) { ?>
<tr class="subhead"><td colspan="10"><?php printf('%s: Reclaim: %s%%, Scratch Usage: %s/%s, Device Type: %s',$spo->STGPOOL_NAME,$spo->RECLAIM,$spo->NUMSCRATCHUSED,$spo->MAXSCRATCH,$spo->DEVCLASSES->DEVTYPE); ?></td></tr>
<?php foreach ($vols as $vo) { ?>
<?php foreach ($o->vols_bypoolbybtype($spo->STGPOOL_NAME,$ctype) as $vuo) {
$vo = $vuo->VOLUME; ?>
<tr class="<?php echo $i++%2 ? 'odd' : 'even'; ?>">
<td class="data"><?php echo HTML::anchor('volume/detail/'.$vo->VOLUME_NAME,$vo->display('VOLUME_NAME')); ?></td>
<td class="data"><?php echo $vo->display('LAST_READ_DATE'); ?></td>
@@ -34,21 +34,18 @@
<td class="data"><?php echo $vo->display('ACCESS'); ?></td>
<td class="data"><?php echo $vo->display('STATUS'); ?></td>
<td class="data-right"><?php printf('%s/%s',$vo->READ_ERRORS,$vo->WRITE_ERRORS); ?></td>
<td class="data-right"><?php echo $vo->display('EST_CAPACITY_MB'); ?></td>
<td class="data-right"><?php echo $vo->display('PCT_UTILIZED'); ?></td>
<td class="data-right"><?php echo $vo->display('PCT_RECLAIM'); ?></td>
<td class="data-right"><?php echo $vo->getFSOnVol($ctype); ?></td>
<td class="data-right"><?php echo $vo->getNodesOnVol($ctype); ?></td>
<td class="data-right"><?php echo count($vo->fs_bybtype($ctype))-1; ?></td>
<td class="data-right"><?php echo count($vo->nodes_bybtype($ctype))-1; ?></td>
</tr>
<?php } ?>
<?php } ?>
<?php } ?>
<?php } else { ?>
<tr><td><?php echo _('There are NO volumes for this Node.'); ?></td></tr>
<?php } ?>
</table>
</td>
<td style="width: 50%; vertical-align: top;">
&nbsp;
</td>
</tr>
<?php } ?>
</table>