projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.2'
[collectd.git]
/
src
/
collectd.conf.in
diff --git
a/src/collectd.conf.in
b/src/collectd.conf.in
index
f3ef675
..
81d7055
100644
(file)
--- a/
src/collectd.conf.in
+++ b/
src/collectd.conf.in
@@
-12,11
+12,20
@@
#Hostname "localhost"
#FQDNLookup true
#Hostname "localhost"
#FQDNLookup true
-#BaseDir "@
prefix@/var
/lib/@PACKAGE_NAME@"
-#PIDFile "@
prefix@/var
/run/@PACKAGE_NAME@.pid"
-#PluginDir "@
prefix@/lib
/@PACKAGE_NAME@"
+#BaseDir "@
localstatedir@
/lib/@PACKAGE_NAME@"
+#PIDFile "@
localstatedir@
/run/@PACKAGE_NAME@.pid"
+#PluginDir "@
libdir@
/@PACKAGE_NAME@"
#TypesDB "@prefix@/share/@PACKAGE_NAME@/types.db"
#TypesDB "@prefix@/share/@PACKAGE_NAME@/types.db"
+
+#----------------------------------------------------------------------------#
+# Interval at which to query values. This may be overwritten on a per-plugin #
+# base by using the 'Interval' option of the LoadPlugin block: #
+# <LoadPlugin foo> #
+# Interval 60 #
+# </LoadPlugin> #
+#----------------------------------------------------------------------------#
#Interval 10
#Interval 10
+
#Timeout 2
#ReadThreads 5
#Timeout 2
#ReadThreads 5
@@
-52,6
+61,7
@@
# to missing dependencies or because they have been deactivated explicitly. #
##############################################################################
# to missing dependencies or because they have been deactivated explicitly. #
##############################################################################
+#@BUILD_PLUGIN_AGGREGATION_TRUE@LoadPlugin aggregation
#@BUILD_PLUGIN_AMQP_TRUE@LoadPlugin amqp
#@BUILD_PLUGIN_APACHE_TRUE@LoadPlugin apache
#@BUILD_PLUGIN_APCUPS_TRUE@LoadPlugin apcups
#@BUILD_PLUGIN_AMQP_TRUE@LoadPlugin amqp
#@BUILD_PLUGIN_APACHE_TRUE@LoadPlugin apache
#@BUILD_PLUGIN_APCUPS_TRUE@LoadPlugin apcups
@@
-161,6
+171,26
@@
# ription of those options is available in the collectd.conf(5) manual page. #
##############################################################################
# ription of those options is available in the collectd.conf(5) manual page. #
##############################################################################
+#<Plugin "aggregation">
+# <Aggregation>
+# #Host "unspecified"
+# Plugin "cpu"
+# #PluginInstance "unspecified"
+# Type "cpu"
+# #TypeInstance "unspecified"
+#
+# GroupBy "Host"
+# GroupBy "TypeInstance"
+#
+# CalculateNum false
+# CalculateSum false
+# CalculateAverage true
+# CalculateMinimum false
+# CalculateMaximum false
+# CalculateStddev false
+# </Aggregation>
+#</Plugin>
+
#<Plugin "amqp">
# <Publish "name">
# Host "localhost"
#<Plugin "amqp">
# <Publish "name">
# Host "localhost"
@@
-187,6
+217,7
@@
#<Plugin apcups>
# Host "localhost"
# Port "3551"
#<Plugin apcups>
# Host "localhost"
# Port "3551"
+# ReportSeconds true
#</Plugin>
#<Plugin ascent>
#</Plugin>
#<Plugin ascent>
@@
-217,7
+248,7
@@
#</Plugin>
#<Plugin csv>
#</Plugin>
#<Plugin csv>
-# DataDir "@
prefix@/var
/lib/@PACKAGE_NAME@/csv"
+# DataDir "@
localstatedir@
/lib/@PACKAGE_NAME@/csv"
# StoreRates false
#</Plugin>
# StoreRates false
#</Plugin>
@@
-330,7
+361,7
@@
#</Plugin>
#<Plugin email>
#</Plugin>
#<Plugin email>
-# SocketFile "@
prefix@/var
/run/@PACKAGE_NAME@-email"
+# SocketFile "@
localstatedir@
/run/@PACKAGE_NAME@-email"
# SocketGroup "collectd"
# SocketPerms "0770"
# MaxConns 5
# SocketGroup "collectd"
# SocketPerms "0770"
# MaxConns 5
@@
-465,8
+496,10
@@
#</Plugin>
#<Plugin memcached>
#</Plugin>
#<Plugin memcached>
-# Host "127.0.0.1"
-# Port "11211"
+# <Instance "local">
+# Host "127.0.0.1"
+# Port "11211"
+# </Instance>
#</Plugin>
#<Plugin modbus>
#</Plugin>
#<Plugin modbus>
@@
-626,6
+659,7
@@
# Host "localhost"
# Port 123
# ReverseLookups false
# Host "localhost"
# Port 123
# ReverseLookups false
+# IncludeUnitID true
#</Plugin>
#<Plugin nut>
#</Plugin>
#<Plugin nut>
@@
-728,6
+762,11
@@
# ValuesFrom "count"
# </Result>
# </Query>
# ValuesFrom "count"
# </Result>
# </Query>
+# <Writer sqlstore>
+# # See contrib/postgresql/collectd_insert.sql for details
+# Statement "SELECT collectd_insert($1, $2, $3, $4, $5, $6, $7, $8, $9);"
+# StoreRates true
+# </Writer>
# <Database foo>
# Host "hostname"
# Port "5432"
# <Database foo>
# Host "hostname"
# Port "5432"
@@
-743,6
+782,12
@@
# Query backend # predefined
# Query rt36_tickets
# </Database>
# Query backend # predefined
# Query rt36_tickets
# </Database>
+# <Database qux>
+# Service "collectd_store"
+# Writer sqlstore
+# # see collectd.conf(5) for details
+# CommitInterval 30
+# </Database>
#</Plugin>
#<Plugin powerdns>
#</Plugin>
#<Plugin powerdns>
@@
-804,13
+849,13
@@
#<Plugin rrdcached>
# DaemonAddress "unix:/tmp/rrdcached.sock"
#<Plugin rrdcached>
# DaemonAddress "unix:/tmp/rrdcached.sock"
-# DataDir "@
prefix@/var
/lib/@PACKAGE_NAME@/rrd"
+# DataDir "@
localstatedir@
/lib/@PACKAGE_NAME@/rrd"
# CreateFiles true
# CollectStatistics true
#</Plugin>
#<Plugin rrdtool>
# CreateFiles true
# CollectStatistics true
#</Plugin>
#<Plugin rrdtool>
-# DataDir "@
prefix@/var
/lib/@PACKAGE_NAME@/rrd"
+# DataDir "@
localstatedir@
/lib/@PACKAGE_NAME@/rrd"
# CacheTimeout 120
# CacheFlush 900
#</Plugin>
# CacheTimeout 120
# CacheFlush 900
#</Plugin>
@@
-867,6
+912,7
@@
#<Plugin "swap">
# ReportByDevice false
#<Plugin "swap">
# ReportByDevice false
+# ReportBytes true
#</Plugin>
#<Plugin "table">
#</Plugin>
#<Plugin "table">