SOURCES: collectd.conf, collectd-apache.conf (NEW), collectd-ascent.conf (N...
blues
blues at pld-linux.org
Thu Oct 30 18:11:58 CET 2008
Author: blues Date: Thu Oct 30 17:11:58 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- put modules configs into separate files and start using collectd.d dir
---- Files affected:
SOURCES:
collectd.conf (1.1 -> 1.2) , collectd-apache.conf (NONE -> 1.1) (NEW), collectd-ascent.conf (NONE -> 1.1) (NEW), collectd-dns.conf (NONE -> 1.1) (NEW), collectd-hddtemp.conf (NONE -> 1.1) (NEW), collectd-ipmi.conf (NONE -> 1.1) (NEW), collectd-mysql.conf (NONE -> 1.1) (NEW), collectd-nginx.conf (NONE -> 1.1) (NEW), collectd-notify_desktop.conf (NONE -> 1.1) (NEW), collectd-notify_email.conf (NONE -> 1.1) (NEW), collectd-nut.conf (NONE -> 1.1) (NEW), collectd-ping.conf (NONE -> 1.1) (NEW), collectd-postgresql.conf (NONE -> 1.1) (NEW), collectd-powerdns.conf (NONE -> 1.1) (NEW), collectd-rrdtool.conf (NONE -> 1.1) (NEW), collectd-sensors.conf (NONE -> 1.1) (NEW), collectd-snmp.conf (NONE -> 1.1) (NEW), collectd-uuid.conf (NONE -> 1.1) (NEW), collectd-xmms.conf (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/collectd.conf
diff -u SOURCES/collectd.conf:1.1 SOURCES/collectd.conf:1.2
--- SOURCES/collectd.conf:1.1 Mon Feb 6 14:23:20 2006
+++ SOURCES/collectd.conf Thu Oct 30 18:11:46 2008
@@ -1,38 +1,243 @@
#
# Config file for collectd(1).
# Please read collectd.conf(5) for a list of options.
-# http://verplant.org/collectd/
+# http://collectd.org/
#
+#Hostname "localhost"
+FQDNLookup true
+#BaseDir "/usr/var/lib/collectd"
+#PIDFile "/usr/var/run/collectd.pid"
+#PluginDir "/usr/lib/collectd"
+#TypesDB "/usr/lib/collectd/types.db"
+#Interval 10
+#ReadThreads 5
+
+LoadPlugin logfile
+LoadPlugin syslog
+
+#<Plugin logfile>
+# LogLevel info
+# File STDOUT
+# Timestamp true
+#</Plugin>
+
+#<Plugin syslog>
+# LogLevel info
+#</Plugin>
+
+LoadPlugin apcups
+#LoadPlugin apple_sensors
LoadPlugin battery
LoadPlugin cpu
LoadPlugin cpufreq
+LoadPlugin csv
LoadPlugin df
LoadPlugin disk
-#LoadPlugin hddtemp
-#<Plugin hddtemp>
-# Host 127.0.0.1
-# Port 7634
-#</Plugin>
+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 mysql
-#<Plugin mysql>
-# Host database.serv.er
-# User db_user
-# Password secret
-## Database db_name
-#</Plugin>
+#LoadPlugin multimeter
+LoadPlugin netlink
+LoadPlugin network
LoadPlugin nfs
-#LoadPlugin ping
-#<Plugin ping>
-# Host host.foo.bar
-# Host host2.foo.bar
-#</Plugin>
+LoadPlugin ntpd
+#LoadPlugin onewire
+#LoadPlugin perl
LoadPlugin processes
-#LoadPlugin sensors
LoadPlugin serial
LoadPlugin swap
-LoadPlugin tape
-LoadPlugin traffic
+LoadPlugin tail
+#LoadPlugin tape
+LoadPlugin tcpconns
+LoadPlugin teamspeak2
+LoadPlugin thermal
+LoadPlugin unixsock
LoadPlugin users
+LoadPlugin vmem
+LoadPlugin vserver
+LoadPlugin wireless
+
+#<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
+# Domain "name"
+# BlockDevice "name:device"
+# InterfaceDevice "name:device"
+# IgnoreSelected false
+# 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"
+# IgnoreSelected false
+#</Plugin>
+
+#<Plugin perl>
+# IncludeDir "/my/include/path"
+# BaseName "Collectd::Plugin"
+# 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>
+
+#<Plugin tcpconns>
+# ListeningPorts false
+# LocalPort "25"
+# RemotePort "25"
+#</Plugin>
+
+#<Plugin teamspeak2>
+# Host "127.0.0.1"
+# Port "51234"
+# Server "8767"
+#</Plugin>
+
+#<Plugin thermal>
+# ForceUseProcfs false
+# Device "THRM"
+# IgnoreSelected false
+#</Plugin>
+
+#<Plugin unixsock>
+# SocketFile "/usr/var/run/collectd-unixsock"
+# SocketGroup "collectd"
+# SocketPerms "0660"
+#</Plugin>
+
+#<Plugin vmem>
+# Verbose false
+#</Plugin>
+
+
+
+### Include all files from /etc/collectd.d/*.conf
+Include "/etc/collectd.d/*.conf"
+
================================================================
Index: SOURCES/collectd-apache.conf
diff -u /dev/null SOURCES/collectd-apache.conf:1.1
--- /dev/null Thu Oct 30 18:11:59 2008
+++ SOURCES/collectd-apache.conf Thu Oct 30 18:11:46 2008
@@ -0,0 +1,9 @@
+LoadPlugin apache
+
+<Plugin apache>
+ URL "http://localhost/status?auto"
+ User "www-user"
+ Password "secret"
+ CACert "/etc/ssl/ca.crt"
+</Plugin>
+
================================================================
Index: SOURCES/collectd-ascent.conf
diff -u /dev/null SOURCES/collectd-ascent.conf:1.1
--- /dev/null Thu Oct 30 18:12:00 2008
+++ SOURCES/collectd-ascent.conf Thu Oct 30 18:11:46 2008
@@ -0,0 +1,9 @@
+LoadPlugin ascent
+
+<Plugin ascent>
+ URL "http://localhost/ascent/status/"
+ User "www-user"
+ Password "secret"
+ CACert "/etc/ssl/ca.crt"
+</Plugin>
+
================================================================
Index: SOURCES/collectd-dns.conf
diff -u /dev/null SOURCES/collectd-dns.conf:1.1
--- /dev/null Thu Oct 30 18:12:01 2008
+++ SOURCES/collectd-dns.conf Thu Oct 30 18:11:47 2008
@@ -0,0 +1,7 @@
+LoadPlugin dns
+
+<Plugin dns>
+ Interface "eth0"
+# IgnoreSource "192.168.0.1"
+</Plugin>
+
================================================================
Index: SOURCES/collectd-hddtemp.conf
diff -u /dev/null SOURCES/collectd-hddtemp.conf:1.1
--- /dev/null Thu Oct 30 18:12:01 2008
+++ SOURCES/collectd-hddtemp.conf Thu Oct 30 18:11:47 2008
@@ -0,0 +1,8 @@
+LoadPlugin hddtemp
+
+<Plugin hddtemp>
+# Host "127.0.0.1"
+# Port "7634"
+ TranslateDevicename false
+</Plugin>
+
================================================================
Index: SOURCES/collectd-ipmi.conf
diff -u /dev/null SOURCES/collectd-ipmi.conf:1.1
--- /dev/null Thu Oct 30 18:12:02 2008
+++ SOURCES/collectd-ipmi.conf Thu Oct 30 18:11:48 2008
@@ -0,0 +1,4 @@
+LoadPlugin ipmi
+
+#<Plugin ipmi>
+#</Plugin>
================================================================
Index: SOURCES/collectd-mysql.conf
diff -u /dev/null SOURCES/collectd-mysql.conf:1.1
--- /dev/null Thu Oct 30 18:12:02 2008
+++ SOURCES/collectd-mysql.conf Thu Oct 30 18:11:48 2008
@@ -0,0 +1,8 @@
+LoadPlugin mysql
+
+#<Plugin mysql>
+# Host "database.serv.er"
+# User "db_user"
+# Password "secret"
+# Database "db_name"
+#</Plugin>
================================================================
Index: SOURCES/collectd-nginx.conf
diff -u /dev/null SOURCES/collectd-nginx.conf:1.1
--- /dev/null Thu Oct 30 18:12:03 2008
+++ SOURCES/collectd-nginx.conf Thu Oct 30 18:11:48 2008
@@ -0,0 +1,8 @@
+LoadPlugin nginx
+
+#<Plugin nginx>
+# URL "http://localhost/status?auto"
+# User "www-user"
+# Password "secret"
+# CACert "/etc/ssl/ca.crt"
+#</Plugin>
================================================================
Index: SOURCES/collectd-notify_desktop.conf
diff -u /dev/null SOURCES/collectd-notify_desktop.conf:1.1
--- /dev/null Thu Oct 30 18:12:03 2008
+++ SOURCES/collectd-notify_desktop.conf Thu Oct 30 18:11:49 2008
@@ -0,0 +1,7 @@
+LoadPlugin notify_desktop
+
+#<Plugin notify_desktop>
+# OkayTimeout 1000
+# WarningTimeout 5000
+# FailureTimeout 0
+#</Plugin>
================================================================
Index: SOURCES/collectd-notify_email.conf
diff -u /dev/null SOURCES/collectd-notify_email.conf:1.1
--- /dev/null Thu Oct 30 18:12:04 2008
+++ SOURCES/collectd-notify_email.conf Thu Oct 30 18:11:49 2008
@@ -0,0 +1,13 @@
+LoadPlugin notify_email
+
+#<Plugin notify_email>
+# SMTPServer "localhost"
+# SMTPPort 25
+# SMTPUser "my-username"
+# SMTPPassword "my-password"
+# From "collectd at 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 at domain1.net"
+# Recipient "email2 at domain2.com"
+#</Plugin>
================================================================
Index: SOURCES/collectd-nut.conf
diff -u /dev/null SOURCES/collectd-nut.conf:1.1
--- /dev/null Thu Oct 30 18:12:05 2008
+++ SOURCES/collectd-nut.conf Thu Oct 30 18:11:50 2008
@@ -0,0 +1,5 @@
+LoadPlugin nut
+
+#<Plugin nut>
+# UPS "upsname at hostname:port"
+#</Plugin>
================================================================
Index: SOURCES/collectd-ping.conf
diff -u /dev/null SOURCES/collectd-ping.conf:1.1
--- /dev/null Thu Oct 30 18:12:05 2008
+++ SOURCES/collectd-ping.conf Thu Oct 30 18:11:50 2008
@@ -0,0 +1,6 @@
+LoadPlugin ping
+
+#<Plugin ping>
+# Host "host.foo.bar"
+# TTL 255
+#</Plugin>
================================================================
Index: SOURCES/collectd-postgresql.conf
diff -u /dev/null SOURCES/collectd-postgresql.conf:1.1
--- /dev/null Thu Oct 30 18:12:06 2008
+++ SOURCES/collectd-postgresql.conf Thu Oct 30 18:11:50 2008
@@ -0,0 +1,26 @@
+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>
================================================================
Index: SOURCES/collectd-powerdns.conf
diff -u /dev/null SOURCES/collectd-powerdns.conf:1.1
--- /dev/null Thu Oct 30 18:12:06 2008
+++ SOURCES/collectd-powerdns.conf Thu Oct 30 18:11:51 2008
@@ -0,0 +1,15 @@
+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>
================================================================
Index: SOURCES/collectd-rrdtool.conf
diff -u /dev/null SOURCES/collectd-rrdtool.conf:1.1
--- /dev/null Thu Oct 30 18:12:07 2008
+++ SOURCES/collectd-rrdtool.conf Thu Oct 30 18:11:51 2008
@@ -0,0 +1,7 @@
+LoadPlugin rrdtool
+
+#<Plugin rrdtool>
+# DataDir "/usr/var/lib/collectd/rrd"
+# CacheTimeout 120
+# CacheFlush 900
+#</Plugin>
================================================================
Index: SOURCES/collectd-sensors.conf
diff -u /dev/null SOURCES/collectd-sensors.conf:1.1
--- /dev/null Thu Oct 30 18:12:07 2008
+++ SOURCES/collectd-sensors.conf Thu Oct 30 18:11:52 2008
@@ -0,0 +1,8 @@
+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>
================================================================
Index: SOURCES/collectd-snmp.conf
diff -u /dev/null SOURCES/collectd-snmp.conf:1.1
--- /dev/null Thu Oct 30 18:12:08 2008
+++ SOURCES/collectd-snmp.conf Thu Oct 30 18:11:52 2008
@@ -0,0 +1,43 @@
+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>
================================================================
Index: SOURCES/collectd-uuid.conf
diff -u /dev/null SOURCES/collectd-uuid.conf:1.1
--- /dev/null Thu Oct 30 18:12:09 2008
+++ SOURCES/collectd-uuid.conf Thu Oct 30 18:11:52 2008
@@ -0,0 +1,5 @@
+LoadPlugin uuid
+
+#<Plugin uuid>
+# UUIDFile "/etc/uuid"
+#</Plugin>
================================================================
Index: SOURCES/collectd-xmms.conf
diff -u /dev/null SOURCES/collectd-xmms.conf:1.1
--- /dev/null Thu Oct 30 18:12:09 2008
+++ SOURCES/collectd-xmms.conf Thu Oct 30 18:11:53 2008
@@ -0,0 +1,2 @@
+LoadPlugin xmms
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/collectd.conf?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list