Index: /trunk/ippMonitor/Makefile.in =================================================================== --- /trunk/ippMonitor/Makefile.in (revision 42271) +++ /trunk/ippMonitor/Makefile.in (revision 42272) @@ -85,4 +85,6 @@ $(DESTWWW)/show_log.php \ $(DESTWWW)/heathers_plot.php \ +$(DESTWWW)/storage.php \ +$(DESTWWW)/skycoverage.php \ $(DESTWWW)/loader.js Index: /trunk/ippMonitor/def/autocodeImage.php =================================================================== --- /trunk/ippMonitor/def/autocodeImage.php (revision 42271) +++ /trunk/ippMonitor/def/autocodeImage.php (revision 42272) @@ -115,4 +115,22 @@ foreach ($row as $i => $value) { switch ($value) { + case 'g.00002': + $filter = 1; + break; + case 'r.00002': + $filter = 2; + break; + case 'i.00002': + $filter = 3; + break; + case 'z.00002': + $filter = 4; + break; + case 'y.00002': + $filter = 5; + break; + case 'w.00002': + $filter = 6; + break; case 'g.00000': $filter = 1; Index: /trunk/ippMonitor/raw/czartool_labels.php =================================================================== --- /trunk/ippMonitor/raw/czartool_labels.php (revision 42271) +++ /trunk/ippMonitor/raw/czartool_labels.php (revision 42272) @@ -207,6 +207,6 @@ $ganglia = "http://ganglia.pan-starrs.ifa.hawaii.edu"; $svnlink = "https://svn.pan-starrs.ifa.hawaii.edu/trac/ipp"; -$conflink = "https://confluence.ipp.ifa.hawaii.edu"; -$jiralink = "https://jira.ipp.ifa.hawaii.edu"; +$conflink = "https://panstarrs.atlassian.net"; +$jiralink = "https://panstarrs.atlassian.net"; $hsttime1 = date("Y-m-d H:i:s", strtotime("$lastUpdateTime")); $utctime1 = gmdate("Y-m-d H:i:s", strtotime("$lastUpdateTime")); @@ -241,7 +241,7 @@  |  Memory_reports"; echo "Documentations for IPP - Czarblog -  |  Confluence -  |  Jira + Czarblog +  |  Confluence +  |  Jira  |  trac"; echo "Current nightly science status @@ -288,4 +288,5 @@ showReplicationsStatus($REPL_HOST_NEBULOUS_SECONDARY, $REPL_USER_NEBULOUS_SECONDARY, $REPL_PASSWORD_NEBULOUS_SECONDARY, $REPL_LABEL_NEBULOUS_SECONDARY); showReplicationsStatus($REPL_HOST_NEBULOUS_TERTIARY, $REPL_USER_NEBULOUS_TERTIARY, $REPL_PASSWORD_NEBULOUS_TERTIARY, $REPL_LABEL_NEBULOUS_TERTIARY); +showReplicationsStatus($REPL_HOST_NEBULOUS_QUATERNARY, $REPL_USER_NEBULOUS_QUATERNARY, $REPL_PASSWORD_NEBULOUS_QUATERNARY, $REPL_LABEL_NEBULOUS_QUATERNARY); // other dbs showDatabaseStatus($HOST_PSTAMP, $USER_PSTAMP, $PASSWORD_PSTAMP, $LABEL_PSTAMP); @@ -364,8 +365,8 @@ # gnuplots # time series plot -# echo "

"; -# echo "

"; + echo "

"; + echo "

"; # rate series plot -# echo "

"; + echo "

"; #for dev version # google chart @@ -382,11 +383,10 @@ } - # data quality timeseries echo getDataQuality($projectdb); # storage timeseries -echo getSpaces($czardb); +#echo getSpaces($czardb); # storage plot -echo getHosts($czardb); +#echo getHosts($czardb); # timer for main page end @@ -1727,5 +1727,4 @@ $sql = "select format(used/total*100,1), usable from cluster_space order by timestamp desc limit 1;"; - if ($debug) {echo "$sql
";} $qry = $db->query($sql); @@ -1810,5 +1809,4 @@ } - ########################################################################### # @@ -1823,4 +1821,16 @@ $start = $time; + $date = gmdate("Y-m-d"); + $sql = "SELECT MAX(exp_id) FROM rawExp WHERE dateobs >= date_sub('$date', interval 20 day) AND dateobs <= date_sub('$date', interval 10 day)"; + $qry = $db->query($sql); + if (dberror($qry)) { + print "*** WARNING: no data in period 10-20 days before requested date (query will be slower) **\n"; + $refExpID = 0; + } + $qry->fetchInto($refExpID); + if ($refExpID[0] = 'NULL') { + $refExpID[0] = 0; + } + #Query for the needed data $DQarray = array(); @@ -1829,4 +1839,5 @@ # $sql.= " WHERE (rawExp.dateobs > utc_date() - INTERVAL 14 hour) and (rawExp.dateobs < utc_date() + INTERVAL 10 hour)"; $sql.= " WHERE (rawExp.dateobs > utc_date())"; + $sql.= " AND exp_id > $refExpID[0]"; $sql.= " AND exp_type = 'OBJECT' AND camRun.state like 'full' ORDER BY dateobs asc;"; if ($debug) {echo "$sql
";} @@ -2070,5 +2081,5 @@ echo " vAxis: { "; echo " title: 'Zeropoint offset (mag)',"; - echo " viewWindow: { min: -0.5, max: 0.5 }, "; + echo " viewWindow: { min: -0.25, max: 0.25 }, "; echo " },"; echo " chartArea: {left:80, top:50, right:20, bottom:50},"; Index: /trunk/ippMonitor/raw/ganglia.php =================================================================== --- /trunk/ippMonitor/raw/ganglia.php (revision 42272) +++ /trunk/ippMonitor/raw/ganglia.php (revision 42272) @@ -0,0 +1,29 @@ +"; +echo ""; +echo " "; +echo "

ganglia

"; +echo "
"; +echo " "; +echo ""; +echo ""; + +menu_end(); + + +?> + Index: /trunk/ippMonitor/raw/ipp.czar.dat =================================================================== --- /trunk/ippMonitor/raw/ipp.czar.dat (revision 42271) +++ /trunk/ippMonitor/raw/ipp.czar.dat (revision 42272) @@ -1,12 +1,17 @@ -input | ipp.menu.dat +input | ipp.menu.dat -menutop | menutop | plain |   | +menutop | menutop | plain |   | -menulink | menuselect | link | czartool | czartool_labels.php -menulink | menuselect | link | mask stats | maskStats.php -menulink | menuselect | link | night summary | nightSummary.php -menutop | menutop | plain |   | -menulink | menuselect | link | Exposures Status | exposureStatus.php -menulink | menuselect | link | MOPS Exposures Status | mopsStatus.php -menulink | menuselect | link | MySql ProcessList | gpc1MysqlProcessList.php +menulink | menuselect | link | czartool | czartool_labels.php +menulink | menuselect | link | storage only | storage.php +menulink | menuselect | link | mask stats | maskStats.php +menulink | menuselect | link | night summary | nightSummary.php +menulink | menuselect | link | skycoverage | skycoverage.php +menulink | menuselect | link | ganglia | ganglia.php +menutop | menutop | plain |   | + +menulink | menuselect | link | Exposures Status | exposureStatus.php +menulink | menuselect | link | MOPS Exposures Status | mopsStatus.php +menulink | menuselect | link | MySql ProcessList | gpc1MysqlProcessList.php + Index: /trunk/ippMonitor/raw/ipp.plots.dat =================================================================== --- /trunk/ippMonitor/raw/ipp.plots.dat (revision 42271) +++ /trunk/ippMonitor/raw/ipp.plots.dat (revision 42272) @@ -11,5 +11,4 @@ menulink | menuselect | link | Simple plot - diff | simplePlotDiffImage.php menulink | menuselect | link | Subset plot - diff | subsetPlotDiffImage.php -menulink | menuselect | link | Heather's Plots | heathers_plot.php menutop | menutop | plain |   | Index: /trunk/ippMonitor/raw/skycoverage.php =================================================================== --- /trunk/ippMonitor/raw/skycoverage.php (revision 42272) +++ /trunk/ippMonitor/raw/skycoverage.php (revision 42272) @@ -0,0 +1,29 @@ +"; +echo ""; +echo " "; +echo "

Skycoverage

"; +echo "
"; +echo " "; +echo ""; +echo ""; + +menu_end(); + + +?> + Index: /trunk/ippMonitor/raw/storage.php =================================================================== --- /trunk/ippMonitor/raw/storage.php (revision 42272) +++ /trunk/ippMonitor/raw/storage.php (revision 42272) @@ -0,0 +1,265 @@ +"; +echo ""; +echo " "; +echo "

Storage status

"; +# storage timeseries +echo getSpaces($czardb); +# storage plot +echo getHosts($czardb); +echo " "; +echo ""; +echo ""; + +menu_end(); + + +///////////////////////////////////////////////////////////////////////////// +// // +// Functions // +// // +///////////////////////////////////////////////////////////////////////////// + + +########################################################################### +# +# Gets disk status +# +########################################################################### +function getHosts($db) { + // timer start + $time = microtime(); + $time = explode(' ', $time); + $time = $time[1] + $time[0]; + $start = $time; + + #echo ""; + echo ""; + echo "
"; + echo "
"; + echo "
"; + echo "
Free
"; + echo "
Used
"; + echo "
> 97% limit
"; + echo "
Down | Repair
"; + echo "
Power Off
"; + echo " "; + echo "
"; + echo "
"; + + echo ""; + $time = microtime(); + $time = explode(' ', $time); + $time = $time[1] + $time[0]; + $finish = $time; + $total_time = round(($finish - $start), 3); + $start= $finish; + echo "
loading in $total_time seconds
"; +} + +########################################################################### +# +# Gets disk spaces status +# +########################################################################### +function getSpaces($db) { + // timer start + $time = microtime(); + $time = explode(' ', $time); + $time = $time[1] + $time[0]; + $start = $time; + + $db->query("SELECT sum(format(available, 2)) FROM hosts where host like 'ippb%'")->fetchInto($row); + $ippbusable = $row[0]; + $db->query("SELECT sum(format(available, 2)) FROM hosts where host like 'ippb%' and writable = 1")->fetchInto($row); + $ippbfree = $row[0]; + + $db->query("SELECT sum(format(available, 2)) FROM hosts where host not like 'ippb%'")->fetchInto($row); + $ippusable = $row[0]; + $db->query("SELECT sum(format(available, 2)) FROM hosts where host not like 'ippb%' and writable = 1")->fetchInto($row); + $ippfree = $row[0]; + + $sql = "select format(used/total*100,1), usable from cluster_space order by timestamp desc limit 1;"; + + if ($debug) {echo "$sql
";} + $qry = $db->query($sql); + if (dberror($qry)) {echo "error with $sql
\n";} + $qry->fetchInto($row); + $allocated = $row[0]; + $usable = $row[1]; + + #echo ""; + echo ""; + echo "
"; + echo "
"; + echo "
"; + echo "
ipp + ippb nodes: $ippusable + $ippbusable TB (latest usable)
"; + echo "
ipp + ippb nodes: $ippfree + $ippbfree TB (latest free)
"; + echo "
"; + echo "
"; + + echo ""; + $time = microtime(); + $time = explode(' ', $time); + $time = $time[1] + $time[0]; + $finish = $time; + $total_time = round(($finish - $start), 3); + $start= $finish; + echo "
loading in $total_time seconds
"; +} + + +?> +