From: Florian Forster <octo@collectd.org>
Date: Sun, 17 Jun 2012 18:46:43 +0000 (+0200)
Subject: collection3: Use {instance} in Df's grpah title.
X-Git-Tag: collectd-5.0.5~7^2~10
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=084561b5c844c532c1e93964a4b1a403114eb80f;p=collectd.git

collection3: Use {instance} in Df's grpah title.

{type_instance} didn't work when used with other plugins than "df", e.g.
the example configuration of the Oracle plugin uses this.
---

diff --git a/contrib/collection3/lib/Collectd/Graph/Type/Df.pm b/contrib/collection3/lib/Collectd/Graph/Type/Df.pm
index 0fbd0d35..4a70c41a 100644
--- a/contrib/collection3/lib/Collectd/Graph/Type/Df.pm
+++ b/contrib/collection3/lib/Collectd/Graph/Type/Df.pm
@@ -34,7 +34,7 @@ sub new
   my $obj = Collectd::Graph::Type->new (@_);
   $obj->{'data_sources'} = [qw(free used)];
   $obj->{'rrd_opts'} = ['-v', 'Bytes'];
-  $obj->{'rrd_title'} = 'Disk space ({type_instance})';
+  $obj->{'rrd_title'} = 'Disk space ({instance})';
   $obj->{'rrd_format'} = '%5.1lf%sB';
   $obj->{'colors'} = [qw(00b000 ff0000)];
 
@@ -58,7 +58,7 @@ sub getRRDArgs
   my $faded_green = get_faded_color ('00ff00');
   my $faded_red = get_faded_color ('ff0000');
 
-  return (['-t', 'Diskspace (' . $ident->{'type_instance'} . ')', '-v', 'Bytes', '-l', '0',
+  return (['-t', $obj->getTitle ($ident), '-v', 'Bytes', '-l', '0',
     "DEF:free_min=${filename}:free:MIN",
     "DEF:free_avg=${filename}:free:AVERAGE",
     "DEF:free_max=${filename}:free:MAX",