Index: trunk/ippMonitor/raw/storage.php =================================================================== --- trunk/ippMonitor/raw/storage.php (revision 42736) +++ trunk/ippMonitor/raw/storage.php (revision 42921) @@ -52,11 +52,11 @@ echo ""; echo "
"; - echo "
"; + echo "
"; echo "
"; - echo "
Free
"; - echo "
Used
"; - echo "
> 97% limit
"; - echo "
Down | Repair
"; - echo "
Power Off
"; + echo "
Free
"; + echo "
Used
"; + echo "
> 97% limit
"; + echo "
Down | Repair
"; + echo "
Offline
"; echo "
"; echo "
"; @@ -69,7 +69,5 @@ exec("neb-host |cut -b 17-30,86-", $hostnoteall); - $sql = "SELECT host, format(total, 2), format(available, 2), format(used, 2), writable, readable, format(used/total*100,3) as ratio - FROM hosts - ORDER BY host"; + $sql = "SELECT host, format(total, 2), format(available, 2), format(used, 2), writable, readable, format(used/total*100,3) as ratio FROM hosts where xattr <> 3 "; $qry = $db->query($sql); @@ -80,32 +78,72 @@ $dataRows = array(); + $maxUsed = 0; // initialize before the while loop + while ($qry->fetchInto($row)) { - // Access data using numeric indices - $host = $row[0]; // ipp071.0 - $total = $row[1]; // 80.0352 - $available = $row[2]; // 10.8096 - $used = $row[3]; // 69.2256 - $writable = $row[4]; // 0 - $readable = $row[5]; // 1 - $ratio = $row[6]; // 86.493950215116 - + // Access by index + $host = $row[0]; // ipp071.0 + $total = $row[1]; // 80.0352 TB + $available = $row[2]; // 10.8096 TB + $used = $row[3]; // 69.2256 TB + $writable = $row[4]; // 0 + $readable = $row[5]; // 1 + $ratio = $row[6]; // 86.4939 % + + // update maxUsed + if ($total > $maxUsed) { + $maxUsed = $total/2; + } + + // Match notes $hostnotes = preg_grep("/$host/", $hostnoteall); $hostnote = reset($hostnotes); - $styles = "stroke-width: 0.5; stroke-color: black;"; + // Defaults + $styles = "stroke-width: .5; stroke-color: black;"; + $status = "down"; + $usedColor = "lightgrey"; + $freeColor = "lightgrey"; + + // Status logic if ($writable == 1 && $readable == 1) { - $usedColor = $ratio >= 97 ? "#ff0000" : "#ffff00"; - $freeColor = "#00ff00"; + $status = "up"; + $usedColor = ($ratio >= 97) ? "pink" : "yellow"; // red if ≥97% + $freeColor = "#a6ec99"; // green free } elseif ($writable == 0 && $readable == 1) { - $usedColor = $ratio >= 97 ? "#ff0000" : "#ffff00"; - $freeColor = "#bbbbbb"; + $status = "repair"; + $usedColor = ($ratio >= 97) ? "pink" : "yellow"; + $freeColor = "lightgrey"; // grey free + } elseif ($available < 1) { + $used = $maxUsed; + $available = $maxUsed; + $status = "offline"; + $usedColor = "white"; + $freeColor = "white"; + } + + if ($status == "down") { + $tooltipUsed = $host . ": " . round($ratio, 1) . "% of " . $total . " TB used ". + "
" . $hostnote . ""; + $tooltipFree = "" . + $host . ": " . $available . " TB free" . + ""; + } elseif ($status == "offline") { + $tooltipUsed = $host . ": " . round($ratio, 1) . "% of " . $total . " TB used ". + "
" . $hostnote . ""; + $tooltipFree = "" . + $host . ": " . $total . " TB free" . + ""; } else { - $usedColor = $freeColor = "#bbbbbb"; + $tooltipUsed = $host . ": " . round($ratio, 1) . "% of " . $total . " TB used
" . $hostnote; + $tooltipFree = $host . ": " . $available . " TB free"; } - $dataRows[] = "[ \"$host\", $used, \"$styles color: $usedColor;\", \"$host: $ratio% of $total TB used
$hostnote\", - $available, \"$styles color: $freeColor;\", \"$host: $available TB free\"]"; + // Build data row (manual string concatenation for old PHP) + $dataRows[] = + "[ \"" . $host . ":" . $status . "\", " . + $used . ", \"" . $styles . " color: " . $usedColor . ";\", \"" . $tooltipUsed . "\", " . + $available . ", \"" . $styles . " color: " . $freeColor . ";\", \"" . $tooltipFree . "\" ]"; + } - echo "