Merge pull request #385 from ccin2p3/libvirt-plugin-instance

libvirt plugin: Add "PluginInstanceFormat" option.

diff --cc src/collectd.conf.in
index a95945208bd0d87279615c0e0c00e2c4962cc50c,3581db44398c495d3c4f1a67195c1909f5258879..3c4f23954ee477222d88a61d7dd2c2d7418c573f
--- 1/src/collectd.conf.in
--- 2/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@@ -500,12 -472,9 +500,13 @@@
  #     IgnoreSelected false
  #     HostnameFormat name
  #     InterfaceFormat name
+ #     PluginInstanceFormat name
  #</Plugin>
  
 +#<Plugin load>
 +#        ReportRelative true
 +#</Plugin>
 +
  #<Plugin lpar>
  #     CpuPoolStats   false
  #     ReportBySerial false

diff --cc src/collectd.conf.pod
index 25a51d01852e37d3df13b0cc9f888abf6bd0e173,858dc16db11cc09b84f1261ca674160a31155e9e..32ed99034cf0d4cc907fd5499e18a774737a3430
--- 1/src/collectd.conf.pod
--- 2/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@@ -2276,27 -2153,16 +2276,35 @@@ setting B<name>
  B<address> means use the interface's mac address. This is useful since the
  interface path might change between reboots of a guest or across migrations.
  
+ =item B<PluginInstanceFormat> B<name|uuid>
+ 
+ When the libvirt plugin logs data, it sets the plugin_instance of the collected 
+ data according to this setting. The default is to use the guest name as provided 
+ by the hypervisor, which is equal to setting B<name>.
+ 
+ B<uuid> means use the guest's UUID.
+ 
  =back
  
 ++=head2 Plugin C<load>
 +
 +The I<Load plugin> collects the system load. These numbers give a rough overview
 +over the utilization of a machine. The system load is defined as the number of
 +runnable tasks in the run-queue and is provided by many operating systems as a
 +one, five or fifteen minute average.
 +
 +The following configuration options are available:
 +
 +=over 4
 +
 +=item B<ReportRelative> B<false>|B<true>
 +
 +When enabled, system load divided by number of available CPU cores is reported
 +for intervals 1 min, 5 min and 15 min. Defaults to false.
 +
 +=back
 +
 +
  =head2 Plugin C<logfile>
  
  =over 4