projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
contrib/collection3: Add the "IgnoreUnknown" config option.
[collectd.git]
/
contrib
/
collection3
/
lib
/
Collectd
/
Graph
/
Type
/
GenericStacked.pm
diff --git
a/contrib/collection3/lib/Collectd/Graph/Type/GenericStacked.pm
b/contrib/collection3/lib/Collectd/Graph/Type/GenericStacked.pm
index
a1a3e1c
..
ab95ee2
100644
(file)
--- a/
contrib/collection3/lib/Collectd/Graph/Type/GenericStacked.pm
+++ b/
contrib/collection3/lib/Collectd/Graph/Type/GenericStacked.pm
@@
-49,6
+49,19
@@
sub getRRDArgs
my $colors = $obj->{'rrd_colors'} || {};
my @ret = ('-t', $rrd_title, @$rrd_opts);
my $colors = $obj->{'rrd_colors'} || {};
my @ret = ('-t', $rrd_title, @$rrd_opts);
+ my $ignore_unknown = $obj->{'ignore_unknown'} || 0;
+ if ($ignore_unknown)
+ {
+ if ($ignore_unknown =~ m/^(yes|true|on)$/i)
+ {
+ $ignore_unknown = 1;
+ }
+ else
+ {
+ $ignore_unknown = 0;
+ }
+ }
+
if (defined $obj->{'rrd_vertical'})
{
push (@ret, '-v', $obj->{'rrd_vertical'});
if (defined $obj->{'rrd_vertical'})
{
push (@ret, '-v', $obj->{'rrd_vertical'});
@@
-59,6
+72,23
@@
sub getRRDArgs
sort_idents_by_type_instance ($idents, $obj->{'custom_order'});
}
sort_idents_by_type_instance ($idents, $obj->{'custom_order'});
}
+ if ($ignore_unknown)
+ {
+ my $new_idents = [];
+ for (@$idents)
+ {
+ if (exists ($obj->{'ds_names'}{$_->{'type_instance'}}))
+ {
+ push (@$new_idents, $_);
+ }
+ }
+
+ if (@$new_idents)
+ {
+ $idents = $new_idents;
+ }
+ }
+
$obj->{'ds_names'} ||= {};
my @names = map { $obj->{'ds_names'}{$_->{'type_instance'}} || $_->{'type_instance'} } (@$idents);
$obj->{'ds_names'} ||= {};
my @names = map { $obj->{'ds_names'}{$_->{'type_instance'}} || $_->{'type_instance'} } (@$idents);