collectd.conf(5), ChangeLog: Documented the new `Include' features.

diff --git a/ChangeLog b/ChangeLog
index f8c40e20d0187083f28c533f412d2fb1a4e25e34..9b3374c3b429c31a76b46ef370236d04a82d61ef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,8 @@ yyyy-mm-dd, Version 4.3.0
        * collectd: Support for more than one `TypesDB' file has been added.
          This is useful when one such file is included in a package but one
          wants to add custom type definitions.
+       * collectd: The `Include' config option has been expanded to handle
+         entire directories and shell wildcards.
        * collectdmon: The new `collectdmon' binary detects when collectd
          terminates and automatically restarts it again.
        * csv plugin: The CSV plugin is now able to store counter values as a

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 92a5e2545e78a7756ad5263c1d46c6ace3f6dcf5..09661eb6382b80369a6276d50ac114acd21f45d7 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -53,11 +53,21 @@ directory for the daemon.
 Loads the plugin I<Plugin>. There must be at least one such line or B<collectd>
 will be mostly useless.
 
-=item B<Include> I<File>
+=item B<Include> I<Path>
 
-Includes the file I<File> as if it was copy and pasted here. To prevent loops
-and shooting yourself in the foot in interesting ways the nesting is limited to
-a depth of 8E<nbsp>levels, which should be sufficient for most uses.
+If I<Path> points to a file, includes that file. If I<Path> points to a
+directory, recursively includes all files within that directory and its
+subdirectories. If the C<wordexp> function is available on your system,
+shell-like wildcards are expanded before files are included. This means you can
+use statements like the following:
+
+  Include "/etc/collectd.d/*.conf"
+
+To prevent loops and shooting yourself in the foot in interesting ways the
+nesting is limited to a depth of 8E<nbsp>levels, which should be sufficient for
+most uses. Since symlinks are followed it is still possible to crash the daemon
+by looping symlinks. In our opinion significant stupidity should result in an
+appropriate amount of pain.
 
 It is no problem to have a block like C<E<lt>Plugin fooE<gt>> in more than one
 file, but you cannot include files from within blocks.