Merge pull request #88 from felipejfc/master

Add the option to disable sending deis logs and metrics to nsq. Closes #36 and #37

Author: Jonathan Chauncey

README.md

@@ -34,6 +34,11 @@ To turn off log collection of fluentd's own logs to avoid infinite loops set the
 To turn off the deis output plugin set the following environment variable to a non-empty string value
 * DISABLE_DEIS_OUTPUT
 
+### Disable sending log or metrics data to nsq
+To turn off sending log or metrics data to nsq set the following environment variable to "false"
+* SEND_LOGS_TO_NSQ
+* SEND_METRICS_TO_NSQ
+
 This means we will not capture data from the log stream and send it to NSQ for processing. This means you will disable application logs (`deis logs`) and metrics generated from deis router.
 
 ## Plugins

rootfs/opt/fluentd/deis-output/lib/fluent/plugin/out_deis.rb

@@ -26,6 +26,8 @@ def initialize
       @influx_nsq = nil
       @log_topic = ENV['NSQ_LOG_TOPIC'] || "logs"
       @metric_topic = ENV['NSQ_METRIC_TOPIC'] || "metrics"
+      @send_logs_to_nsq = ENV['SEND_LOGS_TO_NSQ'].to_s.downcase == 'false' ? false : true
+      @send_metrics_to_nsq = ENV['SEND_METRICS_TO_NSQ'].to_s.downcase == 'false' ? false : true
     end
 
     def start
@@ -43,7 +45,7 @@ def emit(tag, es, chain)
         if from_controller?(record) || deis_deployed_app?(record)
           @logger_nsq ||= get_nsq_producer(@log_topic)
           record["time"] = Time.now().strftime("%FT%T.%6N%:z")
-          push(@logger_nsq, record) if @logger_nsq
+          push(@logger_nsq, record) if @send_logs_to_nsq && @logger_nsq
         end
 
         if from_router?(record)
@@ -54,7 +56,7 @@ def emit(tag, es, chain)
               line = data.map do |point|
                 InfluxDB::PointValue.new(point).dump
               end.join("\n".freeze)
-              push(@influx_nsq, line) if @influx_nsq
+              push(@influx_nsq, line) if @send_metrics_to_nsq && @influx_nsq
             end
           rescue Exception => e
             puts "Error:#{e.backtrace}"