Only glob *.conf by default in conf.d folder

Fixes #6979, Fixes #1831

docs/static/setting-up-logstash.asciidoc

@@ -154,8 +154,8 @@ pipeline, and _settings files_, which specify options that control Logstash star
 ==== Pipeline Configuration Files
 
 You create pipeline configuration files when you define the stages of your Logstash processing pipeline. On deb and
-rpm, you place the pipeline configuration files in the `/etc/logstash/conf.d` directory. Logstash tries to load all
-files in the `/etc/logstash/conf.d directory`, so don't store any non-config files or backup files in this directory.
+rpm, you place the pipeline configuration files in the `/etc/logstash/conf.d` directory. Logstash tries to load only  
+files with `.conf` extension in the `/etc/logstash/conf.d directory` and ignores all other files.
 
 See <<configuration>> for more info.
 

logstash-core/lib/logstash/config/source/local.rb

@@ -37,7 +37,11 @@ def read
         config_parts = []
         encoding_issue_files = []
 
-        get_files.each do |file|
+        if logger.debug?
+          logger.debug("Skipping following files while reading config since they doesn't match the glob", :files => get_unmatched_files)
+        end
+
+        get_matched_files.each do |file|
           next unless ::File.file?(file) # skip directory
 
           logger.debug("Reading config file", :config_file => file)
@@ -78,7 +82,7 @@ def normalize_path(path)
         ::File.expand_path(path)
       end
 
-      def get_files
+      def get_matched_files
         Dir.glob(path).sort
       end
 
@@ -90,6 +94,13 @@ def path
         end
       end
 
+      def get_unmatched_files
+        # transform "/var/lib/*.conf" => /var/lib/*
+        t = File.split(@path)
+        all_files = Dir.glob(File.join(t.first, "*")).sort
+        all_files - get_matched_files
+      end
+
       def valid_encoding?(content)
         content.ascii_only? && content.valid_encoding?
       end

pkg/centos/after-install.sh

@@ -2,7 +2,7 @@ chown -R logstash:logstash /usr/share/logstash
 chown -R logstash /var/log/logstash
 chown logstash:logstash /var/lib/logstash
 sed -i \
-  -e 's|# path.config:|path.config: /etc/logstash/conf.d|' \
+  -e 's|# path.config:|path.config: /etc/logstash/conf.d/*.conf|' \
   -e 's|# path.logs:|path.logs: /var/log/logstash|' \
   -e 's|# path.data:|path.data: /var/lib/logstash|' \
   /etc/logstash/logstash.yml

pkg/debian/after-install.sh

@@ -5,7 +5,7 @@ chown -R logstash /var/log/logstash
 chown logstash:logstash /var/lib/logstash
 chmod 755 /etc/logstash
 sed -i \
-  -e 's|# path.config:|path.config: /etc/logstash/conf.d|' \
+  -e 's|# path.config:|path.config: /etc/logstash/conf.d/*.conf|' \
   -e 's|# path.logs:|path.logs: /var/log/logstash|' \
   -e 's|# path.data:|path.data: /var/lib/logstash|' \
   /etc/logstash/logstash.yml

pkg/ubuntu/after-install.sh

@@ -4,7 +4,7 @@ chown -R logstash:logstash /usr/share/logstash
 chown -R logstash /var/log/logstash
 chown logstash:logstash /var/lib/logstash
 sed -i \
-  -e 's|# path.config:|path.config: /etc/logstash/conf.d|' \
+  -e 's|# path.config:|path.config: /etc/logstash/conf.d/*.conf|' \
   -e 's|# path.logs:|path.logs: /var/log/logstash|' \
   -e 's|# path.data:|path.data: /var/lib/logstash|' \
   /etc/logstash/logstash.yml