From: Darold Gilles Date: Thu, 16 Apr 2015 17:42:09 +0000 (+0200) Subject: Solve some issues from pull request #234, Duration Chart is now an independant chart... X-Git-Tag: v7.0~12 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=80608a911a6a5bfa41bf09159cc0578d5a43cbb9;p=pgbadger Solve some issues from pull request #234, Duration Chart is now an independant chart linked to a menu called "Duration per user". --- diff --git a/pgbadger b/pgbadger index 93ac29c..87737db 100755 --- a/pgbadger +++ b/pgbadger @@ -3927,6 +3927,7 @@ sub html_header
  • Queries by type
  • Queries by database
  • Queries by user
    • +
  • Duration by user
  • Queries by host
  • Queries by application
  • @@ -6888,12 +6889,11 @@ sub print_query_per_user $infos{queries}{"Sum queries per users < $pie_percentage_limit%"} += $user_info{$d}{count} || 0; push(@{$small{queries}}, $d); } - if ((($user_info{$d}{duration} * 100) / ($total_duration || 1)) > $pie_percentage_limit) { $infos{duration}{$d} = $user_info{$d}{duration} || 0; } else { $infos{duration}{"Sum duration per users < $pie_percentage_limit%"} += $user_info{$d}{duration} || 0; - push(@{$small{duration}}, $d); + push(@{$small{duration}}, $d); } } if ($#{$small{queries}} == 0) { @@ -6902,7 +6902,7 @@ sub print_query_per_user } if ($#{$small{duration}} == 0){ $infos{duration}{$small{duration}[0]} = $infos{duration}{"Sum duration per users < $pie_percentage_limit%"}; - delete $infos{duration}{"Sum duration per users < $pie_percentage_limit%"}; + delete $infos{duration}{"Sum duration per users < $pie_percentage_limit%"}; } } $drawn_graphs{queriesbyuser_graph} = &flotr2_piegraph($graphid++, 'graph_queriesbyuser', 'Queries per user', %{$infos{queries}}); @@ -6920,8 +6920,6 @@ sub print_query_per_user @@ -6929,28 +6927,56 @@ sub print_query_per_user
    - }; - - print $fh qq{
    $drawn_graphs{queriesbyuser_graph}
    +
    + + + + + + + + + + + $query_user_info + +
    UserRequest typeCountDuration
    +
    +
    +
    + + }; delete $drawn_graphs{queriesbyuser_graph}; print $fh qq{ +
    +

    Duration by user

    +
    +

    Key values

    +
    +
      +
    • $main_user_duration[1] ($main_user_duration[0]) Main time consuming user
      • +
    +
    +
    +
    +
    + +
    $drawn_graphs{durationbyuser_graph}
    -}; - delete $drawn_graphs{durationbyuser_graph}; - - print $fh qq{ -
    +
    @@ -6968,10 +6994,11 @@ sub print_query_per_user - + }; -} + delete $drawn_graphs{durationbyuser_graph}; +} sub print_query_per_host { @@ -11003,6 +11030,13 @@ sub flotr2_piegraph { my ($buttonid, $divid, $title, %data) = @_; + my $type = ''; + if ($divid =~ /size/) { + $type = 'size'; + } elsif ($divid =~ /duration/) { + $type = 'duration'; + } + if (scalar keys %data == 0) { return qq{
    NO DATASET
    @@ -11056,7 +11090,7 @@ document.writeln('
    '+format_number(obj.y)+' '+obj.series.label+''; + var textToShow = ''; + if (utype == 'duration') { + textToShow += pretty_print_number(obj.y, utype); + } else { + textToShow += format_number(obj.y); + } + textToShow += ' '+obj.series.label+''; return textToShow; } @@ -13555,7 +13595,7 @@ footer { height: 400px; } -#queriesbytype_graph, #lockbytype_graph, #databasesessions_graph, #usersessions_graph, #hostsessions_graph, #databaseconnections_graph, #userconnections_graph, #hostconnections_graph, #logstype_graph, #tableanalyzes_graph, #tablevacuums_graph, #tuplevacuums_graph, #pagevacuums_graph, #queriesbydatabase_graph, #queriesbyapplication_graph, #queriesbyuser_graph, #queriesbyhost_graph, #histogram_query_times_graph, #histogram_session_times_graph { +#queriesbytype_graph, #lockbytype_graph, #databasesessions_graph, #usersessions_graph, #hostsessions_graph, #databaseconnections_graph, #userconnections_graph, #hostconnections_graph, #logstype_graph, #tableanalyzes_graph, #tablevacuums_graph, #tuplevacuums_graph, #pagevacuums_graph, #queriesbydatabase_graph, #queriesbyapplication_graph, #queriesbyuser_graph, #queriesbyhost_graph, #histogram_query_times_graph, #histogram_session_times_graph, #durationbyuser_graph { width : 100%; height: 320px; } @@ -13615,7 +13655,7 @@ footer { width : 94.5%; } - #queriesbytype_graph, #lockbytype_graph, #databasesessions_graph, #usersessions_graph, #hostsessions_graph, #databaseconnections_graph, #userconnections_graph, #hostconnections_graph, #logstype_graph, #tableanalyzes_graph, #tablevacuums_graph, #tuplevacuums_graph, #pagevacuums_graph, #queriesbydatabase_graph, #queriesbyapplication_graph, #queriesbyuser_graph, #queriesbyhost_graph, #histogram_query_times_graph, #histogram_session_times_graph { + #queriesbytype_graph, #lockbytype_graph, #databasesessions_graph, #usersessions_graph, #hostsessions_graph, #databaseconnections_graph, #userconnections_graph, #hostconnections_graph, #logstype_graph, #tableanalyzes_graph, #tablevacuums_graph, #tuplevacuums_graph, #pagevacuums_graph, #queriesbydatabase_graph, #queriesbyapplication_graph, #queriesbyuser_graph, #queriesbyhost_graph, #histogram_query_times_graph, #histogram_session_times_graph, #durationbyuser_graph { width : 94.5%; }