fluent-plugin-ec2-metadata 0.0.13 → 0.0.14
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: df4eabe2c68517c236c36639c5ffd605ff54d808
|
4
|
+
data.tar.gz: 9f15d7dfe46065e66b6a980e9df2b4c0cae90997
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 6595ef778482ec613e89d99461d8d34c7a583e57f0090f3ec168c71e994fe70ad6869b0b99e26757e0f3a5e6a2d9c3ab194482bc2702bc65fa3b519135cc6614
|
7
|
+
data.tar.gz: dbb124817cd7d47fb635f9339b6e66a464894ec5136dc2649f6d6d2eaa1e591344104695b97033e55cd04143702517a32ef963be3a6f60b588012acc6376ea77
|
@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
|
|
4
4
|
|
5
5
|
Gem::Specification.new do |spec|
|
6
6
|
spec.name = "fluent-plugin-ec2-metadata"
|
7
|
-
spec.version = "0.0.
|
7
|
+
spec.version = "0.0.14"
|
8
8
|
spec.authors = ["SAKAMOTO Takumi"]
|
9
9
|
spec.email = ["takumi.saka@gmail.com"]
|
10
10
|
spec.description = %q{Fluentd output plugin to add ec2 metadata fields to a event record}
|
@@ -19,7 +19,7 @@ module Fluent
|
|
19
19
|
}
|
20
20
|
}
|
21
21
|
|
22
|
-
@placeholder_expander = PlaceholderExpander.new
|
22
|
+
@placeholder_expander = PlaceholderExpander.new(log)
|
23
23
|
|
24
24
|
# get metadata first and then setup a refresh thread
|
25
25
|
@ec2_metadata = Hash.new
|
@@ -53,13 +53,13 @@ module Fluent
|
|
53
53
|
ec2_metadata['vpc_id'] = get_metadata("network/interfaces/macs/#{ec2_metadata['mac']}/vpc-id")
|
54
54
|
rescue
|
55
55
|
ec2_metadata['vpc_id'] = nil
|
56
|
-
|
56
|
+
log.info "ec2-metadata: 'vpc_id' is undefined #{ec2_metadata['instance_id']} is not in VPC}"
|
57
57
|
end
|
58
58
|
begin
|
59
59
|
ec2_metadata['subnet_id'] = get_metadata("network/interfaces/macs/#{ec2_metadata['mac']}/subnet-id")
|
60
60
|
rescue
|
61
61
|
ec2_metadata['subnet_id'] = nil
|
62
|
-
|
62
|
+
log.info "ec2-metadata: 'subnet_id' is undefined because #{ec2_metadata['instance_id']} is not in VPC}"
|
63
63
|
end
|
64
64
|
@ec2_metadata.merge!(ec2_metadata)
|
65
65
|
end
|
@@ -120,6 +120,10 @@ module Fluent
|
|
120
120
|
end
|
121
121
|
|
122
122
|
class PlaceholderExpander
|
123
|
+
def initialize(log)
|
124
|
+
@log = log
|
125
|
+
end
|
126
|
+
|
123
127
|
# referenced https://github.com/fluent/fluent-plugin-rewrite-tag-filter
|
124
128
|
# referenced https://github.com/sonots/fluent-plugin-record-reformer
|
125
129
|
attr_reader :placeholders
|
@@ -144,7 +148,7 @@ module Fluent
|
|
144
148
|
|
145
149
|
def expand(str)
|
146
150
|
str.gsub(/(\${[a-z_:\-]+(\[-?[0-9]+\])?}|__[A-Z_]+__)/) {
|
147
|
-
|
151
|
+
@log.warn "ec2-metadata: unknown placeholder `#{$1}` found in a tag `#{@placeholders['${tag}']}`" unless @placeholders.include?($1)
|
148
152
|
@placeholders[$1]
|
149
153
|
}
|
150
154
|
end
|
@@ -21,7 +21,7 @@ module Fluent
|
|
21
21
|
tag_parts = tag.split('.')
|
22
22
|
modify_record(record, tag, tag_parts)
|
23
23
|
rescue => e
|
24
|
-
|
24
|
+
log.warn "ec2-metadata: #{e.class} #{e.message} #{e.backtrace.join(', ')}"
|
25
25
|
end
|
26
26
|
end
|
27
27
|
end
|
@@ -11,6 +11,10 @@ module Fluent
|
|
11
11
|
define_method("router") { Fluent::Engine }
|
12
12
|
end
|
13
13
|
|
14
|
+
unless method_defined?(:log)
|
15
|
+
define_method(:log) { $log }
|
16
|
+
end
|
17
|
+
|
14
18
|
config_param :output_tag, :string
|
15
19
|
config_param :aws_key_id, :string, :default => ENV['AWS_ACCESS_KEY_ID'], :secret => true
|
16
20
|
config_param :aws_sec_key, :string, :default => ENV['AWS_SECRET_ACCESS_KEY'], :secret => true
|
@@ -26,7 +30,7 @@ module Fluent
|
|
26
30
|
}
|
27
31
|
chain.next
|
28
32
|
rescue => e
|
29
|
-
|
33
|
+
log.warn "ec2-metadata: #{e.class} #{e.message} #{e.backtrace.join(', ')}"
|
30
34
|
end
|
31
35
|
end
|
32
36
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: fluent-plugin-ec2-metadata
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.14
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- SAKAMOTO Takumi
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-11-
|
11
|
+
date: 2016-11-21 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: fluentd
|