summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Pevec <apevec@redhat.com>2011-11-28 23:47:02 +0100
committerAlan Pevec <apevec@redhat.com>2011-11-29 01:54:19 +0100
commit2ca6ad63a981f2d9a94d423e3b601b2d07b49637 (patch)
tree21ab46a84de99a26851044a484fa3bf914b0fe12
parent436825e0133c9289ee2ec09539d87379ed225eaa (diff)
downloadcollectd-2ca6ad63a981f2d9a94d423e3b601b2d07b49637.tar.gz
collectd-2ca6ad63a981f2d9a94d423e3b601b2d07b49637.tar.xz
collectd-2ca6ad63a981f2d9a94d423e3b601b2d07b49637.zip
collectd-web config file DataDir value wrong
rhbz#719809
-rw-r--r--collectd.spec10
-rw-r--r--collection.conf2
2 files changed, 10 insertions, 2 deletions
diff --git a/collectd.spec b/collectd.spec
index 9be7002..6b7fc37 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -306,7 +306,7 @@ sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in
%{__install} -Dp -m0644 src/collectd.conf %{buildroot}%{_sysconfdir}/collectd.conf
%{__install} -Dp -m0755 contrib/fedora/init.d-collectd %{buildroot}%{_initrddir}/collectd
-%{__install} -d -m0755 %{buildroot}%{_localstatedir}/lib/collectd/
+%{__install} -d -m0755 %{buildroot}%{_localstatedir}/lib/collectd/rrd
%{__install} -d -m0755 %{buildroot}/%{_datadir}/collectd/collection3/
%{__install} -d -m0755 %{buildroot}/%{_sysconfdir}/httpd/conf.d/
@@ -357,6 +357,13 @@ do
LoadPlugin $p
EOF
done
+%{__cat} >> %{buildroot}/etc/collectd.d/rrdtool.conf <<EOF
+<Plugin rrdtool>
+ DataDir "/var/lib/collectd/rrd"
+ CacheTimeout 120
+ CacheFlush 900
+</Plugin>
+EOF
# *.la files shouldn't be distributed.
@@ -602,6 +609,7 @@ fi
* Mon Nov 28 2011 Alan Pevec <apevec@redhat.com> 4.10.4-1
- new upstream version 4.10.4
http://mailman.verplant.org/pipermail/collectd/2011-October/004777.html
+- collectd-web config file DataDir value wrong rhbz#719809
* Fri Jul 29 2011 Kevin Fenzi <kevin@scrye.com> - 4.10.3-8
- Rebuild for new snmp again.
diff --git a/collection.conf b/collection.conf
index 73c415d..d5cdac6 100644
--- a/collection.conf
+++ b/collection.conf
@@ -1,4 +1,4 @@
-DataDir "/var/lib/collectd/"
+DataDir "/var/lib/collectd/rrd"
GraphWidth 400
#UnixSockAddr "/var/run/collectd-unixsock"
<Type apache_bytes>