- configuration moved to separate sub-configs

Changed files:
    collectd-apcups.conf -> 1.1
    collectd-battery.conf -> 1.1
    collectd-cpu.conf -> 1.1
    collectd-cpufreq.conf -> 1.1
    collectd-csv.conf -> 1.1
    collectd-df.conf -> 1.1
    collectd-disk.conf -> 1.1
    collectd-email.conf -> 1.1
    collectd-entropy.conf -> 1.1
    collectd-exec.conf -> 1.1
    collectd-filecount.conf -> 1.1
    collectd-interface.conf -> 1.1
    collectd-iptables.conf -> 1.1
    collectd-irq.conf -> 1.1
    collectd-load.conf -> 1.1
    collectd-logfile.conf -> 1.1
    collectd-mbmon.conf -> 1.1
    collectd-memcached.conf -> 1.1
    collectd-memory.conf -> 1.1
    collectd-multimeter.conf -> 1.1
    collectd-netlink.conf -> 1.1
    collectd-network.conf -> 1.1
    collectd-nfs.conf -> 1.1
    collectd-ntpd.conf -> 1.1
    collectd-processes.conf -> 1.1
    collectd-serial.conf -> 1.1
    collectd-swap.conf -> 1.1
    collectd-syslog.conf -> 1.1
    collectd-tail.conf -> 1.1
    collectd.conf -> 1.4
    collectd.spec -> 1.44

diff --git a/collectd-apcups.conf b/collectd-apcups.conf
new file mode 100644 (file)
index 0000000..0af1159
--- /dev/null
+++ b/collectd-apcups.conf
@@ -0,0 +1,6 @@
+LoadPlugin apcups
+
+#<Plugin apcups>
+#       Host "localhost"
+#       Port "3551"
+#</Plugin>

diff --git a/collectd-battery.conf b/collectd-battery.conf
new file mode 100644 (file)
index 0000000..fb03102
--- /dev/null
+++ b/collectd-battery.conf
@@ -0,0 +1,2 @@
+LoadPlugin battery
+

diff --git a/collectd-cpu.conf b/collectd-cpu.conf
new file mode 100644 (file)
index 0000000..6aabc7a
--- /dev/null
+++ b/collectd-cpu.conf
@@ -0,0 +1,2 @@
+LoadPlugin cpu
+

diff --git a/collectd-cpufreq.conf b/collectd-cpufreq.conf
new file mode 100644 (file)
index 0000000..5ac3338
--- /dev/null
+++ b/collectd-cpufreq.conf
@@ -0,0 +1,2 @@
+LoadPlugin cpufreq
+

diff --git a/collectd-csv.conf b/collectd-csv.conf
new file mode 100644 (file)
index 0000000..95e6ece
--- /dev/null
+++ b/collectd-csv.conf
@@ -0,0 +1,6 @@
+LoadPlugin csv
+
+#<Plugin csv>
+#       DataDir "/usr/var/lib/collectd/csv"
+#       StoreRates false
+#</Plugin>

diff --git a/collectd-df.conf b/collectd-df.conf
new file mode 100644 (file)
index 0000000..78bcddd
--- /dev/null
+++ b/collectd-df.conf
@@ -0,0 +1,9 @@
+LoadPlugin df
+
+#<Plugin df>
+#       Device "/dev/hda1"
+#       Device "192.168.0.2:/mnt/nfs"
+#       MountPoint "/home"
+#       FSType "ext3"
+#       IgnoreSelected false
+#</Plugin>

diff --git a/collectd-disk.conf b/collectd-disk.conf
new file mode 100644 (file)
index 0000000..54dda64
--- /dev/null
+++ b/collectd-disk.conf
@@ -0,0 +1,6 @@
+LoadPlugin disk
+
+#<Plugin disk>
+#       Disk "/^[hs]d[a-f][0-9]?$/"
+#       IgnoreSelected false
+#</Plugin>

diff --git a/collectd-email.conf b/collectd-email.conf
new file mode 100644 (file)
index 0000000..12ea10f
--- /dev/null
+++ b/collectd-email.conf
@@ -0,0 +1,8 @@
+LoadPlugin email
+
+#<Plugin email>
+#       SocketFile "/usr/var/run/collectd-email"
+#       SocketGroup "collectd"
+#       SocketPerms "0770"
+#       MaxConns 5
+#</Plugin>

diff --git a/collectd-entropy.conf b/collectd-entropy.conf
new file mode 100644 (file)
index 0000000..6ae3aa6
--- /dev/null
+++ b/collectd-entropy.conf
@@ -0,0 +1,2 @@
+LoadPlugin entropy
+

diff --git a/collectd-exec.conf b/collectd-exec.conf
new file mode 100644 (file)
index 0000000..accf583
--- /dev/null
+++ b/collectd-exec.conf
@@ -0,0 +1,6 @@
+LoadPlugin exec
+
+#<Plugin exec>
+#       Exec "user:group" "/path/to/exec"
+#       NotificationExec "user:group" "/path/to/exec"
+#</Plugin>

diff --git a/collectd-filecount.conf b/collectd-filecount.conf
new file mode 100644 (file)
index 0000000..4ea804e
--- /dev/null
+++ b/collectd-filecount.conf
@@ -0,0 +1,10 @@
+LoadPlugin filecount
+
+#<Plugin filecount>
+#       <Directory "/path/to/dir">
+#               Instance "foodir"
+#               Name "*.conf"
+#               MTime "-5m"
+#               Size "+10k"
+#       </Directory>
+#</Plugin>

diff --git a/collectd-interface.conf b/collectd-interface.conf
new file mode 100644 (file)
index 0000000..a122760
--- /dev/null
+++ b/collectd-interface.conf
@@ -0,0 +1,6 @@
+LoadPlugin interface
+
+#<Plugin interface>
+#       Interface "eth0"
+#       IgnoreSelected false
+#</Plugin>

diff --git a/collectd-iptables.conf b/collectd-iptables.conf
new file mode 100644 (file)
index 0000000..cc12d48
--- /dev/null
+++ b/collectd-iptables.conf
@@ -0,0 +1,5 @@
+LoadPlugin iptables
+
+#<Plugin iptables>
+#       Chain table chain
+#</Plugin>

diff --git a/collectd-irq.conf b/collectd-irq.conf
new file mode 100644 (file)
index 0000000..3f37b16
--- /dev/null
+++ b/collectd-irq.conf
@@ -0,0 +1,8 @@
+LoadPlugin irq
+
+#<Plugin irq>
+#       Irq 7
+#       Irq 8
+#       Irq 9
+#       IgnoreSelected true
+#</Plugin>

diff --git a/collectd-load.conf b/collectd-load.conf
new file mode 100644 (file)
index 0000000..dfb524c
--- /dev/null
+++ b/collectd-load.conf
@@ -0,0 +1,2 @@
+LoadPlugin load
+

diff --git a/collectd-logfile.conf b/collectd-logfile.conf
new file mode 100644 (file)
index 0000000..a78dce5
--- /dev/null
+++ b/collectd-logfile.conf
@@ -0,0 +1,7 @@
+LoadPlugin logfile
+
+#<Plugin logfile>
+#       LogLevel info
+#       File STDOUT
+#       Timestamp true
+#</Plugin>

diff --git a/collectd-mbmon.conf b/collectd-mbmon.conf
new file mode 100644 (file)
index 0000000..7a11c2a
--- /dev/null
+++ b/collectd-mbmon.conf
@@ -0,0 +1,6 @@
+LoadPlugin mbmon
+
+#<Plugin mbmon>
+#       Host "127.0.0.1"
+#       Port "411"
+#</Plugin>

diff --git a/collectd-memcached.conf b/collectd-memcached.conf
new file mode 100644 (file)
index 0000000..728f1fd
--- /dev/null
+++ b/collectd-memcached.conf
@@ -0,0 +1,6 @@
+LoadPlugin memcached
+
+#<Plugin memcached>
+#       Host "127.0.0.1"
+#       Port "11211"
+#</Plugin>

diff --git a/collectd-memory.conf b/collectd-memory.conf
new file mode 100644 (file)
index 0000000..446f503
--- /dev/null
+++ b/collectd-memory.conf
@@ -0,0 +1,2 @@
+LoadPlugin memory
+

diff --git a/collectd-multimeter.conf b/collectd-multimeter.conf
new file mode 100644 (file)
index 0000000..7d825f2
--- /dev/null
+++ b/collectd-multimeter.conf
@@ -0,0 +1 @@
+LoadPlugin multimeter

diff --git a/collectd-netlink.conf b/collectd-netlink.conf
new file mode 100644 (file)
index 0000000..1165467
--- /dev/null
+++ b/collectd-netlink.conf
@@ -0,0 +1,10 @@
+LoadPlugin netlink
+
+#<Plugin netlink>
+#       Interface "All"
+#       VerboseInterface "All"
+#       QDisc "eth0" "pfifo_fast-1:0"
+#       Class "ppp0" "htb-1:10"
+#       Filter "ppp0" "u32-1:0"
+#       IgnoreSelected false
+#</Plugin>

diff --git a/collectd-network.conf b/collectd-network.conf
new file mode 100644 (file)
index 0000000..a9bc50d
--- /dev/null
+++ b/collectd-network.conf
@@ -0,0 +1,11 @@
+LoadPlugin network
+
+#<Plugin network>
+#       Server "ff18::efc0:4a42" "25826"
+#       Server "239.192.74.66" "25826"
+#       Listen "ff18::efc0:4a42" "25826"
+#       Listen "239.192.74.66" "25826"
+#       TimeToLive "128"
+#       Forward false
+#       CacheFlush 1800
+#</Plugin>

diff --git a/collectd-nfs.conf b/collectd-nfs.conf
new file mode 100644 (file)
index 0000000..981eaa2
--- /dev/null
+++ b/collectd-nfs.conf
@@ -0,0 +1,2 @@
+LoadPlugin nfs
+

diff --git a/collectd-ntpd.conf b/collectd-ntpd.conf
new file mode 100644 (file)
index 0000000..032adfb
--- /dev/null
+++ b/collectd-ntpd.conf
@@ -0,0 +1,7 @@
+LoadPlugin ntpd
+
+#<Plugin ntpd>
+#       Host "localhost"
+#       Port 123
+#       ReverseLookups false
+#</Plugin>

diff --git a/collectd-processes.conf b/collectd-processes.conf
new file mode 100644 (file)
index 0000000..62308c6
--- /dev/null
+++ b/collectd-processes.conf
@@ -0,0 +1,5 @@
+LoadPlugin processes
+
+#<Plugin processes>
+#       Process "name"
+#</Plugin>

diff --git a/collectd-serial.conf b/collectd-serial.conf
new file mode 100644 (file)
index 0000000..ff206da
--- /dev/null
+++ b/collectd-serial.conf
@@ -0,0 +1,2 @@
+LoadPlugin serial
+

diff --git a/collectd-swap.conf b/collectd-swap.conf
new file mode 100644 (file)
index 0000000..1bbe8ee
--- /dev/null
+++ b/collectd-swap.conf
@@ -0,0 +1,2 @@
+LoadPlugin swap
+

diff --git a/collectd-syslog.conf b/collectd-syslog.conf
new file mode 100644 (file)
index 0000000..2701b94
--- /dev/null
+++ b/collectd-syslog.conf
@@ -0,0 +1,5 @@
+LoadPlugin syslog
+
+#<Plugin syslog>
+#       LogLevel info
+#</Plugin>

diff --git a/collectd-tail.conf b/collectd-tail.conf
new file mode 100644 (file)
index 0000000..a1ec8c7
--- /dev/null
+++ b/collectd-tail.conf
@@ -0,0 +1,19 @@
+LoadPlugin tail
+
+#<Plugin "tail">
+#  <File "/var/log/exim4/mainlog">
+#    Instance "exim"
+#    <Match>
+#      Regex "S=([1-9][0-9]*)"
+#      DSType "CounterAdd"
+#      Type "ipt_bytes"
+#      Instance "total"
+#    </Match>
+#    <Match>
+#      Regex "\\<R=local_user\\>"
+#      DSType "CounterInc"
+#      Type "email_count"
+#      Instance "local_user"
+#    </Match>
+#  </File>
+#</Plugin>

diff --git a/collectd.conf b/collectd.conf
index 1c64a383769007fea53f41a3b6bfe16c669d8a66..a47401216ae0330b36621c2e99543a66142f63b1 100644 (file)
--- a/collectd.conf
+++ b/collectd.conf
@@ -13,113 +13,19 @@ FQDNLookup   true
 #Interval     10
 #ReadThreads  5
 
-LoadPlugin logfile
-LoadPlugin syslog
+### Include all files from /etc/collectd.d/*.conf
+Include "/etc/collectd.d/*.conf"
 
-#<Plugin logfile>
-#      LogLevel info
-#      File STDOUT
-#      Timestamp true
-#</Plugin>
+##### UNSUPPORTED Modules #####
 
-#<Plugin syslog>
-#      LogLevel info
-#</Plugin>
 
-LoadPlugin apcups
 #LoadPlugin apple_sensors
-LoadPlugin battery
-LoadPlugin cpu
-LoadPlugin cpufreq
-LoadPlugin csv
-LoadPlugin df
-LoadPlugin disk
-LoadPlugin email
-LoadPlugin entropy
-LoadPlugin exec
-LoadPlugin filecount
-LoadPlugin interface
-LoadPlugin iptables
 #LoadPlugin ipvs
-LoadPlugin irq
 #LoadPlugin libvirt
-LoadPlugin load
-LoadPlugin mbmon
-LoadPlugin memcached
-LoadPlugin memory
-#LoadPlugin multimeter
-LoadPlugin netlink
-LoadPlugin network
-LoadPlugin nfs
-LoadPlugin ntpd
 #LoadPlugin onewire
 #LoadPlugin perl
-LoadPlugin processes
-LoadPlugin serial
-LoadPlugin swap
-LoadPlugin tail
 #LoadPlugin tape
 
-#<Plugin apcups>
-#      Host "localhost"
-#      Port "3551"
-#</Plugin>
-
-#<Plugin csv>
-#      DataDir "/usr/var/lib/collectd/csv"
-#      StoreRates false
-#</Plugin>
-
-#<Plugin df>
-#      Device "/dev/hda1"
-#      Device "192.168.0.2:/mnt/nfs"
-#      MountPoint "/home"
-#      FSType "ext3"
-#      IgnoreSelected false
-#</Plugin>
-
-#<Plugin disk>
-#      Disk "/^[hs]d[a-f][0-9]?$/"
-#      IgnoreSelected false
-#</Plugin>
-
-#<Plugin email>
-#      SocketFile "/usr/var/run/collectd-email"
-#      SocketGroup "collectd"
-#      SocketPerms "0770"
-#      MaxConns 5
-#</Plugin>
-
-#<Plugin exec>
-#      Exec "user:group" "/path/to/exec"
-#      NotificationExec "user:group" "/path/to/exec"
-#</Plugin>
-
-#<Plugin filecount>
-#      <Directory "/path/to/dir">
-#              Instance "foodir"
-#              Name "*.conf"
-#              MTime "-5m"
-#              Size "+10k"
-#      </Directory>
-#</Plugin>
-
-#<Plugin interface>
-#      Interface "eth0"
-#      IgnoreSelected false
-#</Plugin>
-
-#<Plugin iptables>
-#      Chain table chain
-#</Plugin>
-
-#<Plugin irq>
-#      Irq 7
-#      Irq 8
-#      Irq 9
-#      IgnoreSelected true
-#</Plugin>
-
 #<Plugin libvirt>
 #      Connection "xen:///"
 #      RefreshInterval 60
@@ -130,41 +36,6 @@ LoadPlugin tail
 #      HostnameFormat name
 #</Plugin>
 
-#<Plugin mbmon>
-#      Host "127.0.0.1"
-#      Port "411"
-#</Plugin>
-
-#<Plugin memcached>
-#      Host "127.0.0.1"
-#      Port "11211"
-#</Plugin>
-
-#<Plugin netlink>
-#      Interface "All"
-#      VerboseInterface "All"
-#      QDisc "eth0" "pfifo_fast-1:0"
-#      Class "ppp0" "htb-1:10"
-#      Filter "ppp0" "u32-1:0"
-#      IgnoreSelected false
-#</Plugin>
-
-#<Plugin network>
-#      Server "ff18::efc0:4a42" "25826"
-#      Server "239.192.74.66" "25826"
-#      Listen "ff18::efc0:4a42" "25826"
-#      Listen "239.192.74.66" "25826"
-#      TimeToLive "128"
-#      Forward false
-#      CacheFlush 1800
-#</Plugin>
-
-#<Plugin ntpd>
-#      Host "localhost"
-#      Port 123
-#      ReverseLookups false
-#</Plugin>
-
 #<Plugin onewire>
 #      Device "-s localhost:4304"
 #      Sensor "F10FCA000800"
@@ -178,29 +49,3 @@ LoadPlugin tail
 #      LoadPlugin foo
 #</Plugin>
 
-#<Plugin processes>
-#      Process "name"
-#</Plugin>
-
-#<Plugin "tail">
-#  <File "/var/log/exim4/mainlog">
-#    Instance "exim"
-#    <Match>
-#      Regex "S=([1-9][0-9]*)"
-#      DSType "CounterAdd"
-#      Type "ipt_bytes"
-#      Instance "total"
-#    </Match>
-#    <Match>
-#      Regex "\\<R=local_user\\>"
-#      DSType "CounterInc"
-#      Type "email_count"
-#      Instance "local_user"
-#    </Match>
-#  </File>
-#</Plugin>
-
-
-### Include all files from /etc/collectd.d/*.conf
-Include "/etc/collectd.d/*.conf"
-

diff --git a/collectd.spec b/collectd.spec
index 9a86551daaddc562e82a9676d2c0143c41505aab..0c2637706717c7ccfd858b4d4d189302e9ece759 100644 (file)
--- a/collectd.spec
+++ b/collectd.spec
@@ -2,62 +2,14 @@
 # - lm_sensors subpackage
 # - package contrib scripts as %doc
 # - put every plugin into subpackages
-# - Current plugins status:
-#    apache  . . . . . . yes
-#    apcups  . . . . . . yes
+# - perl modules with Collectd classes package to separate package
+# - Disabled modules:
 #    apple_sensors . . . no            (obvious)
-#    ascent  . . . . . . yes
-#    battery . . . . . . yes
-#    cpu . . . . . . . . yes
-#    cpufreq . . . . . . yes
-#    csv . . . . . . . . yes
-#    df  . . . . . . . . yes
-#    disk  . . . . . . . yes
-#    dns . . . . . . . . yes
-#    email . . . . . . . yes
-#    entropy . . . . . . yes
-#    exec  . . . . . . . yes
-#    hddtemp . . . . . . yes
-#    interface . . . . . yes
-#    iptables  . . . . . yes
-#    ipmi  . . . . . . . yes
 #    ipvs  . . . . . . . no            (ip_vs.h not found - llh to be fixed)
-#    irq . . . . . . . . yes
 #    libvirt . . . . . . no            (requires library)
-#    load  . . . . . . . yes
-#    logfile . . . . . . yes
-#    mbmon . . . . . . . yes
-#    memcached . . . . . yes
-#    memory  . . . . . . yes
-#    multimeter  . . . . no
-#    mysql . . . . . . . yes
-#    netlink . . . . . . yes
-#    network . . . . . . yes
-#    nfs . . . . . . . . yes
-#    nginx . . . . . . . yes
-#    ntpd  . . . . . . . yes
-#    nut . . . . . . . . yes
+#    multimeter  . . . . no            ?
 #    perl  . . . . . . . no            (needs libperl)
-#    ping  . . . . . . . yes
-#    powerdns  . . . . . yes
-#    processes . . . . . yes
-#    rrdtool . . . . . . yes
-#    sensors . . . . . . yes
-#    serial  . . . . . . yes
-#    snmp  . . . . . . . yes
-#    swap  . . . . . . . yes
-#    syslog  . . . . . . yes
-#    tail  . . . . . . . yes
 #    tape  . . . . . . . no            ?
-#    tcpconns  . . . . . yes
-#    teamspeak2  . . . . yes
-#    unixsock  . . . . . yes
-#    users . . . . . . . yes
-#    uuid  . . . . . . . yes
-#    vmem  . . . . . . . yes
-#    vserver . . . . . . yes
-#    wireless  . . . . . yes
-#    xmms  . . . . . . . yes
 #
 # Conditional build:
 %bcond_without dns             # ???
@@ -75,7 +27,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.2
+Release:       5.3
 License:       GPL v2
 Group:         Daemons
 Source0:       http://collectd.org/files/%{name}-%{version}.tar.gz
@@ -109,6 +61,36 @@ Source32:   %{name}-users.conf
 Source33:      %{name}-vmem.conf
 Source34:      %{name}-vserver.conf
 Source35:      %{name}-wireless.conf
+Source36:      %{name}-apcups.conf
+Source37:      %{name}-battery.conf
+Source38:      %{name}-cpufreq.conf
+Source39:      %{name}-cpu.conf
+Source40:      %{name}-csv.conf
+Source41:      %{name}-df.conf
+Source42:      %{name}-disk.conf
+Source43:      %{name}-email.conf
+Source44:      %{name}-entropy.conf
+Source45:      %{name}-exec.conf
+Source46:      %{name}-filecount.conf
+Source47:      %{name}-interface.conf
+Source48:      %{name}-iptables.conf
+Source49:      %{name}-irq.conf
+Source50:      %{name}-irq.conf
+Source51:      %{name}-load.conf
+Source52:      %{name}-logfile.conf
+Source53:      %{name}-mbmon.conf
+Source54:      %{name}-memcached.conf
+Source55:      %{name}-memory.conf
+Source56:      %{name}-multimeter.conf
+Source57:      %{name}-netlink.conf
+Source58:      %{name}-network.conf
+Source59:      %{name}-nfs.conf
+Source60:      %{name}-ntpd.conf
+Source61:      %{name}-processes.conf
+Source62:      %{name}-serial.conf
+Source63:      %{name}-swap.conf
+Source64:      %{name}-syslog.conf
+Source65:      %{name}-tail.conf
 URL:           http://collectd.org/
 BuildRequires: OpenIPMI-devel
 BuildRequires: autoconf
@@ -429,6 +411,36 @@ 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
+install %{SOURCE36} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/apcups.conf
+install %{SOURCE37} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/battery.conf
+install %{SOURCE38} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/cpufreq.conf
+install %{SOURCE39} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/cpu.conf
+install %{SOURCE40} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/csv.conf
+install %{SOURCE41} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/df.conf
+install %{SOURCE42} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/disk.conf
+install %{SOURCE43} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/email.conf
+install %{SOURCE44} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/entropy.conf
+install %{SOURCE45} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/exec.conf
+install %{SOURCE46} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/filecount.conf
+install %{SOURCE47} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/interface.conf
+install %{SOURCE48} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/iptables.conf
+install %{SOURCE49} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/irq.conf
+install %{SOURCE50} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/irq.conf
+install %{SOURCE51} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/load.conf
+install %{SOURCE52} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/logfile.conf
+install %{SOURCE53} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/mbmon.conf
+install %{SOURCE54} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/memcached.conf
+install %{SOURCE55} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/memory.conf
+install %{SOURCE56} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/multimeter.conf
+install %{SOURCE57} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/netlink.conf
+install %{SOURCE58} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/network.conf
+install %{SOURCE59} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/nfs.conf
+install %{SOURCE60} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/ntpd.conf
+install %{SOURCE61} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/processes.conf
+install %{SOURCE62} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/serial.conf
+install %{SOURCE63} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/swap.conf
+install %{SOURCE64} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/syslog.conf
+install %{SOURCE65} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/tail.conf
 
 # Cleanups:
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
@@ -446,6 +458,33 @@ if [ "$1" = "0" ]; then
        /sbin/chkconfig --del %{name}
 fi
 
+%define module_scripts() \
+%post %1 \
+%service %{name} restart \
+\
+%postun %1 \
+%service %{name} restart
+
+%module_scripts ascent
+%module_scripts apache
+%module_scripts collection
+%module_scripts dns
+%module_scripts hddtemp
+%module_scripts ipmi
+%module_scripts mysql
+%module_scripts nginx
+%module_scripts notify_desktop
+%module_scripts notify_email
+%module_scripts nut
+%module_scripts ping
+%module_scripts postgresql
+%module_scripts powerdns
+%module_scripts rrdtool
+%module_scripts sensors
+%module_scripts snmp
+%module_scripts uuid
+%module_scripts xmms
+
 %triggerin collection -- apache1 < 1.3.37-3, apache1-base
 %webapp_register apache %{_webapp}
 
@@ -463,6 +502,36 @@ fi
 %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/apcups.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/battery.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/cpufreq.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/cpu.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/csv.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/df.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/disk.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/email.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/entropy.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/exec.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/filecount.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/interface.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/iptables.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/irq.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/irq.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/load.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/logfile.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/mbmon.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/memcached.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/memory.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/multimeter.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/netlink.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/network.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/nfs.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/ntpd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/processes.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/serial.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/swap.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/syslog.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/tail.conf
 %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
@@ -479,8 +548,8 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/apcups.so
 #%attr(755,root,root) %{_libdir}/%{name}/apple_sensors.so
 %attr(755,root,root) %{_libdir}/%{name}/battery.so
-%attr(755,root,root) %{_libdir}/%{name}/cpufreq.so
 %attr(755,root,root) %{_libdir}/%{name}/cpu.so
+%attr(755,root,root) %{_libdir}/%{name}/cpufreq.so
 %attr(755,root,root) %{_libdir}/%{name}/csv.so
 %attr(755,root,root) %{_libdir}/%{name}/df.so
 %attr(755,root,root) %{_libdir}/%{name}/disk.so
@@ -496,6 +565,7 @@ fi
 # It was marked as disabled in status message on top.
 #%attr(755,root,root) %{_libdir}/%{name}/ipvs.so
 %attr(755,root,root) %{_libdir}/%{name}/irq.so
+#%attr(755,root,root) %{_libdir}/%{name}/libvirt.so
 %attr(755,root,root) %{_libdir}/%{name}/load.so
 %attr(755,root,root) %{_libdir}/%{name}/logfile.so
 %attr(755,root,root) %{_libdir}/%{name}/mbmon.so