Updated collectd.conf and added thresholds.conf.

 * Added missing configuration options.
 * Removed unneeded configuration options.
 * Include thresholds.conf from collectd.conf.

diff --git a/debian/collectd.conf b/debian/collectd.conf
index 0b57f3b7b11a77a714b25a79a7a10e6468660310..aabbc6081f11eee2662ecc433a93625e6a01c6d2 100644 (file)
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -4,10 +4,10 @@
 # Please read collectd.conf(5) for details.
 
 #Hostname "localhost"
+FQDNLookup true
 #BaseDir "/var/lib/collectd"
-#PIDFile "/var/run/collectd.pid"
 #PluginDir "/usr/lib/collectd"
-#TypesDB "/usr/lib/collectd/types.db"
+#TypesDB "/usr/lib/collectd/types.db" "/etc/collectd/my_types.db"
 #Interval 10
 #ReadThreads 5
 
@@ -29,6 +29,7 @@ LoadPlugin interface
 #LoadPlugin iptables
 #LoadPlugin ipvs
 LoadPlugin irq
+#LoadPlugin libvirt
 LoadPlugin load
 #LoadPlugin logfile
 #LoadPlugin mbmon
@@ -55,6 +56,7 @@ LoadPlugin syslog
 LoadPlugin tcpconns
 #LoadPlugin unixsock
 LoadPlugin users
+#LoadPlugin uuid
 #LoadPlugin vserver
 #LoadPlugin wireless
 
@@ -72,6 +74,7 @@ LoadPlugin users
 
 #<Plugin csv>
 #   DataDir "/var/lib/collectd/csv"
+#   StoreRates false
 #</Plugin>
 
 #<Plugin df>
@@ -95,6 +98,8 @@ LoadPlugin users
 
 #<Plugin exec>
 #   Exec user "/path/to/exec"
+#   NotificationExec "/path/to/exec"
+#   NagiosExec "/path/to/exec"
 #</Plugin>
 
 #<Plugin hddtemp>
@@ -108,7 +113,7 @@ LoadPlugin users
 #</Plugin>
 
 #<Plugin iptables>
-#   Chain table chain
+#   Chain "table" "chain"
 #</Plugin>
 
 #<Plugin irq>
@@ -118,9 +123,20 @@ LoadPlugin users
 #   IgnoreSelected true
 #</Plugin>
 
+#<Plugin libvirt>
+#   Connection "xen:///"
+#   RefreshInterval 60
+#   Domain "name"
+#   BlockDevice "name:device"
+#   InterfaceDevice "name:device"
+#   IgnoreSelected false
+#   HostnameFormat name
+#</Plugin>
+
 #<Plugin logfile>
 #   LogLevel "info"
 #   File STDOUT
+#   Timestamp true
 #</Plugin>
 
 #<Plugin mbmon>
@@ -146,6 +162,7 @@ LoadPlugin users
 #   QDisc "eth0" "pfifo_fast-1:0"
 #   Class "ppp0" "htb-1:10"
 #   Filter "ppp0" "u32-1:0"
+#   IgnoreSelected false
 #</Plugin>
 
 #<Plugin network>
@@ -168,6 +185,7 @@ LoadPlugin users
 #<Plugin ntpd>
 #   Host "localhost"
 #   Port 123
+#   ReverseLookups false
 #</Plugin>
 
 #<Plugin nut>
@@ -177,6 +195,7 @@ LoadPlugin users
 #<Plugin perl>
 #   IncludeDir "/my/include/path"
 #   BaseName "Collectd::Plugin"
+#   EnableDebugger ""
 #   LoadPlugin "foo"
 #   LoadPlugin "bar"
 #</Plugin>
@@ -184,6 +203,7 @@ LoadPlugin users
 #<Plugin ping>
 #   Host "host.foo.bar"
 #   Host "host.baz.qux"
+#   TTL 255
 #</Plugin>
 
 #<Plugin processes>
@@ -200,6 +220,7 @@ LoadPlugin users
 #   StepSize 10
 #   HeartBeat 20
 #   RRARows 1200
+#   RRATimespan 158112000
 #   XFF 0.1
 </Plugin>
 
@@ -210,6 +231,8 @@ LoadPlugin users
 #   IgnoreSelected false
 #</Plugin>
 
+# See /usr/share/doc/collectd/examples/snmp-data.conf.gz for a
+# comprehensive sample configuration.
 #<Plugin snmp>
 #   <Data "powerplus_voltge_input">
 #       Type "voltage"
@@ -268,3 +291,9 @@ LoadPlugin users
 #   SocketPerms "0660"
 #</Plugin>
 
+#<Plugin uuid>
+#   UUIDFile "/etc/uuid"
+#</Plugin>
+
+Include "/etc/collectd/thresholds.conf"
+

diff --git a/debian/rules b/debian/rules
index 199707fd1c0b43239441bba7f2d959d01fa407a6..5975fd881871307bf974fb8b0aa7f1d7d9474e98 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -98,6 +98,8 @@ install-arch: build
                debian/collectd/etc/collectd/collectd.conf
        install -m 0644 debian/collection.conf \
                debian/collectd/etc/collectd/collection.conf
+       install -m 0644 debian/thresholds.conf \
+               debian/collectd/etc/collectd/thresholds.conf
        
        mkdir -p debian/collectd/usr/lib/collectd/utils/
        for UTIL in extractDS.px migrate-3-4.px; do \

diff --git a/debian/thresholds.conf b/debian/thresholds.conf
new file mode 100644 (file)
index 0000000..f7ec3d5
--- /dev/null
+++ b/debian/thresholds.conf
@@ -0,0 +1,37 @@
+# Threshold configuration for collectd(1).
+#
+# See the section "THRESHOLD CONFIGURATION" in collectd.conf(5) for details.
+
+#<Threshold>
+#      <Type "counter">
+#              WarningMin 0.00
+#              WarningMax 1000.00
+#              FailureMin 0
+#              FailureMax 1200.00
+#              Invert false
+#              Persist false
+#              Instance "some_instance"
+#      </Type>
+#
+#      <Plugin "interface">
+#              Instance "eth0"
+#              <Type "if_octets">
+#                      FailureMax 10000000
+#              </Type>
+#      </Plugin>
+#
+#      <Host "hostname">
+#              <Type "cpu">
+#                      Instance "idle"
+#                      FailureMin 10
+#              </Type>
+#
+#              <Plugin "memory">
+#                      <Type "memory">
+#                              Instance "cached"
+#                              WarningMin 100000000
+#                      </Type>
+#              </Plugin>
+#      </Host>
+#</Threshold>
+