--- parse_log.cgi	2003/10/05 17:52:04	1.1
+++ parse_log.cgi	2003/10/05 19:00:15	1.2
@@ -11,9 +11,15 @@
 use CGI qw/:standard *table/;
 use CGI::Carp qw(fatalsToBrowser);
 use Data::Sorting qw(:arrays);
+use Time::ParseDate;
+
 use Data::Dumper;
 
-my $date_fmt = "%Y-%m-%d %H:%M:%S";
+my $date_fmt = "%Y-%m-%d";
+my $date_time_fmt = "%Y-%m-%d %H:%M:%S";
+
+my $from_date = "now - 6 months";
+my $to_date = "now";
 
 # working days definition (1-7; mon=1)
 my $wday_start = 1;
@@ -22,11 +28,10 @@
 my $whours_start = "7:00";
 my $whours_end = "17:00";
 
-my $debug=0;
+my $debug=1;
 $debug++ if (grep(/-v/,@ARGV));
 $debug++ if (grep(/-d/,@ARGV));
 
-
 my $q = new CGI;
 
 my $print_orphans = $q->param('print_orphans') || 0;
@@ -59,7 +64,7 @@
 # pretty format date
 sub d {
 	my $utime = shift || return "?";
-	return strftime($date_fmt,localtime($utime));
+	return strftime($date_time_fmt,localtime($utime));
 }
 # pretty format duration
 sub dur {
@@ -75,8 +80,11 @@
 	$s = $s % 60;
 
 	$out .= $d."d " if ($d > 0);
-	$out .= sprintf("%02d:%02d:%02d [%d]",$h,$m,$s, $dur);
-#	$out .= sprintf("%02d:%02d:%02d",$h,$m,$s);
+	if ($debug) {
+		$out .= sprintf("%02d:%02d:%02d [%d]",$h,$m,$s, $dur);
+	} else {
+		$out .= sprintf("%02d:%02d:%02d",$h,$m,$s);
+	}
 
 	return $out;
 }
@@ -87,6 +95,7 @@
 my %fail;
 my %downtime;	# total downtime
 my %sg_filter;	# filter for service/group
+my %sg_count;	# count number of downtimes
 
 my $log_file="/home/dpavlin/mon-log/sap.log";
 
@@ -111,11 +120,12 @@
 					'dur'=>dur($utime - $fail{$id}),
 					'desc'=>$desc };
 				$downtime{"$group/$service"} += ($utime - $fail{$id}),
+				$sg_count{"$group/$service"}++;
 			}
 			$sg_filter{"$group/$service"}++;
 			delete $fail{$id};
 		} elsif ($status eq "up") {
-			if ($print_orphans) {
+			if ($print_orphans && grep(m;$group/$service;,@sg_selected)) {
 				push @data, {
 					'sg'=>"$group/$service",
 					'to_time'=>$utime,
@@ -123,11 +133,12 @@
 					'to'=>d($utime),
 					'dur'=>'unknown',
 					'desc'=>$desc };
+				$sg_count{"$group/$service"}++;
 			}
 			delete $fail{$id};
 			$sg_filter{"$group/$service"}++;
 		} elsif (defined($fail{$id})) {
-			if ($rep_reset) {
+			if ($rep_reset && grep(m;$group/$service;,@sg_selected)) {
 				push @data, {
 					'sg'=>"$group/$service",
 					'from_time'=>$fail{$id},
@@ -139,6 +150,7 @@
 					'desc'=>'[failure again]'};
 				$downtime{"$group/$service"} += ($utime - $fail{$id}),
 				$fail{$id} = $utime;
+				$sg_count{"$group/$service"}++;
 			}
 			$sg_filter{"$group/$service"}++;
 		} else {
@@ -172,6 +184,13 @@
 	$q->checkbox(-name=>'print_orphans',-checked=>0,
 	-label=>"show records which are not complete in this interval"),
 	br,
+	$q->checkbox(-name=>'use_date_limit',-checked=>1,
+	-label=>"use date limit from:"),
+	$q->textfield(-name=>'from_date',-size=>20,-default=>$from_date),
+	" to: ",
+	$q->textfield(-name=>'to_date',-size=>20,-default=>$to_date),
+	small('Using <a href="http://search.cpan.org/search?mode=module&query=Time::ParseDate">Time::ParseDate</a>'),
+	br,
 	$q->submit(-name=>'show',-value=>'Show report'),
 	)),end_table;
 
@@ -189,30 +208,47 @@
 	}
 }
 
-print start_table({-border=>1,-cellspacing=>0,-cellpadding=>2,-width=>'100%'}),
-	Tr(
+
+my ($from_time,$to_time,$from_html,$to_html);
+if ($q->param('use_date_limit')) {
+	$from_time = parsedate($q->param('from_date'), UK=>1);
+	$to_time = parsedate($q->param('to_date'), UK=>1);
+	$from_html = strftime($date_fmt,localtime($from_time));
+	$to_html = strftime($date_fmt,localtime($to_time));
+	$from_html .= " [$from_time] " if ($debug);
+	$to_html .= " [$to_time] " if ($debug);
+}
+
+# sort data
+#
+my @sorted = sorted_array(@data, @sort);
+#my @sorted = @data;
+
+print "-- sort: ",Dumper(@sort)," (data: ".@data." sorted: ".@sorted.") --\n",br if ($debug);
+
+print start_table({-border=>1,-cellspacing=>0,-cellpadding=>2,-width=>'100%'});
+
+print Tr(
 		th("group/service"),
 		th({-bgcolor=>'#f0f0f0'},
 			&sort_link($q,'from_time','u').' from '.
-			&sort_link($q,'from_time','d')
+			&sort_link($q,'from_time','d'),
+			br,$from_html
 		),
 		th(
 			&sort_link($q,'to_time','u').' to '.
-			&sort_link($q,'to_time','d')
+			&sort_link($q,'to_time','d'),
+			br,$to_html
 		),
 		th({-bgcolor=>'#e0e0e0'},
 			&sort_link($q,'dur_time','u').' duration '.
 			&sort_link($q,'dur_time','d')
 		),
 		th("description")
-	);
-
-my @sorted = sorted_array(@data, @sort);
-#my @sorted = @data;
-
-print "-- sort: ",Dumper(@sort)," (data: ".@data." sorted: ".@sorted.") --\n";
+	) if (scalar @sorted > 0);
 
 foreach my $row (@sorted) {
+	next if ($q->param('use_date_limit') && ($row->{from_time} < $from_time || $row->{to_time} > $to_time));
 	print Tr(
 		td({-align=>'left',-valign=>'center'},$row->{sg}),
 		td({-align=>'right',-bgcolor=>'#f0f0f0'},$row->{from}),
@@ -226,9 +262,9 @@
 #
 
 foreach my $sg (keys %downtime) {
-print Tr(th({-colspan=>3,-align=>'right'},"total for $sg:"),
-	th({-bgcolor=>'#e0e0e0',-align=>'right'},dur($downtime{"$sg"})),
-	th("")),"\n";
+print Tr(td({-colspan=>3,-align=>'right'},"total for $sg:"),
+	td({-bgcolor=>'#e0e0e0',-align=>'right'},dur($downtime{$sg})),
+	td(small("in ".$sg_count{$sg}." failures"))),"\n";
 }
 
 print end_table,