Update to resolve conflicts due to renamed files

[collectd.git] / src / collectd.conf.in

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 8bae3b6..a282244 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -703,6 +703,7 @@
 
 #<Plugin "intel_rdt">
 #  Cores "0-2"
 
 #<Plugin "intel_rdt">
 #  Cores "0-2"

+#  Processes "sshd"

 #</Plugin>
 
 #<Plugin interface>
 #</Plugin>
 
 #<Plugin interface>


@@ -1664,16 +1665,20 @@
 #      Connection "xen:///"
 #      RefreshInterval 60
 #      Domain "name"
 #      Connection "xen:///"
 #      RefreshInterval 60
 #      Domain "name"

+#      ReportBlockDevices true
+#      ReportNetworkInterfaces true

 #      BlockDevice "name:device"
 #      BlockDeviceFormat target
 #      BlockDeviceFormatBasename false
 #      InterfaceDevice "name:device"
 #      IgnoreSelected false
 #      HostnameFormat name
 #      BlockDevice "name:device"
 #      BlockDeviceFormat target
 #      BlockDeviceFormatBasename false
 #      InterfaceDevice "name:device"
 #      IgnoreSelected false
 #      HostnameFormat name

+#      HostnameMetadataXPath "/instance/name/text()"
+#      HostnameMetadataNS "http://openstack.org/xmlns/libvirt/nova/1.0"

 #      InterfaceFormat name
 #      PluginInstanceFormat name
 #      Instances 1
 #      InterfaceFormat name
 #      PluginInstanceFormat name
 #      Instances 1

-#      ExtraStats "cpu_util disk disk_err domain_state fs_info job_stats_background pcpu perf vcpupin"
+#      ExtraStats "cpu_util disk disk_err domain_state fs_info job_stats_background pcpu perf vcpupin disk_physical disk_allocation disk_capacity"

 #      PersistentNotification false
 #</Plugin>
 
 #      PersistentNotification false
 #</Plugin>