ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/cms/source/reports/php/latest/latest.php
(Generate patch)

Comparing projects/cms/source/reports/php/latest/latest.php (file contents):
Revision 1.40 by tdb, Sun May 19 21:15:29 2002 UTC vs.
Revision 1.43 by tdb, Mon Oct 21 13:02:58 2002 UTC

# Line 2 | Line 2
2  
3   #
4   # i-scream central monitoring system
5 + # http://www.i-scream.org.uk
6   # Copyright (C) 2000-2002 i-scream
7   #
8   # This program is free software; you can redistribute it and/or
# Line 37 | Line 38 | function printLine($title) {
38   }
39  
40  
41 < function showStat($title, $value, $input) {
41 > function showStat($title, $value, $input, $graph="") {
42  
43      $report = $value;
44  
# Line 53 | Line 54 | function showStat($title, $value, $input) {
54              </td>
55              <td width="50%" align="left" valign="top">
56               <? if (preg_match("/^[0-9]+\.?[0-9]*$/", $value)) {
57 <                    linkToHistory($report);
57 >                    linkToHistory($graph);
58                  } ?>
59                <?=$value?></td>
60            </tr>
# Line 62 | Line 63 | function showStat($title, $value, $input) {
63   }
64  
65  
66 < function linkToHistory($report) {
66 > function linkToHistory($graph) {
67      global $machine;
68 <    $yesterday = date("Y-m-d", time() - 86400);
69 <    echo <<<EOT
70 <        <a href="browser.php?machine_name=$machine&report=$report&day=$yesterday&submit=Show"><img src="minichart.gif" alt="View yesterday's 24-hour chart" width="20" height="20" border="0"></a>
68 >    if(!empty($graph)) {
69 >        echo <<<EOT
70 >        <a href="graphs.php?machine_name=$machine&graph=$graph&submit=Show"><img src="minichart.gif" alt="View historical graphs of this data" width="20" height="20" border="0"></a>
71   EOT;
72 +    }
73   }
74  
75  
# Line 82 | Line 84 | function showDisks($diskRoot, $units, $input) {
84          if ($name || $mount) {
85              $used = "$diskRoot.p$i.attributes.used";
86              $kbytes = "$diskRoot.p$i.attributes.kbytes";
87 <            showBar("$name<br>($mount)", $used, $kbytes, $units, $input);
87 >            $graph = preg_replace("/_/", "$hex_underscore", $mount);
88 >            $graph = preg_replace("/\//", "$hex_slash", $graph);
89 >            $totalinodes = getPregMatch("$diskRoot.p$i.attributes.totalinodes", $input);
90 >            $freeinodes = getPregMatch("$diskRoot.p$i.attributes.freeinodes", $input);
91 >            showBar("$name ($mount)<br>space used", $used, $kbytes, $units, $input, "disk-$graph");
92 >            showBar("inodes used", (int) $freeinodes, (int) $totalinodes, " inodes", $input, "", "swap");
93 >            print "          <br><br>\n";
94          }
95          else {
96              break;
# Line 99 | Line 107 | function getPregMatch($value, $input) {
107  
108  
109   # show a bar-represented value.
110 < function showBar($title, $value, $max, $units, $input, $arrange='normal') {
110 > function showBar($title, $value, $max, $units, $input, $graph="", $arrange='normal') {
111  
112      include("latest_config.inc.php");
113  
114      $report = $value;
115 <
116 <    $value = getPregMatch($value, $input);
115 >    if (!is_int($value)) {
116 >        $value = getPregMatch($value, $input);
117 >    }
118      if (!is_int($max)) {
119          $max = getPregMatch($max, $input);
120      }
# Line 130 | Line 139 | function showBar($title, $value, $max, $units, $input,
139      ?>
140          <table border="0" cellpadding="0" cellspacing="0" align="center">
141            <tr>
142 <            <td colspan="2"><? linkToHistory($report); ?> <b><?=$title?></b> <font size="2">(<?=$value?><?=$units?>)</font></td>
142 >            <td colspan="2"><? linkToHistory($graph); ?> <b><?=$title?></b> <font size="2">(<?=$value?><?=$units?>)</font></td>
143            </tr>
144            <tr>
145              <td colspan="2" bgcolor="#eeeeff"><img src="<?=$barImage?>" border="0" height="20" width="<?=$width?>"></td>
# Line 141 | Line 150 | function showBar($title, $value, $max, $units, $input,
150            <tr>
151              <td align="left">0<?=$units?></td>
152              <td align="right"><?=$max?><?=$units?></td>
144          </tr>
145          <tr>
146            <td colspan="2">&nbsp;</td>
153            </tr>
154          </table>
155      <?

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines