SOURCES: collectd.conf, collectd-apcups.conf (NEW), collectd-battery.conf (...
blues
blues at pld-linux.org
Sun Nov 2 00:04:57 CET 2008
Author: blues Date: Sat Nov 1 23:04:57 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- configuration moved to separate sub-configs
---- Files affected:
SOURCES:
collectd.conf (1.3 -> 1.4) , collectd-apcups.conf (NONE -> 1.1) (NEW), collectd-battery.conf (NONE -> 1.1) (NEW), collectd-cpu.conf (NONE -> 1.1) (NEW), collectd-cpufreq.conf (NONE -> 1.1) (NEW), collectd-csv.conf (NONE -> 1.1) (NEW), collectd-df.conf (NONE -> 1.1) (NEW), collectd-disk.conf (NONE -> 1.1) (NEW), collectd-email.conf (NONE -> 1.1) (NEW), collectd-entropy.conf (NONE -> 1.1) (NEW), collectd-exec.conf (NONE -> 1.1) (NEW), collectd-filecount.conf (NONE -> 1.1) (NEW), collectd-interface.conf (NONE -> 1.1) (NEW), collectd-iptables.conf (NONE -> 1.1) (NEW), collectd-irq.conf (NONE -> 1.1) (NEW), collectd-load.conf (NONE -> 1.1) (NEW), collectd-logfile.conf (NONE -> 1.1) (NEW), collectd-mbmon.conf (NONE -> 1.1) (NEW), collectd-memcached.conf (NONE -> 1.1) (NEW), collectd-memory.conf (NONE -> 1.1) (NEW), collectd-multimeter.conf (NONE -> 1.1) (NEW), collectd-netlink.conf (NONE -> 1.1) (NEW), collectd-network.conf (NONE -> 1.1) (NEW), collectd-nfs
.conf (NONE -> 1.1) (NEW), collectd-ntpd.conf (NONE -> 1.1) (NEW), collectd-processes.conf (NONE -> 1.1) (NEW), collectd-serial.conf (NONE -> 1.1) (NEW), collectd-swap.conf (NONE -> 1.1) (NEW), collectd-syslog.conf (NONE -> 1.1) (NEW), collectd-tail.conf (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/collectd.conf
diff -u SOURCES/collectd.conf:1.3 SOURCES/collectd.conf:1.4
--- SOURCES/collectd.conf:1.3 Thu Oct 30 18:39:00 2008
+++ SOURCES/collectd.conf Sun Nov 2 00:04:41 2008
@@ -13,113 +13,19 @@
#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 @@
# 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"
@@ -177,30 +48,4 @@
# EnableDebugger ""
# 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"
================================================================
Index: SOURCES/collectd-apcups.conf
diff -u /dev/null SOURCES/collectd-apcups.conf:1.1
--- /dev/null Sun Nov 2 00:04:58 2008
+++ SOURCES/collectd-apcups.conf Sun Nov 2 00:04:40 2008
@@ -0,0 +1,6 @@
+LoadPlugin apcups
+
+#<Plugin apcups>
+# Host "localhost"
+# Port "3551"
+#</Plugin>
================================================================
Index: SOURCES/collectd-battery.conf
diff -u /dev/null SOURCES/collectd-battery.conf:1.1
--- /dev/null Sun Nov 2 00:04:59 2008
+++ SOURCES/collectd-battery.conf Sun Nov 2 00:04:41 2008
@@ -0,0 +1,2 @@
+LoadPlugin battery
+
================================================================
Index: SOURCES/collectd-cpu.conf
diff -u /dev/null SOURCES/collectd-cpu.conf:1.1
--- /dev/null Sun Nov 2 00:04:59 2008
+++ SOURCES/collectd-cpu.conf Sun Nov 2 00:04:42 2008
@@ -0,0 +1,2 @@
+LoadPlugin cpu
+
================================================================
Index: SOURCES/collectd-cpufreq.conf
diff -u /dev/null SOURCES/collectd-cpufreq.conf:1.1
--- /dev/null Sun Nov 2 00:05:00 2008
+++ SOURCES/collectd-cpufreq.conf Sun Nov 2 00:04:42 2008
@@ -0,0 +1,2 @@
+LoadPlugin cpufreq
+
================================================================
Index: SOURCES/collectd-csv.conf
diff -u /dev/null SOURCES/collectd-csv.conf:1.1
--- /dev/null Sun Nov 2 00:05:01 2008
+++ SOURCES/collectd-csv.conf Sun Nov 2 00:04:42 2008
@@ -0,0 +1,6 @@
+LoadPlugin csv
+
+#<Plugin csv>
+# DataDir "/usr/var/lib/collectd/csv"
+# StoreRates false
+#</Plugin>
================================================================
Index: SOURCES/collectd-df.conf
diff -u /dev/null SOURCES/collectd-df.conf:1.1
--- /dev/null Sun Nov 2 00:05:02 2008
+++ SOURCES/collectd-df.conf Sun Nov 2 00:04:43 2008
@@ -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>
================================================================
Index: SOURCES/collectd-disk.conf
diff -u /dev/null SOURCES/collectd-disk.conf:1.1
--- /dev/null Sun Nov 2 00:05:02 2008
+++ SOURCES/collectd-disk.conf Sun Nov 2 00:04:43 2008
@@ -0,0 +1,6 @@
+LoadPlugin disk
+
+#<Plugin disk>
+# Disk "/^[hs]d[a-f][0-9]?$/"
+# IgnoreSelected false
+#</Plugin>
================================================================
Index: SOURCES/collectd-email.conf
diff -u /dev/null SOURCES/collectd-email.conf:1.1
--- /dev/null Sun Nov 2 00:05:03 2008
+++ SOURCES/collectd-email.conf Sun Nov 2 00:04:44 2008
@@ -0,0 +1,8 @@
+LoadPlugin email
+
+#<Plugin email>
+# SocketFile "/usr/var/run/collectd-email"
+# SocketGroup "collectd"
+# SocketPerms "0770"
+# MaxConns 5
+#</Plugin>
================================================================
Index: SOURCES/collectd-entropy.conf
diff -u /dev/null SOURCES/collectd-entropy.conf:1.1
--- /dev/null Sun Nov 2 00:05:03 2008
+++ SOURCES/collectd-entropy.conf Sun Nov 2 00:04:44 2008
@@ -0,0 +1,2 @@
+LoadPlugin entropy
+
================================================================
Index: SOURCES/collectd-exec.conf
diff -u /dev/null SOURCES/collectd-exec.conf:1.1
--- /dev/null Sun Nov 2 00:05:04 2008
+++ SOURCES/collectd-exec.conf Sun Nov 2 00:04:44 2008
@@ -0,0 +1,6 @@
+LoadPlugin exec
+
+#<Plugin exec>
+# Exec "user:group" "/path/to/exec"
+# NotificationExec "user:group" "/path/to/exec"
+#</Plugin>
================================================================
Index: SOURCES/collectd-filecount.conf
diff -u /dev/null SOURCES/collectd-filecount.conf:1.1
--- /dev/null Sun Nov 2 00:05:04 2008
+++ SOURCES/collectd-filecount.conf Sun Nov 2 00:04:45 2008
@@ -0,0 +1,10 @@
+LoadPlugin filecount
+
+#<Plugin filecount>
+# <Directory "/path/to/dir">
+# Instance "foodir"
+# Name "*.conf"
+# MTime "-5m"
+# Size "+10k"
+# </Directory>
+#</Plugin>
================================================================
Index: SOURCES/collectd-interface.conf
diff -u /dev/null SOURCES/collectd-interface.conf:1.1
--- /dev/null Sun Nov 2 00:05:05 2008
+++ SOURCES/collectd-interface.conf Sun Nov 2 00:04:45 2008
@@ -0,0 +1,6 @@
+LoadPlugin interface
+
+#<Plugin interface>
+# Interface "eth0"
+# IgnoreSelected false
+#</Plugin>
================================================================
Index: SOURCES/collectd-iptables.conf
diff -u /dev/null SOURCES/collectd-iptables.conf:1.1
--- /dev/null Sun Nov 2 00:05:05 2008
+++ SOURCES/collectd-iptables.conf Sun Nov 2 00:04:46 2008
@@ -0,0 +1,5 @@
+LoadPlugin iptables
+
+#<Plugin iptables>
+# Chain table chain
+#</Plugin>
================================================================
Index: SOURCES/collectd-irq.conf
diff -u /dev/null SOURCES/collectd-irq.conf:1.1
--- /dev/null Sun Nov 2 00:05:06 2008
+++ SOURCES/collectd-irq.conf Sun Nov 2 00:04:46 2008
@@ -0,0 +1,8 @@
+LoadPlugin irq
+
+#<Plugin irq>
+# Irq 7
+# Irq 8
+# Irq 9
+# IgnoreSelected true
+#</Plugin>
================================================================
Index: SOURCES/collectd-load.conf
diff -u /dev/null SOURCES/collectd-load.conf:1.1
--- /dev/null Sun Nov 2 00:05:06 2008
+++ SOURCES/collectd-load.conf Sun Nov 2 00:04:46 2008
@@ -0,0 +1,2 @@
+LoadPlugin load
+
================================================================
Index: SOURCES/collectd-logfile.conf
diff -u /dev/null SOURCES/collectd-logfile.conf:1.1
--- /dev/null Sun Nov 2 00:05:07 2008
+++ SOURCES/collectd-logfile.conf Sun Nov 2 00:04:47 2008
@@ -0,0 +1,7 @@
+LoadPlugin logfile
+
+#<Plugin logfile>
+# LogLevel info
+# File STDOUT
+# Timestamp true
+#</Plugin>
================================================================
Index: SOURCES/collectd-mbmon.conf
diff -u /dev/null SOURCES/collectd-mbmon.conf:1.1
--- /dev/null Sun Nov 2 00:05:07 2008
+++ SOURCES/collectd-mbmon.conf Sun Nov 2 00:04:47 2008
@@ -0,0 +1,6 @@
+LoadPlugin mbmon
+
+#<Plugin mbmon>
+# Host "127.0.0.1"
+# Port "411"
+#</Plugin>
================================================================
Index: SOURCES/collectd-memcached.conf
diff -u /dev/null SOURCES/collectd-memcached.conf:1.1
--- /dev/null Sun Nov 2 00:05:08 2008
+++ SOURCES/collectd-memcached.conf Sun Nov 2 00:04:47 2008
@@ -0,0 +1,6 @@
+LoadPlugin memcached
+
+#<Plugin memcached>
+# Host "127.0.0.1"
+# Port "11211"
+#</Plugin>
================================================================
Index: SOURCES/collectd-memory.conf
diff -u /dev/null SOURCES/collectd-memory.conf:1.1
--- /dev/null Sun Nov 2 00:05:09 2008
+++ SOURCES/collectd-memory.conf Sun Nov 2 00:04:48 2008
@@ -0,0 +1,2 @@
+LoadPlugin memory
+
================================================================
Index: SOURCES/collectd-multimeter.conf
diff -u /dev/null SOURCES/collectd-multimeter.conf:1.1
--- /dev/null Sun Nov 2 00:05:09 2008
+++ SOURCES/collectd-multimeter.conf Sun Nov 2 00:04:48 2008
@@ -0,0 +1 @@
+LoadPlugin multimeter
================================================================
Index: SOURCES/collectd-netlink.conf
diff -u /dev/null SOURCES/collectd-netlink.conf:1.1
--- /dev/null Sun Nov 2 00:05:10 2008
+++ SOURCES/collectd-netlink.conf Sun Nov 2 00:04:49 2008
@@ -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>
================================================================
Index: SOURCES/collectd-network.conf
diff -u /dev/null SOURCES/collectd-network.conf:1.1
--- /dev/null Sun Nov 2 00:05:10 2008
+++ SOURCES/collectd-network.conf Sun Nov 2 00:04:49 2008
@@ -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>
================================================================
Index: SOURCES/collectd-nfs.conf
diff -u /dev/null SOURCES/collectd-nfs.conf:1.1
--- /dev/null Sun Nov 2 00:05:11 2008
+++ SOURCES/collectd-nfs.conf Sun Nov 2 00:04:49 2008
@@ -0,0 +1,2 @@
+LoadPlugin nfs
+
================================================================
Index: SOURCES/collectd-ntpd.conf
diff -u /dev/null SOURCES/collectd-ntpd.conf:1.1
--- /dev/null Sun Nov 2 00:05:11 2008
+++ SOURCES/collectd-ntpd.conf Sun Nov 2 00:04:50 2008
@@ -0,0 +1,7 @@
+LoadPlugin ntpd
+
+#<Plugin ntpd>
+# Host "localhost"
+# Port 123
+# ReverseLookups false
+#</Plugin>
================================================================
Index: SOURCES/collectd-processes.conf
diff -u /dev/null SOURCES/collectd-processes.conf:1.1
--- /dev/null Sun Nov 2 00:05:12 2008
+++ SOURCES/collectd-processes.conf Sun Nov 2 00:04:50 2008
@@ -0,0 +1,5 @@
+LoadPlugin processes
+
+#<Plugin processes>
+# Process "name"
+#</Plugin>
================================================================
Index: SOURCES/collectd-serial.conf
diff -u /dev/null SOURCES/collectd-serial.conf:1.1
--- /dev/null Sun Nov 2 00:05:13 2008
+++ SOURCES/collectd-serial.conf Sun Nov 2 00:04:51 2008
@@ -0,0 +1,2 @@
+LoadPlugin serial
+
================================================================
Index: SOURCES/collectd-swap.conf
diff -u /dev/null SOURCES/collectd-swap.conf:1.1
--- /dev/null Sun Nov 2 00:05:13 2008
+++ SOURCES/collectd-swap.conf Sun Nov 2 00:04:51 2008
@@ -0,0 +1,2 @@
+LoadPlugin swap
+
================================================================
Index: SOURCES/collectd-syslog.conf
diff -u /dev/null SOURCES/collectd-syslog.conf:1.1
--- /dev/null Sun Nov 2 00:05:14 2008
+++ SOURCES/collectd-syslog.conf Sun Nov 2 00:04:51 2008
@@ -0,0 +1,5 @@
+LoadPlugin syslog
+
+#<Plugin syslog>
+# LogLevel info
+#</Plugin>
================================================================
Index: SOURCES/collectd-tail.conf
diff -u /dev/null SOURCES/collectd-tail.conf:1.1
--- /dev/null Sun Nov 2 00:05:14 2008
+++ SOURCES/collectd-tail.conf Sun Nov 2 00:04:52 2008
@@ -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>
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/collectd.conf?r1=1.3&r2=1.4&f=u
More information about the pld-cvs-commit
mailing list