From a614377154e1cd13c714745ed12f0b1b8e755f41 Mon Sep 17 00:00:00 2001
From: Darold Gilles <gilles@darold.net>
Date: Sun, 1 Nov 2015 16:53:08 +0100
Subject: [PATCH] Add charts on throughput.

---
 SquidAnalyzer.pm            | 35 +++++++++++++++++++++++++++++------
 resources/squidanalyzer.css |  2 +-
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/SquidAnalyzer.pm b/SquidAnalyzer.pm
index 10cee07..e002a07 100644
--- a/SquidAnalyzer.pm
+++ b/SquidAnalyzer.pm
@@ -155,6 +155,8 @@ my %Translate = (
 	'Top_denied_link' => 'Top Denied',
 	'SquidGuard_acl_title' => 'SquidGuard ACL use',
 	'Throughput' => 'Throughput',
+	'Graph_throughput_title' => '%s throughput on',
+	'Throughput_graph' => 'Bytes/sec',
 );
 
 my @TLD1 = (
@@ -3149,25 +3151,28 @@ sub _print_cache_stat
 			$hits =~ s/,$//;
 			$bytes =~ s/,$//;
 			my %hits_tmp = split(/[:,]/, $hits);
-			foreach my $tmp (sort {$a <=> $b} keys %hits_tmp) {
+			foreach my $tmp (keys %hits_tmp) {
 				$detail_code_stat{$code}{$tmp}{request} = $hits_tmp{$tmp};
 				$code_stat{$code}{request} += $hits_tmp{$tmp};
 			}
 			my %bytes_tmp = split(/[:,]/, $bytes);
-			foreach my $tmp (sort {$a <=> $b} keys %bytes_tmp) {
+			foreach my $tmp (keys %bytes_tmp) {
 				$detail_code_stat{$code}{$tmp}{bytes} = $bytes_tmp{$tmp};
 				$code_stat{$code}{bytes} += $bytes_tmp{$tmp};
 			}
-			if ($data =~ s/thp_bytes_$type=([^;]+);thp_duration_$type=([^;]+)//) {
+			if ($data =~ /thp_bytes_$type=([^;]+);thp_duration_$type=([^;]+)/) {
 				$bytes = $1 || '';
 				my $elapsed = $2 || '';
+				$bytes =~ s/,$//;
 				$elapsed =~ s/,$//;
 				my %bytes_tmp = split(/[:,]/, $bytes);
-				foreach my $tmp (sort {$a <=> $b} keys %bytes_tmp) {
+				foreach my $tmp (keys %bytes_tmp) {
+					$detail_code_stat{throughput}{"$tmp"}{bytes} = $bytes_tmp{"$tmp"};
 					$throughput_stat{$code}{bytes} += $bytes_tmp{$tmp};
 				}
 				my %elapsed_tmp = split(/[:,]/, $elapsed);
-				foreach my $tmp (sort {$a <=> $b} keys %elapsed_tmp) {
+				foreach my $tmp (keys %elapsed_tmp) {
+					$detail_code_stat{throughput}{"$tmp"}{elapsed} = $elapsed_tmp{"$tmp"};
 					$throughput_stat{$code}{elapsed} += $elapsed_tmp{$tmp};
 				}
 			}
@@ -3242,6 +3247,7 @@ sub _print_cache_stat
 	my @hit = ();
 	my @miss = ();
 	my @denied = ();
+	my @throughput = ();
 	my @total = ();
 	for (my $i = 0; $i <= $#xaxis; $i++) {
 		my $ddate = $xaxis[$i];
@@ -3264,10 +3270,16 @@ sub _print_cache_stat
 		} else {
 			push(@denied, "[ $xaxis[$i], 0 ]");
 		}
+		if (exists $detail_code_stat{throughput}{$ddate}{bytes}) {
+			push(@throughput, "[ $xaxis[$i], " . int($detail_code_stat{throughput}{$ddate}{bytes}/($detail_code_stat{throughput}{$ddate}{elapsed}/1000)) . " ]");
+		} else {
+			push(@throughput, "[ $xaxis[$i], 0 ]");
+		}
 		push(@total, "[ $xaxis[$i], $tot ]");
 		delete $detail_code_stat{HIT}{$ddate}{request};
 		delete $detail_code_stat{MISS}{$ddate}{request};
 		delete $detail_code_stat{DENIED}{$ddate}{request};
+		delete $detail_code_stat{throughput}{$ddate};
 	}
 
 	my $t1 = $Translate{'Graph_cache_hit_title'};
@@ -3323,6 +3335,14 @@ sub _print_cache_stat
 	@denied = ();
 	@total = ();
 
+	$t1 = $Translate{'Graph_throughput_title'};
+	$t1 =~ s/\%s/$title/;
+	$t1 = "$t1 $stat_date";
+	$ylabel = $Translate{'Bytes_graph'} || $Translate{'Bytes'};
+	my $throughput_bytes = $self->flotr2_bargraph(3, 'throughput_bytes', $type, $t1, $xlabel, $ylabel,
+				join(',', @throughput), $Translate{'Throughput_graph'});
+	@throughput = ();
+
 	print $out qq{
 <table class="stata">
 <tr>
@@ -3376,7 +3396,10 @@ sub _print_cache_stat
 </tr>
 </table>
 
-<table class="graphs"><tr><td>$code_requests</td><td>$code_bytes</td></tr></table>
+<table class="graphs">
+<tr><td>$code_requests</td><td>$code_bytes</td></tr>
+<tr><td colspan="2" align="center">$throughput_bytes</td></tr>
+</table>
 
 	<h4>$Translate{'Legend'}</h4>
 	<div class="line-separator"></div>
diff --git a/resources/squidanalyzer.css b/resources/squidanalyzer.css
index d4bc26a..3461c8e 100644
--- a/resources/squidanalyzer.css
+++ b/resources/squidanalyzer.css
@@ -60,7 +60,7 @@ table.stata td a:hover { color: #76add2; }
 /*   Graphs   */
 /**************/
 
-#code_requests, #network_hits, #user_hits, #domain_hits, #second_domain_hits, #mime_hits, #code_bytes, #network_bytes, #user_bytes, #domain_bytes, #second_domain_bytes, #mime_bytes, #squidguard_acl {
+#code_requests, #network_hits, #user_hits, #domain_hits, #second_domain_hits, #mime_hits, #code_bytes, #network_bytes, #user_bytes, #domain_bytes, #second_domain_bytes, #mime_bytes, #squidguard_acl, #throughput_bytes {
      width : 550px;
      height: 300px;
      background:#F3F2ED;