Index: trunk/ippMonitor/raw/czartool_labels.php =================================================================== --- trunk/ippMonitor/raw/czartool_labels.php (revision 30760) +++ trunk/ippMonitor/raw/czartool_labels.php (revision 30908) @@ -58,11 +58,26 @@ if ($plotType == "") { $plotType = "linear"; } + +// header block +echo ""; +echo "

Czartool

"; +echo ""; + +// status table at top $nsStatus = getNightlyScienceStatus($czardb); $plotTypeLink = ($plotType == "linear") ? "log" : "linear"; $link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&label=" . $selectedLabel . "&stage=" . $selectedStage . "&revertstage=" . $stage . "&plottype=$plotTypeLink"; -echo "

Current ippMonitor SVN version: "; -include 'version.php'; -echo "

"; -echo "

Current status of the IPP as of $lastUpdateTime (faults are shown in parentheses).
Documentation can be found here and cluster load monitored here
Current nightly science status: $nsStatus
Use $plotTypeLink plots
Who uses the cluster?
IPP Metrics
Czar log pages
Exposure summary

"; +echo "\n"; +echo "\n"; +echo ""; +echo ""; +echo ""; +echo ""; +echo ""; +echo ""; +echo ""; +echo ""; +echo ""; +echo "
Time of last update$lastUpdateTime
ippMonitor SVN version"; include 'version.php'; echo "
Current nightly science status$nsStatus
Documentationhere
Cluster loadhere
Who's using the cluster?here
IPP metricshere
Czar log pageshere
Exposure summaryhere
\n"; // deal with reverts: turn on or off if requested and pass current revert state for this stage onto labels table later @@ -102,131 +117,131 @@ echo "\n"; - echo "\n"; - - - # 1st row - echo "\n"; +echo "
\n"; + + # 1st row + echo "\n"; + echo "\n"; + echo "\n"; + echo "
\n"; + echo "\n"; + echo "\n"; echo " \n"; - echo "\n"; - - - - # 2nd row - echo "\n"; - echo " \n"; - echo "\n"; - - - # 3rd row - echo "\n"; - echo " \n"; - echo "\n"; - - # 4th row - echo "\n"; - echo " \n"; - echo "\n"; - - # 5th row - echo "\n"; + # timeseries plot + echo "
"; + echo "\n"; echo " \n"; - echo "\n"; - - echo "
\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
\n"; - # timeseries plot - echo "
"; - echo "		\n"; - createLabelsTable($pass, - $proj, - $czardb, - "stdscience", - $stdsLabels, - $distLabels, - $pubLabels, - $stages, - $states, - "new", - $selectedLabel, - $selectedStage, - $plotType); - echo "
\n"; - echo "
\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
\n"; - # rate plot - echo "
"; - echo "		\n"; - createLabelsTable($pass, - $proj, - $czardb, - "update", - $updateLabels, - $distLabels, - $pubLabels, - $stages, - $states, - "new", - $selectedLabel, - $selectedStage, - $plotType); - echo "
\n"; - echo "
\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - - echo "\n"; - echo "\n"; - echo "
\n"; - # histogram plot - echo "
"; - echo "		\n"; - createServersTable($pass, $proj,$czardb, $servers, $selectedLabel, $selectedStage, $plotType); - echo " \n"; - $today = date("Y-m-d"); - createSummitDataTable($gpc1db, $today); - echo "
\n"; - echo "
\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
\n"; - # storage plot - echo "
"; - echo "		\n"; - createDatesTable($czardb); - echo "
\n"; - echo "
\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
\n"; - if ($selectedServer && !$serverCmd) showServerStatus($selectedServer); - echo "\n"; - # This is awful - echo ""; - echo ""; - echo ""; - 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); - showReplicationsStatus($REPL_HOST_PSTAMP, $REPL_USER_PSTAMP, $REPL_PASSWORD_PSTAMP, $REPL_DBNAME_PSTAMP); - echo "
Databases Replication Status
Update fix log here
DatabaseReplication Status
"; - echo "
\n"; - echo "
\n"; + createLabelsTable($pass, + $proj, + $czardb, + "stdscience", + $stdsLabels, + $distLabels, + $pubLabels, + $stages, + $states, + "new", + $selectedLabel, + $selectedStage, + $plotType); + echo "
\n"; + echo " \n"; + echo "\n"; + + # 2nd row + echo "\n"; + echo " \n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "
\n"; + # rate plot + echo "
"; + echo "		\n"; + createLabelsTable($pass, + $proj, + $czardb, + "update", + $updateLabels, + $distLabels, + $pubLabels, + $stages, + $states, + "new", + $selectedLabel, + $selectedStage, + $plotType); + echo "
\n"; + echo " \n"; + echo "\n"; + + + # 3rd row + echo "\n"; + echo " \n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + + echo "\n"; + echo "\n"; + echo "
\n"; + # histogram plot + echo "
"; + echo "		\n"; + createServersTable($pass, $proj,$czardb, $servers, $selectedLabel, $selectedStage, $plotType); + echo " \n"; + $today = date("Y-m-d"); + createSummitDataTable($gpc1db, $today); + echo "
\n"; + echo " \n"; + echo "\n"; + + # 4th row + echo "\n"; + echo " \n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "
\n"; + # storage plot + echo "
"; + echo "		\n"; + createDatesTable($czardb); + echo "
\n"; + echo " \n"; + echo "\n"; + + # 5th row + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "
\n"; + if ($selectedServer && !$serverCmd) showServerStatus($selectedServer); + echo "\n"; + # This is awful + echo "\n"; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + 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); + showReplicationsStatus($REPL_HOST_PSTAMP, $REPL_USER_PSTAMP, $REPL_PASSWORD_PSTAMP, $REPL_DBNAME_PSTAMP); + echo "
Database replication status (update fix log here)
DatabaseStatus
"; + echo "
\n"; + echo " \n"; + echo "\n"; + +echo "\n"; menu_end(); @@ -250,9 +265,11 @@ // set up the table - echo "\n"; - echo "\n"; - write_header_cell ("list", "Exposure type"); - write_header_cell ("list", "At summit"); - write_header_cell ("list", "Registered at MHPCC"); + echo "
\n"; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; $msg = "No science images taken since $date"; @@ -268,25 +285,26 @@ $qry2->fetchInto($mhpcc); - $class = "list"; - echo "\n"; - - if ($expType[0] == "OBJECT") { - if ($summit[0] == $mhpcc[0]) { - $msg = "All science exposures taken since $date
have been registered at MHPCC"; - } - else { - $msg = "Warning: Not all science exposures taken since $date
have been registered at MHPCC"; - } + echo ""; + + if ($summit[0] == $mhpcc[0]) { + + if ($expType[0] == "OBJECT") $msg = "All science exposures taken since $date
have been registered at MHPCC"; + $color = ""; } - - write_table_cell ($class, '%s', "", $expType[0]); - write_table_cell ($class, '%d', "", $summit[0]); - write_table_cell ($class, '%d', $link, $mhpcc[0]); - echo "\n"; - } - + else { + if ($expType[0] == "OBJECT") $msg = "Warning: Not all science exposures taken since $date
have been registered at MHPCC"; + $color = "red"; + } + + echo ""; + echo ""; + + echo ""; + + echo ""; + } + + echo ""; echo "
Status of last night's data
Exposure typeAt summitRegistered at MHPCC
$expType[0]$summit[0]$mhpcc[0]
$msg
\n"; - - echo "

$msg

"; } @@ -331,14 +349,36 @@ $selectedLabel, $selectedStage, $plotType) { - // set up table columns - $class = "list"; - echo "\n"; - echo "\n"; - - echo "

Current labels for $server server (D=distributing, P=publishing)

"; - - write_header_cell($class, ""); - write_header_cell($class, ""); - write_header_cell($class, "Reverts:"); + // setup table + echo "
\n"; + echo "\n"; + echo ""; + echo "\n"; + + echo "\n"; + //echo ""; + echo ""; + echo ""; + foreach ($stages as &$stage) { @@ -357,38 +397,28 @@ if($reverting) {$label = "Stop";$link = $link . "off";} unset($reverting); - write_table_cell($class, '%s', $link, $label); - } - write_header_cell($class, ""); - - echo "\n"; - echo "\n"; - write_header_cell($class, " "); - write_header_cell($class, "Label (in order of priority)"); + echo ""; + + } + + echo "\n"; + echo "\n"; + //echo ""; + echo ""; foreach ($stages as &$stage) { - if ($stage == $selectedStage) $link = ""; - else $link = + if ($stage == $selectedStage) $showLink = 0; + else $showLink = 1; + $link = "czartool_labels.php?pass=".$pass - ."&proj=".$proj - ."&label=".$selectedLabel - ."&stage=".$stage - ."&plottype=".$plotType; - - write_table_cell($class, '%s', $link, $stage); - } - - if ($selectedStage=="all_stages") $link = ""; - else $link = - "czartool_labels.php?pass=".$pass - ."&proj=".$proj + ."&proj=".$proj ."&label=".$selectedLabel - ."&stage=all_stages" + ."&stage=".$stage ."&plottype=".$plotType; - write_table_cell($class, '%s', $link, "All stages"); - - echo "\n"; - echo "\n"; - + createLabelTableCell($showLink, $link, $stage); + } + + + // setup default link $defaultlink = "czartool_labels.php?pass=".$pass @@ -415,20 +445,21 @@ } - // create link to label summary page for each label - if ($thisLabel == $selectedLabel) $link = ""; - else $link = - "czartool_labels.php?pass=".$pass - ."&proj=".$proj - ."&label=".$thisLabel - ."&stage=".$selectedStage - ."&plottype=".$plotType; - - echo "\n"; - $distPub = " "; + // show distribution/publishing status + echo "\n"; + $distPub = " "; if ($distributing) $distPub = "D"; if ($publishing) $distPub = $distPub . "P"; - write_table_cell($class, '%s', "", $distPub); - - write_table_cell($class, '%s', $link, $thisLabel); + echo ""; + + // create link to label summary page for each label + if ($thisLabel == $selectedLabel) $showLink = 0; + else $showLink = 1; + $link = + "czartool_labels.php?pass=".$pass + ."&proj=".$proj + ."&label=".$thisLabel + ."&stage=".$selectedStage + ."&plottype=".$plotType; + createLabelTableCell($showLink, $link, $thisLabel); $str = ""; @@ -437,54 +468,64 @@ $link = $defaultlink; getStateAndFaults($db, $thisLabel, $selectedState, "burntool", $str, $anyFaults); - write_table_cell($class, '%s', $anyFaults ? $link : "", $str); + createLabelTableCell($anyFaults, $link, $str); $link = "failedChipProcessedImfile.php?pass=" . $pass . "&proj=" . $proj . "&chipRun.label=" . $thisLabel . "&chipRun.state=".$searchState; getStateAndFaults($db, $thisLabel, $selectedState, "chip", $str, $anyFaults); - write_table_cell($class, '%s', $anyFaults ? $link : "", $str); + createLabelTableCell($anyFaults, $link, $str); $link = "failedCamProcessedExp.php?pass=" . $pass . "&proj=" . $proj . "&camRun.label=" . $thisLabel . "&camRun.state=".$searchState; getStateAndFaults($db, $thisLabel, $selectedState, "cam", $str, $anyFaults); - write_table_cell($class, '%s', $anyFaults ? $link : "", $str); + createLabelTableCell($anyFaults, $link, $str); $link = "failedFakeProcessedImfile.php?pass=" . $pass . "&proj=" . $proj . "&fakeRun.label=" . $thisLabel . "&fakeRun.state=".$searchState; getStateAndFaults($db, $thisLabel, $selectedState, "fake", $str, $anyFaults); - write_table_cell($class, '%s', $anyFaults ? $link : "", $str); + createLabelTableCell($anyFaults, $link, $str); $link = "failedWarpSkyfiles.php?pass=" . $pass . "&proj=" . $proj . "&warpRun.label=" . $thisLabel . "&warpRun.state=".$searchState; getStateAndFaults($db, $thisLabel, $selectedState, "warp", $str, $anyFaults); - write_table_cell($class, '%s', $anyFaults ? $link : "", $str); + createLabelTableCell($anyFaults, $link, $str); $link = "failedStackSkyfile.php?pass=" . $pass . "&proj=" . $proj . "&stackRun.label=" . $thisLabel . "&stackRun.state=".$searchState; getStateAndFaults($db, $thisLabel, $selectedState, "stack", $str, $anyFaults); - write_table_cell($class, '%s', $anyFaults ? $link : "", $str); + createLabelTableCell($anyFaults, $link, $str); $link = "failedDiffSkyfile.php?pass=" . $pass . "&proj=" . $proj . "&diffRun.label=" . $thisLabel . "&diffRun.state=".$searchState; getStateAndFaults($db, $thisLabel, $selectedState, "diff", $str, $anyFaults); - write_table_cell($class, '%s', $anyFaults ? $link : "", $str); + createLabelTableCell($anyFaults, $link, $str); $link = $defaultlink; getStateAndFaults($db, $thisLabel, $selectedState, "magic", $str, $anyFaults); - write_table_cell($class, '%s', $anyFaults ? $link : "", $str); + createLabelTableCell($anyFaults, $link, $str); $link = $defaultlink; getStateAndFaults($db, $thisLabel, $selectedState, "magicDS", $str, $anyFaults); - write_table_cell($class, '%s', $anyFaults ? $link : "", $str); + createLabelTableCell($anyFaults, $link, $str); $link = $defaultlink; getStateAndFaults($db, $thisLabel, $selectedState, "dist", $str, $anyFaults); - write_table_cell($class, '%s', $anyFaults ? $link : "", $str); + createLabelTableCell($anyFaults, $link, $str); echo "\n"; } - if ($selectedLabel == "all_".$server."_labels") $link = ""; - else $link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&label=all_".$server."_labels&stage=".$selectedStage."&plottype=".$plotType; - - echo "\n"; - write_table_cell($class, '%s', "", " "); - write_table_cell($class, '%s', $link, "All $server labels"); + if ($selectedLabel == "all_".$server."_labels") $showLink = 0; + else $showLink = 1; + $link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&label=all_".$server."_labels&stage=".$selectedStage."&plottype=".$plotType; echo "\n"; echo "
"; + + $link = "czartool_labels.php?pass=".$pass + ."&proj=".$proj + ."&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)
$distPub
\n"; +} + + +########################################################################### +# +# Creates table cell for lable table +# +########################################################################### +function createLabelTableCell($showLink, $link, $str) { + + if ($showLink) echo "$str"; + else if ($str) echo "$str"; + else echo " "; } @@ -594,9 +635,10 @@ function createDatesTable($db) { - $class = "list"; - echo "\n"; - echo "\n"; - write_header_cell($class, "Server"); - write_header_cell($class, "Dates"); + echo "
\n"; + echo "\n"; + echo ""; + echo "\n"; + echo ""; + echo ""; echo "\n"; @@ -632,9 +674,8 @@ } - $class = "list"; - echo "\n"; - write_table_cell($class, '%s', "", $server); - write_table_cell($class, '%s', "", $dates); - echo "\n"; + echo ""; + echo ""; + echo ""; + echo ""; } @@ -648,27 +689,32 @@ // set up table columns - $class = "list"; - echo "
Current dates for selected pantasks servers
ServerDates
$server$dates
\n"; - echo "\n"; - write_header_cell($class, "Server"); - write_header_cell($class, "Alive?"); - $link = "czartool_labels.php?pass=".$pass - ."&proj=".$proj - ."&label=".$selectedLabel - ."&stage=".$selectedStage - ."&plottype=".$plotType - ."&allservercmd=stop"; - - $link = ""; # TODO removed links temporarily - write_table_cell($class, '%s', $link, "Stop all"); - $link = "czartool_labels.php?pass=".$pass - ."&proj=".$proj - ."&label=".$selectedLabel - ."&stage=".$selectedStage - ."&plottype=".$plotType - ."&allservercmd=run"; - - $link = ""; # TODO removed links temporarily - write_table_cell($class, '%s', $link, "Run all"); + echo "
\n"; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + + //write_header_cell($class, "Server"); + //write_header_cell($class, "Alive?"); + //$link = "czartool_labels.php?pass=".$pass + // ."&proj=".$proj + // ."&label=".$selectedLabel + // ."&stage=".$selectedStage + // ."&plottype=".$plotType + // ."&allservercmd=stop"; + + //$link = ""; # TODO removed links temporarily + // write_table_cell($class, '%s', $link, "Stop all"); + //$link = "czartool_labels.php?pass=".$pass + // ."&proj=".$proj + // ."&label=".$selectedLabel + // ."&stage=".$selectedStage + // ."&plottype=".$plotType + // ."&allservercmd=run"; + + //$link = ""; # TODO removed links temporarily + // write_table_cell($class, '%s', $link, "Run all"); echo "\n"; @@ -677,5 +723,5 @@ getServerStatus($db, $server, $alive, $running); - echo "\n"; + echo "\n"; $link = "czartool_labels.php?pass=".$pass ."&proj=".$proj @@ -686,37 +732,44 @@ #$link = ""; # TODO removed links temporarily - write_table_cell($class, '%s', $link, $server); - write_table_cell($class, '%s', "", $alive ? "yes" : "NO"); - - if ($alive) { - - $link = "czartool_labels.php?pass=".$pass - ."&proj=".$proj - ."&label=".$selectedLabel - ."&stage=".$selectedStage - ."&plottype=".$plotType - ."&server=".$server - ."&servercmd="; - - if ($running) { - - $link = $link . "stop"; - $link = ""; # TODO removed links temporarily - write_table_cell($class, '%s', $link, "stop"); - write_table_cell($class, '%s', "", ""); - } - else { - - $link = $link . "run"; - write_table_cell($class, '%s', "", ""); - $link = ""; # TODO removed links temporarily - write_table_cell($class, '%s', $link, "run"); - } - } - else { - - write_table_cell($class, '%s', "", ""); - write_table_cell($class, '%s', "", ""); - } + //write_table_cell($class, '%s', $link, $server); + //write_table_cell($class, '%s', "", $alive ? "yes" : "NO"); + echo ""; + $yesNo = $alive ? "yes" : "NO"; + $color = $alive ? "" : "red"; + echo ""; + $yesNo = $running ? "yes" : "NO"; + $color = $running ? "" : "red"; + echo ""; + + //if ($alive) { + + // $link = "czartool_labels.php?pass=".$pass + // ."&proj=".$proj + // ."&label=".$selectedLabel + // ."&stage=".$selectedStage + // ."&plottype=".$plotType + // ."&server=".$server + // ."&servercmd="; + + //if ($running) { + + // $link = $link . "stop"; + // $link = ""; # TODO removed links temporarily + // write_table_cell($class, '%s', $link, "stop"); + // write_table_cell($class, '%s', "", ""); + // } + // else { + + // $link = $link . "run"; + // write_table_cell($class, '%s', "", ""); + // $link = ""; # TODO removed links temporarily + // write_table_cell($class, '%s', $link, "run"); + // } + // } + // else { + + // write_table_cell($class, '%s', "", ""); + // write_table_cell($class, '%s', "", ""); + // } echo "\n"; } @@ -822,5 +875,9 @@ $dbRepl = DB::connect("mysql://$replUser:$replPassword@$replHost"); if (PEAR::isError($dbRepl)) { - die("MySQL DB connection error: Check the configuration for $replDatabaseName"); + echo ""; + //die("MySQL DB connection error: Check the configuration for $replDatabaseName"); + die(""); + return; + } $res = $dbRepl->query('SHOW SLAVE STATUS');
Pantasks server status
ServerAlive?Running?
$server$yesNo$yesNo
$replDatabaseNameMySQL DB connection error - check configuration