ebl add more graph type

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3377 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/gui/bweb/cgi/bgraph.pl b/gui/bweb/cgi/bgraph.pl
index 63750b530e6731e4016fbab36a419d07e3c05778..ba5bd36872a7501337de84f471b6a9334fffde24 100755 (executable)
--- a/gui/bweb/cgi/bgraph.pl
+++ b/gui/bweb/cgi/bgraph.pl
@@ -151,6 +151,24 @@ sub make_tab
     return ($date, $ret);
 }
 
+sub make_tab_sum
+{
+    my ($all_row) = @_;
+
+    my $i=0;
+    my $last_date=0;
+
+    my $ret = {};
+    
+    foreach my $row (@$all_row) {
+       $ret->{date}->[$i]   = $row->[0];       
+       $ret->{nb}->[$i] = $row->[1];
+       $i++;
+    }
+
+    return ($ret);
+}
+
 if ($graph eq 'job_size') {
 
     my $query = "
@@ -304,5 +322,59 @@ $limitq
        $obj->set_legend(keys %$ret);
     }
     print $obj->plot([$d, values %$ret])->png;
+
+
+# number of job per day/hour
+} elsif ($graph =~ /^job_(count|sum|avg)_((p?)(day|hour|month))$/) {
+    my $t = $1;
+    my $d = uc($2);
+    my $per_t = $3;
+    my ($limit, $label) = $bweb->get_limit(age   => $arg->{age},
+                                          limit => $arg->{limit},
+                                          offset=> $arg->{offset},
+                                          groupby => "A",
+                                          );
+    my @arg;                   # arg for plotting
+
+    if (!$per_t) {             # much better aspect
+       $gtype = 'lines';
+    } else {
+       push @arg, ("x_number_format" => undef,
+                   "x_min_value" => 0,
+                   );
+    }
+
+    if ($t eq 'sum' or $t eq 'avg') {
+       push @arg, ('y_number_format' => \&Bweb::human_size);
+    }
+
+    my $query = "
+SELECT
+     " . ($per_t?"":"UNIX_TIMESTAMP") . "(" . $bweb->{sql}->{"STARTTIME_$d"} . ") AS A,
+     $t(JobBytes)                  AS nb
+FROM Job, Client, FileSet
+WHERE Job.ClientId = Client.ClientId
+  AND Job.FileSetId = FileSet.FileSetId
+  AND Job.Type = 'B'
+  $clientq
+  $statusq
+  $filesetq
+  $levelq
+  $jobnameq
+$limit
+";
+
+    print STDERR $query  if ($debug);
+
+    my $obj = get_graph('title' => "Job $t : $arg->{jclients}/$arg->{jjobnames}",
+                       'y_label' => $t,
+                       'y_min_value' => 0,
+                       @arg,
+                       );
+
+    my $all = $dbh->selectall_arrayref($query) ;
+    my ($ret) = make_tab_sum($all);
+
+    print $obj->plot([$ret->{date}, $ret->{nb}])->png;    
 }
 

diff --git a/gui/bweb/tpl/graph.tpl b/gui/bweb/tpl/graph.tpl
index ffab0f39768579a05152bcf30a8341d03e3c3dfc..5ad94e1aa07f4a1b64223782af61afa590ba471c 100644 (file)
--- a/gui/bweb/tpl/graph.tpl
+++ b/gui/bweb/tpl/graph.tpl
@@ -68,10 +68,22 @@
 <tr>
   <td> <h2> Type </h2> 
  <select name='graph' class='formulaire'>
-   <option id='job_size'     value='job_size'>Job Size</option>
-   <option id='job_duration' value='job_duration'>Job Duration</option>
-   <option id='job_rate' value='job_rate'>Job Rate</option>
-   <option id='job_file' value='job_file'>Job Files</option>
+   <option id='job_size'     value='job_size' title="Job size per job for the period">Job Size</option>
+   <option id='job_duration' value='job_duration' title="Job duration per job for the period">Job Duration</option>
+   <option id='job_rate' value='job_rate' title="Job rate per job for the period">Job Rate</option>
+   <option id='job_file' value='job_file' title="Number of backped file per job for the period">Job Files</option>
+   <option id='job_count_phour' value='job_count_phour' title="Number of job per hour for the period">Job per hour</option>
+   <option id='job_count_pday' value='job_count_pday' title="Number of job per day for the period">Job per day</option>
+   <option id='job_avg_phour' value='job_avg_pday' title="Average backup size per day for the period">Job avg B/hour</option>
+   <option id='job_avg_pday' value='job_avg_pday' title="Average backup size per hour for the period">Job avg B/day</option>
+   <option id='job_sum_phour' value='job_sum_phour' title="Job size per hour">Job total B/hour</option>
+   <option id='job_sum_pday' value='job_sum_pday' title="Job size per day">Job total B/day</option>
+   <option id='job_count_hour' value='job_count_hour' title="Number of job per hour for the period">Jobs Count (h)</option>
+   <option id='job_count_day' value='job_count_day' title="Number of job per day for the period">Jobs Count (d)</option>
+   <option id='job_avg_hour' value='job_avg_hour' title="Average backup size per hour for the period">Job avg size (h)</option>
+   <option id='job_avg_day' value='job_avg_day' title="Average backup size per day for the period">Job avg size (d)</option>
+   <option id='job_sum_hour' value='job_sum_hour' title="Job size per hour for the period">Job Bytes (h)</option>
+   <option id='job_sum_day' value='job_sum_day' title="Job size per day for the period">Job Bytes (d)</option>
  </select>
   </td>
   <td valign='bottom'>