Merge branch 'collectd-4.6'

[collectd.git] / contrib / collection3 / bin / index.cgi
diff --git a/contrib/collection3/bin/index.cgi b/contrib/collection3/bin/index.cgi

index b0001d2..be20928 100755 (executable)
--- a/contrib/collection3/bin/index.cgi
+++ b/contrib/collection3/bin/index.cgi
@@ -27,10 +27,11 @@ use HTML::Entities ('encode_entities');
  
  use Data::Dumper;
  
-use Collectd::Graph::TypeLoader (qw(tl_read_config tl_load_type));
+use Collectd::Graph::Config (qw(gc_read_config gc_get_scalar));
+use Collectd::Graph::TypeLoader (qw(tl_load_type));
  use Collectd::Graph::Common (qw(get_files_from_directory get_all_hosts
        get_timespan_selection get_selected_files get_host_selection
-      get_plugin_selection));
+      get_plugin_selection flush_files));
  use Collectd::Graph::Type ();
  
  our $Debug = param ('debug') ? 1 : 0;
@@ -57,7 +58,7 @@ if (!exists ($Actions{$action}))
    exit 1;
  }
  
-tl_read_config ("$RealBin/../etc/collection3.conf");
+gc_read_config ("$RealBin/../etc/collection.conf");
  
  $Actions{$action}->();
  exit (0);
@@ -107,6 +108,14 @@ sub start_html
  {
    return if ($html_started);
  
+  my $end;
+  my $begin;
+  my $timespan;
+
+  $end = time ();
+  $timespan = get_timespan_selection ();
+  $begin = $end - $timespan;
+
    if (can_handle_xhtml ())
    {
      print <<HTML;
@@ -136,8 +145,9 @@ HTML
      <title>collection.cgi, Version 3</title>
      <link rel="icon" href="../share/shortcut-icon.png" type="image/png" />
      <link rel="stylesheet" href="../share/style.css" type="text/css" />
+    <script type="text/javascript" src="../share/navigate.js" />
    </head>
-  <body>
+  <body onload="nav_init ($begin, $end);">
  HTML
    $html_started = 1;
  }}
@@ -261,18 +271,28 @@ sub action_show_selection
    start_html ();
    show_selector ();
  
-  my $ident = {};
-
    my $all_files;
+  my $timespan;
+
    my $types = {};
  
+  my $id_counter = 0;
+
    $all_files = get_selected_files ();
+  $timespan = get_timespan_selection ();
  
    if ($Debug)
    {
      print "<pre>", Data::Dumper->Dump ([$all_files], ['all_files']), "</pre>\n";
    }
  
+  # Send FLUSH command to the daemon if necessary and possible.
+  flush_files ($all_files,
+      begin => time () - $timespan,
+      end => time (),
+      addr => gc_get_scalar ('UnixSockAddr', undef),
+      interval => gc_get_scalar ('Interval', 10));
+
    for (@$all_files)
    {
      my $file = $_;
@@ -301,17 +321,50 @@ sub action_show_selection
      my $type = $_;
      my $graphs_num = $types->{$type}->getGraphsNum ();
  
-    my $timespan = get_timespan_selection ();
-
      for (my $i = 0; $i < $graphs_num; $i++)
      {
        my $args = $types->{$type}->getGraphArgs ($i);
        my $url = encode_entities ("graph.cgi?$args;begin=-$timespan");
+      my $id = sprintf ("graph%04i", $id_counter++);
  
        print "      <tr>\n";
        print "        <td rowspan=\"$graphs_num\">$type</td>\n" if ($i == 0);
-
-      print qq#        <td><img src="$url" /></td>\n#;
+      print <<EOF;
+        <td>
+          <div class="graph_canvas">
+            <div class="graph_float">
+              <img id="${id}" class="graph_image"
+                alt="A graph"
+                src="$url" />
+              <div class="controls zoom">
+                <div title="Earlier"
+                  onclick="nav_move_earlier ('${id}');">&#x2190;</div>
+                <div title="Zoom out"
+                  onclick="nav_zoom_out ('${id}');">-</div>
+                <div title="Zoom in"
+                  onclick="nav_zoom_in ('${id}');">+</div>
+                <div title="Later"
+                  onclick="nav_move_later ('${id}');">&#x2192;</div>
+              </div>
+              <div class="controls preset">
+                <div title="Show current hour"
+                  onclick="nav_time_reset ('${id}', 3600);">H</div>
+                <div title="Show current day"
+                  onclick="nav_time_reset ('${id}', 86400);">D</div>
+                <div title="Show current week"
+                  onclick="nav_time_reset ('${id}', 7 * 86400);">W</div>
+                <div title="Show current month"
+                  onclick="nav_time_reset ('${id}', 31 * 86400);">M</div>
+                <div title="Show current year"
+                  onclick="nav_time_reset ('${id}', 366 * 86400);">Y</div>
+                <div title="Set all images to this timespan"
+                  onclick="nav_set_reference ('${id}');">!</div>
+              </div>
+            </div>
+          </div>
+       </td>
+EOF
+      # print qq#        <td><img src="$url" /></td>\n#;
        print "      </tr>\n";
      }
    }