projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
contrib/collection3: Added the ability to `flush' data sets.
[collectd.git]
/
contrib
/
collection3
/
bin
/
index.cgi
diff --git
a/contrib/collection3/bin/index.cgi
b/contrib/collection3/bin/index.cgi
index
d581bfb
..
be20928
100755
(executable)
--- a/
contrib/collection3/bin/index.cgi
+++ b/
contrib/collection3/bin/index.cgi
@@
-27,11
+27,11
@@
use HTML::Entities ('encode_entities');
use Data::Dumper;
use Data::Dumper;
-use Collectd::Graph::Config (qw(gc_read_config));
+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
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;
use Collectd::Graph::Type ();
our $Debug = param ('debug') ? 1 : 0;
@@
-271,20
+271,28
@@
sub action_show_selection
start_html ();
show_selector ();
start_html ();
show_selector ();
- my $ident = {};
-
my $all_files;
my $all_files;
+ my $timespan;
+
my $types = {};
my $id_counter = 0;
$all_files = get_selected_files ();
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";
}
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 = $_;
for (@$all_files)
{
my $file = $_;
@@
-313,8
+321,6
@@
sub action_show_selection
my $type = $_;
my $graphs_num = $types->{$type}->getGraphsNum ();
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);
for (my $i = 0; $i < $graphs_num; $i++)
{
my $args = $types->{$type}->getGraphArgs ($i);