From 6339228e442aaad2e7a862291b9f7b1bace33995 Mon Sep 17 00:00:00 2001 From: Daniel Nelson Date: Tue, 22 Aug 2017 11:31:07 -0700 Subject: [PATCH] Update config directory documentation --- docs/CONFIGURATION.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md index 364fb216c..d2cffbe07 100644 --- a/docs/CONFIGURATION.md +++ b/docs/CONFIGURATION.md @@ -27,8 +27,11 @@ for numbers and booleans they should be plain (ie, $INT_VAR, $BOOL_VAR) ## Configuration file locations The location of the configuration file can be set via the `--config` command -line flag. Telegraf will also pick up all files matching the pattern `*.conf` if -the `-config-directory` command line flag is used. +line flag. + +When the `--config-directory` command line flag is used files ending with +`.conf` in the specified directory will also be included in the Telegraf +configuration. On most systems, the default locations are `/etc/telegraf/telegraf.conf` for the main configuration file and `/etc/telegraf/telegraf.d` for the directory of