IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 42272 for trunk/ippMonitor


Ignore:
Timestamp:
Sep 1, 2022, 2:04:44 PM (4 years ago)
Author:
cclin33
Message:

CCL: update simple plot code and add storage.php, skycoverage.php, and ganglia.php under czar page

Location:
trunk/ippMonitor
Files:
3 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippMonitor/Makefile.in

    r41730 r42272  
    8585$(DESTWWW)/show_log.php \
    8686$(DESTWWW)/heathers_plot.php \
     87$(DESTWWW)/storage.php \
     88$(DESTWWW)/skycoverage.php \
    8789$(DESTWWW)/loader.js
    8890

  • trunk/ippMonitor/def/autocodeImage.php

    r39498 r42272  
    115115  foreach ($row as $i => $value) {
    116116    switch ($value) {
     117    case 'g.00002':
     118      $filter = 1;
     119      break;
     120    case 'r.00002':
     121      $filter = 2;
     122      break;
     123    case 'i.00002':
     124      $filter = 3;
     125      break;
     126    case 'z.00002':
     127      $filter = 4;
     128      break;
     129    case 'y.00002':
     130      $filter = 5;
     131      break;
     132    case 'w.00002':
     133      $filter = 6;
     134      break;
    117135    case 'g.00000':
    118136      $filter = 1;

  • trunk/ippMonitor/raw/czartool_labels.php

    r42180 r42272  
    207207$ganglia = "http://ganglia.pan-starrs.ifa.hawaii.edu";
    208208$svnlink = "https://svn.pan-starrs.ifa.hawaii.edu/trac/ipp";
    209 $conflink = "https://confluence.ipp.ifa.hawaii.edu";
    210 $jiralink = "https://jira.ipp.ifa.hawaii.edu";
     209$conflink = "https://panstarrs.atlassian.net";
     210$jiralink = "https://panstarrs.atlassian.net";
    211211$hsttime1 = date("Y-m-d H:i:s", strtotime("$lastUpdateTime"));
    212212$utctime1 = gmdate("Y-m-d H:i:s", strtotime("$lastUpdateTime"));
    … …  
    241241  &nbsp|&nbsp <a href=\"$ganglia/?m=mem_report&r=hour&s=by%2520name&c=IPP+Production&h=&sh=1&hc=8&z=small\" target=new> <font color=\"blue\">Memory_reports</font></a></td></tr>";
    242242echo "<tr><td>Documentations for IPP</td>
    243           <td><a href=\"$conflink/pages/viewrecentblogposts.action?key=IPPCZAR\" target=new><font color=\"blue\">Czarblog</font></a>
    244   &nbsp|&nbsp <a href=\"$conflink/display/IPPCZAR/IPP-Czaring+Home\" target=new><font color=\"blue\">Confluence</font></a>
    245   &nbsp|&nbsp <a href=\"$jiralink/projects/IPP/issues/filter=allissues\" target=new><font color=\"blue\">Jira</font></a>
     243          <td><a href=\"$conflink/wiki/spaces/IPPCZAR/pages/679903282/Czarblog+Roll\" target=new><font color=\"blue\">Czarblog</font></a>
     244  &nbsp|&nbsp <a href=\"$conflink/wiki/spaces/IPPCZAR/overview\" target=new><font color=\"blue\">Confluence</font></a>
     245  &nbsp|&nbsp <a href=\"$jiralink/issues/?filter=-4\" target=new><font color=\"blue\">Jira</font></a>
    246246  &nbsp|&nbsp <a href=\"$svnlink/\" target=new><font color=\"blue\">trac</font></a></td></tr>";
    247247echo "<tr><td>Current nightly science status</td>
    … …  
    288288showReplicationsStatus($REPL_HOST_NEBULOUS_SECONDARY, $REPL_USER_NEBULOUS_SECONDARY, $REPL_PASSWORD_NEBULOUS_SECONDARY, $REPL_LABEL_NEBULOUS_SECONDARY);
    289289showReplicationsStatus($REPL_HOST_NEBULOUS_TERTIARY, $REPL_USER_NEBULOUS_TERTIARY, $REPL_PASSWORD_NEBULOUS_TERTIARY, $REPL_LABEL_NEBULOUS_TERTIARY);
     290showReplicationsStatus($REPL_HOST_NEBULOUS_QUATERNARY, $REPL_USER_NEBULOUS_QUATERNARY, $REPL_PASSWORD_NEBULOUS_QUATERNARY, $REPL_LABEL_NEBULOUS_QUATERNARY);
    290291// other dbs
    291292showDatabaseStatus($HOST_PSTAMP, $USER_PSTAMP, $PASSWORD_PSTAMP, $LABEL_PSTAMP);
    … …  
    364365   # gnuplots
    365366   # time series plot
    366 #   echo "<img src=\"czartool_getplot.php?mode=$selectedMode&type=t&label=$selectedLabel&proj=$proj&stage=$selectedStage&plottype=linear\"><br><br>";
    367 #   echo "<img src=\"czartool_getplot.php?mode=$selectedMode&type=t&label=$selectedLabel&proj=$proj&stage=$selectedStage&plottype=log\"><br><br>";
     367   echo "<img src=\"czartool_getplot.php?mode=$selectedMode&type=t&label=$selectedLabel&proj=$proj&stage=$selectedStage&plottype=linear\"><br><br>";
     368   echo "<img src=\"czartool_getplot.php?mode=$selectedMode&type=t&label=$selectedLabel&proj=$proj&stage=$selectedStage&plottype=log\"><br><br>";
    368369   # rate series plot
    369 #   echo "<img src=\"czartool_getplot.php?mode=$selectedMode&type=rt&label=$selectedLabel&proj=$proj&stage=$selectedStage&plottype=linear\"><br><br>";
     370   echo "<img src=\"czartool_getplot.php?mode=$selectedMode&type=rt&label=$selectedLabel&proj=$proj&stage=$selectedStage&plottype=linear\"><br><br>";
    370371   #for dev version
    371372   # google chart
    … …  
    382383}
    383384
    384 
    385385# data quality timeseries
    386386echo getDataQuality($projectdb);
    387387# storage timeseries
    388 echo getSpaces($czardb);
     388#echo getSpaces($czardb);
    389389# storage plot
    390 echo getHosts($czardb);
     390#echo getHosts($czardb);
    391391
    392392# timer for main page end
    … …  
    17271727
    17281728    $sql = "select format(used/total*100,1), usable from cluster_space order by timestamp desc limit 1;";
    1729 
    17301729    if ($debug) {echo "$sql<br>";}
    17311730    $qry = $db->query($sql);
    … …  
    18101809}
    18111810
    1812 
    18131811###########################################################################
    18141812#
    … …  
    18231821    $start = $time;
    18241822
     1823    $date = gmdate("Y-m-d");
     1824    $sql = "SELECT MAX(exp_id) FROM rawExp WHERE dateobs >= date_sub('$date', interval 20 day) AND dateobs <= date_sub('$date', interval 10 day)";
     1825    $qry = $db->query($sql);
     1826    if (dberror($qry)) {
     1827        print "*** WARNING: no data in period 10-20 days before requested date (query will be slower) **\n";
     1828        $refExpID = 0;
     1829    }
     1830    $qry->fetchInto($refExpID);
     1831    if ($refExpID[0] = 'NULL') {
     1832        $refExpID[0] = 0;
     1833    }
     1834
    18251835    #Query for the needed data
    18261836    $DQarray = array();
    … …  
    18291839#    $sql.= " WHERE (rawExp.dateobs > utc_date() - INTERVAL 14 hour) and (rawExp.dateobs < utc_date() + INTERVAL 10 hour)";
    18301840    $sql.= " WHERE (rawExp.dateobs > utc_date())";
     1841    $sql.= " AND exp_id > $refExpID[0]";
    18311842    $sql.= " AND exp_type = 'OBJECT' AND camRun.state like 'full' ORDER BY dateobs asc;";
    18321843    if ($debug) {echo "$sql<br>";}
    … …  
    20702081   echo "     vAxis: {  ";
    20712082   echo "                  title: 'Zeropoint offset (mag)',";
    2072    echo "     viewWindow: {   min: -0.5, max: 0.5    },  ";
     2083   echo "     viewWindow: {   min: -0.25, max: 0.25    },  ";
    20732084   echo "     },";
    20742085   echo "     chartArea: {left:80, top:50, right:20, bottom:50},";

  • trunk/ippMonitor/raw/ipp.czar.dat

    r40840 r42272  
    1 input     | ipp.menu.dat
     1input      | ipp.menu.dat
    22
    3 menutop   | menutop      | plain   | &nbsp;   |   
     3menutop    | menutop         | plain   | &nbsp;                 |   
    44
    5 menulink   | menuselect      | link    | czartool        | czartool_labels.php
    6 menulink   | menuselect      | link    | mask stats                   | maskStats.php
    7 menulink   | menuselect      | link    | night summary                | nightSummary.php
    8 menutop   | menutop      | plain   | &nbsp;                       |
    9 menulink  | menuselect   | link    | Exposures Status             | exposureStatus.php
    10 menulink  | menuselect   | link    | MOPS Exposures Status        | mopsStatus.php
    11 menulink  | menuselect   | link    | MySql ProcessList            | gpc1MysqlProcessList.php
     5menulink   | menuselect      | link    | czartool               | czartool_labels.php
     6menulink   | menuselect      | link    | storage only           | storage.php
     7menulink   | menuselect      | link    | mask stats             | maskStats.php
     8menulink   | menuselect      | link    | night summary          | nightSummary.php
     9menulink   | menuselect      | link    | skycoverage            | skycoverage.php
     10menulink   | menuselect      | link    | ganglia                | ganglia.php
    1211
     12menutop    | menutop         | plain   | &nbsp;                 |
     13
     14menulink   | menuselect      | link    | Exposures Status       | exposureStatus.php
     15menulink   | menuselect      | link    | MOPS Exposures Status  | mopsStatus.php
     16menulink   | menuselect      | link    | MySql ProcessList      | gpc1MysqlProcessList.php
     17

  • trunk/ippMonitor/raw/ipp.plots.dat

    r41202 r42272  
    1111menulink  | menuselect      | link    | Simple plot - diff                  | simplePlotDiffImage.php
    1212menulink  | menuselect      | link    | Subset plot - diff                  | subsetPlotDiffImage.php
    13 menulink  | menuselect      | link    | Heather's Plots                     | heathers_plot.php
    1413
    1514menutop   | menutop      | plain   | &nbsp;                                 |
Note: See TracChangeset for help on using the changeset viewer.