From 1177eda1b37e14d90abc9d0247a3698d103b9cf5 Mon Sep 17 00:00:00 2001 From: Darold Date: Fri, 20 Apr 2012 12:44:11 +0200 Subject: [PATCH] Fix per sessions graphs --- pgbadger | 52 +++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 43 insertions(+), 9 deletions(-) diff --git a/pgbadger b/pgbadger index 163febc..9c5aa3c 100755 --- a/pgbadger +++ b/pgbadger @@ -1000,7 +1000,7 @@ sub dump_as_html my $write_average = (($per_hour_info{$d}{$h}{'INSERT'}{duration}+$per_hour_info{$d}{$h}{'UPDATE'}{duration}+$per_hour_info{$d}{$h}{'DELETE'}{duration})||0)/(($per_hour_info{$d}{$h}{'INSERT'}{count}+$per_hour_info{$d}{$h}{'UPDATE'}{count}+$per_hour_info{$d}{$h}{'DELETE'}{count})||1); print $fh "$zday$h", &comma_numbers($per_hour_info{$d}{$h}{count}), "", &convert_time($per_hour_info{$d}{$h}{average}), "",&comma_numbers($per_hour_info{$d}{$h}{'SELECT'}{count}||0), "", &convert_time($per_hour_info{$d}{$h}{'SELECT'}{average}||0), "", &comma_numbers($per_hour_info{$d}{$h}{'INSERT'}{count}||0), "", &comma_numbers($per_hour_info{$d}{$h}{'UPDATE'}{count}||0), "", &comma_numbers($per_hour_info{$d}{$h}{'DELETE'}{count}||0), "", &convert_time($write_average), ""; if ($tempfile_info{count}) { - my $temp_average = '0.00'; + my $temp_average = '0'; if ($tempfile_info{chronos}{$d}{$h}{count}) { $temp_average = &comma_numbers(sprintf("%.2f", $tempfile_info{chronos}{$d}{$h}{size}/$tempfile_info{chronos}{$d}{$h}{count})); } @@ -1010,7 +1010,7 @@ sub dump_as_html if (exists $checkpoint_info{chronos}{$d}{$h}) { print $fh "", &comma_numbers($checkpoint_info{chronos}{$d}{$h}{wbuffer}) || 0, "", &comma_numbers($checkpoint_info{chronos}{$d}{$h}{file_added}) || 0, "", &comma_numbers($checkpoint_info{chronos}{$d}{$h}{file_removed}) || 0, "", &comma_numbers($checkpoint_info{chronos}{$d}{$h}{file_recycled}) || 0, "", &comma_numbers($checkpoint_info{chronos}{$d}{$h}{write}) || 0, "", &comma_numbers($checkpoint_info{chronos}{$d}{$h}{sync}) || 0, "", &comma_numbers($checkpoint_info{chronos}{$d}{$h}{total}) || 0, ""; } else { - print $fh "       "; + print $fh "0000000"; } } print $fh "\n"; @@ -1164,7 +1164,7 @@ sub dump_as_html if ($graph) { my @data1 = (); - push(@data1, sprintf("%0.2f", ($overall_stat{'SELECT'}*100)/$total), sprintf("%0.2f", ($overall_stat{'INSERT'}*100)/$total), sprintf("%0.2f", ($overall_stat{'UPDATE'}*100)/$total), sprintf("%0.2f", (($total - $totala)*100)/$total), sprintf("%0.2f", (($total - $totala)*100)/$total)); + push(@data1, sprintf("%0.2f", ($overall_stat{'SELECT'}*100)/$total), sprintf("%0.2f", ($overall_stat{'INSERT'}*100)/$total), sprintf("%0.2f", ($overall_stat{'UPDATE'}*100)/$total), sprintf("%0.2f", ($overall_stat{'DELETE'}*100)/$total), sprintf("%0.2f", (($total - $totala)*100)/$total)); my @labels = ('SELECT' . " $data1[0]\%", 'INSERT' . " $data1[1]\%", 'UPDATE' . " $data1[2]\%", 'DELETE' . " $data1[3]\%", 'OTHER' . " $data1[4]\%"); push(@graph_values, [ @labels ] ); @labels = (); push(@graph_values, [ @data1 ] ); @data1 = (); @@ -1247,8 +1247,8 @@ sub dump_as_html } push(@graph_values, [ @labels ] ); @labels = (); push(@graph_values, [ @data1 ] ); @data1 = (); - &create_graph_pie('databaseconn', 'Database connections'); - print $fh qq{

Databases connections

}; + &create_graph_pie('databasesession', 'Databases sessions'); + print $fh qq{

Databases Sessions

}; @graph_values = (); } print $fh "\n"; @@ -1257,6 +1257,8 @@ sub dump_as_html if (exists $session_info{user}) { print $fh qq{

Sessions per user ^

+ +
@@ -1265,17 +1267,34 @@ sub dump_as_html }; - + my $total_count = 0; foreach my $d (sort keys %{$session_info{user}}) { + $total_count += $session_info{user}{$d}{count}; print $fh "\n"; } - print $fh "
UserAv. duration (s)
$d", &comma_numbers($session_info{user}{$d}{count}), "", &convert_time($session_info{user}{$d}{duration}), "", &convert_time($session_info{user}{$d}{duration}/$session_info{user}{$d}{count}), "
\n"; + print $fh "
Users Sessions

}; + @graph_values = (); + } + print $fh "\n"; } # Show session per host statistics if (exists $session_info{host}) { print $fh qq{

Sessions per host ^

+ +
@@ -1284,11 +1303,26 @@ sub dump_as_html }; - + my $total_count = 0; foreach my $d (sort keys %{$session_info{host}}) { + $total_count += $session_info{host}{$d}{count}; print $fh "\n"; } - print $fh "
HostAv. duration (s)
$d", &comma_numbers($session_info{host}{$d}{count}), "", &convert_time($session_info{host}{$d}{duration}), "", &convert_time($session_info{host}{$d}{duration}/$session_info{host}{$d}{count}), "
\n"; + print $fh "
Hosts Sessions

}; + @graph_values = (); + } + print $fh "\n"; } $connection_info{count}++; -- 2.50.1