From 27e6c81114d7f52ec257a99e68aa72c37484bb15 Mon Sep 17 00:00:00 2001
From: Sebastian Harl <sh@teamix.net>
Date: Tue, 20 Nov 2012 12:55:21 +0100
Subject: [PATCH] sample configuration: Added section comments as specified in
 upstream's config.

---
 debian/collectd.conf   | 27 +++++++++++++++++++++++++++
 debian/thresholds.conf |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/debian/collectd.conf b/debian/collectd.conf
index 7210521..57d639e 100644
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -6,6 +6,12 @@
 # You should also read /usr/share/doc/collectd-core/README.Debian.plugins
 # before enabling any more plugins.
 
+##############################################################################
+# Global                                                                     #
+#----------------------------------------------------------------------------#
+# Global settings for the daemon.                                            #
+##############################################################################
+
 #Hostname "localhost"
 FQDNLookup true
 #BaseDir "/var/lib/collectd"
@@ -15,6 +21,14 @@ FQDNLookup true
 #Timeout 2
 #ReadThreads 5
 
+##############################################################################
+# Logging                                                                    #
+#----------------------------------------------------------------------------#
+# Plugins which provide logging functions should be loaded first, so log     #
+# messages generated when loading or configuring other plugins can be        #
+# accessed.                                                                  #
+##############################################################################
+
 #LoadPlugin logfile
 LoadPlugin syslog
 
@@ -29,6 +43,12 @@ LoadPlugin syslog
 	LogLevel info
 </Plugin>
 
+##############################################################################
+# LoadPlugin section                                                         #
+#----------------------------------------------------------------------------#
+# Specify what features to activate.                                         #
+##############################################################################
+
 #LoadPlugin aggregation
 #LoadPlugin amqp
 #LoadPlugin apache
@@ -120,6 +140,13 @@ LoadPlugin users
 #LoadPlugin write_http
 #LoadPlugin write_mongodb
 
+##############################################################################
+# Plugin configuration                                                       #
+#----------------------------------------------------------------------------#
+# In this section configuration stubs for each plugin are provided. A desc-  #
+# ription of those options is available in the collectd.conf(5) manual page. #
+##############################################################################
+
 #<Plugin "aggregation">
 #	<Aggregation>
 #		#Host "unspecified"
diff --git a/debian/thresholds.conf b/debian/thresholds.conf
index 53c62be..2bd4f2c 100644
--- a/debian/thresholds.conf
+++ b/debian/thresholds.conf
@@ -1,6 +1,6 @@
 # Threshold configuration for collectd(1).
 #
-# See the section "THRESHOLD CONFIGURATION" in collectd.conf(5) for details.
+# See the collectd-threshold(5) manual page for details.
 
 #LoadPlugin "threshold"
 #<Plugin "threshold">
-- 
2.30.2