author | Florian Forster <octo@huhu.verplant.org> | |
Mon, 18 Feb 2008 19:53:32 +0000 (20:53 +0100) | ||
committer | Florian Forster <octo@huhu.verplant.org> | |
Mon, 18 Feb 2008 19:53:32 +0000 (20:53 +0100) |
Makefile.am | patch | blob | history | |
README | patch | blob | history | |
contrib/README | patch | blob | history | |
src/collectd.conf.in | patch | blob | history | |
src/collectd.conf.pod | patch | blob | history | |
src/perl.c | patch | blob | history |
diff --git a/Makefile.am b/Makefile.am
index 9a96eb27c8594f65ae0079f6bbe48e74a4e0faaa..b52b0e9309da9fe889237f70034039e231b18928 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
EXTRA_DIST = contrib version-gen.sh
-dist-hook:
- find $(distdir) -type d -name '.svn' | xargs rm -rf
-
install-exec-hook:
$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run
$(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/$(PACKAGE_NAME)
+ $(mkinstalldirs) $(DESTDIR)$(localstatedir)/log
index a16e9ec56cac30200563ad2756f24234a09fd0b1..4f3c812050876d97191038df63d79d772738ffe6 100644 (file)
--- a/README
+++ b/README
- libvirt
CPU, disk and network I/O statistics from virtual machines.
+ - libxml2
+ Parse XML data provided by libvirt.
+
- mbmon
Motherboard sensors: temperature, fanspeed and voltage information,
using mbmon(1).
Collects statistics from `nginx' (speak: engine X), a HTTP and mail
server/proxy.
- - ntp
+ - ntpd
NTP daemon statistics: Local clock drift, offset to peers, etc.
- nut
diff --git a/contrib/README b/contrib/README
index 398d13ba9bdd0dcab5020e5fb2b51f210c31d273..0f532f6a5eb1ae4dbdc34e02d49a22efd164f3f1 100644 (file)
--- a/contrib/README
+++ b/contrib/README
exactly `collectd's job. They may or may not require in-depth knowledge of RRD
files and/or `collectd's inner workings. Use at your own risk.
-PerlLib/
---------
- Perl modules to be used in conjunction with collectd. See the perldoc
-documentation of the .pm-files to find out what they're good for.
-
add_rra.sh
----------
Before version 3.9.0 collectd used to create a different set of RRAs. The
diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 2554d60a6f75a4ce4eba5e6bd012c056e6571b4e..e125bb63173ee7585e71902feee3dacfa79cc071 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@BUILD_PLUGIN_IPTABLES_TRUE@LoadPlugin iptables
@BUILD_PLUGIN_IPVS_TRUE@LoadPlugin ipvs
@BUILD_PLUGIN_IRQ_TRUE@LoadPlugin irq
+@BUILD_PLUGIN_LIBVIRT_TRUE@LoadPlugin libvirt
@BUILD_PLUGIN_LOAD_TRUE@LoadPlugin load
@BUILD_PLUGIN_LOGFILE_TRUE@LoadPlugin logfile
@BUILD_PLUGIN_MBMON_TRUE@LoadPlugin mbmon
@BUILD_PLUGIN_TCPCONNS_TRUE@LoadPlugin tcpconns
@BUILD_PLUGIN_UNIXSOCK_TRUE@LoadPlugin unixsock
@BUILD_PLUGIN_USERS_TRUE@LoadPlugin users
+@BUILD_PLUGIN_UUID_TRUE@LoadPlugin uuid
@BUILD_PLUGIN_VSERVER_TRUE@LoadPlugin vserver
@BUILD_PLUGIN_WIRELESS_TRUE@LoadPlugin wireless
@BUILD_PLUGIN_XMMS_TRUE@LoadPlugin xmms
#<Plugin exec>
# Exec "user:group" "/path/to/exec"
+# NotificationExec "/path/to/exec"
#</Plugin>
@BUILD_PLUGIN_HDDTEMP_TRUE@<Plugin hddtemp>
# IgnoreSelected true
#</Plugin>
+#<Plugin libvirt>
+# Connection "xen:///"
+# RefreshInterval 60
+# Domain "name"
+# BlockDevice "name:device"
+# InterfaceDevice "name:device"
+# IgnoreSelected false
+# HostnameFormat name
+#</Plugin>
+
#<Plugin logfile>
# LogLevel info
# File STDOUT
+# Timestamp true
#</Plugin>
#<Plugin mbmon>
# QDisc "eth0" "pfifo_fast-1:0"
# Class "ppp0" "htb-1:10"
# Filter "ppp0" "u32-1:0"
+# IgnoreSelected false
#</Plugin>
#<Plugin network>
#<Plugin perl>
# IncludeDir "/my/include/path"
# BaseName "Collectd::Plugin"
+# EnableDebugger ""
# LoadPlugin foo
#</Plugin>
#<Plugin ping>
# Host "host.foo.bar"
+# TTL 255
#</Plugin>
#<Plugin processes>
# SocketGroup "collectd"
# SocketPerms "0660"
#</Plugin>
+
+#<Plugin uuid>
+# UUIDFile "/etc/uuid"
+#</Plugin>
+
diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index ac85e47782bbdda1f0fae290a19d1d21bbc74ceb..383dda6397c5e4e6c1b90d9c683e32137b179e4a 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
the list of domains and devices to be refreshed on every iteration.
Refreshing the devices in particular is quite a costly operation, so if your
-virtualization setup is static you might consider increasing this.
+virtualization setup is static you might consider increasing this. If this
+option is set to 0, refreshing is disabled completely.
=item B<Domain> I<name>
diff --git a/src/perl.c b/src/perl.c
index 3c50528f9f62ebad0360642eac2c1089eaabecc0..7558a50638390fc7918b8d1b60420d14a2f8a3a6 100644 (file)
--- a/src/perl.c
+++ b/src/perl.c
ds = va_arg (ap, data_set_t *);
vl = va_arg (ap, value_list_t *);
- if (-1 == data_set2av (aTHX_ ds, pds))
- return -1;
+ if (-1 == data_set2av (aTHX_ ds, pds)) {
+ av_clear (pds);
+ av_undef (pds);
+ pds = Nullav;
+ ret = -1;
+ }
- if (-1 == value_list2hv (aTHX_ vl, ds, pvl))
- return -1;
+ if (-1 == value_list2hv (aTHX_ vl, ds, pvl)) {
+ hv_clear (pvl);
+ hv_undef (pvl);
+ pvl = Nullhv;
+ ret = -1;
+ }
XPUSHs (sv_2mortal (newSVpv (ds->type, 0)));
XPUSHs (sv_2mortal (newRV_noinc ((SV *)pds)));
n = va_arg (ap, notification_t *);
- if (-1 == notification2hv (aTHX_ n, notif))
- return -1;
+ if (-1 == notification2hv (aTHX_ n, notif)) {
+ hv_clear (notif);
+ hv_undef (notif);
+ notif = Nullhv;
+ ret = -1;
+ }
XPUSHs (sv_2mortal (newRV_noinc ((SV *)notif)));
}