fluentd 0.14.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65c4b02fdf574383246339cf37f879344d1ab8b3
-  data.tar.gz: 55cb7dc5dbbc1743dd24372eb227ff4460d05cd4
+  metadata.gz: 3eae91c70d2df47e3cd6aeb7b1e80d44fd8ee41b
+  data.tar.gz: 926661743f2177e7d116c1c7238d802b57fee63d
 SHA512:
-  metadata.gz: 6a7f80a460e9578a196f8a125c459013cfea84a96e29ef1c341aedcbc1b0af2e70aedd0fc58d1335d6f364da7d3aa078e0da33d5539ca8d52070ace779589091
-  data.tar.gz: 5fcb5d468553b2ca4a692a1ed0fe2e00fc0bc353c858cc505ee93975c9ce6fc9248cf12160262804bac3fb8a4cced363407567ebd147cb1f83c893097a2c3fcb
+  metadata.gz: 3584a4e41dc1188a43c0f5b75ea8505662bae178bdc796dd3a2cc8d28395000c18cb9b13c55cc34c113bf5d704c571634ba0ea1709325cc255e88da2a0150e74
+  data.tar.gz: 2f3836aea63fbaa48d761f2bce898f2925e130228c0c1b40e7115f2ccb0ce424aa7cd6200c0381b279f4358f3eef2e3d90e0f50ee0114441aaecc15250f1e2bd

data/example/copy_roundrobin.conf

@@ -0,0 +1,39 @@
+<source>
+  @type  dummy
+  @label @test
+  tag    test.copy
+  auto_increment_key id
+</source>
+
+<source>
+  @type dummy
+  @label @test
+  tag    test.rr
+  auto_increment_key id
+</source>
+
+<label @test>
+  <match test.copy>
+    @type copy
+    <store>
+      @type stdout
+      output_type json
+    </store>
+    <store>
+      @type stdout
+      output_type ltsv
+    </store>
+  </match>
+
+  <match test.rr>
+    @type roundrobin
+    <store>
+      @type stdout
+      output_type json
+    </store>
+    <store>
+      @type stdout
+      output_type ltsv
+    </store>
+  </match>
+</label>

data/example/filter_stdout.conf

@@ -1,22 +1,22 @@
 <source>
-  type dummy
+  @type dummy
   tag dummy
 </source>
 
 <filter **>
-  type stdout
+  @type stdout
 </filter>
 
 <filter **>
-  type stdout
+  @type stdout
   output_type hash
 </filter>
 
 <filter **>
-  type stdout
+  @type stdout
   format ltsv
 </filter>
 
 <match **>
-  type null
+  @type null
 </match>

data/example/in_forward.conf

@@ -1,7 +1,7 @@
 <source>
-  type forward
+  @type forward
 </source>
 
 <match test>
-  type stdout
+  @type stdout
 </match>

data/example/in_http.conf

@@ -1,5 +1,5 @@
 <source>
-  type http
+  @type http
   bind 0.0.0.0
   port 9880
   body_size_limit 32MB
@@ -10,5 +10,5 @@
 </source>
 
 <match test>
-  type stdout
+  @type stdout
 </match>

data/example/in_syslog.conf

@@ -1,5 +1,5 @@
 <source>
-  type syslog
+  @type syslog
   bind 0.0.0.0
   port 5140
   tag test
@@ -11,5 +11,5 @@
 </source>
 
 <match test>
-  type stdout
+  @type stdout
 </match>

data/example/in_tail.conf

@@ -1,5 +1,5 @@
 <source>
-  type tail
+  @type tail
   format none
   path /var/log/fluentd_test.log
   pos_file /var/log/fluentd_test.pos
@@ -10,5 +10,5 @@
 </source>
 
 <match test>
-  type stdout
+  @type stdout
 </match>

data/example/in_tcp.conf

@@ -1,5 +1,5 @@
 <source>
-  type tcp
+  @type tcp
   format none
   bind 0.0.0.0
   port 5170
@@ -9,5 +9,5 @@
 </source>
 
 <match test>
-  type stdout
+  @type stdout
 </match>

data/example/in_udp.conf

@@ -1,5 +1,5 @@
 <source>
-  type udp
+  @type udp
   format none
   bind 0.0.0.0
   port 5160
@@ -9,5 +9,5 @@
 </source>
 
 <match test>
-  type stdout
+  @type stdout
 </match>

data/example/out_buffered_null.conf

@@ -0,0 +1,32 @@
+#
+# bundle exec bin/fluentd -c example/out_buffered_null.conf
+#   (+ --emit-error-log-interval 10)
+<source>
+  @type dummy
+  tag dummy
+  rate 500000000
+  dummy [
+    {"message": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"},
+    {"message": "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"},
+    {"message": "ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"}
+  ]
+</source>
+
+<match dummy.**>
+  @type buffered_null
+  try_flush_interval 60
+  flush_interval 60
+  buffer_chunk_limit 1k
+  buffer_queue_limit 2
+</match>
+
+<label error_log>
+  <match **>
+    @type stdout # or buffered_stdout
+  </match>
+</label>
+
+<match fluent.**>
+  @type relabel
+  @label error_log
+</match>

data/example/out_copy.conf

@@ -1,15 +1,15 @@
 <source>
-  type forward
+  @type forward
 </source>
 
 <match test>
-  type copy
+  @type copy
   deep_copy false
   <store>
-    type stdout
+    @type stdout
   </store>
   <store>
-    type file
+    @type file
     path /var/log/fluentd/out_file_test
     format json
     buffer_type memory

data/example/out_file.conf

@@ -1,9 +1,9 @@
 <source>
-  type forward
+  @type forward
 </source>
 
 <match test>
-  type file
+  @type file
   path /var/log/fluentd/out_file_test
   format json
   buffer_type memory

data/example/out_forward.conf

@@ -1,10 +1,10 @@
 <source>
-  type dummy
+  @type dummy
   tag test
 </source>
 
 <match test>
-  type forward
+  @type forward
 
   <server>
     # first server

data/example/v0_12_filter.conf

@@ -9,7 +9,7 @@
 # $ echo '{"message":"hello world"}' | fluent-cat foo
 
 <source>
-  type forward
+  @type forward
   port 24224
 </source>
 
@@ -21,13 +21,13 @@
 # - {"messag22":"keep this please"} is filtered out.
 
 <filter foo>
-  type grep
+  @type grep
   regexp1  message keep this
 </filter>
 
 # Matches the events that was kept by the above filter
 <match foo>
-  type stdout
+  @type stdout
 </match>
 
 # For all events with the tag "bar", add the machine's hostname with
@@ -35,7 +35,7 @@
 # at 123.4.2.4:24224.
 
 <filter bar>
-  type record_transformer
+  @type record_transformer
   <record>
     hostname ${hostname}
   </record>
@@ -44,7 +44,7 @@
 # By the time it is getting matched here, the event has
 # the "hostname" field.
 <match bar>
-  type forward
+  @type forward
   <server>
     host 123.4.2.4
     port 24225
@@ -61,12 +61,12 @@
 # - {"last_name":"FURUHASHI"} throws an error because it has no field called "name"
 
 <filter foo.bar>
-  type grep
+  @type grep
   exclude1 hello .
 </filter>
 
 <filter foo.bar>
-  type record_transformer
+  @type record_transformer
   enable_ruby true
   <record>
     name ${name.downcase}
@@ -74,5 +74,5 @@
 </filter>
 
 <match foo.bar>
-  type stdout
+  @type stdout
 </match>

data/fluentd.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |gem|
     gem.add_runtime_dependency("win32-service", ["~> 0.8.3"])
     gem.add_runtime_dependency("win32-ipc", ["~> 0.6.1"])
     gem.add_runtime_dependency("win32-event", ["~> 0.6.1"])
-    gem.add_runtime_dependency("windows-pr", ["~> 1.2.3"])
+    gem.add_runtime_dependency("windows-pr", ["~> 1.2.5"])
   end
   gem.add_runtime_dependency("strptime", [">= 0.1.7"])
 

data/lib/fluent/command/fluentd.rb

@@ -60,10 +60,15 @@ op.on('-d', '--daemon PIDFILE', "daemonize fluent process") {|s|
   opts[:daemonize] = s
 }
 
-op.on('--no-supervisor', "run without fluent supervisor") {
+op.on('--under-supervisor', "run fluent worker under supervisor (this option is NOT for users)") {
   opts[:supervise] = false
 }
 
+op.on('--no-supervisor', "run fluent worker without supervisor") {
+  opts[:supervise] = false
+  opts[:standalone_worker] = true
+}
+
 op.on('--user USER', "change user") {|s|
   opts[:chuser] = s
 }

data/lib/fluent/compat/handle_tag_name_mixin.rb

@@ -0,0 +1,53 @@
+#
+# Fluentd
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+require 'fluent/compat/record_filter_mixin'
+
+module Fluent
+  module Compat
+    module HandleTagNameMixin
+      include RecordFilterMixin
+
+      attr_accessor :remove_tag_prefix, :remove_tag_suffix, :add_tag_prefix, :add_tag_suffix
+      def configure(conf)
+        super
+
+        @remove_tag_prefix = if conf.has_key?('remove_tag_prefix')
+                               Regexp.new('^' + Regexp.escape(conf['remove_tag_prefix']))
+                             else
+                               nil
+                             end
+
+        @remove_tag_suffix = if conf.has_key?('remove_tag_suffix')
+                               Regexp.new(Regexp.escape(conf['remove_tag_suffix']) + '$')
+                             else
+                               nil
+                             end
+
+        @add_tag_prefix = conf['add_tag_prefix']
+        @add_tag_suffix = conf['add_tag_suffix']
+      end
+
+      def filter_record(tag, time, record)
+        tag.sub!(@remove_tag_prefix, '') if @remove_tag_prefix
+        tag.sub!(@remove_tag_suffix, '') if @remove_tag_suffix
+        tag.insert(0, @add_tag_prefix) if @add_tag_prefix
+        tag << @add_tag_suffix if @add_tag_suffix
+        super(tag, time, record)
+      end
+    end
+  end
+end

data/lib/fluent/compat/input.rb

@@ -17,6 +17,7 @@
 require 'fluent/plugin'
 require 'fluent/plugin/input'
 require 'fluent/compat/call_super_mixin'
+require 'fluent/process' # to load Fluent::DetachProcessMixin
 
 module Fluent
   module Compat

data/lib/fluent/compat/output.rb

@@ -22,6 +22,7 @@ require 'fluent/compat/propagate_default'
 require 'fluent/compat/output_chain'
 require 'fluent/timezone'
 require 'fluent/mixin'
+require 'fluent/process' # to load Fluent::DetachProcessMixin
 
 require 'fluent/plugin_helper/compat_parameters'
 

data/lib/fluent/compat/record_filter_mixin.rb

@@ -0,0 +1,34 @@
+#
+# Fluentd
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+module Fluent
+  module Compat
+    module RecordFilterMixin
+      def filter_record(tag, time, record)
+      end
+
+      def format_stream(tag, es)
+        out = ''
+        es.each {|time,record|
+          tag_temp = tag.dup
+          filter_record(tag_temp, time, record)
+          out << format(tag_temp, time, record)
+        }
+        out
+      end
+    end
+  end
+end

data/lib/fluent/compat/set_tag_key_mixin.rb

@@ -0,0 +1,50 @@
+#
+# Fluentd
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+require 'fluent/config/error'
+require 'fluent/config/types'
+require 'fluent/compat/record_filter_mixin'
+
+module Fluent
+  module Compat
+    module SetTagKeyMixin
+      include RecordFilterMixin
+
+      attr_accessor :include_tag_key, :tag_key
+
+      def configure(conf)
+        @include_tag_key = false
+
+        super
+
+        if s = conf['include_tag_key']
+          include_tag_key = Fluent::Config.bool_value(s)
+          raise Fluent::ConfigError, "Invalid boolean expression '#{s}' for include_tag_key parameter" if include_tag_key.nil?
+
+          @include_tag_key = include_tag_key
+        end
+
+        @tag_key = conf['tag_key'] || 'tag' if @include_tag_key
+      end
+
+      def filter_record(tag, time, record)
+        super
+
+        record[@tag_key] = tag if @include_tag_key
+      end
+    end
+  end
+end