Index: trunk/ippMonitor/raw/czartool_labels.php =================================================================== --- trunk/ippMonitor/raw/czartool_labels.php (revision 42858) +++ trunk/ippMonitor/raw/czartool_labels.php (revision 42902) @@ -1412,6 +1412,17 @@ } else { if ($qry->fetchInto($row)) { - list($host, $total, $available, $used, $writable, $readable, $ratio) = $row; - $storageInfo = "$ratio% of $total"; + list($host, $total, $available, $used, $writable, $readable, $ratioStr) = $row; + $ratio = floatval($ratioStr); // convert to number + + // Determine color + if ($ratio < 80) { + $color = 'lightgreen'; + } elseif ($ratio <= 90) { + $color = 'yellow'; + } else { + $color = 'pink'; + } + + $storageInfo = "$ratioStr% of $total"; } else { $storageInfo = "No host storage data"; @@ -1421,5 +1432,5 @@ $dbRepl = DB::connect("mysql://$replUser:$replPassword@$replHost"); if (PEAR::isError($dbRepl)) { - echo "$replDatabaseName$storageInfoMySQL DB connection error - check configuration"; + echo "$replDatabaseName$storageInfoMySQL DB connection error - check configuration"; return -1; // Don't stop the rest of the script } @@ -1428,5 +1439,5 @@ $res = $dbRepl->query('SHOW SLAVE STATUS'); if (PEAR::isError($res)) { - echo "$replDatabaseName$storageInfoMySQL query error - invalid user or privileges"; + echo "$replDatabaseName$storageInfoMySQL query error - invalid user or privileges"; $dbRepl->disconnect(); return -1; @@ -1434,5 +1445,5 @@ if (!$res->fetchInto($row)) { - echo "$replDatabaseName$storageInfoNo replication data available"; + echo "$replDatabaseName$storageInfoNo replication data available"; $dbRepl->disconnect(); return 0; @@ -1449,14 +1460,14 @@ $replStatus = ($errorStatusInMySql == 0) ? "OK ($sec_behind sec behind)" - : "PROBLEM"; + : "PROBLEM"; echo "$replDatabaseName$storageInfo"; + echo "$replStatus"; + if ($errorStatusInMySql != 0) { - echo "Connect to $replDatabaseName, run SHOW SLAVE STATUS, and resolve the issue. "; - echo "See MySQL Docs."; - } - - echo "$replStatus"; + echo "
Connect to $hostPrefix replication database, run 'SHOW SLAVE STATUS', and fix the problem. "; + echo "See MySQL Docs
"; + } $dbRepl->disconnect(); @@ -1490,6 +1501,17 @@ } else { if ($qry->fetchInto($row)) { - list($host, $total, $available, $used, $writable, $readable, $ratio) = $row; - $storageInfo = "$ratio% of $total "; + list($host, $total, $available, $used, $writable, $readable, $ratioStr) = $row; + $ratio = floatval($ratioStr); // convert to number + + // Determine color + if ($ratio < 80) { + $color = 'lightgreen'; + } elseif ($ratio <= 90) { + $color = 'yellow'; + } else { + $color = 'pink'; + } + + $storageInfo = "$ratioStr% of $total"; } else { $storageInfo = "No host storage data"; @@ -1596,17 +1618,23 @@ if ($debug) {echo "$sql
";} + $qry = $projectdb->query($sql); while ($qry->fetchInto($tmp)) { list($expType, $downloadState, $rawState, $count, $summit_exp, $pz_exp, $raw_exp) = $tmp; + if ($proj == "gpc1") { + $summit_exp_link = "$summit_exp"; + } else { + $summit_exp_link = "$summit_exp"; + } if ($downloadState == NULL) { - echo " $expType ($summit_exp) loading imfiles null $count"; + echo " $summit_exp_link $expType loading imfiles null $count"; } else { if ($downloadState == 'run') { - echo " $expType ($summit_exp) summit_copy ($pz_exp) saving ($pz_exp) $count"; + echo " $summit_exp_link $expType $pz_exp copying $pz_exp saving $count"; } else { if ($rawState == NULL) { - echo " $expType ($summit_exp) $downloadState ($pz_exp) registering ($pz_exp) $count"; - } else { - echo " $expType ($summit_exp) $downloadState ($pz_exp) $rawState ($raw_exp) $count"; + echo " $summit_exp_link $expType $pz_exp $downloadState $pz_exp registering $count"; + } else { + echo " $summit_exp_link $expType $pz_exp $downloadState $raw_exp $rawState $count"; } } @@ -1629,16 +1657,4 @@ AND summitExp.exp_name LIKE '$expnamem1' ORDER BY summitExp.dateobs desc) as sub GROUP BY sum_type, pzstate, rawstate"; - // $sql = " - // SELECT summitExp.exp_type, pzDownloadExp.state, rawExp.state, COUNT(*) - // FROM summitExp - // LEFT JOIN pzDownloadExp USING (summit_id) - // LEFT JOIN rawExp ON summitExp.exp_name = rawExp.exp_name - // WHERE summitExp.summit_id >= ( - // SELECT COALESCE(MIN(summit_id), 0) - // FROM summitExp - // WHERE exp_name LIKE '$expnamem5' - // ) - // AND summitExp.exp_name LIKE '$expnamem1' - // GROUP BY summitExp.exp_type, pzDownloadExp.state, rawExp.state"; if ($debug) {echo "$sql
";} @@ -1646,34 +1662,23 @@ while ($qry->fetchInto($tmp)) { list($expType, $downloadState, $rawState, $count, $summit_exp, $pz_exp, $raw_exp) = $tmp; + if ($proj == "gpc1") { + $summit_exp_link = "$summit_exp"; + } else { + $summit_exp_link = "$summit_exp"; + } if ($downloadState == NULL) { - echo " $expType ($summit_exp) loading imfiles null $count"; + echo " $summit_exp_link $expType loading imfiles null $count"; } else { if ($downloadState == 'run') { - echo " $expType ($summit_exp) summit_copy ($pz_exp) saving ($pz_exp) $count"; + echo " $summit_exp_link $expType $pz_exp copying $pz_exp saving $count"; } else { if ($rawState == NULL) { - echo " $expType ($summit_exp) $downloadState ($pz_exp) registering $count"; - } else { - echo " $expType ($summit_exp) $downloadState ($pz_exp) $rawState ($raw_exp) $count"; + echo " $summit_exp_link $expType $pz_exp $downloadState $pz_exp registering $count"; + } else { + echo " $summit_exp_link $expType $pz_exp $downloadState $raw_exp $rawState $count"; } } } } - //while ($qry->fetchInto($tmp)) { - // list($expType, $downloadState, $rawState, $count) = $tmp; - // if ($downloadState == NULL) { - // echo " $expType null null $count"; - // } else { - // if ($downloadState == 'run') { - // echo " $expType loading null $count"; - // } else { - // if ($rawState == NULL) { - // echo " $expType $downloadState loading $count"; - // } else { - // echo " $expType $downloadState download ($rawState) $count"; - // } - // } - // } - //} echo "";