Changeset 351

Timestamp:

12/11/06 02:15:01 (6 years ago)

Author:

max

Message:

More fun with graphs!

Files:

• util/server_daily_maint (modified) (9 diffs)

util/server_daily_maint

@@ -14 +14 @@
 my $days_to_keep = 14;          # keep 14 days
 my $store_dir = $ENV{HOME} . "/whuffy.com/dev/stats";    # where we retrieve our feedback
-my $graph_dir = $ENV{HOME} . "/whuffy.com/dev/test"; # where we store our graphs
+my $graph_dir = $ENV{HOME} . "/whuffy.com/dev/feedback"; # where we store our graphs
 my $stylesheet = '/svgstyles.css';
-my $debug = 1;
+my $debug = 0;
 
 use strict;
@@ -566 +566 @@
         my $gwidth = 250;
 
-        print "Generating graph $gname ..\n" if ($debug);
+        print "Generating graph $gname ($title)...\n" if ($debug);
         # work out scale..
         my $min, my $max;
@@ -584 +584 @@
         $scalediv = 1 if ($scalediv < 1);
 
-        return if (($min == 0) && ($max == 0));
+        if (($min == 0) && ($max == 0)) { print "oh oh\n"; return; };
 
         my $graph = SVG::TT::Graph::TimeSeries->new({
@@ -621 +621 @@
 sub graph_count_data
 {
-        my ($template, $varname, $max_hrs, $max_days, $max_weeks, $max_months, @fields) = @_;
-
+        my ($template, $varname, $request, @fields) = @_;
+
+        my @requests = split(/ /, $request);
         my @graphs;
 
-        # hours
-        if ($max_hrs > 0) {
+        my $tdata = {
+                        hour => { n => 3600, tformat => "%a %H:%M", abbrev => "hr" },
+                        day =>  { n => 86400, tformat => "%a %e %b", abbrev => "day" },
+                        week => { n => 604800, tformat => "%e %b %y", abbrev => "wk" },
+                        month =>{ n => 2592000, tformat => "%b %y", abbrev => "mn" }
+                    };
+
+        foreach my $r (@requests)
+        {
+                next unless ($r =~ /(\d+)(\w+)/);
+                my $max = $1;
+                my $timeslice = $2;
+
                 my $fieldnum = 0, my $d, my $fielddesc = "";
-                foreach my $field (@fields) {
-                        for (my $i = ($max_hrs-1); $i >= 0; $i--) {
-                                my $val = numvar($store->{per_hour}->[$i]->{$field},$field,0);
-                                $val /= numvar($store->{per_hour}->[$i]->{duration_count},$field,1) if ($field =~ /duration$/);
-                                my $time_offset = $starttime + $store->{tzdiff} - (60*60*$i);
-                                push(@{$d->[$fieldnum]}, strftime("%Y-%m-%d %H:%M:%S", localtime($time_offset)), $val);
-                        }
-                        $fieldnum++;
-                        $fielddesc .= $field."_";
-                }
-                push @graphs, { GRAPH => &graph_one_count_data($fielddesc."hr", "Last $max_hrs hours", "%a %H:%M", "6 hours", $d) };
-        }
-
-        # days
-        if ($max_days > 0) {
-                my $fieldnum = 0, my $d, my $fielddesc = "";
-                foreach my $field (@fields) {
-                        for (my $i = ($max_days-1); $i >= 0; $i--) {
-                                my $val = numvar($store->{per_day}->[$i]->{$field},$field,0);
-                                $val /= numvar($store->{per_hour}->[$i]->{duration_count},$field,1) if ($field =~ /^duration$/);
-                                my $time_offset = $starttime + $store->{tzdiff} - (60*60*24*$i);
-                                push(@{$d->[$fieldnum]}, strftime("%Y-%m-%d %H:%M:%S", localtime($time_offset)), $val);
-                        }
-                        $fieldnum++;
-                        $fielddesc .= $field."_";
-                }
-                push @graphs, { GRAPH => &graph_one_count_data($fielddesc."day", "Last $max_days days", "%a %e %b", "5 days", $d) };
-        }
-
-        # weeks
-        if ($max_weeks > 0) {
-                my $fieldnum = 0, my $d, my $fielddesc = "";
-                foreach my $field (@fields) {
-                        for (my $i = ($max_weeks-1); $i >= 0; $i--) {
-                                my $val = numvar($store->{per_week}->[$i]->{$field},$field,0);
-                                $val /= numvar($store->{per_hour}->[$i]->{duration_count},$field,1) if ($field =~ /^duration$/);
-                                my $time_offset = $starttime + $store->{tzdiff} - (60*60*24*7*$i);
-                                push(@{$d->[$fieldnum]}, strftime("%Y-%m-%d %H:%M:%S", localtime($time_offset)), $val);
-                        }
-                        $fieldnum++;
-                        $fielddesc .= $field."_";
-                }
-                push @graphs, { GRAPH => &graph_one_count_data($fielddesc."wk", "Last $max_weeks weeks", "%e %b %y", "3 weeks", $d) };
-        }
-
-        # months
-        if ($max_months > 0) {
-                my $fieldnum = 0, my $d, my $fielddesc = "";
-                foreach my $field (@fields) {
-                        for (my $i = ($max_months-1); $i >= 0; $i--) {
-                                my $val = numvar($store->{per_week}->[$i]->{$field},$field,0);
-                                $val /= numvar($store->{per_hour}->[$i]->{duration_count},$field,1) if ($field =~ /^duration$/);
-                                my $time_offset = $starttime + $store->{tzdiff} - (60*60*24*30*$i);
-                                push(@{$d->[$fieldnum]}, strftime("%Y-%m-%d %H:%M:%S", localtime($time_offset)), $val);
-                        }
-                        $fieldnum++;
-                        $fielddesc .= $field."_";
-                }
-                push @graphs, { GRAPH => &graph_one_count_data($fielddesc."mn", "Last $max_months months", "%b %y", "4 months", $d)};
+                foreach my $field (@fields) 
+                {
+                        for (my $i = ($max-1); $i >= 0; $i--) 
+                        {
+                                my $val = numvar($store->{"per_$timeslice"}->[$i]->{$field},$field,0);
+                                $val /= numvar($store->{per_hour}->[$i]->{duration_count},$field,1) if ($field =~ /duration$/);
+                                my $time_offset = $starttime + $store->{tzdiff} - ($i * $tdata->{$timeslice}->{n});
+                                push(@{$d->[$fieldnum]}, strftime("%Y-%m-%d %H:%M:%S", localtime($time_offset)), $val);
+                        }
+                        $fieldnum++;
+                        $fielddesc .= $field."_";                 
+                }
+                my $ts = int($max > 20 ? $max / 4 : $max > 7 ? 3 : 2);
+                push @graphs, { GRAPH => &graph_one_count_data($fielddesc.$tdata->{$timeslice}->{abbrev}, 
+                                                               "Last $max $timeslice" . 's', 
+                                                               $tdata->{$timeslice}->{tformat},
+                                                               "$ts $timeslice" . 's',
+                                                               $d) }; 
         }
 
@@ -710 +681 @@
         &report_count_data($template, 'OVERALL_SEEN', "visits", "all");
         &report_count_data($template, 'OVERALL_NODATA', "visits_with_no_details", "brief");
-        &graph_count_data($template, 'GRAPHS_OVERALL', 24,21,12,24, "visits", "visits_with_no_details");
+        &graph_count_data($template, 'GRAPHS_OVERALL', "24hour 7day 12week 12month", "visits", "visits_with_no_details");
         &report_count_data($template, 'USERS', "seen_sysid_list");
-        &graph_count_data($template, 'GRAPHS_USERS', 24,21,12,24, "seen_sysid_list");
+        &graph_count_data($template, 'GRAPHS_USERS', "24hour 7day 12week 12month", "seen_sysid_list");
 
         @graphs = ();
@@ -732 +703 @@
         $template->param('DURATION' => \@duration);
 
-        &graph_count_data($template, 'GRAPHS_DURATION', 24,21,12,24,"duration", "duration_min", "duration_max");
+        &graph_count_data($template, 'GRAPHS_DURATION', "24hour 7day 12week 12month","duration", "duration_min", "duration_max");
 
         @graphs = ( );
@@ -807 +778 @@
                 &report_count_data($template, 'COMPONENT_SUCCESS_RUNS', "c_".$c."_success_counter", "all");
                 &report_count_data($template, 'COMPONENT_FAIL_RUNS', "c_".$c."_fail_counter", "brief");
-                &graph_count_data($template, 'GRAPHS_OVERALL', 24,21,12,24, "c_".$c."_success_counter", "c_".$c."_fail_counter");
+                &graph_count_data($template, 'GRAPHS_OVERALL', "24hour 7day 12week 12month", "c_".$c."_success_counter", "c_".$c."_fail_counter");
 
                 my @sf; 
@@ -847 +818 @@
                         $h->{'DURATIONS'} = \@durations;
 
-                        $h->{'GRAPHS_DURATIONS'} = &graph_count_data(undef, undef, 24,21,12,24,$g."_duration", $g."_duration_min", $g."_duration_max");
+                        $h->{'GRAPHS_DURATIONS'} = &graph_count_data(undef, undef, "24hour 7day 12week 12month",$g."_duration", $g."_duration_min", $g."_duration_max");
                         push @sf, $h;
                 }
@@ -873 +844 @@
                             }
                         }
-                        push @statistics, { STATNAME => $sname, TIMESLICES => [ @timeslices ], GRAPHS_STATISTICS => &graph_count_data(undef, undef, 72,0,12,0,$svar."_duration", $svar."_duration_min", $svar."_duration_max")};
+                        push @statistics, { STATNAME => $sname, TIMESLICES => [ @timeslices ], GRAPHS_STATISTICS => &graph_count_data(undef, undef, "72hour 12week",$svar."_duration", $svar."_duration_min", $svar."_duration_max")};
                 }
                 #       print Dumper(\@statistics);