File mailgraph-1.14-add_postgrey_and_greylisting_sup... of Package mailgraph

Overview Repositories Revisions Requests Users Attributes Meta

File mailgraph-1.14-add_postgrey_and_greylisting_support.patch of Package mailgraph

Index: mailgraph-1.14/mailgraph.cgi
===================================================================
--- mailgraph-1.14.orig/mailgraph.cgi
+++ mailgraph-1.14/mailgraph.cgi
@@ -28,12 +28,14 @@ my @graphs = (
 );
 
 my %color = (
-	sent     => '000099', # rrggbb in hex
-	received => '009900',
-	rejected => 'AA0000', 
-	bounced  => '000000',
-	virus    => 'DDBB00',
-	spam     => '999999',
+	sent       => '000099', # rrggbb in hex
+	received   => '009900',
+	rejected   => 'AA0000',
+	bounced    => '000000',
+	virus      => 'DDBB00',
+	spam       => '999999',
+	greylisted => '999999',
+	delayed	   => '006400',
 );
 
 sub rrd_graph(@)
@@ -151,6 +153,36 @@ sub graph_err($$)
 	);
 }
 
+sub graph_grey($$)
+{
+	my ($range, $file) = @_;
+	my $step = $range*$points_per_sample/$xpoints;
+	rrd_graph($range, $file, $ypoints_grey,
+		"DEF:greylisted=$rrd_greylist:greylisted:AVERAGE",
+		"DEF:mgreylisted=$rrd_greylist:greylisted:MAX",
+		"CDEF:rgreylisted=greylisted,60,*",
+		"CDEF:dgreylisted=greylisted,UN,0,greylisted,IF,$step,*",
+		"CDEF:sgreylisted=PREV,UN,dgreylisted,PREV,IF,dgreylisted,+",
+		"CDEF:rmgreylisted=mgreylisted,60,*",
+		"AREA:rgreylisted#$color{greylisted}:Greylisted",
+		'GPRINT:sgreylisted:MAX:total\: %8.0lf msgs',
+		'GPRINT:rgreylisted:AVERAGE:avg\: %5.2lf msgs/min',
+		'GPRINT:rmgreylisted:MAX:max\: %4.0lf msgs/min\l',
+
+		"DEF:delayed=$rrd_greylist:delayed:AVERAGE",
+		"DEF:mdelayed=$rrd_greylist:delayed:MAX",
+		"CDEF:rdelayed=delayed,60,*",
+		"CDEF:ddelayed=delayed,UN,0,delayed,IF,$step,*",
+		"CDEF:sdelayed=PREV,UN,ddelayed,PREV,IF,ddelayed,+",
+		"CDEF:rmdelayed=mdelayed,60,*",
+		"LINE2:rdelayed#$color{delayed}:Delayed   ",
+		'GPRINT:sdelayed:MAX:total\: %8.0lf msgs',
+		'GPRINT:rdelayed:AVERAGE:avg\: %5.2lf msgs/min',
+		'GPRINT:rmdelayed:MAX:max\: %4.0lf msgs/min\l',
+	);
+}
+
+
 sub print_html()
 {
 	print "Content-Type: text/html\n\n";
@@ -180,6 +212,7 @@ HEADER
 		print "<h2 id=\"G$n\">$graphs[$n]{title}<a href=\"#TOP\">&nbsp;TOP</a></h2>\n";
 		print "<p><img src=\"$scriptname?${n}-n\" alt=\"mailgraph\"/><br/>\n";
 		print "<img src=\"$scriptname?${n}-e\" alt=\"mailgraph\"/></p>\n";
+		print "<img src=\"$scriptname?${n}-g\" alt=\"mailgraph\"/></p>\n";
 	}
 
 	print <<FOOTER;
@@ -232,6 +265,11 @@ sub main()
 			graph_err($graphs[$1]{seconds}, $file);
 			send_image($file);
 		}
+		elsif($img =~ /^(\d+)-g$/) {
+			my $file = "$tmp_dir/$uri/mailgraph_$1_grey.png";
+			graph_grey($graphs[$1]{seconds}, $file);
+			send_image($file);
+		}
 		else {
 			die "ERROR: invalid argument\n";
 		}
Index: mailgraph-1.14/mailgraph.pl
===================================================================
--- mailgraph-1.14.orig/mailgraph.pl
+++ mailgraph-1.14/mailgraph.pl
@@ -380,9 +380,10 @@ my $statfile='';
 my $logfile;
 my $rrd = "mailgraph.rrd";
 my $rrd_virus = "mailgraph_virus.rrd";
+my $rrd_greylist = "mailgraph_greylist.rrd";
 my $year;
 my $this_minute;
-my %sum = ( sent => 0, received => 0, bounced => 0, rejected => 0, virus => 0, spam => 0 );
+my %sum = ( sent => 0, received => 0, bounced => 0, rejected => 0, virus => 0, spam => 0, greylisted => 0, delayed => 0);
 my %sum_stat = %sum;
 my $rrd_inited=0;
 
@@ -397,6 +398,8 @@ sub event_bounced($);
 sub event_rejected($);
 sub event_virus($);
 sub event_spam($);
+sub event_greylisted($);
+sub event_delayed($);
 sub init_rrd($);
 sub update($);
 
@@ -418,8 +421,9 @@ sub usage
 	print "  --daemon-log=FILE  write verbose-log to FILE instead of /var/log/mailgraph.log\n";
 	print "  --ignore-localhost ignore mail to/from localhost (used for virus scanner)\n";
 	print "  --ignore-host=HOST ignore mail to/from HOST regexp (used for virus scanner)\n";
-	print "  --only-mail-rrd    update only the mail rrd\n";
-	print "  --only-virus-rrd   update only the virus rrd\n";
+	print "  --no-mail-rrd      no update mail rrd\n";
+	print "  --no-virus-rrd     no update virus rrd\n";
+	print "  --no-greylist-rrd  no update greylist rrd\n";
 	print "  --rrd-name=NAME    use NAME.rrd and NAME_virus.rrd for the rrd files\n";
 	print "  --rbl-is-spam      count rbl rejects as spam\n";
 	print "  --virbl-is-virus   count virbl rejects as viruses\n";
@@ -434,7 +438,7 @@ sub main
 		'year|y=i', 'host=s', 'verbose|v', 'daemon|d!', 'statfile|s=s',
 		'daemon_pid|daemon-pid=s', 'daemon_rrd|daemon-rrd=s',
 		'daemon_log|daemon-log=s', 'ignore-localhost!', 'ignore-host=s@',
-		'only-mail-rrd', 'only-virus-rrd', 'rrd_name|rrd-name=s',
+		'no-mail-rrd', 'no-virus-rrd', 'no-greylist-rrd', 'rrd_name|rrd-name=s',
 		'rbl-is-spam', 'virbl-is-virus'
 		) or exit(1);
 	usage if $opt{help};
@@ -450,6 +454,7 @@ sub main
 	$statfile       = $opt{statfile} if defined $opt{statfile};
 	$rrd		= $opt{rrd_name}.".rrd" if defined $opt{rrd_name};
 	$rrd_virus	= $opt{rrd_name}."_virus.rrd" if defined $opt{rrd_name};
+	$rrd_greylist   = $opt{rrd_name}."_greylist.rrd" if defined $opt{rrd_name};
 
 	# compile --ignore-host regexps
 	if(defined $opt{'ignore-host'}) {
@@ -526,7 +531,7 @@ sub init_rrd($)
 	my $year_steps = $month_steps*12;
 
 	# mail rrd
-	if(! -f $rrd and ! $opt{'only-virus-rrd'}) {
+	if(! -f $rrd and ! $opt{'no-mail-rrd'}) {
 		RRDs::create($rrd, '--start', $m, '--step', $rrdstep,
 				'DS:sent:ABSOLUTE:'.($rrdstep*2).':0:U',
 				'DS:recv:ABSOLUTE:'.($rrdstep*2).':0:U',
@@ -548,7 +553,7 @@ sub init_rrd($)
 	}
 
 	# virus rrd
-	if(! -f $rrd_virus and ! $opt{'only-mail-rrd'}) {
+	if(! -f $rrd_virus and ! $opt{'no-virus-rrd'}) {
 		RRDs::create($rrd_virus, '--start', $m, '--step', $rrdstep,
 				'DS:virus:ABSOLUTE:'.($rrdstep*2).':0:U',
 				'DS:spam:ABSOLUTE:'.($rrdstep*2).':0:U',
@@ -565,6 +570,25 @@ sub init_rrd($)
 	elsif(-f $rrd_virus and ! defined $rrd_virus) {
 		$this_minute = RRDs::last($rrd_virus) + $rrdstep;
 	}
+	# greylist rrd
+	if(! -f $rrd_greylist and ! $opt{'no-greylist-rrd'}) {
+		RRDs::create($rrd_greylist, '--start', $m, '--step', $rrdstep,
+				'DS:greylisted:ABSOLUTE:'.($rrdstep*2).':0:U',
+				'DS:delayed:ABSOLUTE:'.($rrdstep*2).':0:U',
+				"RRA:AVERAGE:0.5:$day_steps:$realrows",   # day
+				"RRA:AVERAGE:0.5:$week_steps:$realrows",  # week
+				"RRA:AVERAGE:0.5:$month_steps:$realrows", # month
+				"RRA:AVERAGE:0.5:$year_steps:$realrows",  # year
+				"RRA:MAX:0.5:$day_steps:$realrows",   # day
+				"RRA:MAX:0.5:$week_steps:$realrows",  # week
+				"RRA:MAX:0.5:$month_steps:$realrows", # month
+				"RRA:MAX:0.5:$year_steps:$realrows",  # year
+				);
+			$this_minute = $m;
+	}
+	elsif(-f $rrd_greylist and ! defined $rrd_greylist) {
+		$this_minute = RRDs::last($rrd_greylist) + $rrdstep;
+	}
 
 	$rrd_inited=1;
 }
@@ -614,6 +638,9 @@ sub process_line($)
 			elsif($opt{'rbl-is-spam'} and $text    =~ /^(?:[0-9A-Z]+: |NOQUEUE: )?reject: .*: 554.* blocked using/) {
 				event($time, 'spam');
 			}
+			elsif($text =~ /Greylisted/) {
+				event($time, 'greylisted');
+			}
 			elsif($text =~ /^(?:[0-9A-Z]+: |NOQUEUE: )?reject: /) {
 				event($time, 'rejected');
 			}
@@ -857,6 +884,21 @@ sub process_line($)
 			event($time, 'virus');
 		}
 	}
+	elsif($prog eq 'postgrey') {
+		# Old versions (up to 1.27)
+		if($text =~ /delayed [0-9]+ seconds: client/) {
+			event($time, 'delayed');
+		}
+		# New versions (from 1.28)
+		if($text =~ /delay=[0-9]+/) {
+			event($time, 'delayed');
+		}
+	}
+	elsif($prog eq 'grossd') {
+		if($text =~ /a\=greylist/) {
+			event($time, 'greylisted');
+		}
+	}
 }
 
 sub event($$)
@@ -875,14 +917,16 @@ sub update($)
 	return 1 if $m == $this_minute;
 	return 0 if $m < $this_minute;
 
-	print "update $this_minute:$sum{sent}:$sum{received}:$sum{bounced}:$sum{rejected}:$sum{virus}:$sum{spam}\n" if $opt{verbose};
-	RRDs::update $rrd, "$this_minute:$sum{sent}:$sum{received}:$sum{bounced}:$sum{rejected}" unless $opt{'only-virus-rrd'};
-	RRDs::update $rrd_virus, "$this_minute:$sum{virus}:$sum{spam}" unless $opt{'only-mail-rrd'};
+	print "update $this_minute:$sum{sent}:$sum{received}:$sum{bounced}:$sum{rejected}:$sum{virus}:$sum{spam}:$sum{greylisted}:$sum{delayed}\n" if $opt{verbose};
+	RRDs::update $rrd, "$this_minute:$sum{sent}:$sum{received}:$sum{bounced}:$sum{rejected}" unless $opt{'no-mail-rrd'};
+	RRDs::update $rrd_virus, "$this_minute:$sum{virus}:$sum{spam}" unless $opt{'no-virus-rrd'};
+	RRDs::update $rrd_greylist, "$this_minute:$sum{greylisted}:$sum{delayed}" unless $opt{'no-greylist-rrd'};
 	if($m > $this_minute+$rrdstep) {
 		for(my $sm=$this_minute+$rrdstep;$sm<$m;$sm+=$rrdstep) {
-			print "update $sm:0:0:0:0:0:0 (SKIP)\n" if $opt{verbose};
-			RRDs::update $rrd, "$sm:0:0:0:0" unless $opt{'only-virus-rrd'};
-			RRDs::update $rrd_virus, "$sm:0:0" unless $opt{'only-mail-rrd'};
+			print "update $sm:0:0:0:0:0:0:0:0 (SKIP)\n" if $opt{verbose};
+			RRDs::update $rrd, "$sm:0:0:0:0" unless $opt{'no-mail-rrd'};
+			RRDs::update $rrd_virus, "$sm:0:0" unless $opt{'no-virus-rrd'};
+			RRDs::update $rrd_greylist, "$sm:0:0" unless $opt{'no-greylist-rrd'};
 		}
 	}
 	if ("$statfile" ne ""){
@@ -895,6 +939,8 @@ sub update($)
 	$sum{rejected}=0;
 	$sum{virus}=0;
 	$sum{spam}=0;
+	$sum{greylisted}=0;
+	$sum{delayed}=0;
 	return 1;
 }
 
@@ -936,8 +982,9 @@ B<mailgraph> [I<options>...]
  --daemon-log=FILE  write verbose-log to FILE instead of /var/log/mailgraph.log
  --ignore-localhost ignore mail to/from localhost (used for virus scanner)
  --ignore-host=HOST ignore mail to/from HOST regexp (used for virus scanner)
- --only-mail-rrd    update only the mail rrd
- --only-virus-rrd   update only the virus rrd
+ --no-mail-rrd      do not update mail rrd
+ --no-virus-rrd     do not update virus rrd
+ --no-greylist-rrd  do not update greylist rrd
  --rrd-name=NAME    use NAME.rrd and NAME_virus.rrd for the rrd files
  --rbl-is-spam      count rbl rejects as spam
  --virbl-is-virus   count virbl rejects as viruses

Places

File mailgraph-1.14-add_postgrey_and_greylisting_support.patch of Package mailgraph

Places