fluentd 1.11.3-x86-mingw32 → 1.11.4-x86-mingw32

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of fluentd might be problematic. Click here for more details.

checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: fa31c3908803fa5ede4c5d120bd9f7d7023d902d14a183946b8e1418a54808e0
4
- data.tar.gz: ed4dfe3d8db58c25637919a2b3efe1e4f52cf7bad05ef60f20270253231b0b48
3
+ metadata.gz: cf55614713059475446573f871e0d22863b38e6eb4ebb871cec712cb0d999091
4
+ data.tar.gz: 9e124c553ddb7fd818d4c70900af7ef001d52b18667ff517022fc9bc6bf80a38
5
5
  SHA512:
6
- metadata.gz: ad4790a87f4f7e911afc29fd28e68e6a49f8dc695b864068168a9ba131fce28f0c3dcf6e072621f3782c86788c60aed68f5b4b9a1525d71406353dc4c0bfbf82
7
- data.tar.gz: d9f82bf5942cb3666a6f0fe8c16d3edf420c5fbb4dfc246f6f08bfbda4205e555de87fedef1c5f5de2b4747bd5f6c060b9c7484ba79c14f844dc7db7f880dd70
6
+ metadata.gz: 2c40c66f42b4de82b3c1bc30f8db3f08520dd1c584a54795bcd93770431e580833d85208b12abefac1d8b37bbfdee8e3ff48b20d9c962df6205d0c87c4468fb7
7
+ data.tar.gz: fd1487dd0e126454502f75817d6dd17f585517cd09bebb0ba7fa9dbfeb13682d39ed038053213786f0a3273b439a6d795445b7a18b2deeed809c3c63321fa1e6
@@ -1,5 +1,19 @@
1
1
  # v1.11
2
2
 
3
+ ## Release v1.11.4 - 2020/10/13
4
+
5
+ ### Enhancement
6
+
7
+ * inject: Support `unixtime_millis` in `time_type` parameter
8
+ https://github.com/fluent/fluentd/pull/3145
9
+
10
+ ### Bug fix
11
+
12
+ * out_http: Fix broken data with `json_array true`
13
+ https://github.com/fluent/fluentd/pull/3144
14
+ * output: Fix wrong logging issue for `${chunk_id}`
15
+ https://github.com/fluent/fluentd/pull/3134
16
+
3
17
  ## Release v1.11.3 - 2020/09/30
4
18
 
5
19
  ### Enhancement
@@ -215,7 +215,7 @@ module Fluent::Plugin
215
215
  req.basic_auth(@auth.username, @auth.password)
216
216
  end
217
217
  set_headers(req)
218
- req.body = @json_array ? "[#{chunk.read.chop!}]" : chunk.read
218
+ req.body = @json_array ? "[#{chunk.read.chop}]" : chunk.read
219
219
  req
220
220
  end
221
221
 
@@ -769,17 +769,19 @@ module Fluent
769
769
  end
770
770
  end
771
771
 
772
- if rvalue =~ CHUNK_KEY_PLACEHOLDER_PATTERN
773
- log.warn "chunk key placeholder '#{$1}' not replaced. template:#{str}"
774
- end
775
-
776
- rvalue.sub(CHUNK_ID_PLACEHOLDER_PATTERN) {
772
+ rvalue = rvalue.sub(CHUNK_ID_PLACEHOLDER_PATTERN) {
777
773
  if chunk_passed
778
774
  dump_unique_id_hex(chunk.unique_id)
779
775
  else
780
776
  log.warn "${chunk_id} is not allowed in this plugin. Pass Chunk instead of metadata in extract_placeholders's 2nd argument"
781
777
  end
782
778
  }
779
+
780
+ if rvalue =~ CHUNK_KEY_PLACEHOLDER_PATTERN
781
+ log.warn "chunk key placeholder '#{$1}' not replaced. template:#{str}"
782
+ end
783
+
784
+ rvalue
783
785
  end
784
786
  end
785
787
 
@@ -76,7 +76,7 @@ module Fluent
76
76
  config_param :time_key, :string, default: nil
77
77
 
78
78
  # To avoid defining :time_type twice
79
- config_param :time_type, :enum, list: [:float, :unixtime, :string], default: :float
79
+ config_param :time_type, :enum, list: [:float, :unixtime, :unixtime_millis, :string], default: :float
80
80
 
81
81
  Fluent::TimeMixin::TIME_PARAMETERS.each do |name, type, opts|
82
82
  config_param(name, type, **opts)
@@ -132,6 +132,7 @@ module Fluent
132
132
  if @_inject_time_key
133
133
  @_inject_time_formatter = case @inject_config.time_type
134
134
  when :float then ->(time){ time.to_r.truncate(+6).to_f } # microsecond floating point value
135
+ when :unixtime_millis then ->(time) { time.to_f.floor(3) * 1000 }
135
136
  when :unixtime then ->(time){ time.to_i }
136
137
  else
137
138
  localtime = @inject_config.localtime && !@inject_config.utc
@@ -16,6 +16,6 @@
16
16
 
17
17
  module Fluent
18
18
 
19
- VERSION = '1.11.3'
19
+ VERSION = '1.11.4'
20
20
 
21
21
  end
@@ -378,6 +378,18 @@ class OutputTest < Test::Unit::TestCase
378
378
  assert { logs.any? { |log| log.include?("${chunk_id} is not allowed in this plugin") } }
379
379
  end
380
380
 
381
+ test '#extract_placeholders does not log for ${chunk_id} placeholder' do
382
+ @i.configure(config_element('ROOT', '', {}, [config_element('buffer', '')]))
383
+ tmpl = "/mypath/${chunk_id}/tail"
384
+ t = event_time('2016-04-11 20:30:00 +0900')
385
+ v = {key1: "value1", key2: "value2"}
386
+ c = create_chunk(timekey: t, tag: 'fluentd.test.output', variables: v)
387
+ @i.log.out.logs.clear
388
+ @i.extract_placeholders(tmpl, c)
389
+ logs = @i.log.out.logs
390
+ assert { logs.none? { |log| log.include?("${chunk_id}") } }
391
+ end
392
+
381
393
  test '#extract_placeholders logs warn message with not replaced key' do
382
394
  @i.configure(config_element('ROOT', '', {}, [config_element('buffer', '')]))
383
395
  tmpl = "/mypath/${key1}/test"
@@ -176,6 +176,19 @@ class InjectHelperTest < Test::Unit::TestCase
176
176
  assert_equal record.merge({"timedata" => float_time}), @d.inject_values_to_record('tag', time, record)
177
177
  end
178
178
 
179
+ test 'injects time as unix time millis into specified key' do
180
+ time_in_unix = Time.parse("2016-06-21 08:10:11 +0900").to_i
181
+ time_subsecond = 320_101_224
182
+ time = Fluent::EventTime.new(time_in_unix, time_subsecond)
183
+ unixtime_millis = 1466464211320
184
+
185
+ @d.configure(config_inject_section("time_key" => "timedata", "time_type" => "unixtime_millis"))
186
+ @d.start
187
+
188
+ record = {"key1" => "value1", "key2" => 2}
189
+ assert_equal record.merge({"timedata" => unixtime_millis}), @d.inject_values_to_record('tag', time, record)
190
+ end
191
+
179
192
  test 'injects time as unix time into specified key' do
180
193
  time_in_unix = Time.parse("2016-06-21 08:10:11 +0900").to_i
181
194
  time_subsecond = 320_101_224
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fluentd
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.11.3
4
+ version: 1.11.4
5
5
  platform: x86-mingw32
6
6
  authors:
7
7
  - Sadayuki Furuhashi
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-09-30 00:00:00.000000000 Z
11
+ date: 2020-10-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: msgpack