X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollectd.conf.in;h=87af1c96c390b53ba79a51356c14f46678ece771;hb=25fa4ad93203289ec8d78e8d4b687acc3c05004a;hp=f3ef6759b1fc7ee6573e7b621076954be7fbc503;hpb=cc6d0a87fde638e2ad8c44ec5c15d8193439e12d;p=collectd.git
diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index f3ef6759..87af1c96 100644
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -12,9 +12,9 @@
#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"
#Interval 10
#Timeout 2
@@ -52,6 +52,7 @@
# 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
@@ -161,6 +162,26 @@
# ription of those options is available in the collectd.conf(5) manual page. #
##############################################################################
+#
+#
+# #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
+#
+#
+
#
#
# Host "localhost"
@@ -217,7 +238,7 @@
#
#
-# DataDir "@prefix@/var/lib/@PACKAGE_NAME@/csv"
+# DataDir "@localstatedir@/lib/@PACKAGE_NAME@/csv"
# StoreRates false
#
@@ -330,7 +351,7 @@
#
#
-# SocketFile "@prefix@/var/run/@PACKAGE_NAME@-email"
+# SocketFile "@localstatedir@/run/@PACKAGE_NAME@-email"
# SocketGroup "collectd"
# SocketPerms "0770"
# MaxConns 5
@@ -465,8 +486,10 @@
#
#
-# Host "127.0.0.1"
-# Port "11211"
+#
+# Host "127.0.0.1"
+# Port "11211"
+#
#
#
@@ -626,6 +649,7 @@
# Host "localhost"
# Port 123
# ReverseLookups false
+# IncludeUnitID true
#
#
@@ -804,13 +828,13 @@
#
# DaemonAddress "unix:/tmp/rrdcached.sock"
-# DataDir "@prefix@/var/lib/@PACKAGE_NAME@/rrd"
+# DataDir "@localstatedir@/lib/@PACKAGE_NAME@/rrd"
# CreateFiles true
# CollectStatistics true
#
#
-# DataDir "@prefix@/var/lib/@PACKAGE_NAME@/rrd"
+# DataDir "@localstatedir@/lib/@PACKAGE_NAME@/rrd"
# CacheTimeout 120
# CacheFlush 900
#
@@ -867,6 +891,7 @@
#
# ReportByDevice false
+# ReportBytes true
#
#