From 48f88965be035b4a53b037ad52cc450500c4e628 Mon Sep 17 00:00:00 2001 From: Marc Fournier Date: Mon, 3 Nov 2014 11:24:38 +0100 Subject: [PATCH] s/libvirt/virt/ in doc & rpm specfile ... as this plugin was renamed in 62f94860. --- AUTHORS | 2 +- README | 8 ++++---- contrib/redhat/collectd.spec | 36 ++++++++++++++++++------------------ src/collectd.conf.pod | 6 +++--- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/AUTHORS b/AUTHORS index d821d9ef..2a76b5b2 100644 --- a/AUTHORS +++ b/AUTHORS @@ -217,7 +217,7 @@ Piotr Hosowicz - SMF manifest for collectd. Richard W. M. Jones - - libvirt plugin. + - virt plugin. - uuid plugin. Roman Klesel diff --git a/README b/README index 1956609b..3e3a030b 100644 --- a/README +++ b/README @@ -146,9 +146,6 @@ Features Detailed CPU statistics of the “Logical Partitions” virtualization technique built into IBM's POWER processors. - - libvirt - CPU, memory, disk and network I/O statistics from virtual machines. - - lvm Size of “Logical Volumes” (LV) and “Volume Groups” (VG) of Linux' “Logical Volume Manager” (LVM). @@ -347,6 +344,9 @@ Features - varnish Various statistics from Varnish, an HTTP accelerator. + - virt + CPU, memory, disk and network I/O statistics from virtual machines. + - vmem Virtual memory statistics, e. g. the number of page-ins/-outs or the number of pagefaults. @@ -775,7 +775,7 @@ Prerequisites * libxml2 (optional) Parse XML data. This is needed for the `ascent', `bind', `curl_xml' and - `libvirt' plugins. + `virt' plugins. * libxmms (optional) diff --git a/contrib/redhat/collectd.spec b/contrib/redhat/collectd.spec index 9d63e3a1..19305924 100644 --- a/contrib/redhat/collectd.spec +++ b/contrib/redhat/collectd.spec @@ -96,7 +96,7 @@ %define with_ipvs 0%{!?_without_ipvs:0%{?_has_ip_vs_h}} %define with_irq 0%{!?_without_irq:1} %define with_java 0%{!?_without_java:1} -%define with_libvirt 0%{!?_without_libvirt:1} +%define with_virt 0%{!?_without_virt:1} %define with_load 0%{!?_without_load:1} %define with_logfile 0%{!?_without_logfile:1} %define with_log_logstash 0%{!?_without_log_logstash:0%{?_has_libyajl}} @@ -417,16 +417,6 @@ This plugin for collectd allows plugins to be written in Java and executed in an embedded JVM. %endif -%if %{with_libvirt} -%package libvirt -Summary: Libvirt plugin for collectd -Group: System Environment/Daemons -Requires: %{name}%{?_isa} = %{version}-%{release} -BuildRequires: libvirt-devel -%description libvirt -This plugin collects information from virtualized guests. -%endif - %if %{with_log_logstash} %package log_logstash Summary: log_logstash plugin for collectd @@ -680,6 +670,16 @@ BuildRequires: varnish-libs-devel The Varnish plugin collects information about Varnish, an HTTP accelerator. %endif +%if %{with_virt} +%package virt +Summary: Virt plugin for collectd +Group: System Environment/Daemons +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildRequires: libvirt-devel +%description virt +This plugin collects information from virtualized guests. +%endif + %if %{with_write_http} %package write_http Summary: Write-HTTP plugin for collectd @@ -996,10 +996,10 @@ Development files for libcollectdclient %define _with_java --disable-java %endif -%if %{with_libvirt} -%define _with_libvirt --enable-libvirt +%if %{with_virt} +%define _with_virt --enable-virt %else -%define _with_libvirt --disable-libvirt +%define _with_virt --disable-virt %endif %if %{with_load} @@ -1513,7 +1513,7 @@ Development files for libcollectdclient %{?_with_iptables} \ %{?_with_ipvs} \ %{?_with_java} \ - %{?_with_libvirt} \ + %{?_with_virt} \ %{?_with_log_logstash} \ %{?_with_lpar} \ %{?_with_lvm} \ @@ -1983,9 +1983,9 @@ fi %{_mandir}/man5/collectd-java.5* %endif -%if %{with_libvirt} -%files libvirt -%{_libdir}/%{name}/libvirt.so +%if %{with_virt} +%files virt +%{_libdir}/%{name}/virt.so %endif %if %{with_log_logstash} diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod index 1615d7b3..da2030dd 100644 --- a/src/collectd.conf.pod +++ b/src/collectd.conf.pod @@ -6499,7 +6499,7 @@ will be collected. =item B B -When the libvirt plugin logs data, it sets the hostname of the collected data +When the virt plugin logs data, it sets the hostname 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. @@ -6515,7 +6515,7 @@ between, thus I<"foo:1234-1234-1234-1234">). =item B B|B
-When the libvirt plugin logs interface data, it sets the name of the collected +When the virt plugin logs interface data, it sets the name of the collected data according to this setting. The default is to use the path as provided by the hypervisor (the "dev" property of the target node), which is equal to setting B. @@ -6525,7 +6525,7 @@ interface path might change between reboots of a guest or across migrations. =item B B -When the libvirt plugin logs data, it sets the plugin_instance of the collected +When the virt 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. -- 2.11.0