Merge branch 'collectd-4.7' into collectd-4.8

[collectd.git] / contrib / collection3 / lib / Collectd / Graph / Type.pm

diff --git a/contrib/collection3/lib/Collectd/Graph/Type.pm b/contrib/collection3/lib/Collectd/Graph/Type.pm
index 01c2417..81add72 100644 (file)
--- a/contrib/collection3/lib/Collectd/Graph/Type.pm
+++ b/contrib/collection3/lib/Collectd/Graph/Type.pm
@@ -250,7 +250,11 @@ sub getTitle
   my $type_instance = $ident->{'type_instance'};
   my $instance;
 
-  if (defined $type_instance)
+  if ((defined $type_instance) && (defined $plugin_instance))
+  {
+    $instance = "$plugin_instance/$type_instance";
+  }
+  elsif (defined $type_instance)
   {
     $instance = $type_instance;
   }