From: Paweł Gołaszewski Date: Thu, 30 Oct 2008 17:39:03 +0000 (+0000) Subject: - more plugin configuration into separate configs X-Git-Tag: auto/th/collectd-4_5_1-1~3 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcollectd.git;a=commitdiff_plain;h=25bc0190c44f6153778e19b51e14c20a90e6d5ac;ds=sidebyside - more plugin configuration into separate configs Changed files: collectd-tcpconns.conf -> 1.1 collectd-teamspeak2.conf -> 1.1 collectd-thermal.conf -> 1.1 collectd-unixsock.conf -> 1.1 collectd-users.conf -> 1.1 collectd-vmem.conf -> 1.1 collectd-vserver.conf -> 1.1 collectd-wireless.conf -> 1.1 collectd.conf -> 1.3 collectd.spec -> 1.43 --- diff --git a/collectd-tcpconns.conf b/collectd-tcpconns.conf new file mode 100644 index 0000000..dfb7fdf --- /dev/null +++ b/collectd-tcpconns.conf @@ -0,0 +1,7 @@ +LoadPlugin tcpconns + +# +# ListeningPorts false +# LocalPort "25" +# RemotePort "25" +# diff --git a/collectd-teamspeak2.conf b/collectd-teamspeak2.conf new file mode 100644 index 0000000..9105086 --- /dev/null +++ b/collectd-teamspeak2.conf @@ -0,0 +1,7 @@ +LoadPlugin teamspeak2 + +# +# Host "127.0.0.1" +# Port "51234" +# Server "8767" +# diff --git a/collectd-thermal.conf b/collectd-thermal.conf new file mode 100644 index 0000000..11aba86 --- /dev/null +++ b/collectd-thermal.conf @@ -0,0 +1,7 @@ +LoadPlugin thermal + +# +# ForceUseProcfs false +# Device "THRM" +# IgnoreSelected false +# diff --git a/collectd-unixsock.conf b/collectd-unixsock.conf new file mode 100644 index 0000000..2b705b8 --- /dev/null +++ b/collectd-unixsock.conf @@ -0,0 +1,7 @@ +LoadPlugin unixsock + +# +# SocketFile "/usr/var/run/collectd-unixsock" +# SocketGroup "collectd" +# SocketPerms "0660" +# diff --git a/collectd-users.conf b/collectd-users.conf new file mode 100644 index 0000000..0a2c4c2 --- /dev/null +++ b/collectd-users.conf @@ -0,0 +1,2 @@ +LoadPlugin users + diff --git a/collectd-vmem.conf b/collectd-vmem.conf new file mode 100644 index 0000000..29b1444 --- /dev/null +++ b/collectd-vmem.conf @@ -0,0 +1,5 @@ +LoadPlugin vmem + +# +# Verbose false +# diff --git a/collectd-vserver.conf b/collectd-vserver.conf new file mode 100644 index 0000000..8b6b684 --- /dev/null +++ b/collectd-vserver.conf @@ -0,0 +1,2 @@ +LoadPlugin vserver + diff --git a/collectd-wireless.conf b/collectd-wireless.conf new file mode 100644 index 0000000..cf301eb --- /dev/null +++ b/collectd-wireless.conf @@ -0,0 +1,2 @@ +LoadPlugin wireless + diff --git a/collectd.conf b/collectd.conf index a1ebbd8..1c64a38 100644 --- a/collectd.conf +++ b/collectd.conf @@ -59,14 +59,6 @@ LoadPlugin serial LoadPlugin swap LoadPlugin tail #LoadPlugin tape -LoadPlugin tcpconns -LoadPlugin teamspeak2 -LoadPlugin thermal -LoadPlugin unixsock -LoadPlugin users -LoadPlugin vmem -LoadPlugin vserver -LoadPlugin wireless # # Host "localhost" @@ -208,35 +200,6 @@ LoadPlugin wireless # # -# -# ListeningPorts false -# LocalPort "25" -# RemotePort "25" -# - -# -# Host "127.0.0.1" -# Port "51234" -# Server "8767" -# - -# -# ForceUseProcfs false -# Device "THRM" -# IgnoreSelected false -# - -# -# SocketFile "/usr/var/run/collectd-unixsock" -# SocketGroup "collectd" -# SocketPerms "0660" -# - -# -# Verbose false -# - - ### Include all files from /etc/collectd.d/*.conf Include "/etc/collectd.d/*.conf" diff --git a/collectd.spec b/collectd.spec index 685860f..9a86551 100644 --- a/collectd.spec +++ b/collectd.spec @@ -75,7 +75,7 @@ Summary: Collects system information in RRD files Summary(pl.UTF-8): Zbieranie informacji o systemie w plikach RRD Name: collectd Version: 4.5.0 -Release: 5.1 +Release: 5.2 License: GPL v2 Group: Daemons Source0: http://collectd.org/files/%{name}-%{version}.tar.gz @@ -101,6 +101,14 @@ Source24: %{name}-sensors.conf Source25: %{name}-snmp.conf Source26: %{name}-uuid.conf Source27: %{name}-xmms.conf +Source28: %{name}-tcpconns.conf +Source29: %{name}-teamspeak2.conf +Source30: %{name}-thermal.conf +Source31: %{name}-unixsock.conf +Source32: %{name}-users.conf +Source33: %{name}-vmem.conf +Source34: %{name}-vserver.conf +Source35: %{name}-wireless.conf URL: http://collectd.org/ BuildRequires: OpenIPMI-devel BuildRequires: autoconf @@ -413,6 +421,14 @@ install %{SOURCE24} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/sensors.conf install %{SOURCE25} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/snmp.conf install %{SOURCE26} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/uuid.conf install %{SOURCE27} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/xmms.conf +install %{SOURCE28} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/tcpconns.conf +install %{SOURCE29} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/teamspeak2.conf +install %{SOURCE30} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/thermal.conf +install %{SOURCE31} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/unixsock.conf +install %{SOURCE32} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/users.conf +install %{SOURCE33} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/vmem.conf +install %{SOURCE34} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/vserver.conf +install %{SOURCE35} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/wireless.conf # Cleanups: rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la @@ -445,10 +461,20 @@ fi %files %defattr(644,root,root,755) %doc AUTHORS ChangeLog README TODO contrib - +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf +%dir %{_sysconfdir}/%{name}.d +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/tcpconns.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/teamspeak2.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/thermal.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/unixsock.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/users.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/vmem.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/vserver.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/wireless.conf %attr(755,root,root) %{_sbindir}/collectd %attr(755,root,root) %{_sbindir}/collectdmon %attr(755,root,root) %{_bindir}/collectd-nagios + %dir %{_libdir}/%{name} %attr(755,root,root) %{_libdir}/%{name}/apcups.so #%attr(755,root,root) %{_libdir}/%{name}/apple_sensors.so @@ -491,8 +517,8 @@ fi %attr(755,root,root) %{_libdir}/%{name}/syslog.so %attr(755,root,root) %{_libdir}/%{name}/tail.so #%attr(755,root,root) %{_libdir}/%{name}/tape.so -%attr(755,root,root) %{_libdir}/%{name}/teamspeak2.so %attr(755,root,root) %{_libdir}/%{name}/tcpconns.so +%attr(755,root,root) %{_libdir}/%{name}/teamspeak2.so %attr(755,root,root) %{_libdir}/%{name}/thermal.so #%attr(755,root,root) %{_libdir}/%{name}/traffic.so %attr(755,root,root) %{_libdir}/%{name}/unixsock.so @@ -502,9 +528,6 @@ fi %attr(755,root,root) %{_libdir}/%{name}/wireless.so %{_libdir}/%{name}/types.db -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf -%dir %{_sysconfdir}/%{name}.d - %attr(754,root,root) /etc/rc.d/init.d/%{name} %{_mandir}/man1/collectd.1*