Changeset 417

Timestamp:

01/03/07 16:17:00 (6 years ago)

Author:

max

Message:

Add key to component failure graphs, remove long-term ones

Files:

• util/server_daily_maint (modified) (10 diffs)

util/server_daily_maint

@@ -854 +854 @@
 sub graph_count_data
 {
-        my ($template, $varname, $request, @fields) = @_;
+        my ($template, $varname, $request, $show_key, @fields) = @_;
 
         my @requests = split(/ /, $request);
@@ -880 +880 @@
                 $title = "Last $max $timeslice" . 's' unless ($title);
 
-                my $fieldnum = 0, my $d, my $fielddesc = "";
+                my $fieldnum = 0, my $d, my $fielddesc = "", my @keys;
                 foreach my $field (@fields) 
                 {
+                        my $anydata = 0;
+                        my @data;
                         for (my $i = ($max-1); $i >= 0; $i--) 
                         {
@@ -896 +898 @@
                                 }
                                 my $time_offset = $starttime - ($i * $tdata->{$timeslice}->{n});
-                                push(@{$d->[$fieldnum]}, strftime("%Y-%m-%d %H:%M:%S", localtime($time_offset)), $val);
+                                push(@data, strftime("%Y-%m-%d %H:%M:%S", localtime($time_offset)), $val);
+                                $anydata = 1 if ($val);
                         }
-                        $fieldnum++;
-                        $fielddesc .= $field."_";                 
+                        $fielddesc .= $field."_";
+                        if ($anydata)
+                        {
+                            push (@{$d->[$fieldnum]}, @data);
+                            $fieldnum++;
+                            if ($show_key)
+                            {
+                                my $k = $field;
+                                $k = $1 if ($k =~ /^c_(.+)_fail/);
+                                push (@keys, $k);
+                            }
+                        }
                 }
                 $fielddesc = substr($fielddesc, 0, 150) . "-more-" if (length($fielddesc) > 160);
@@ -908 +921 @@
                                                                "$ts $timeslice" . 's',
                                                                $d,
-                                                               0,
-                                                               $varname =~ /duration/i) }; 
+                                                               $show_key ? 505 : 0,
+                                                               ($varname =~ /duration/i ? 1 : 0),
+                                                               ($show_key ? \@keys : undef) ) }; 
         }
 
@@ -932 +946 @@
         &report_count_data($template, 'MISSING', 'missing_sysid_list', 'all');
         &report_count_data($template, 'FAILURE', 'fail_sysid_list', 'all');
-        &graph_count_data($template, 'GRAPHS_USAGE', 'day week 12week year', 'success_sysid_list', 'missing_sysid_list', 'fail_sysid_list');
+        &graph_count_data($template, 'GRAPHS_USAGE', 'day week 12week year', 0, 'success_sysid_list', 'missing_sysid_list', 'fail_sysid_list');
 
         &graph_missing_data($template, 'GRAPHS_MISSING');
 
         &report_count_data($template, 'RUNS_SEEN', "visits", "all");
-        &graph_count_data($template, 'GRAPHS_RUNS', "day week 12week year", "visits");
+        &graph_count_data($template, 'GRAPHS_RUNS', "day week 12week year", 0, "visits");
 
         my @graphs = ();
@@ -957 +971 @@
         $template->param('DURATION' => \@duration);
 
-        &graph_count_data($template, 'GRAPHS_DURATION', "day week 12week year", "duration_min", "duration", "duration_max");
+        &graph_count_data($template, 'GRAPHS_DURATION', "day week 12week year", 0, "duration_min", "duration", "duration_max");
 
         @graphs = ( );
@@ -1036 +1050 @@
         $template->param('COMPONENTS', \@components);
         $template->param('CFAILURES', \@cfailures);
-        &graph_count_data($template, 'CFAILURE_GRAPHS', 'day week 12week year', @counters);
+        &graph_count_data($template, 'CFAILURE_GRAPHS', 'day week', 1, @counters);
 
         print "Generating index.html...\n\n" if ($debug);
@@ -1056 +1070 @@
                 &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', "day week 12week year", "c_".$c."_success_counter", "c_".$c."_fail_counter");
+                &graph_count_data($template, 'GRAPHS_OVERALL', "day week 12week year", 0, "c_".$c."_success_counter", "c_".$c."_fail_counter");
 
                 my @sf; 
@@ -1096 +1110 @@
                         $h->{'DURATIONS'} = \@durations;
 
-                        $h->{'GRAPHS_DURATIONS'} = &graph_count_data(undef, undef, "day week 12week year",$g."_duration", $g."_duration_min", $g."_duration_max");
+                        $h->{'GRAPHS_DURATIONS'} = &graph_count_data(undef, undef, "day week 12week year", 0, $g."_duration", $g."_duration_min", $g."_duration_max");
                         push @sf, $h;
                 }
@@ -1122 +1136 @@
                             }
                         }
-                        push @statistics, { STATNAME => $sname, TIMESLICES => [ @timeslices ], GRAPHS_STATISTICS => &graph_count_data(undef, undef, "72hour 12week",$svar."_duration", $svar."_duration_min", $svar."_duration_max")};
+                        push @statistics, { STATNAME => $sname, TIMESLICES => [ @timeslices ], GRAPHS_STATISTICS => &graph_count_data(undef, undef, "72hour 12week", 0, $svar."_duration", $svar."_duration_min", $svar."_duration_max")};
                 }
                 $template->param(STATISTICS => \@statistics);