- not needed now

Changed files:
    collectd-apache.conf -> 1.2
    collectd-apcups.conf -> 1.2
    collectd-ascent.conf -> 1.2
    collectd-battery.conf -> 1.2
    collectd-cpu.conf -> 1.2
    collectd-cpufreq.conf -> 1.2
    collectd-csv.conf -> 1.2
    collectd-disk.conf -> 1.2
    collectd-dns.conf -> 1.2
    collectd-email.conf -> 1.2
    collectd-entropy.conf -> 1.2
    collectd-exec.conf -> 1.2
    collectd-filecount.conf -> 1.2
    collectd-hddtemp.conf -> 1.2
    collectd-interface.conf -> 1.2
    collectd-ipmi.conf -> 1.2
    collectd-iptables.conf -> 1.2
    collectd-irq.conf -> 1.2
    collectd-load.conf -> 1.2
    collectd-logfile.conf -> 1.2
    collectd-mbmon.conf -> 1.2
    collectd-memcached.conf -> 1.2
    collectd-memory.conf -> 1.2
    collectd-multimeter.conf -> 1.2
    collectd-mysql.conf -> 1.2
    collectd-netlink.conf -> 1.2
    collectd-network.conf -> 1.2
    collectd-nfs.conf -> 1.2
    collectd-nginx.conf -> 1.2
    collectd-notify_desktop.conf -> 1.2
    collectd-notify_email.conf -> 1.2
    collectd-ntpd.conf -> 1.2
    collectd-nut.conf -> 1.2
    collectd-ping.conf -> 1.2
    collectd-postgresql.conf -> 1.2
    collectd-powerdns.conf -> 1.2
    collectd-processes.conf -> 1.2
    collectd-sensors.conf -> 1.2
    collectd-serial.conf -> 1.2
    collectd-snmp.conf -> 1.2
    collectd-swap.conf -> 1.2
    collectd-syslog.conf -> 1.2
    collectd-tail.conf -> 1.2
    collectd-tcpconns.conf -> 1.2
    collectd-teamspeak2.conf -> 1.2
    collectd-thermal.conf -> 1.2
    collectd-unixsock.conf -> 1.2
    collectd-users.conf -> 1.2
    collectd-uuid.conf -> 1.2
    collectd-vmem.conf -> 1.2
    collectd-vserver.conf -> 1.2
    collectd-wireless.conf -> 1.2
    collectd-xmms.conf -> 1.2

diff --git a/collectd-apache.conf b/collectd-apache.conf
deleted file mode 100644 (file)
index 48ed29c..0000000
--- a/collectd-apache.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-LoadPlugin apache
-
-<Plugin apache>
-       URL "http://localhost/status?auto"
-       User "www-user"
-       Password "secret"
-       CACert "/etc/ssl/ca.crt"
-</Plugin>
-

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

diff --git a/collectd-ascent.conf b/collectd-ascent.conf
deleted file mode 100644 (file)
index 7883ade..0000000
--- a/collectd-ascent.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-LoadPlugin ascent
-
-<Plugin ascent>
-       URL "http://localhost/ascent/status/"
-       User "www-user"
-       Password "secret"
-       CACert "/etc/ssl/ca.crt"
-</Plugin>
-

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

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

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

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

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

diff --git a/collectd-dns.conf b/collectd-dns.conf
deleted file mode 100644 (file)
index 20245fc..0000000
--- a/collectd-dns.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-LoadPlugin dns
-
-<Plugin dns>
-       Interface "eth0"
-#       IgnoreSource "192.168.0.1"
-</Plugin>
-

diff --git a/collectd-email.conf b/collectd-email.conf
deleted file mode 100644 (file)
index 12ea10f..0000000
--- a/collectd-email.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644 (file)
index 6ae3aa6..0000000
--- a/collectd-entropy.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-LoadPlugin entropy
-

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

diff --git a/collectd-hddtemp.conf b/collectd-hddtemp.conf
deleted file mode 100644 (file)
index 1f7119f..0000000
--- a/collectd-hddtemp.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-LoadPlugin hddtemp
-
-<Plugin hddtemp>
-#       Host "127.0.0.1"
-#       Port "7634"
-        TranslateDevicename false
-</Plugin>
-

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

diff --git a/collectd-ipmi.conf b/collectd-ipmi.conf
deleted file mode 100644 (file)
index 8b4ea05..0000000
--- a/collectd-ipmi.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-LoadPlugin ipmi
-
-#<Plugin ipmi>
-#</Plugin>

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

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

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

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

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

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

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

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

diff --git a/collectd-mysql.conf b/collectd-mysql.conf
deleted file mode 100644 (file)
index f41258f..0000000
--- a/collectd-mysql.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-LoadPlugin mysql
-
-#<Plugin mysql>
-#       Host "database.serv.er"
-#       User "db_user"
-#       Password "secret"
-#       Database "db_name"
-#</Plugin>

diff --git a/collectd-netlink.conf b/collectd-netlink.conf
deleted file mode 100644 (file)
index 1165467..0000000
--- a/collectd-netlink.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-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
deleted file mode 100644 (file)
index a9bc50d..0000000
--- a/collectd-network.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-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
deleted file mode 100644 (file)
index 981eaa2..0000000
--- a/collectd-nfs.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-LoadPlugin nfs
-

diff --git a/collectd-nginx.conf b/collectd-nginx.conf
deleted file mode 100644 (file)
index 9e3fe90..0000000
--- a/collectd-nginx.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-LoadPlugin nginx
-
-#<Plugin nginx>
-#       URL "http://localhost/status?auto"
-#       User "www-user"
-#       Password "secret"
-#       CACert "/etc/ssl/ca.crt"
-#</Plugin>

diff --git a/collectd-notify_desktop.conf b/collectd-notify_desktop.conf
deleted file mode 100644 (file)
index c9bfc6c..0000000
--- a/collectd-notify_desktop.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-LoadPlugin notify_desktop
-
-#<Plugin notify_desktop>
-#       OkayTimeout 1000
-#       WarningTimeout 5000
-#       FailureTimeout 0
-#</Plugin>

diff --git a/collectd-notify_email.conf b/collectd-notify_email.conf
deleted file mode 100644 (file)
index 9c8b78d..0000000
--- a/collectd-notify_email.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-LoadPlugin notify_email
-
-#<Plugin notify_email>
-#       SMTPServer "localhost"
-#       SMTPPort 25
-#       SMTPUser "my-username"
-#       SMTPPassword "my-password"
-#       From "collectd@main0server.com"
-#       # <WARNING/FAILURE/OK> on <hostname>. beware! do not use not more than two %s in this string!!!
-#       Subject "Aaaaaa!! %s on %s!!!!!"
-#       Recipient "email1@domain1.net"
-#       Recipient "email2@domain2.com"
-#</Plugin>

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

diff --git a/collectd-nut.conf b/collectd-nut.conf
deleted file mode 100644 (file)
index fc2df4e..0000000
--- a/collectd-nut.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-LoadPlugin nut
-
-#<Plugin nut>
-#       UPS "upsname@hostname:port"
-#</Plugin>

diff --git a/collectd-ping.conf b/collectd-ping.conf
deleted file mode 100644 (file)
index 3ca3fa3..0000000
--- a/collectd-ping.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-LoadPlugin ping
-
-#<Plugin ping>
-#       Host "host.foo.bar"
-#       TTL 255
-#</Plugin>

diff --git a/collectd-postgresql.conf b/collectd-postgresql.conf
deleted file mode 100644 (file)
index 1194a44..0000000
--- a/collectd-postgresql.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-LoadPlugin postgresql
-
-#<Plugin postgresql>
-#       <Query magic>
-#               Query "SELECT magic, spells FROM wizard WHERE host = $1;"
-#               Param hostname
-#               Column gauge magic
-#               Column counter spells
-#       </Query>
-#
-#       <Database foo>
-#               Host "hostname"
-#               Port 5432
-#               User "username"
-#               Password "secret"
-#
-#               SSLMode "prefer"
-#               KRBSrvName "kerberos_service_name"
-#
-#               Query magic
-#       </Database>
-#
-#       <Database bar>
-#               Service "service_name"
-#       </Database>
-#</Plugin>

diff --git a/collectd-powerdns.conf b/collectd-powerdns.conf
deleted file mode 100644 (file)
index 39d3b48..0000000
--- a/collectd-powerdns.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-LoadPlugin powerdns
-
-#<Plugin powerdns>
-#  <Server "server_name">
-#    Collect "latency"
-#    Collect "udp-answers" "udp-queries"
-#    Socket "/var/run/pdns.controlsocket"
-#  </Server>
-#  <Recursor "recursor_name">
-#    Collect "questions"
-#    Collect "cache-hits" "cache-misses"
-#    Socket "/var/run/pdns_recursor.controlsocket"
-#  </Recursor>
-#  LocalSocket "/var/run/collectd-powerdns"
-#</Plugin>

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

diff --git a/collectd-sensors.conf b/collectd-sensors.conf
deleted file mode 100644 (file)
index 80c7415..0000000
--- a/collectd-sensors.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-LoadPlugin sensors
-
-#<Plugin sensors>
-#       Sensor "it8712-isa-0290/temperature-temp1"
-#       Sensor "it8712-isa-0290/fanspeed-fan3"
-#       Sensor "it8712-isa-0290/voltage-in8"
-#       IgnoreSelected false
-#</Plugin>

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

diff --git a/collectd-snmp.conf b/collectd-snmp.conf
deleted file mode 100644 (file)
index d11568a..0000000
--- a/collectd-snmp.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-LoadPlugin snmp
-
-#<Plugin snmp>
-#   <Data "powerplus_voltge_input">
-#       Type "voltage"
-#       Table false
-#       Instance "input_line1"
-#       Values "SNMPv2-SMI::enterprises.6050.5.4.1.1.2.1"
-#   </Data>
-#   <Data "hr_users">
-#       Type "users"
-#       Table false
-#       Instance ""
-#       Values "HOST-RESOURCES-MIB::hrSystemNumUsers.0"
-#   </Data>
-#   <Data "std_traffic">
-#       Type "if_octets"
-#       Table true
-#       Instance "IF-MIB::ifDescr"
-#       Values "IF-MIB::ifInOctets" "IF-MIB::ifOutOctets"
-#   </Data>
-#   
-#   <Host "some.switch.mydomain.org">
-#       Address "192.168.0.2"
-#       Version 1
-#       Community "community_string"
-#       Collect "std_traffic"
-#       Inverval 120
-#   </Host>
-#   <Host "some.server.mydomain.org">
-#       Address "192.168.0.42"
-#       Version 2
-#       Community "another_string"
-#       Collect "std_traffic" "hr_users"
-#   </Host>
-#   <Host "some.ups.mydomain.org">
-#       Address "192.168.0.3"
-#       Version 1
-#       Community "more_communities"
-#       Collect "powerplus_voltge_input"
-#       Interval 300
-#   </Host>
-#</Plugin>

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

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

diff --git a/collectd-tail.conf b/collectd-tail.conf
deleted file mode 100644 (file)
index a1ec8c7..0000000
--- a/collectd-tail.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-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-tcpconns.conf b/collectd-tcpconns.conf
deleted file mode 100644 (file)
index dfb7fdf..0000000
--- a/collectd-tcpconns.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-LoadPlugin tcpconns
-
-#<Plugin tcpconns>
-#       ListeningPorts false
-#       LocalPort "25"
-#       RemotePort "25"
-#</Plugin>

diff --git a/collectd-teamspeak2.conf b/collectd-teamspeak2.conf
deleted file mode 100644 (file)
index 9105086..0000000
--- a/collectd-teamspeak2.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-LoadPlugin teamspeak2
-
-#<Plugin teamspeak2>
-#       Host "127.0.0.1"
-#       Port "51234"
-#       Server "8767"
-#</Plugin>

diff --git a/collectd-thermal.conf b/collectd-thermal.conf
deleted file mode 100644 (file)
index 11aba86..0000000
--- a/collectd-thermal.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-LoadPlugin thermal
-
-#<Plugin thermal>
-#       ForceUseProcfs false
-#       Device "THRM"
-#       IgnoreSelected false
-#</Plugin>

diff --git a/collectd-unixsock.conf b/collectd-unixsock.conf
deleted file mode 100644 (file)
index 2b705b8..0000000
--- a/collectd-unixsock.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-LoadPlugin unixsock
-
-#<Plugin unixsock>
-#       SocketFile "/usr/var/run/collectd-unixsock"
-#       SocketGroup "collectd"
-#       SocketPerms "0660"
-#</Plugin>

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

diff --git a/collectd-uuid.conf b/collectd-uuid.conf
deleted file mode 100644 (file)
index b3078b6..0000000
--- a/collectd-uuid.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-LoadPlugin uuid
-
-#<Plugin uuid>
-#       UUIDFile "/etc/uuid"
-#</Plugin>

diff --git a/collectd-vmem.conf b/collectd-vmem.conf
deleted file mode 100644 (file)
index 29b1444..0000000
--- a/collectd-vmem.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-LoadPlugin vmem
-
-#<Plugin vmem>
-#       Verbose false
-#</Plugin>

diff --git a/collectd-vserver.conf b/collectd-vserver.conf
deleted file mode 100644 (file)
index 8b6b684..0000000
--- a/collectd-vserver.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-LoadPlugin vserver
-

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

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