Changeset 33638 for branches/eam_branches/ipp-20111122/ippMonitor/raw/czartool_labels.php

Timestamp:

Mar 30, 2012, 2:49:37 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20111122/ippMonitor

Files:

• . (modified) (1 prop)
• raw/czartool_labels.php (modified) (3 diffs)

branches/eam_branches/ipp-20111122/ippMonitor/raw/czartool_labels.php

@@ -169 +169 @@
 echo "<tr><td>Postage stamp server status</td><td><a href=\"http://pstamp.ipp.ifa.hawaii.edu/status.php\"><font color=\"blue\">here</font></a></td></tr>";
 echo "<tr><td>Documentation</td><td><a href=\"http://svn.pan-starrs.ifa.hawaii.edu/trac/ipp/wiki/Processing\"><font color=\"blue\">here</font></a></td></tr>";
-echo "<tr><td>Cluster load</td><td><a href=\"http://ganglia.pan-starrs.ifa.hawaii.edu/?r=hour&s=descending&hc=6&c=IPP%2520Production\"><font color=\"blue\">here</font></a></td></tr>";
+echo "<tr><td>Cluster load</td><td><a href=\"http://ganglia.pan-starrs.ifa.hawaii.edu/?r=hour&s=descending&hc=6&c=IPP%2520Production\"><font color=\"blue\">here</font></a> <a href=\"http://ganglia.pan-starrs.ifa.hawaii.edu/?m=cpu_report&r=hour&s=by%2520name&c=IPP+Production&h=&sh=1&hc=8&z=small\"><font color=\"blue\">cpu_report</font></a></td></tr>";
 echo "<tr><td>Who's using the cluster?</td><td><a href=\"http://ippmonitor.ipp.ifa.hawaii.edu/ippMonitor/clusterMonitor/top.html\"><font color=\"blue\">here</font></a></td></tr>";
 echo "<tr><td>IPP metrics</td><td><a href=\"http://ipp0022.ifa.hawaii.edu/ps1sc/ippMetrics\"><font color=\"blue\">here</font></a></td></tr>";
@@ -492 +492 @@
     createFormattedTableCell(($selectedLabel != "all"), $link, "All labels", 0, null);
 
-    createFormattedTableCell(0, null, "Reverts:", 0, "$columnHeaderColor");
+    createFormattedTableCell(0, null, "Reverting?", 0, "$columnHeaderColor");
 
     foreach ($stages as &$stage) {
@@ -498 +498 @@
         if ($stage == "burntool") continue;
         $reverting = getRevertStatus($db, $stage);
-        $link = 
-            "czartool_labels.php?pass=".$pass
-            ."&proj=".$proj
-            ."&mode=" .$selectedMode
-            ."&label=".$selectedLabel
-            ."&stage=".$selectedStage
-            ."&plottype=".$plotType
-            ."&revertstage=".$stage
-            ."&revertmode=";
-
-        if(!$reverting) {$label =  "Start";$link = $link . "on";}
-        if($reverting) {$label = "Stop";$link = $link . "off";}
+        #$link = 
+        #    "czartool_labels.php?pass=".$pass
+        #    ."&proj=".$proj
+        #    ."&mode=" .$selectedMode
+        #    ."&label=".$selectedLabel
+        #    ."&stage=".$selectedStage
+        #    ."&plottype=".$plotType
+        #    ."&revertstage=".$stage
+        #    ."&revertmode=";
+#
+        #if(!$reverting) {$label =  "Start";$link = $link . "on";}
+        #if($reverting) {$label = "Stop";$link = $link . "off";}
+        if(!$reverting) {$label =  "no";}
+        if($reverting) {$label = "yes";}
         unset($reverting);
-        createFormattedTableCell(1, $link, $label, 0, "$columnHeaderColor");
+        #createFormattedTableCell(1, $link, $label, 0, "$columnHeaderColor");
+        createFormattedTableCell(0, null, $label, 0, "$columnHeaderColor");
         #echo "<td><a href=\"$link\"><font color=\"blue\">$label</font></td>";