Index: /trunk/ippMonitor/czartool/czarpoll.pl =================================================================== --- /trunk/ippMonitor/czartool/czarpoll.pl (revision 42920) +++ /trunk/ippMonitor/czartool/czarpoll.pl (revision 42921) @@ -654,4 +654,5 @@ my $readable = 1; my $writable = 1; + my $xattr = 0; #print "Mount $mount_point: total=${total_tb}TB, used=${used_tb}TB (${used_percent}%), available=${available_tb}TB (${available_percent}%)\n"; @@ -660,6 +661,6 @@ #my $host_label = "$host.$suffix(${total_tb}T)"; my $host_label = "$host.$suffix"; - $czarDb->updateHost($host_label, $total_tb, $available_tb, $used_tb, $readable, $writable); - } - } -} + $czarDb->updateHost($host_label, $total_tb, $available_tb, $used_tb, $readable, $writable, $xattr); + } + } +} Index: /trunk/ippMonitor/czartool/czartool/CzarDb.pm =================================================================== --- /trunk/ippMonitor/czartool/czartool/CzarDb.pm (revision 42920) +++ /trunk/ippMonitor/czartool/czartool/CzarDb.pm (revision 42921) @@ -346,5 +346,5 @@ ########################################################################### sub updateHost { - my ($self, $host, $total, $available, $used, $readable, $writable) = @_; + my ($self, $host, $total, $available, $used, $readable, $writable, $xattr) = @_; my $query = $self->{_db}->prepare(<{_db}->prepare(<execute; Index: /trunk/ippMonitor/czartool/czartool/Nebulous.pm =================================================================== --- /trunk/ippMonitor/czartool/czartool/Nebulous.pm (revision 42920) +++ /trunk/ippMonitor/czartool/czartool/Nebulous.pm (revision 42921) @@ -96,4 +96,5 @@ my $readable; my $writable; + my $xattr; foreach $line (@cmdOut) { @@ -120,5 +121,7 @@ if ($4 >= 98) {$self->{_hostsOverNinetyEightPC}++;} - $self->getReadableWritableStatus($1, \$readable, \$writable); + $self->getReadableWritableStatus($1, \$readable, \$writable, \$xattr); + print "Host: $1, Readable: $readable, Writable: $writable, Xattr: $xattr\n"; + $self->{_czarDb}->updateHost($1, @@ -126,5 +129,5 @@ $self->convertKbToTb($3), $self->convertKbToTb($2), - $readable, $writable); + $readable, $writable, $xattr); } } @@ -144,8 +147,9 @@ ########################################################################### sub getReadableWritableStatus { - my ($self, $host, $readable, $writable) = @_; + my ($self, $name, $readable, $writable, $xattr) = @_; ${$readable} = 0; ${$writable} = 0; + ${$xattr} = 0; my @cmdOut = `neb-host`; @@ -154,5 +158,5 @@ chomp($line); - if ($line =~ m/[0-9.A-Za-z]+\s+$host\s+([01]+)\s+([01]+)\s+([01]+)\s+.*/i) { + if ($line =~ m/[0-9.A-Za-z]+\s+$name\s+([01]+)\s+([01]+)\s+([01]+)\s+([0-9]+)\s+.*/i) { # if mounted... @@ -161,4 +165,5 @@ ${$readable} = $3; ${$writable} = $2; + ${$xattr} = $4; } } Index: /trunk/ippMonitor/raw/czartool_labels.php =================================================================== --- /trunk/ippMonitor/raw/czartool_labels.php (revision 42920) +++ /trunk/ippMonitor/raw/czartool_labels.php (revision 42921) @@ -1706,5 +1706,5 @@ # ########################################################################### -function getHosts($db) { +function getHostsold($db) { // timer start $time = microtime(); @@ -1716,5 +1716,5 @@ echo ""; echo "
"; - echo "
"; + echo "
"; echo "
"; echo "
Free
"; @@ -1735,5 +1735,6 @@ echo " 'free', {type: 'string', role: 'style'}, {type: 'string', role: 'tooltip', 'p': {'html': true}}],"; - $sql = "SELECT host, format(total,1), format(available,2), format(used,2), writable, readable, format(used/total*100,2) FROM hosts where host like 'ipp1%' or host like 'ippb%' order by host"; + //$sql = "SELECT host, format(total,1), format(available,2), format(used,2), writable, readable, format(used/total*100,2) FROM hosts"; + $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 "; if ($debug) {echo "$sql
";} $qry = $db->query($sql); @@ -1753,5 +1754,5 @@ if ($ratio >= 97) { # space used over limits, up mode (read/write ok). - echo "[ \"$host\", "; + echo "[ \"$host:up\", "; echo " $used, \"stroke-width: 0.3;\"+\"stroke-color: black;\"+\"color: #ff0000;\", \"$host: $ratio% of $total TB used
$hostnote[0]\", "; echo " $available, \"stroke-width: 0.3;\"+\"stroke-color: black;\"+\"color: #00ff00;\", \"$host: $available TB free\"],"; @@ -1759,5 +1760,5 @@ else { # enough space, up mode (read/write ok). - echo "[ \"$host\", "; + echo "[ \"$host:up\", "; echo " $used, \"stroke-width: 0.3;\"+\"stroke-color: black;\"+\"color: #ffff00;\", \"$host: $ratio% of $total TB used
$hostnote[0]\", "; echo " $available, \"stroke-width: 0.3;\"+\"stroke-color: black;\"+\"color: #00ff00;\", \"$host: $available TB free\"],"; @@ -1767,5 +1768,5 @@ if ($ratio >= 97) { # space used over limits, repair mode (read only). - echo "[ \"$host\", "; + echo "[ \"$host:repair\", "; echo " $used, \"stroke-width: 0.3;\"+\"stroke-color: black;\"+\"color: #ff0000;\", \"$host: $ratio% of $total TB used
$hostnote[0]\", "; echo " $available, \"stroke-width: 0.3;\"+\"stroke-color: black;\"+\"color: #bbbbbb;\", \"$host: $available TB free\"],"; @@ -1773,5 +1774,5 @@ else { # enough space, but hosts are unstable, repair mode (read only). - echo "[ \"$host\", "; + echo "[ \"$host:repair\", "; echo " $used, \"stroke-width: 0.3;\"+\"stroke-color: black;\"+\"color: #ffff00;\", \"$host: $ratio% of $total TB used
$hostnote[0]\", "; echo " $available, \"stroke-width: 0.3;\"+\"stroke-color: black;\"+\"color: #bbbbbb;\", \"$host: $available TB free\"],"; @@ -1780,5 +1781,5 @@ else { # down mode (can't read or write). - echo "[ \"$host\", "; + echo "[ \"$host:down\", "; echo " $used, \"stroke-width: 0.3;\"+\"stroke-color: black;\"+\"color: #bbbbbb;\", \"$host: $ratio% used
$hostnote[0]\", "; echo " $available, \"stroke-width: 0.3;\"+\"stroke-color: black;\"+\"color: #bbbbbb;\", \"$host: $available TB free\"],"; @@ -1798,6 +1799,7 @@ echo " gridlines: {count: 10}"; echo " },"; + echo " vAxis: { textPosition: 'in', direction: 1 },"; echo " bar: { groupWidth: '95%' },"; - echo " chartArea: {left:100, top:30, right:20, bottom:40},"; + echo " chartArea: {left:20, top:30, right:20, bottom:40},"; echo " fontSize: 15,"; echo " isStacked: true,"; @@ -1819,4 +1821,144 @@ ########################################################################### # +# Gets disk status +# +########################################################################### +function getHosts($db) { + $start = microtime(true); + + echo ""; + echo "
"; + echo "
"; + echo "
"; + echo "
Free
"; + echo "
Used
"; + echo "
> 97% limit
"; + echo "
Down | Repair
"; + echo "
Offline
"; + echo "
"; + echo "
"; + + // Set environment variables + putenv("PATH=/usr/local/bin:/usr/bin:/bin:/data/ippc65.0/ipp/src/psconfig//ipp-20210708-gentoo.lin64/bin"); + putenv("PERL5LIB=/data/ippc65.0/ipp/src/psconfig//ipp-20210708-gentoo.lin64/lib"); + + $hostnoteall = array(); + 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 where xattr <> 3 "; + $qry = $db->query($sql); + + if ($qry === false) { + echo "Error with SQL query
"; + return; + } + + $dataRows = array(); + $maxUsed = 0; // initialize before the while loop + + while ($qry->fetchInto($row)) { + // 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); + + // Defaults + $styles = "stroke-width: .5; stroke-color: black;"; + $status = "down"; + $usedColor = "lightgrey"; + $freeColor = "lightgrey"; + + // Status logic + if ($writable == 1 && $readable == 1) { + $status = "up"; + $usedColor = ($ratio >= 97) ? "pink" : "yellow"; // red if ≥97% + $freeColor = "#a6ec99"; // green free + } elseif ($writable == 0 && $readable == 1) { + $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 { + $tooltipUsed = $host . ": " . round($ratio, 1) . "% of " . $total . " TB used
" . $hostnote; + $tooltipFree = $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 ""; + + $total_time = round(microtime(true) - $start, 3); + echo "
loading in $total_time seconds
"; +} + +########################################################################### +# # Gets disk spaces status # @@ -1829,15 +1971,22 @@ $start = $time; - $db->query("SELECT sum(format(available, 2)) FROM hosts where host like 'ippb%'")->fetchInto($row); + + $db->query("SELECT FORMAT(IFNULL(SUM(available), 0), 1) FROM hosts where host like 'ippb%' and xattr <> 3")->fetchInto($row); $ippbusable = $row[0]; - $db->query("SELECT sum(format(available, 2)) FROM hosts where host like 'ippb%' and writable = 1")->fetchInto($row); + $db->query("SELECT FORMAT(IFNULL(SUM(available), 0), 1) FROM hosts where host like 'ippb%' and writable = 1 and xattr <> 3")->fetchInto($row); $ippbfree = $row[0]; - $db->query("SELECT sum(format(available, 2)) FROM hosts where host not like 'ippb%'")->fetchInto($row); + $db->query("SELECT FORMAT(IFNULL(SUM(available), 0), 1) FROM hosts where host not like 'ippb%' and xattr <> 3")->fetchInto($row); $ippusable = $row[0]; - $db->query("SELECT sum(format(available, 2)) FROM hosts where host not like 'ippb%' and writable = 1")->fetchInto($row); + $db->query("SELECT FORMAT(IFNULL(SUM(available), 0), 1) FROM hosts where host not like 'ippb%' and writable = 1 and xattr <> 3")->fetchInto($row); $ippfree = $row[0]; + $db->query("SELECT FORMAT(IFNULL(SUM(available), 0), 1) FROM hosts where host like 'ipp%_bck.0' and xattr <> 3")->fetchInto($row); + $bckusable = $row[0]; + $db->query("SELECT FORMAT(IFNULL(SUM(available), 0), 1) FROM hosts where host like 'ipp%_bck.0' and writable = 1 and xattr <> 3")->fetchInto($row); + $bckfree = $row[0]; + $sql = "select format(used/total*100,1), usable from cluster_space order by timestamp desc limit 1;"; + if ($debug) {echo "$sql
";} $qry = $db->query($sql); @@ -1851,7 +2000,7 @@ echo "
"; echo "
"; - echo "
"; - echo "
ipp + ippb nodes: $ippusable + $ippbusable TB (latest usable)
"; - echo "
ipp + ippb nodes: $ippfree + $ippbfree TB (latest free)
"; + echo "
"; + echo "
ipp*_bck: $bckusable TB (usable)
"; + echo "
ipp*_bck: $bckfree TB (free)
"; echo "
"; echo "
"; @@ -1863,6 +2012,6 @@ echo " var data = new google.visualization.DataTable();"; echo " data.addColumn('datetime', 'Day');"; - echo " data.addColumn('number', 'Usable');"; - echo " data.addColumn('number', 'Free');"; + echo " data.addColumn('number', 'Usable (ipp:$ippusable, ippb:$ippbusable) TB');"; + echo " data.addColumn('number', 'Free (ipp:$ippfree, ippb:$ippbfree) TB');"; echo " data.addRows(["; $interval = 10; Index: /trunk/ippMonitor/raw/storage.php =================================================================== --- /trunk/ippMonitor/raw/storage.php (revision 42920) +++ /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 "