Index: trunk/ippMonitor/INSTALL =================================================================== --- trunk/ippMonitor/INSTALL (revision 41134) +++ trunk/ippMonitor/INSTALL (revision 41135) @@ -12,23 +12,25 @@ # testing of those parts of ippMonitor which depend on IPP code without modifyin # the operational installation -# 2019.11.18 CCL: which parts of ippMonitor depends on IPP codes? If there is not many +# 2019.11.18 CCL: not sure which parts of ippMonitor depends on IPP codes? If there is not many # , just use trunk version should work fine. psconfig ipp-trunk-20180515 -# run psconfigure to generate Makefile and raw/site.php (site.php.in includes CZARPLOTDIR now) +# run psconfigure to generate Makefile and raw/site.php +# $CZARPLOTDIR and $METRICSPLOTDIR will be generated a link in the same folder as ippMonitor psconfigure --htdocs /var/www/localhost/htdocs --site ~/ippconfig/ippmonitor.config -# copy these files and modify them +# copy these files and modify them (CCL removed CZARPLOTDIR) cp config.dat.in config.dat -# for czarpool.pl, the path needs to be defined. -cp czartool/czarconfig.xml.in czartool/czarconfig.xml -# then set gnuplot path /export/ipp113.0/ipp/czartool_plots --> for ipp113 -# ipp117 is set to be rsynced in crontab regularly from ipp113's path, -# so need to remove crontab if czarpool.pl is under development -# then set gnuplot path /export/ipp117.0/ipp/czartool_plots --> for ipp117 - # install the php code: +# czartool_plots and ippMetrics will be linked to different path in different hostnames make +# for running czarpool.pl, +cp czartool/czarconfig.xml.in czartool/czarconfig.xml +# then set gnuplot path for czartool_plots and ippMetrics in ippMonitor dir +# /var/www/localhost/htdocs/ippMonitor/czartool_plots +# /var/www/localhost/htdocs/ippMonitor/ippMetrics +# enter czartool +./czarpool.pl Index: trunk/ippMonitor/Makefile.in =================================================================== --- trunk/ippMonitor/Makefile.in (revision 41134) +++ trunk/ippMonitor/Makefile.in (revision 41135) @@ -1,3 +1,3 @@ -default: updateVersion php +default: updateVersion php mklink help: @echo "USAGE: make php" @@ -9,4 +9,6 @@ DESTBIN = @BINDIR@ DESTWWW = @HTDOCS@/ippMonitor +CZARPLOTDIR = /export/@HOST2@.0/ipp/czartool_plots +METRICSPLOTDIR = /export/@HOST2@.0/ipp/ippMetrics GENERATE = $(SCRIPTS)/generate @@ -173,4 +175,5 @@ $(DESTWWW)/fullforceSummary.php \ $(DESTWWW)/fullforce_failure.php \ +$(DESTWWW)/failedFullforce.php \ $(DESTWWW)/diffSummary.php \ $(DESTWWW)/diffSummary_Images.php \ @@ -281,6 +284,9 @@ DESTLINK = $(DESTWWW)/index.php - -php: $(RAWSRC) $(DEFSRC) $(PICTURES) $(DESTLINK) $(PROGRAMS) +CZPLOTSLINK = $(DESTWWW)/czartool_plots +METRICSLINK = $(DESTWWW)/ippMetrics + + +php: $(RAWSRC) $(DEFSRC) $(PICTURES) $(DESTLINK) $(PROGRAMS) # dependancy rules for binary code ######################### @@ -311,6 +317,18 @@ updateVersion: rm -f $(DESTWWW)/version.php - -test: + @if [ ! -d $(CZARPLOTDIR) ]; then mkdir -p $(CZARPLOTDIR); fi + @if [ ! -d $(METRICSPLOTDIR) ]; then mkdir -p $(METRICSPLOTDIR); fi + +mklink: $(CZPLOTSLINK) $(METRICSLINK) + +$(CZPLOTSLINK): $(CZARPLOTDIR) + rm -f $@ + ln -s $(CZARPLOTDIR) $@ + +$(METRICSLINK): $(METRICSPLOTDIR) + rm -f $@ + ln -s $(METRICSPLOTDIR) $@ + +test: #DESTWWW := $(DESTWWW)/test echo $(DESTWWW) @@ -355,4 +373,7 @@ cp $(SCRIPTS)/$* $(DESTBIN)/$* || exit chmod +x $(DESTBIN)/$* || exit + + + # utilities ################################################# Index: trunk/ippMonitor/def/failedFullforce.d =================================================================== --- trunk/ippMonitor/def/failedFullforce.d (revision 41135) +++ trunk/ippMonitor/def/failedFullforce.d (revision 41135) @@ -0,0 +1,26 @@ +TABLE fullForceInput JOIN warpRun USING (warp_id) JOIN fullForceRun USING (ff_id) JOIN fullForceResult USING (ff_id) +TITLE Full Force Failed +FILE failedFullforce.php +MENU ipp.ffs.dat + +ARGS ARG1 fullForceRun.ff_id=$fullForceRun.ff_id +ARGS ARG1 basename=$fullForceResult.path_base + +WHERE fullForceResult.fault != 0 +# field size format name show link to extras +FIELD fullForceRun.ff_id, 5, %d, FF ID +FIELD fullForceRun.label, 7, %s, Label +FIELD fullForceRun.state, 7, %s, State, value, failedFullforce.php, ARG1 +FIELD warpRun.tess_id, 5, %s, Tess ID +FIELD warpRun.label AS warpRunLabel, 5, %s, warp Label +FIELD fullForceRun.data_group, 7, %s, data grp +FIELD fullForceRun.dist_group, 7, %s, dist grp +FIELD fullForceResult.fault, 7, %d, fault +FIELD fullForceResult.quality, 7, %d, quality +FIELD fullForceResult.path_base, 7, %s, path_base, none + +MODE summary +GROUP fullForceRun.ff_id + +TAIL PHP insert_log ('LOG.EXP'); + Index: trunk/ippMonitor/raw/czartool_labels.php =================================================================== --- trunk/ippMonitor/raw/czartool_labels.php (revision 41134) +++ trunk/ippMonitor/raw/czartool_labels.php (revision 41135) @@ -214,105 +214,176 @@ echo ""; -#echo "
"; +///////////////////////////////////////// +// timer begin for status and links +///////////////////////////////////////// +$time = microtime(); +$time = explode(' ', $time); +$time = $time[1] + $time[0]; +$start = $time; // status table at top $nsStatus = getNightlyScienceStatus($czardb, $proj); $plotTypeLink = ($plotType == "linear") ? "log" : "linear"; -$link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&label=" . $selectedLabel . "&stage=" . $selectedStage . "&revertstage=" . $stage . "&plottype=$plotTypeLink"; +$link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&label=" . $selectedLabel . + "&stage=" . $selectedStage . "&revertstage=" . $stage . "&plottype=$plotTypeLink"; + echo "
"; echo $table; - -createTableTitle("Status and links", 3); +createTableTitle("Status and links", 2); echo "\n"; -echo "Time of last update$lastUpdateTime"; -echo "ippMonitor SVN version"; include 'version.php'; echo ""; -echo "Current nightly science status$nsStatus"; -echo "Postage stamp server statushere"; -echo "Documentationhere"; -echo "Cluster loadhere cpu_report mem_report"; -echo "IPP metricshere"; -echo "Czar log pageshere"; -echo "Exposure summaryhere"; -echo "Confluencehere"; -echo "JIRAhere"; +echo "Time of last update + $lastUpdateTime"; +echo "ippMonitor SVN version + "; include 'version.php'; echo ""; +echo "Current nightly science status + $nsStatus"; +echo "Postage stamp server status + here"; +echo "Documentation + here"; +echo "Cluster load + + here + + cpu_report + + mem_report"; +echo "IPP metrics + here"; +echo "Czar log pages + here"; +echo "Exposure summary + here"; +echo "Confluence + here"; +echo "JIRA + here"; +echo "data store + here"; $plotTypeLink = ($plotType == "linear") ? "log" : "linear"; -$link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&mode=" . $selectedMode . "&label=" . $selectedLabel . "&stage=" . $selectedStage . "&revertstage=" . $stage . "&plottype=$plotTypeLink"; - -echo "\n"; - -echo "
"; - - createLabelsTable($pass, - $proj, - $czardb, - $selectedMode, - $labels, - $distLabelsExist, - $pubLabelsExist, - $stages, - "new", - $selectedLabel, - $selectedStage, - $plotType); - - if ($selectedMode == "update") {echo "
"; createPStampDataTable();} - echo "
"; - - # XXX EAM : 2017.09.17 : debugging slowness - createServersTable($pass, $proj,$selectedMode,$czardb, $servers, $selectedLabel, $selectedStage, $plotType); echo "
"; - createSummitDataTable($projectdb); echo "
"; // this is slow because of the join between summitExp and rawExp - createChunkDataTable($projectdb); echo "
"; - createDatesTable($czardb, $proj); echo "
"; - - echo $table; - echo ""; - createTableTitle("Database status (update fix log here)", 2); - - echo ""; - createTableColumnHeader("Database"); - createTableColumnHeader("Status (sec behind master)"); - showDatabaseStatus($HOST_GPC1, $USER_GPC1, $PASSWORD_GPC1, $DBNAME_GPC1); - showReplicationsStatus($REPL_HOST_GPC1, $REPL_USER_GPC1, $REPL_PASSWORD_GPC1, $REPL_DBNAME_GPC1); - showReplicationsStatus($REPL_HOST_GPC1_SECONDARY, $REPL_USER_GPC1_SECONDARY, $REPL_PASSWORD_GPC1_SECONDARY, $REPL_DBNAME_GPC1_SECONDARY); - - echo ""; - - showDatabaseStatus($HOST_NEBULOUS, $USER_NEBULOUS, $PASSWORD_NEBULOUS, $DBNAME_NEBULOUS); - showReplicationsStatus($REPL_HOST_NEBULOUS, $REPL_USER_NEBULOUS, $REPL_PASSWORD_NEBULOUS, $REPL_DBNAME_NEBULOUS); - showReplicationsStatus($REPL_HOST_NEBULOUS_SECONDARY, $REPL_USER_NEBULOUS_SECONDARY, $REPL_PASSWORD_NEBULOUS_SECONDARY, $REPL_DBNAME_NEBULOUS_SECONDARY); - showReplicationsStatus($REPL_HOST_DATASTORE_SECONDARY, $REPL_USER_DATASTORE_SECONDARY, $REPL_PASSWORD_DATASTORE_SECONDARY, $REPL_DBNAME_DATASTORE_SECONDARY); - -# some mysql replication slaves to add when they are returned to service -# showReplicationsStatus($REPL_HOST_PSTAMP, $REPL_USER_PSTAMP, $REPL_PASSWORD_PSTAMP, $REPL_DBNAME_PSTAMP); -# showReplicationsStatus($REPL_HOST_ISP, $REPL_USER_ISP, $REPL_PASSWORD_ISP, $REPL_DBNAME_ISP); - echo ""; - - echo $table; - echo ""; - createTableTitle("Critical machine status", 2); - - echo ""; - createTableColumnHeader("Hostname"); - createTableColumnHeader("Status"); - showPingStatus($HOST_GATEWAY, $DBNAME_GATEWAY); - showPingStatus($HOST_GATEWAY_SECONDARY, $DBNAME_GATEWAY_SECONDARY); - -# showPingStatus($HOST_APACHE1, $DBNAME_APACHE1); - showPingStatus($HOST_APACHE2, $DBNAME_APACHE2); - showPingStatus($HOST_APACHE3, $DBNAME_APACHE3); - showPingStatus($HOST_APACHE4, $DBNAME_APACHE4); - showPingStatus($HOST_APACHE5, $DBNAME_APACHE5); - showPingStatus($HOST_APACHE6, $DBNAME_APACHE6); - showPingStatus($HOST_APACHE7, $DBNAME_APACHE7); - showPingStatus($HOST_PROXY, $DBNAME_PROXY); - showPingStatus($HOST_SVN, $DBNAME_SVN); - showPingStatus($HOST_CONFLUENCE, $DBNAME_CONFLUENCE); - - echo ""; - -echo ""; +$link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&mode=" . $selectedMode . + "&label=" . $selectedLabel . "&stage=" . $selectedStage . "&revertstage=" . $stage . "&plottype=$plotTypeLink"; + +// timer finished +echo ""; +$time = microtime(); +$time = explode(' ', $time); +$time = $time[1] + $time[0]; +$finish = $time; +$total_time = round(($finish - $start), 3); +echo "loading in $total_time seconds."; +echo ""; +echo "
"; + +createLabelsTable($pass, $proj, $czardb, $selectedMode, $labels, + $distLabelsExist, $pubLabelsExist, $stages, "new", $selectedLabel, + $selectedStage, $plotType); +if ($selectedMode == "update") {echo "
"; createPStampDataTable();} + +# XXX EAM : 2017.09.17 : debugging slowness +# CCL : 2019.11.09 : debugging slowness +//createSummitDataTable($projectdb); // this is slow because of the join between summitExp and rawExp, but not the major one +createSummitDataTable2($projectdb); // this is slow because of the join between summitExp and rawExp, but not the major one + +createServersTable($pass, $proj,$selectedMode,$czardb, $servers, $selectedLabel, $selectedStage, $plotType); +// this was the major slowness part due to large table in czardb + +createChunkDataTable($projectdb); // this is another part for slowness during nightly processing + +createDatesTable($czardb, $proj); + +///////////////////////////////////////// +// timer begin for Database status +///////////////////////////////////////// +$time = microtime(); +$time = explode(' ', $time); +$time = $time[1] + $time[0]; +$start = $time; + +// status table at top + echo $table; + echo ""; + createTableTitle("Database status (update fix log here)", 2); + + echo ""; + createTableColumnHeader("Database"); + createTableColumnHeader("Status (sec behind master)"); + showDatabaseStatus($HOST_GPC1, $USER_GPC1, $PASSWORD_GPC1, $DBNAME_GPC1); + showReplicationsStatus($REPL_HOST_GPC1, $REPL_USER_GPC1, $REPL_PASSWORD_GPC1, $REPL_DBNAME_GPC1); + showReplicationsStatus($REPL_HOST_GPC1_SECONDARY, $REPL_USER_GPC1_SECONDARY, $REPL_PASSWORD_GPC1_SECONDARY, $REPL_DBNAME_GPC1_SECONDARY); + + echo ""; + showDatabaseStatus($HOST_NEBULOUS, $USER_NEBULOUS, $PASSWORD_NEBULOUS, $DBNAME_NEBULOUS); + showReplicationsStatus($REPL_HOST_NEBULOUS, $REPL_USER_NEBULOUS, $REPL_PASSWORD_NEBULOUS, $REPL_DBNAME_NEBULOUS); + showReplicationsStatus($REPL_HOST_NEBULOUS_SECONDARY, $REPL_USER_NEBULOUS_SECONDARY, $REPL_PASSWORD_NEBULOUS_SECONDARY, $REPL_DBNAME_NEBULOUS_SECONDARY); + showReplicationsStatus($REPL_HOST_DATASTORE_SECONDARY, $REPL_USER_DATASTORE_SECONDARY, $REPL_PASSWORD_DATASTORE_SECONDARY, $REPL_DBNAME_DATASTORE_SECONDARY); + +// some mysql replication slaves to add when they are returned to service +// showReplicationsStatus($REPL_HOST_PSTAMP, $REPL_USER_PSTAMP, $REPL_PASSWORD_PSTAMP, $REPL_DBNAME_PSTAMP); +// showReplicationsStatus($REPL_HOST_ISP, $REPL_USER_ISP, $REPL_PASSWORD_ISP, $REPL_DBNAME_ISP); + +// timer finished +echo ""; +$time = microtime(); +$time = explode(' ', $time); +$time = $time[1] + $time[0]; +$finish = $time; +$total_time = round(($finish - $start), 3); +echo "loading in $total_time seconds."; +echo ""; +echo "
"; + +///////////////////////////////////////// +// timer begin for critical machines +///////////////////////////////////////// +$time = microtime(); +$time = explode(' ', $time); +$time = $time[1] + $time[0]; +$start = $time; + +// status table at top + $PingStatus = "DOWN"; + echo $table; + echo ""; + createTableTitle("Critical machine status", 3); + + echo ""; + createTableColumnHeader("Hostname"); + createTableColumnHeader("Status"); + createTableColumnHeader("Loading time"); + showPingStatus($HOST_GATEWAY, $DBNAME_GATEWAY); + showPingStatus($HOST_GATEWAY_SECONDARY, $DBNAME_GATEWAY_SECONDARY); + showPingStatus($HOST_APACHE1, $DBNAME_APACHE1); + showPingStatus($HOST_APACHE2, $DBNAME_APACHE2); + showPingStatus($HOST_APACHE3, $DBNAME_APACHE3); + showPingStatus($HOST_APACHE4, $DBNAME_APACHE4); + showPingStatus($HOST_APACHE5, $DBNAME_APACHE5); + showPingStatus($HOST_APACHE6, $DBNAME_APACHE6); + showPingStatus($HOST_APACHE7, $DBNAME_APACHE7); + showPingStatus($HOST_APACHE8, $DBNAME_APACHE8); +// echo "ippc70 (apache node) $PingStatus 0 seconds "; // comment out if ippc70 is back + showPingStatus($HOST_PROXY, $DBNAME_PROXY); + showPingStatus($HOST_SVN, $DBNAME_SVN); + showPingStatus($HOST_CONFLUENCE, $DBNAME_CONFLUENCE); + +// timer finished +echo ""; +$time = microtime(); +$time = explode(' ', $time); +$time = $time[1] + $time[0]; +$finish = $time; +$total_time = round(($finish - $start), 3); +echo "loading in $total_time seconds."; +echo ""; +echo "
"; + + menu_end(); + +############################################################################# +############################# Functions Below ############################# +############################################################################# ########################################################################### @@ -361,90 +432,4 @@ } -########################################################################### -# -# Creates a table of summitExp against rawExp -# -########################################################################### -function createSummitDataTable($projectdb) { - - $date = date("Y-m-d"); - $sql = "SELECT DISTINCT exp_type FROM summitExp WHERE dateobs > '$date'"; - - $qry = $projectdb->query($sql); - if (dberror($qry)) { - echo "error reading newExp table
\n"; - echo "
table query : $sql
\n"; - menu_end(); - } - - // set up the table - global $table; - echo $table; - echo ""; - createTableTitle("Status of last night's data", 4); - echo ""; - createTableColumnHeader("Exposure type"); - createTableColumnHeader("At summit"); - createTableColumnHeader("Registered at MHPCC"); - createTableColumnHeader("At summit (Dropped)"); - - $msg = "No science images taken since $date"; - - // list the results - while ($qry->fetchInto($expType)) { - - $sql = "SELECT COUNT(*) FROM summitExp left join pzDownloadExp using (summit_id) WHERE dateobs > '$date' AND exp_type = '$expType[0]' and (state != 'drop' or state is null) and fault != 1042"; -# $sql = "SELECT COUNT(*) FROM summitExp WHERE dateobs > '$date' AND exp_type = '$expType[0]'"; - $qry2 = $projectdb->query($sql); - $qry2->fetchInto($summit); - - - $sql = "SELECT COUNT(*) FROM summitExp JOIN rawExp ON summitExp.exp_name = rawExp.exp_name WHERE summitExp.dateobs > '$date' AND rawExp.dateobs > '$date' AND summitExp.exp_type = '$expType[0]'"; - $qry2 = $projectdb->query($sql); - $qry2->fetchInto($mhpcc); - - $sql = "SELECT COUNT(*) FROM summitExp join pzDownloadExp using (summit_id) WHERE dateobs > '$date' AND exp_type = '$expType[0]' and state = 'drop'"; - $qry2 = $projectdb->query($sql); - $qry2->fetchInto($dropped); - - - #Query with 30 minutes delay to check during the night if any exposures are missing. - $datehour = gmdate("Y-m-d H:i:s"); - $sql = "SELECT COUNT(*) FROM summitExp left join pzDownloadExp using (summit_id) WHERE dateobs > '$date' AND dateobs <= date_sub('$datehour', interval 30 minute) AND exp_type = '$expType[0]' and (state != 'drop' or state is null) and fault != 1042"; - $qry2 = $projectdb->query($sql); - $qry2->fetchInto($summitdelay); - - $sql = "SELECT COUNT(*) FROM summitExp JOIN rawExp ON summitExp.exp_name = rawExp.exp_name WHERE summitExp.dateobs > '$date' AND summitExp.dateobs <= date_sub('$datehour', interval 30 minute) AND rawExp.dateobs > '$date' AND summitExp.exp_type = '$expType[0]'"; - $qry2 = $projectdb->query($sql); - $qry2->fetchInto($mhpccdelay); - - echo ""; - - $DLdiff = $summit[0] - $mhpcc[0]; - if ($DLdiff == 0) $error = 0; - else $error = 1; - - $delayDLdiff = $summitdelay[0] - $mhpccdelay[0]; - if ($delayDLdiff == 0) $errordelay = 0; - else $errordelay = 1; - - echo "$expType[0]"; - echo "$summit[0]"; - #createFormattedTableCell("", "", $mhpcc[0], $error, 0); - if ($delayDLdiff==0) { - createFormattedTableCell("", "", $mhpcc[0], $error, 0); - } else { - $DLStatus = "$mhpcc[0] ($delayDLdiff)"; - echo "$DLStatus"; - } - - echo "$dropped[0]"; - - echo ""; - } - - echo "\n"; - -} ########################################################################### @@ -455,4 +440,11 @@ function createChunkDataTable($projectdb) { + // timer start + $time = microtime(); + $time = explode(' ', $time); + $time = $time[1] + $time[0]; + $start = $time; + + // function begin #First find the reference exposure ID to speed up the subsequent queries $date = gmdate("Y-m-d"); @@ -634,4 +626,16 @@ echo ""; } + + + // timer finished + echo ""; + $time = microtime(); + $time = explode(' ', $time); + $time = $time[1] + $time[0]; + $finish = $time; + $total_time = round(($finish - $start), 3); + echo "loading in $total_time seconds."; + $start= $finish; + echo ""; echo "
"; @@ -676,4 +680,11 @@ $selectedLabel, $selectedStage, $plotType) { + // timer start + $time = microtime(); + $time = explode(' ', $time); + $time = $time[1] + $time[0]; + $start = $time; + + // function begin $isUpdate = ($selectedMode == "update"); global $headerColor; @@ -799,5 +810,16 @@ echo "\n"; - echo "\n"; + + // timer finished + echo ""; + $time = microtime(); + $time = explode(' ', $time); + $time = $time[1] + $time[0]; + $finish = $time; + $total_time = round(($finish - $start), 3); + echo "loading in $total_time seconds."; + $start= $finish; + echo ""; + echo "
"; } @@ -947,4 +969,11 @@ function createDatesTable($db, $proj) { + // timer start + $time = microtime(); + $time = explode(' ', $time); + $time = $time[1] + $time[0]; + $start = $time; + + // function begin global $table; echo $table; @@ -959,5 +988,16 @@ createServerDateRow($db, $proj, "registration"); - echo "\n"; + // timer finished + echo ""; + $time = microtime(); + $time = explode(' ', $time); + $time = $time[1] + $time[0]; + $finish = $time; + $total_time = round(($finish - $start), 3); + echo "loading in $total_time seconds."; + $start= $finish; + echo ""; + echo "
"; + } @@ -1001,4 +1041,11 @@ function createServersTable($pass, $proj, $selectedMode, $db, $servers, $selectedLabel, $selectedStage, $plotType) { + // timer start + $time = microtime(); + $time = explode(' ', $time); + $time = $time[1] + $time[0]; + $start = $time; + + // function begin // set up table columns global $table; @@ -1087,5 +1134,15 @@ } - echo "\n"; + // timer finished + echo ""; + $time = microtime(); + $time = explode(' ', $time); + $time = $time[1] + $time[0]; + $finish = $time; + $total_time = round(($finish - $start), 3); + echo "loading in $total_time seconds."; + $start= $finish; + echo ""; + echo "
\n"; } @@ -1129,5 +1186,6 @@ function getServerStatus($db,$proj, $server, &$alive, &$running) { - $sql = "SELECT alive, running FROM science_servers WHERE server LIKE '$server' AND telescope LIKE '$proj' ORDER BY timestamp DESC LIMIT 1"; +# $sql = "SELECT alive, running FROM science_servers WHERE server LIKE '$server' AND telescope LIKE '$proj' ORDER BY timestamp DESC LIMIT 1"; + $sql = "SELECT alive, running FROM live_servers WHERE server LIKE '$server' AND telescope LIKE '$proj' ORDER BY timestamp DESC LIMIT 1"; if($debug){echo "$sql
";} @@ -1248,4 +1306,11 @@ ########################################################################### function showPingStatus($Host, $DatabaseName) { + // timer start + $time = microtime(); + $time = explode(' ', $time); + $time = $time[1] + $time[0]; + $start = $time; + + // function begin exec("ping -c 1 $Host", $res, $rval); if ($rval == 0){ @@ -1254,7 +1319,186 @@ $PingStatus = "DOWN"; } - echo "$DatabaseName$PingStatus"; -} - + echo "$DatabaseName"; + + echo "$PingStatus"; + // timer finished + echo ""; + $time = microtime(); + $time = explode(' ', $time); + $time = $time[1] + $time[0]; + $finish = $time; + $total_time = round(($finish - $start), 3); + echo "$total_time seconds"; + $start= $finish; + echo ""; +} + + +########################################################################### +# +# Creates a table of summitExp against rawExp +# +########################################################################### +function createSummitDataTable($projectdb) { + + // timer start + $time = microtime(); + $time = explode(' ', $time); + $time = $time[1] + $time[0]; + $start = $time; + + // function begin + $date = date("Y-m-d"); + $sql = "SELECT DISTINCT exp_type FROM summitExp WHERE dateobs > '$date'"; + + $qry = $projectdb->query($sql); + if (dberror($qry)) { + echo "error reading newExp table
\n"; + echo "
table query : $sql
\n"; + menu_end(); + } + + // set up the table + global $table; + echo $table; + echo ""; + createTableTitle("Data status > $date", 4); + echo ""; + createTableColumnHeader("Exposure type"); + createTableColumnHeader("At summit"); + createTableColumnHeader("Registered at MHPCC"); + createTableColumnHeader("Summit (Drop/Null)"); + + $msg = "No science images taken since $date"; + + // list the results + while ($qry->fetchInto($expType)) { + + $sql = "SELECT COUNT(*) FROM summitExp LEFT JOIN pzDownloadExp USING (summit_id) + WHERE dateobs > '$date' AND exp_type = '$expType[0]'"; + // AND state != 'drop' AND state is not null AND fault != 1042"; + $qry2 = $projectdb->query($sql); + $qry2->fetchInto($summit); + + $sql = "SELECT COUNT(*) FROM summitExp JOIN rawExp ON summitExp.exp_name = rawExp.exp_name + WHERE summitExp.dateobs > '$date' AND rawExp.dateobs > '$date' AND summitExp.exp_type = '$expType[0]'"; + $qry2 = $projectdb->query($sql); + $qry2->fetchInto($mhpcc); + + $sql = "SELECT COUNT(*) FROM summitExp LEFT JOIN pzDownloadExp USING (summit_id) + WHERE dateobs > '$date' AND exp_type = '$expType[0]' AND (state = 'drop' OR state is null)"; + $qry2 = $projectdb->query($sql); + $qry2->fetchInto($dropped); + + + #Query with 30 minutes delay to check during the night if any exposures are missing. + $datehour = gmdate("Y-m-d H:i:s"); + $sql = "SELECT COUNT(*) FROM summitExp LEFT JOIN pzDownloadExp USING (summit_id) + WHERE dateobs > '$date' AND dateobs <= date_sub('$datehour', interval 30 minute) + AND exp_type = '$expType[0]' AND (state != 'drop' OR state is null) and fault != 1042"; + + $qry2 = $projectdb->query($sql); + $qry2->fetchInto($summitdelay); + + $sql = "SELECT COUNT(*) FROM summitExp JOIN rawExp ON summitExp.exp_name = rawExp.exp_name + WHERE summitExp.dateobs > '$date' AND summitExp.dateobs <= date_sub('$datehour', interval 30 minute) + AND rawExp.dateobs > '$date' AND summitExp.exp_type = '$expType[0]'"; + $qry2 = $projectdb->query($sql); + $qry2->fetchInto($mhpccdelay); + + echo ""; + + $DLdiff = $summit[0] - $mhpcc[0]; + if ($DLdiff == 0) $error = 0; + else $error = 1; + + $delayDLdiff = $summitdelay[0] - $mhpccdelay[0]; + if ($delayDLdiff == 0) $errordelay = 0; + else $errordelay = 1; + + echo "$expType[0]"; + echo "$summit[0]"; + if ($delayDLdiff==0) { + createFormattedTableCell("", "", $mhpcc[0], $error, 0); + } else { + $DLStatus = "$mhpcc[0] ($delayDLdiff)"; + echo "$DLStatus"; + } + + echo "$dropped[0]"; + + echo ""; + } + + // timer finished + echo ""; + $time = microtime(); + $time = explode(' ', $time); + $time = $time[1] + $time[0]; + $finish = $time; + $total_time = round(($finish - $start), 3); + echo "loading in $total_time seconds."; + $start= $finish; + echo ""; + echo "
"; +} + + +function createSummitDataTable2($projectdb) { + + // timer start + $time = microtime(); + $time = explode(' ', $time); + $time = $time[1] + $time[0]; + $start = $time; + + // function begin + $date = date("Y-m-d"); + // set up the table + global $table; + global $columnHeaderColor; + echo $table; + echo ""; + createTableTitle("Data status > $date", 4); + echo ""; + createTableColumnHeader("Exp_type at summit"); + createTableColumnHeader("Status at summit"); + createTableColumnHeader("Status at mhpcc"); + createTableColumnHeader("Number"); + $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.dateobs > '$date' group by summitExp.exp_type,pzDownloadExp.state,rawExp.state"; + $qry = $projectdb->query($sql); + while ($qry->fetchInto($tmp)) { + if ($tmp[1] == NULL) { + echo "$tmp[0] null null $tmp[3]"; + } + else { + if ($tmp[1] == 'run') { + echo "$tmp[0] loading null $tmp[3]"; + } + else { + if ($tmp[2] == NULL) { + echo "$tmp[0] $tmp[1] loading $tmp[3]"; + } + else { + echo "$tmp[0] $tmp[1] downloaded $tmp[3]"; + } + } + } + } + + // timer finished + echo ""; + $time = microtime(); + $time = explode(' ', $time); + $time = $time[1] + $time[0]; + $finish = $time; + $total_time = round(($finish - $start), 3); + echo "loading in $total_time seconds."; + $start= $finish; + echo ""; + echo "
"; +} ?> Index: trunk/ippMonitor/raw/site.php.in =================================================================== --- trunk/ippMonitor/raw/site.php.in (revision 41134) +++ trunk/ippMonitor/raw/site.php.in (revision 41135) @@ -13,10 +13,10 @@ $DBI = "@DBI@"; +// location of plots produced by czarpoll.pl +$CZARPLOTDIR = "./czartool_plots"; +$METRICSPLOTDIR = "./ippMetrics"; + // insert config.dat here. this contains a number of system-specific things like // the names of database machines and users - -// location of plots produced by czarpoll.pl -$CZARPLOTDIR = "/export/@HOST2@.0/ipp/czartool_plots"; -$METRICSPLOTDIR = "/export/@HOST2@.0/ipp/ippMetrics"; @CONFIG.DAT@