IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 34249


Ignore:
Timestamp:
Jul 31, 2012, 2:20:53 PM (14 years ago)
Author:
Serge CHASTEL
Message:

Enlarged nebulous view of the storage partitions

Location:
trunk/ippMonitor
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippMonitor/czartool/czarplot.pl

    r32796 r34249  
    6161    print "* OPTIONAL: plot histogram                  -h                          (default=off)\n";}
    6262if (!$timeSeries) {
    63     print "* OPTIONAL: plot timeseries                 -t                          (default=on)\n";} 
     63    print "* OPTIONAL: plot timeseries                 -t                          (default=on)\n";}
    6464if (!$magicMask) {
    65     print "* OPTIONAL: plot magic mask for these times -m                          (default=off)\n";} 
     65    print "* OPTIONAL: plot magic mask for these times -m                          (default=off)\n";}
    6666if (!$exposureId) {
    67     print "* OPTIONAL: set exposure ID for magic mask  -x                          (default=none)\n";} 
     67    print "* OPTIONAL: set exposure ID for magic mask  -x                          (default=none)\n";}
    6868if (!$rate) {
    69     print "* OPTIONAL: plot histogram of rate          -r                          (default=off)\n";} 
     69    print "* OPTIONAL: plot histogram of rate          -r                          (default=off)\n";}
    7070if (!$log) {
    7171    $log = 0;
    7272    print "* OPTIONAL: use log plots                   -g                          (default=$log)\n";}
    7373if (!$nebulous) {
    74     print "* OPTIONAL: plot nebulous disk space        -n                          (default=off)\n";} 
     74    print "* OPTIONAL: plot nebulous disk space        -n                          (default=off)\n";}
    7575if (!$label) {
    7676    $label = "all_stdscience_labels";
    … …  
    7979    print "* OPTIONAL: choose a stage                  -s <chip|cam|warp|etc>      (default=none)\n";}
    8080if (!$timeinpast) {
    81     print "* OPTIONAL: choose time interval in past    -p <'1 hour'|'1 day'|etc>   (default=none\n";} 
     81    print "* OPTIONAL: choose time interval in past    -p <'1 hour'|'1 day'|etc>   (default=none\n";}
    8282if (!$rateInterval) {
    83     print "* OPTIONAL: time interval for rate plot     -i <'1 hour'|'1 day'|etc>   (default=depends on time frame)\n";} 
     83    print "* OPTIONAL: time interval for rate plot     -i <'1 hour'|'1 day'|etc>   (default=depends on time frame)\n";}
    8484if (!$begin) {
    85     print "* OPTIONAL: choose a begin time             -b <datetime>               (default=18:00)\n";} 
     85    print "* OPTIONAL: choose a begin time             -b <datetime>               (default=18:00)\n";}
    8686if (!$end) {
    87     print "* OPTIONAL: choose an end time              -e <datetime>               (default=now)\n";} 
     87    print "* OPTIONAL: choose an end time              -e <datetime>               (default=now)\n";}
    8888if (!$day) {
    89     print "* OPTIONAL: choose a single day to plot     -d <date>                   (default=today)\n";} 
     89    print "* OPTIONAL: choose a single day to plot     -d <date>                   (default=today)\n";}
    9090if (!$path) {
    9191    print "* OPTIONAL: choose an output location       -o <path>                   (default=none)\n";
    92 } 
     92}
    9393if (!$psps) {
    94     print "* OPTIONAL: plot ippToPsps stages           -u                          (default=off)\n";} 
     94    print "* OPTIONAL: plot ippToPsps stages           -u                          (default=off)\n";}
    9595print "*\n*******************************************************************************\n";
    9696
    … …  
    110110my $newDayTime =  $config->getMetricsStartTime();
    111111
    112 my $plotter = undef; 
     112my $plotter = undef;
    113113if ($savingToFile) {
    114114
    … …  
    122122if ($psps) {$plotter->setIppToPspsMode();}
    123123
    124 # if a single day has been chosen 
     124# if a single day has been chosen
    125125if($day) {
    126126
    … …  
    134134        # plots should span 24 housr from previous day
    135135        my $dayBefore = $czarDb->subtractInterval($day, "1 DAY");
    136                
     136
    137137        $begin = "$dayBefore $newDayTime";
    138138        $end = "$day $newDayTime";
    … …  
    147147        my $yesterday = $czarDb->subtractInterval($today, "1 DAY");
    148148
    149        
     149
    150150        if ($timeinpast) {$begin = $czarDb->subtractInterval($end, $timeinpast);}
    151151        elsif ($czarDb->isBefore($end, "$today $newDayTime")) {$begin = "$yesterday $newDayTime";}
    … …  
    166166
    167167if ($histogram) {$plotter->createHistogram($label, $begin, $end);}
    168 if ($nebulous && $timeSeries) {$plotter->plotStorageTimeSeries($begin, $end);}
    169 elsif ($nebulous) {$plotter->plotDiskUsageHistogram();}
     168if ($nebulous && $timeSeries) {
     169    $plotter->plotStorageTimeSeries($begin, $end);
     170}
     171elsif ($nebulous) {
     172    $plotter->plotDiskUsageHistogram();
     173    $plotter->plotDiskUsageHistogramLarge();
     174}
    170175if ($magicMask) {
    171176

  • trunk/ippMonitor/czartool/czarpoll.pl

    r33814 r34249  
    3030
    3131my $config = new czartool::Config();
    32 my $czarDb = $config->getCzarDbInstance(); 
     32my $czarDb = $config->getCzarDbInstance();
    3333my $gpc1Db = $config->getGpc1Instance;
    3434my $nebulous = new czartool::Nebulous($czarDb);
    3535my $pantasks = new czartool::Pantasks();
    36 my $plotter = czartool::Plotter->new_file($config, $config->getGnuplotPath(), $save_temps); 
     36my $plotter = czartool::Plotter->new_file($config, $config->getGnuplotPath(), $save_temps);
    3737
    3838
    3939my @stages = (
    40         "chip", 
    41         "cam", 
    42         "fake", 
    43         "warp", 
    44         "stack", 
    45         "staticsky", 
    46         "diff", 
    47         "dist", 
     40        "chip",
     41        "cam",
     42        "fake",
     43        "warp",
     44        "stack",
     45        "staticsky",
     46        "diff",
     47        "dist",
    4848        "pub",
    4949        "chipbackground");
    … …  
    6565###########################################################################
    6666#
    67 # Updates the dates from pantasks for all interested servers 
     67# Updates the dates from pantasks for all interested servers
    6868#
    6969###########################################################################
    … …  
    7878
    7979        my @dates = @{$pantasks->getDates($server)};
    80         if (@dates) { 
     80        if (@dates) {
    8181
    8282            $czarDb->updateServerDates($server, \@dates);
    … …  
    9191###########################################################################
    9292#
    93 # Updates the labels from pantasks for all interested servers 
     93# Updates the labels from pantasks for all interested servers
    9494#
    9595###########################################################################
    … …  
    103103
    104104        my @labels = @{$pantasks->getLabels($server)};
    105         if (@labels) { 
     105        if (@labels) {
    106106
    107107            $czarDb->updateCurrentLabels($server, \@labels);
    … …  
    116116###########################################################################
    117117#
    118 # Updates pantasks server status TODO should really get info for all servers at once 
     118# Updates pantasks server status TODO should really get info for all servers at once
    119119#
    120120###########################################################################
    … …  
    136136###########################################################################
    137137#
    138 # Polls with provided period (seconds) 
     138# Polls with provided period (seconds)
    139139#
    140140###########################################################################
    … …  
    184184                # create metrics for last 24 hours
    185185                print "* Creating metrics for last 24 hours\n";
    186                 my $dayMetrics = new czartool::DayMetrics($config, 1, 0, $today); 
     186                my $dayMetrics = new czartool::DayMetrics($config, 1, 0, $today);
    187187                $dayMetrics->writeHTML();
    188188
    189189                # now update metrics index page
    190                 my $metricsIndex = new czartool::MetricsIndex($config, 1, 0); 
     190                my $metricsIndex = new czartool::MetricsIndex($config, 1, 0);
    191191                $metricsIndex->writeHTML();
    192192
    … …  
    210210        $plotter->plotStorageTimeSeries($czarDb->subtractInterval($begin, "1 WEEK") , $end);
    211211        $plotter->plotDiskUsageHistogram();
     212        $plotter->plotDiskUsageHistogramLarge();
    212213        updateServerStatus();
    213214
    … …  
    269270    $czarDb->getCurrentIppToPspsLabels($begin, $end, \$ippToPspsLabels);
    270271    $plotter->setIppToPspsMode();
    271    
     272
    272273    # create ippToPsps labels
    273274    foreach $stage (@ippToPspsStages) {
    274275        foreach $row ( @{$ippToPspsLabels} ) {
    275276            my ($label) = @{$row};
    276            
     277
    277278            chomp($label);
    278279            $plotter->createTimeSeries($label, $stage, $begin, $end, 1, 0, 1);

  • trunk/ippMonitor/czartool/czartool/Plotter.pm

    r34109 r34249  
    666666        "set title \"Nebulous disk use across IPP cluster ($totalPercent of total allocated)\";" .
    667667        "set style fill solid 1.00 border -1;" .
     668        "set key center top;" .
     669        "set style histogram rowstacked;" .
     670        "set style data histograms;" .
     671        "set ylabel \"Space (TB)\";" .
     672        "set xtic rotate by -90 scale 0;" .
     673        "plot '".$tmpFile->filename."' " .
     674        "using 2:xtic(1) t \"Used\" lt 7," .
     675        "'' using 3 t \"Over $limit% used\" lt 1," .
     676        "'' using 4 t \"Unavailable\" fs solid 0.50 lt -1 ," .
     677        "'' using 5 t \"Free\" lt 2," .
     678        "'' using 6 notitle fs solid 0.50 lt -1" .
     679        ";" .
     680
     681        "\n";
     682    close GP;
     683}
     684
     685###########################################################################
     686#
     687# Plots disk usage across cluster as a stacked histogram
     688#
     689###########################################################################
     690sub plotDiskUsageHistogramLarge {
     691    my ($self) = @_;
     692
     693    my $prefix = $self->{_outputPath} ? $self->{_outputPath} : "."; # TODO should be function for this
     694        my $outputFile = "$prefix/czarplot_hosts_space_large.png";
     695    my $limit = 97.0;
     696    my $tmpFile = File::Temp->new( TEMPLATE => "czarplot_hosts_space.XXXXX", DIR => '/tmp', SUFFIX => 'dat');
     697    $self->{_czarDb}->createHostsData($limit, $tmpFile);
     698
     699    my $totalUsed = $self->{_czarDb}->getTotalClusterStorageAsPercentage();
     700
     701    my $totalPercent = sprintf("%.1f%%", $totalUsed);
     702
     703    open (GP, "|$GNUPLOT -persist") or die "no gnuplot";
     704    use FileHandle;
     705    GP->autoflush(1);
     706
     707    if ($self->{_outputFormat} ne "X11") {print GP "set output \"$outputFile\";";}
     708    print GP
     709        "set term $self->{_outputFormat} size 1280,1024;" .
     710        "set title \"Nebulous disk use across IPP cluster ($totalPercent of total allocated)\";" .
     711        "set style fill solid 1.00 border -1;" .
     712        "set bmarg 5; " .
    668713        "set key center top;" .
    669714        "set style histogram rowstacked;" .

  • trunk/ippMonitor/raw/czartool_getplot.php

    r33441 r34249  
    2828else if ($type=="s")
    2929$filePath = "$path/czarplot_hosts_space.png";
     30else if ($type=="sl")
     31$filePath = "$path/czarplot_hosts_space_large.png";
    3032else if ($type=="st")
    3133$filePath = "$path/czarplot_cluster.png";

  • trunk/ippMonitor/raw/czartool_labels.php

    r34184 r34249  
    141141 # storage plot
    142142echo "<br>";
    143  echo "<img src=\"czartool_getplot.php?type=s\"><br>";
     143 echo "<a href=\"czartool_getplot.php?type=sl\"><img title=\"Click to enlarge me\" src=\"czartool_getplot.php?type=s\"></a><br>";
    144144 # storage timeseries
    145145echo "<br>";
Note: See TracChangeset for help on using the changeset viewer.