X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollectd.conf.in;h=41d10ee32c8ff13afbfba5c05db00fdf41783cd4;hb=840f4cef30b01a6928832f09daf00890b35f3582;hp=30d536a1ef9f9f534caad11b474c797e79d5c6d6;hpb=598a534ab6f2d122556434b82818c4b6ed8e48f9;p=collectd.git
diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 30d536a1..41d10ee3 100644
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -84,7 +84,7 @@
# Lines beginning with a single `#' belong to plugins which have been built #
# but are disabled by default. #
# #
-# Lines begnning with `##' belong to plugins which have not been built due #
+# Lines beginning with `##' belong to plugins which have not been built due #
# to missing dependencies or because they have been deactivated explicitly. #
##############################################################################
@@ -150,6 +150,7 @@
#@BUILD_PLUGIN_NGINX_TRUE@LoadPlugin nginx
#@BUILD_PLUGIN_NOTIFY_DESKTOP_TRUE@LoadPlugin notify_desktop
#@BUILD_PLUGIN_NOTIFY_EMAIL_TRUE@LoadPlugin notify_email
+#@BUILD_PLUGIN_NOTIFY_NAGIOS_TRUE@LoadPlugin notify_nagios
#@BUILD_PLUGIN_NTPD_TRUE@LoadPlugin ntpd
#@BUILD_PLUGIN_NUMA_TRUE@LoadPlugin numa
#@BUILD_PLUGIN_NUT_TRUE@LoadPlugin nut
@@ -487,7 +488,6 @@
# FSType "ext3"
# IgnoreSelected false
# ReportByDevice false
-# ReportReserved false
# ReportInodes false
# ValuesAbsolute true
# ValuesPercentage false
@@ -563,6 +563,7 @@
#
# Interface "eth0"
# IgnoreSelected false
+# UniqueName false
#
#
@@ -576,6 +577,7 @@
#
# Chain table chain
+# Chain6 table chain
#
#
@@ -838,6 +840,10 @@
# Recipient "email2@domain2.com"
#
+#
+# CommandFile "/usr/local/nagios/var/rw/nagios.cmd"
+#
+
#
# Host "localhost"
# Port 123
@@ -1132,6 +1138,7 @@
# DeleteTimers false
# DeleteGauges false
# DeleteSets false
+# CounterSum false
# TimerPercentile 90.0
# TimerPercentile 95.0
# TimerPercentile 99.0
@@ -1247,10 +1254,10 @@
## None of the following option should be set manually
## This plugin automatically detect most optimal options
## Only set values here if:
-## - The module ask you to
+## - The module asks you to
## - You want to disable the collection of some data
-## - Your (intel) CPU is not supported (yet) by the module
-## - The module generate a lot of errors 'MSR offset 0x... read failed'
+## - Your (Intel) CPU is not supported (yet) by the module
+## - The module generates a lot of errors 'MSR offset 0x... read failed'
## In the last two cases, please open a bug request
#
# TCCActivationTemp "100"
@@ -1342,6 +1349,7 @@
# Host "localhost"
# Port "2003"
# Protocol "tcp"
+# ReconnectInterval 0
# LogSendErrors true
# Prefix "collectd"
# Postfix "collectd"
@@ -1363,6 +1371,7 @@
# ClientKey "/etc/ssl/client.pem"
# ClientCert "/etc/ssl/client.crt"
# ClientKeyPass "secret"
+# Header "X-Custom-Header: custom_value"
# SSLVersion "TLSv1"
# Format "Command"
# StoreRates false