IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 41126


Ignore:
Timestamp:
Nov 18, 2019, 8:49:27 PM (7 years ago)
Author:
ippitc
Message:

CCL: some updates for installation easily

Location:
trunk/ippMonitor
Files:
3 added
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippMonitor/INSTALL

    r40435 r41126  
     1#!/bin/sh
    12
    23# below are commands to configure ippMonitor
    … …  
    1112# testing of those parts of ippMonitor which depend on IPP code without modifyin
    1213# the operational installation
     14# 2019.11.18 CCL: which parts of ippMonitor depends on IPP codes?  If there is not many
     15#                 , just use trunk version should work fine.
    1316psconfig ipp-trunk-20180515
    1417
    15 # run psconfigure to generate Makefile and raw/site.php
     18# run psconfigure to generate Makefile and raw/site.php (site.php.in includes CZARPLOTDIR now)
    1619psconfigure --htdocs /var/www/localhost/htdocs --site ~/ippconfig/ippmonitor.config
     20
     21# copy these files and modify them
     22cp config.dat.in config.dat
     23
     24# for czarpool.pl, the path needs to be defined.
     25cp czartool/czarconfig.xml.in czartool/czarconfig.xml
     26# then set gnuplot path <path>/export/ipp113.0/ipp/czartool_plots</path>  --> for ipp113
     27# ipp117 is set to be rsynced in crontab regularly from ipp113's path,
     28# so need to remove crontab if czarpool.pl is under development
     29# then set gnuplot path <path>/export/ipp117.0/ipp/czartool_plots</path>  --> for ipp117
    1730
    1831# install the php code:
    1932make
     33
     34

  • trunk/ippMonitor/Makefile.in

    r40844 r41126  
    33        @echo "USAGE: make php"
    44
    5 SRC     =       src
    6 DEF     =       def
    7 RAW     =       raw
    8 SCRIPTS =       scripts
    9 DESTBIN =      @BINDIR@
    10 DESTWWW =       @HTDOCS@/ippMonitor
     5SRC     = src
     6DEF     = def
     7RAW     = raw
     8SCRIPTS = scripts
     9DESTBIN = @BINDIR@
     10DESTWWW = @HTDOCS@/ippMonitor
    1111
    1212GENERATE = $(SCRIPTS)/generate
    … …  
    172172$(DESTWWW)/fullforceRun.php \
    173173$(DESTWWW)/fullforceSummary.php \
    174 $(DESTWWW)/failedFullforce.php \
     174$(DESTWWW)/fullforce_failure.php \
    175175$(DESTWWW)/diffSummary.php \
    176176$(DESTWWW)/diffSummary_Images.php \
    … …  
    280280$(DESTWWW)/noimage.png
    281281
    282 DESTLINK = $(DESTWWW)/index.php
     282DESTLINK = $(DESTWWW)/index.php 
    283283
    284284php: $(RAWSRC) $(DEFSRC) $(PICTURES) $(DESTLINK) $(PROGRAMS)
    … …  
    288288# .PRECIOUS: $(BIN)/%.$(ARCH)
    289289
    290 $(DESTLINK): $(DESTWWW)/Login.php
     290$(DESTLINK): $(DESTWWW)/Login.php 
    291291        rm -f $@
    292292        ln -s $(DESTWWW)/Login.php $@

  • trunk/ippMonitor/configure.tcsh

    r39498 r41126  
    134134
    135135set hostname = `hostname -f`
     136set hostname2 = `hostname`
    136137
    137138echo
    … …  
    182183if (-e Makefile) mv -f Makefile Makefile~
    183184cat Makefile.in | sed "s|@HTDOCS@|$htdocs|" > tmp.1
    184 cat tmp.1       | sed "s|@BINDIR@|$bindir|" > Makefile
    185 rm -f tmp.1
     185cat tmp.1       | sed "s|@HOST2@|$hostname2|"  > tmp.2
     186cat tmp.2       | sed "s|@BINDIR@|$bindir|" > Makefile
     187rm -f tmp.2
    186188
    187189# convert raw/site.php.in to raw/site.php
    … …  
    193195cat tmp.1           | sed "s|@DBI@|$DBI|"        > tmp.2
    194196cat tmp.2           | sed "s|@HOST@|$hostname|"  > tmp.1
    195 awk 'BEGIN{t = 0}((t == 0) && ($1 != "@CONFIG.DAT@")){print $0}($1 == "@CONFIG.DAT@"){t = 1}' tmp.1 > raw/site.php
     197cat tmp.1           | sed "s|@HOST2@|$hostname2|"  > tmp.2
     198awk 'BEGIN{t = 0}((t == 0) && ($1 != "@CONFIG.DAT@")){print $0}($1 == "@CONFIG.DAT@"){t = 1}' tmp.2 > raw/site.php
    196199cat config.dat >> raw/site.php
    197 awk 'BEGIN{t = 0}(t == 1){print $0}($1 == "@CONFIG.DAT@"){t = 1}' tmp.1 >> raw/site.php
     200awk 'BEGIN{t = 0}(t == 1){print $0}($1 == "@CONFIG.DAT@"){t = 1}' tmp.2 >> raw/site.php
    198201
    199202rm -f tmp.1 tmp.2

  • trunk/ippMonitor/czartool/czarpoll.pl

    r41125 r41126  
    350350                print "* Performing database cleanup\n";
    351351                $czarDb->cleanupDateRange($yesterday, $yesterday, $config->getCzarCleanupInterval());
    352                 print "* Optimizing the database\n";
    353                 $czarDb->optimize();
     352                #print "* Optimizing the database\n";
     353                #$czarDb->optimize();
    354354                $lastDayDailyTasks = $yesterday;
    355355            }

  • trunk/ippMonitor/def/fullforce_failure.d

    r40882 r41126  
    1 TABLE staticskyRun JOIN staticskyResult USING (sky_id) JOIN staticskyInput USING (sky_id) JOIN stackRun USING (stack_id)
    2 TITLE Static Sky Failed (Log)
    3 FILE  failedStaticsky.php
    4 MENU  ipp.stack.dat
     1TABLE fullForceInput JOIN warpRun USING (warp_id) JOIN fullForceRun USING (ff_id) JOIN fullForceResult USING (ff_id)
     2TITLE Full Force Failed
     3FILE  fullforce_failure.php
     4MENU  ipp.ffs.dat
    55
    6 WHERE staticskyResult.fault != 0
     6ARGS  ARG1 fullForceRun.ff_id=$fullForceRun.ff_id
     7ARGS  ARG1 basename=$fullForceResult.path_base
    78
    8 ARGS  ARG1   staticskyResult.path_base=$staticskyResult.path_base
     9WHERE fullForceResult.fault != 0
     10#        field                       size     format             name           show     link to         extras
     11FIELD   fullForceRun.ff_id,             5,        %d,           FF ID
     12FIELD   fullForceRun.label,             7,        %s,           Label
     13FIELD   fullForceRun.state,             7,        %s,           State,     value,  fullforce_failure.php, ARG1
     14FIELD   warpRun.tess_id,                5,        %s,           Tess ID
     15FIELD   warpRun.label AS warpRunLabel,  5,        %s,           warp Label
     16FIELD   fullForceRun.data_group,        7,        %s,           data grp
     17FIELD   fullForceRun.dist_group,        7,        %s,           dist grp
     18FIELD   fullForceResult.fault,          7,        %d,           fault
     19FIELD   fullForceResult.quality,        7,        %d,           quality
     20FIELD   fullForceResult.path_base,      7,        %s,           path_base, none
    921
    10 #        field                          size  format  name           show     link to         extras
    11 FIELD staticskyRun.sky_id,          5, %d,     Sky ID
    12 FIELD staticskyRun.label,           7, %s,     Label
    13 FIELD staticskyRun.state,           7, %s,     State,           value,          staticsky_failure.php, ARG1
    14 FIELD stackRun.skycell_id,          5, %s,     Skycell ID
    15 FIELD stackRun.tess_id,             5, %s,     Tess ID
    16 FIELD count(stackRun.filter),       5, %d,     #Filters
    17 FIELD stackRun.label,               5, %s,     Stack Label
    18 FIELD staticskyRun.data_group,      7, %s,     data grp
    19 FIELD staticskyRun.dist_group,      7, %s,     dist grp
    20 FIELD staticskyResult.sources,      7, %d,     n(sources)
    21 FIELD staticskyResult.fault,        7, %d,     fault
    22 FIELD staticskyResult.quality,      7, %d,     quality
    23 FIELD staticskyResult.path_base,    5, %s,     path_base,     none
    24 
    25 GROUP staticskyRun.sky_id
     22MODE summary
     23GROUP fullForceRun.ff_id
    2624
    2725TAIL PHP insert_log ('LOG.EXP');
     26

  • trunk/ippMonitor/raw/ipp.php

    r40842 r41126  
    351351  // loop over the lines in the file and generate lines in the menu
    352352  while ($line = fgetcsv ($file, 1024, "|")) {
    353     if (ereg ('^[:blank:]*#', $line[0])) continue;
     353    if (preg_match ("/#/", $line[0])) continue;
     354 // if (ereg ('^[:blank:]*#', $line[0])) continue;
    354355    if (count($line) < 2) continue;
    355356

  • trunk/ippMonitor/raw/site.php.in

    r40432 r41126  
    1616// the names of database machines and users
    1717
     18// location of plots produced by czarpoll.pl
     19$CZARPLOTDIR     = "/export/@HOST2@.0/ipp/czartool_plots";
     20$METRICSPLOTDIR  = "/export/@HOST2@.0/ipp/ippMetrics";
     21
    1822@CONFIG.DAT@
    1923
Note: See TracChangeset for help on using the changeset viewer.