Index: /trunk/ippMonitor/raw/czartool_labels.php =================================================================== --- /trunk/ippMonitor/raw/czartool_labels.php (revision 31891) +++ /trunk/ippMonitor/raw/czartool_labels.php (revision 31892) @@ -46,4 +46,5 @@ $menu = $ID['menu']; +$selectedMode = $_GET[mode]; $selectedStage = $_GET[stage]; $selectedLabel = $_GET[label]; @@ -55,5 +56,9 @@ $allServerCmd = $_GET[allservercmd]; -if ($selectedLabel == "") { $selectedLabel = "all_stdscience_labels"; } +$headerColor = "#0080c0"; +$columnHeaderColor = "lavender"; + +if ($selectedMode == "") { $selectedMode = "stdscience"; } +if ($selectedLabel == "") { $selectedLabel = "all"; } if ($selectedStage == "") { $selectedStage = "all_stages"; } if ($plotType == "") { $plotType = "linear"; } @@ -73,9 +78,9 @@ $debug = 0; - -$stdsLabels = getLabels($czardb, "stdscience"); +$table = "\n"; + +$labels = getLabels($czardb, $selectedMode); $distLabels = getLabels($czardb, "distribution"); $pubLabels = getLabels($czardb, "publishing"); -$updateLabels = getLabels($czardb, "update"); if ($debug) { @@ -86,4 +91,9 @@ } +$isUpdate = ($selectedMode == "update"); +$modeText = $isUpdate ? "Showing update processing" : "Showing standard processing"; +$modeLinkText = $isUpdate ? "standard" : "update"; +$modeLink = $isUpdate ? "stdscience" : "update"; +$link = "czartool_labels.php?pass=".$pass."&proj=".$proj."&mode=".$modeLink."&label=all&stage=" . $selectedStage . "&revertstage=" . $stage . "&plottype=$plotType"; // set up the form @@ -98,29 +108,35 @@ echo ""; -echo ""; echo ""; echo ""; -echo ""; -echo "
"; +echo ""; echo "

Czartool

"; +echo "

$modeText (change to $modeLinkText)

"; echo "
"; +echo ""; # time series plot - echo "
"; +echo "
"; + echo "
"; # rate time series plot - echo "
"; +echo "
"; + echo "
"; # rate stacked histo plot - echo "
"; + #echo "
"; # histogram plot - echo "
"; + #echo "
"; + # storage plot +echo "
"; + echo "
"; # storage timeseries - echo "
"; - # storage plot - echo "
"; + #echo "
"; # pantasks server status, if requested +echo "
"; if ($selectedServer && !$serverCmd) showServerStatus($selectedServer); echo "		"; - -echo "

"; +echo "		"; +echo ""; + +#echo "
"; // status table at top @@ -128,5 +144,8 @@ $plotTypeLink = ($plotType == "linear") ? "log" : "linear"; $link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&label=" . $selectedLabel . "&stage=" . $selectedStage . "&revertstage=" . $stage . "&plottype=$plotTypeLink"; -echo "\n"; +echo "
"; +echo $table; +#"
\n"; +createTableTitle("Status and links", 3); echo "\n"; echo ""; @@ -140,13 +159,19 @@ echo ""; echo ""; + +$plotTypeLink = ($plotType == "linear") ? "log" : "linear"; +$link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&mode=" . $selectedMode . "&label=" . $selectedLabel . "&stage=" . $selectedStage . "&revertstage=" . $stage . "&plottype=$plotTypeLink"; +echo ""; + + echo "
Time of last update$lastUpdateTime
Czar log pageshere
Exposure summaryhere
Plot typeChange to $plotTypeLink
\n"; -echo "

"; +echo "
"; createLabelsTable($pass, $proj, $czardb, - "stdscience", - $stdsLabels, + $selectedMode, + $labels, $distLabels, $pubLabels, @@ -158,34 +183,20 @@ $plotType); -echo "

"; - createLabelsTable($pass, - $proj, - $czardb, - "update", - $updateLabels, - $distLabels, - $pubLabels, - $stages, - $states, - "new", - $selectedLabel, - $selectedStage, - $plotType); -echo "

"; - createServersTable($pass, $proj,$czardb, $servers, $selectedLabel, $selectedStage, $plotType); -echo "

"; +if ($selectedMode == "update") {echo "
"; createPStampDataTable();} +echo "
"; + createServersTable($pass, $proj,$selectedMode,$czardb, $servers, $selectedLabel, $selectedStage, $plotType); +echo "
"; createSummitDataTable($gpc1db); -echo "

"; +echo "
"; createDatesTable($czardb); -echo "

"; - createPStampDataTable(); -echo "

"; +echo "
"; # This is awful - echo "\n"; + echo $table; echo ""; - echo ""; + createTableTitle("Database replication status (update fix log here)", 2); +# echo ""; echo ""; - echo ""; - echo ""; + createTableColumnHeader("Database"); + createTableColumnHeader("Status"); showReplicationsStatus($REPL_HOST_GPC1, $REPL_USER_GPC1, $REPL_PASSWORD_GPC1, $REPL_DBNAME_GPC1); showReplicationsStatus($REPL_HOST_NEBULOUS, $REPL_USER_NEBULOUS, $REPL_PASSWORD_NEBULOUS, $REPL_DBNAME_NEBULOUS); @@ -217,11 +228,14 @@ // set up the table - echo "
Database replication status (update fix log here)

Database replication status (update fix log here)

DatabaseStatus
\n"; + global $table; + echo $table; + + #echo "
\n"; echo ""; - echo ""; + createTableTitle("Postage stamp requests", 3); echo ""; - echo ""; - echo ""; - echo ""; + createTableColumnHeader("Label"); + createTableColumnHeader("Unfinished jobs"); + createTableColumnHeader("Priority"); // list the results @@ -259,11 +273,12 @@ // set up the table - echo "
Postage stamp requests
LabelUnfinished jobsPriority
\n"; + global $table; + echo $table; echo ""; - echo ""; + createTableTitle("Status of last night's data", 3); echo ""; - echo ""; - echo ""; - echo ""; + createTableColumnHeader("Exposure type"); + createTableColumnHeader("At summit"); + createTableColumnHeader("Registered at MHPCC"); $msg = "No science images taken since $date"; @@ -281,26 +296,15 @@ echo ""; - if ($summit[0] == $mhpcc[0]) { - - if ($expType[0] == "OBJECT") $msg = "All science exposures taken since $date
have been registered at MHPCC"; - $error = 0; - } - else { - if ($expType[0] == "OBJECT") $msg = "Warning: Not all science exposures taken since $date
have been registered at MHPCC"; - $error = 1; - } + if ($summit[0] == $mhpcc[0]) $error = 0; + else $error = 1; echo ""; echo ""; - - - #echo ""; - createFormattedTableCell("", "", $mhpcc[0], $error); + createFormattedTableCell("", "", $mhpcc[0], $error, 0); echo ""; } - echo ""; echo "
Status of last night's data
Exposure typeAt summitRegistered at MHPCC
$expType[0]$summit[0]$mhpcc[0]
$msg
\n"; @@ -337,5 +341,5 @@ $proj, $db, - $server, + $selectedMode, $labels, $distLabels, @@ -346,60 +350,23 @@ $selectedLabel, $selectedStage, $plotType) { + $isUpdate = ($selectedMode == "update"); + global $headerColor; + global $columnHeaderColor; + // setup table - echo "\n"; + global $table; + echo $table; + createTableTitle("Label status", 13); + echo "\n"; - echo ""; - echo "\n"; - - echo "\n"; - //echo ""; - echo ""; - echo ""; - - foreach ($stages as &$stage) { - - if ($stage == "burntool") continue; - $reverting = getRevertStatus($db, $stage); - $link = - "czartool_labels.php?pass=".$pass - ."&proj=".$proj - ."&label=".$selectedLabel - ."&stage=".$selectedStage - ."&plottype=".$plotType - ."&revertstage=".$stage - ."&revertmode="; - - if(!$reverting) {$label = "Start";$link = $link . "on";} - if($reverting) {$label = "Stop";$link = $link . "off";} - unset($reverting); - echo ""; - - } - - echo "\n"; - echo "\n"; - //echo ""; - echo ""; + createFormattedTableCell(($selectedStage != "all_stages"), $link, "All stages", 0, "$columnHeaderColor"); + + #echo ""; foreach ($stages as &$stage) { @@ -409,11 +376,12 @@ "czartool_labels.php?pass=".$pass ."&proj=".$proj + ."&mode=" .$selectedMode ."&label=".$selectedLabel ."&stage=".$stage ."&plottype=".$plotType; - createFormattedTableCell($showLink, $link, $stage, 0); - } - + createFormattedTableCell($showLink, $link, $stage, 0, "$columnHeaderColor"); +# createTableColumnHeader("Dates"); + } // setup default link @@ -421,4 +389,5 @@ "czartool_labels.php?pass=".$pass ."&proj=".$proj + ."&mode=" .$selectedMode ."&label=".$selectedLabel ."&stage=".$selectedStage @@ -426,5 +395,5 @@ $searchState = "new"; - if ($server == "update") $searchState = "update"; + if ($selectedMode == "update") $searchState = "update"; // write rows @@ -444,8 +413,4 @@ // show distribution/publishing status echo "\n"; - $distPub = " "; - if ($distributing) $distPub = "D"; - if ($publishing) $distPub = $distPub . "P"; - echo ""; // create link to label summary page for each label @@ -455,8 +420,9 @@ "czartool_labels.php?pass=".$pass ."&proj=".$proj + ."&mode=" .$selectedMode ."&label=".$thisLabel ."&stage=".$selectedStage ."&plottype=".$plotType; - createFormattedTableCell($showLink, $link, $thisLabel, 0); + createFormattedTableCell($showLink, $link, $thisLabel, 0, null); $str = ""; @@ -465,52 +431,81 @@ $link = $defaultlink; getStateAndFaults($db, $thisLabel, $selectedState, "burntool", $str, $anyFaults); - createFormattedTableCell($anyFaults, $link, $str, $anyFaults); + createFormattedTableCell($anyFaults, $link, $str, $anyFaults, 0); $link = "failedChipProcessedImfile.php?pass=" . $pass . "&proj=" . $proj . "&chipRun.label=" . $thisLabel . "&chipRun.state=".$searchState; getStateAndFaults($db, $thisLabel, $selectedState, "chip", $str, $anyFaults); - createFormattedTableCell($anyFaults, $link, $str, $anyFaults); + createFormattedTableCell($anyFaults, $link, $str, $anyFaults, 0); $link = "failedCamProcessedExp.php?pass=" . $pass . "&proj=" . $proj . "&camRun.label=" . $thisLabel . "&camRun.state=".$searchState; getStateAndFaults($db, $thisLabel, $selectedState, "cam", $str, $anyFaults); - createFormattedTableCell($anyFaults, $link, $str, $anyFaults); + createFormattedTableCell($anyFaults, $link, $str, $anyFaults, 0); $link = "failedFakeProcessedImfile.php?pass=" . $pass . "&proj=" . $proj . "&fakeRun.label=" . $thisLabel . "&fakeRun.state=".$searchState; getStateAndFaults($db, $thisLabel, $selectedState, "fake", $str, $anyFaults); - createFormattedTableCell($anyFaults, $link, $str, $anyFaults); + createFormattedTableCell($anyFaults, $link, $str, $anyFaults, 0); $link = "failedWarpSkyfiles.php?pass=" . $pass . "&proj=" . $proj . "&warpRun.label=" . $thisLabel . "&warpRun.state=".$searchState; getStateAndFaults($db, $thisLabel, $selectedState, "warp", $str, $anyFaults); - createFormattedTableCell($anyFaults, $link, $str, $anyFaults); + createFormattedTableCell($anyFaults, $link, $str, $anyFaults, 0); $link = "failedStackSkyfile.php?pass=" . $pass . "&proj=" . $proj . "&stackRun.label=" . $thisLabel . "&stackRun.state=".$searchState; getStateAndFaults($db, $thisLabel, $selectedState, "stack", $str, $anyFaults); - createFormattedTableCell($anyFaults, $link, $str, $anyFaults); + createFormattedTableCell($anyFaults, $link, $str, $anyFaults, 0); $link = "failedDiffSkyfile.php?pass=" . $pass . "&proj=" . $proj . "&diffRun.label=" . $thisLabel . "&diffRun.state=".$searchState; getStateAndFaults($db, $thisLabel, $selectedState, "diff", $str, $anyFaults); - createFormattedTableCell($anyFaults, $link, $str, $anyFaults); + createFormattedTableCell($anyFaults, $link, $str, $anyFaults, 0); $link = $defaultlink; getStateAndFaults($db, $thisLabel, $selectedState, "magic", $str, $anyFaults); - createFormattedTableCell($anyFaults, $link, $str, $anyFaults); + createFormattedTableCell($anyFaults, $link, $str, $anyFaults, (!$isUpdate && !$distributing) ? "gray" : null); $link = $defaultlink; getStateAndFaults($db, $thisLabel, $selectedState, "magicDS", $str, $anyFaults); - createFormattedTableCell($anyFaults, $link, $str, $anyFaults); + createFormattedTableCell($anyFaults, $link, $str, $anyFaults, (!$isUpdate && !$distributing) ? "gray" : null); $link = $defaultlink; getStateAndFaults($db, $thisLabel, $selectedState, "dist", $str, $anyFaults); - createFormattedTableCell($anyFaults, $link, $str, $anyFaults); + createFormattedTableCell($anyFaults, $link, $str, $anyFaults, (!$isUpdate && !$distributing) ? "gray" : null); $link = "publishDone.php?pass=" . $pass . "&proj=" . $proj . "&publishRun.label=" . $thisLabel . "&publishRun.state=".$searchState; getStateAndFaults($db, $thisLabel, $selectedState, "pub", $str, $anyFaults); - createFormattedTableCell($anyFaults, $link, $str, $anyFaults); + createFormattedTableCell($anyFaults, $link, $str, $anyFaults, (!$isUpdate && !$publishing) ? "gray" : null); echo "\n"; } - if ($selectedLabel == "all_".$server."_labels") $showLink = 0; + echo "\n"; + $link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&mode=" . $selectedMode . "&label=all&stage=".$selectedStage."&plottype=".$plotType; + createFormattedTableCell(($selectedLabel != "all"), $link, "All labels", 0, null); + + createFormattedTableCell(0, null, "Reverts:", 0, "$columnHeaderColor"); + + foreach ($stages as &$stage) { + + 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";} + unset($reverting); + createFormattedTableCell(1, $link, $label, 0, "$columnHeaderColor"); + #echo ""; + + } + + echo "\n"; + if ($selectedLabel == "all") $showLink = 0; else $showLink = 1; - $link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&label=all_".$server."_labels&stage=".$selectedStage."&plottype=".$plotType; + $link = "czartool_labels.php?pass=".$pass."&proj=".$proj."&mode=".$selectedMode."&label=all&stage=".$selectedStage."&plottype=".$plotType; echo "\n"; @@ -521,12 +516,35 @@ ########################################################################### # +# Creates a table title +# +########################################################################### +function createTableTitle($str, $colSpan) { + + global $headerColor; + echo ""; +} + +########################################################################### +# +# Creates a table header cell +# +########################################################################### +function createTableColumnHeader($str) { + + global $columnHeaderColor; + echo ""; +} + +########################################################################### +# # Creates table cell with a red background if an error # ########################################################################### -function createFormattedTableCell($showLink, $link, $str, $error) { +function createFormattedTableCell($showLink, $link, $str, $error, $color) { $fontColor = $error ? "black" : "blue"; if ($error) echo ""; @@ -640,10 +658,11 @@ function createDatesTable($db) { - echo "
"; - $link = "czartool_labels.php?pass=".$pass ."&proj=".$proj + ."&mode=".$selectedMode ."&label=".$selectedLabel ."&stage=all_stages" ."&plottype=".$plotType; - if ($selectedStage != "all_stages") echo ""; - else echo ""; - echo "Plot all stages | "; - $link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&label=all_".$server."_labels&stage=".$selectedStage."&plottype=".$plotType; - echo ""; - else echo ""; - echo "Plot all ".$server."_labels | "; - $plotTypeLink = ($plotType == "linear") ? "log" : "linear"; - $plotTypeText = ($plotType == "linear") ? "Use log plots" : "Use linear plots"; - $link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&label=" . $selectedLabel . "&stage=" . $selectedStage . "&revertstage=" . $stage . "&plottype=$plotTypeLink"; - echo "$plotTypeText"; - - - echo "
$server serverReverts:$label
Label (in order of priority)Label (in order of priority)
$distPub
$label

$str

$str

"; + else if ($color) echo ""; else echo ""; if ($showLink) echo "$str
\n"; + global $table; + echo $table; echo "\n"; - echo ""; + createTableTitle("Current dates for selected pantasks servers", 3); echo "\n"; - echo ""; - echo ""; + createTableColumnHeader("Server"); + createTableColumnHeader("Dates"); echo "\n"; @@ -691,14 +710,15 @@ # ########################################################################### -function createServersTable($pass, $proj, $db, $servers, $selectedLabel, $selectedStage, $plotType) { +function createServersTable($pass, $proj, $selectedMode, $db, $servers, $selectedLabel, $selectedStage, $plotType) { // set up table columns - echo "
Current dates for selected pantasks servers
ServerDates
\n"; + global $table; + echo $table; echo ""; - echo ""; + createTableTitle("Pantasks server status", 3); echo ""; - echo ""; - echo ""; - echo ""; + createTableColumnHeader("Server"); + createTableColumnHeader("Alive?"); + createTableColumnHeader("Running?"); //write_header_cell($class, "Server"); @@ -731,4 +751,5 @@ $link = "czartool_labels.php?pass=".$pass ."&proj=".$proj + ."&mode=".$selectedMode ."&server=".$server ."&label=".$selectedLabel @@ -740,7 +761,7 @@ //write_table_cell($class, '%s', "", $alive ? "yes" : "NO"); //echo ""; - createFormattedTableCell(1, $link, $server, 0); - createFormattedTableCell(0, "", $alive ? "yes" : "NO", !$alive); - createFormattedTableCell(0, "", $running ? "yes" : "NO", !$running); + createFormattedTableCell(1, $link, $server, 0, 0); + createFormattedTableCell(0, "", $alive ? "yes" : "NO", !$alive, 0); + createFormattedTableCell(0, "", $running ? "yes" : "NO", !$running, 0); //if ($alive) {
Pantasks server status
ServerAlive?Running?$server