fluent-plugin-gelf-best 1.3.0 → 1.3.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/fluent-plugin-gelf-best.gemspec +1 -0
- data/lib/fluent/plugin/gelf_plugin_util.rb +0 -20
- data/lib/fluent-plugin-gelf-best/version.rb +1 -1
- metadata +15 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 7327c66aa6fddfe60ed1448e76a59ecd906b458957758b748ee3162aefa85d0f
|
|
4
|
+
data.tar.gz: 2f5b1820ab88ce8665288b2e218e8be53aa274d5047e32cde33faaa5dad967c6
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 2735ce20d4dc4405d137405a30ec2c52dc83343fae9fdb7312f35e1b671546bd95ce0ab1c93648deaa1e0175fcedb79df739596aaedb27e767135695169a1ec5
|
|
7
|
+
data.tar.gz: 4add4d31fc40b78c7ff70450b556749e755f0fa6072e62a24160c4afa8ae63f09f4a46c2e2a7d26e876bb9379b65264787da37a603aa807e5dd0489c092416af
|
|
@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
|
|
|
19
19
|
|
|
20
20
|
spec.add_runtime_dependency "fluentd", ">=1.0.0"
|
|
21
21
|
spec.add_runtime_dependency "gelf", ">= 2.0.0"
|
|
22
|
+
spec.add_development_dependency "oj", "~> 3.3.10"
|
|
22
23
|
spec.add_development_dependency "test-unit"
|
|
23
24
|
spec.add_development_dependency "rake"
|
|
24
25
|
end
|
|
@@ -16,20 +16,7 @@ module Fluent
|
|
|
16
16
|
'e' => GELF::ERROR
|
|
17
17
|
}.freeze
|
|
18
18
|
|
|
19
|
-
def get_internal_json_out(record, key)
|
|
20
|
-
json_data = parse_json_field(record[key])
|
|
21
|
-
return record unless json_data
|
|
22
|
-
|
|
23
|
-
record.delete(key)
|
|
24
|
-
merge_record_with_json(record, json_data)
|
|
25
|
-
rescue Oj::ParseError, EncodingError
|
|
26
|
-
# Return original record if JSON parsing fails
|
|
27
|
-
record
|
|
28
|
-
end
|
|
29
|
-
|
|
30
19
|
def make_gelfentry(tag, time, record, conf = {})
|
|
31
|
-
record = get_internal_json_out(record, "message")
|
|
32
|
-
record = get_internal_json_out(record, "log")
|
|
33
20
|
gelfentry = {"_fluentd_tag" => tag, "timestamp" => calculate_timestamp(time)}
|
|
34
21
|
|
|
35
22
|
record.each do |k, v|
|
|
@@ -42,13 +29,6 @@ module Fluent
|
|
|
42
29
|
|
|
43
30
|
private
|
|
44
31
|
|
|
45
|
-
def parse_json_field(json_field)
|
|
46
|
-
return nil unless json_field
|
|
47
|
-
json = Oj.load(json_field.strip)
|
|
48
|
-
return nil unless json.is_a?(Hash)
|
|
49
|
-
json
|
|
50
|
-
end
|
|
51
|
-
|
|
52
32
|
def calculate_timestamp(time)
|
|
53
33
|
if defined?(Fluent::EventTime) && time.is_a?(Fluent::EventTime)
|
|
54
34
|
time.sec + (time.nsec.to_f / 1_000_000_000).round(3)
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: fluent-plugin-gelf-best
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.3.
|
|
4
|
+
version: 1.3.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Alex Yamauchi
|
|
@@ -40,6 +40,20 @@ dependencies:
|
|
|
40
40
|
- - ">="
|
|
41
41
|
- !ruby/object:Gem::Version
|
|
42
42
|
version: 2.0.0
|
|
43
|
+
- !ruby/object:Gem::Dependency
|
|
44
|
+
name: oj
|
|
45
|
+
requirement: !ruby/object:Gem::Requirement
|
|
46
|
+
requirements:
|
|
47
|
+
- - "~>"
|
|
48
|
+
- !ruby/object:Gem::Version
|
|
49
|
+
version: 3.3.10
|
|
50
|
+
type: :development
|
|
51
|
+
prerelease: false
|
|
52
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
53
|
+
requirements:
|
|
54
|
+
- - "~>"
|
|
55
|
+
- !ruby/object:Gem::Version
|
|
56
|
+
version: 3.3.10
|
|
43
57
|
- !ruby/object:Gem::Dependency
|
|
44
58
|
name: test-unit
|
|
45
59
|
requirement: !ruby/object:Gem::Requirement
|