fluent-plugin-ec2-metadata 0.0.12 → 0.0.13
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.travis.yml +1 -0
- data/fluent-plugin-ec2-metadata.gemspec +1 -1
- data/lib/fluent/plugin/ec2_metadata.rb +3 -4
- data/test/cassettes/ec2-vpc.yml +4 -0
- data/test/helper.rb +2 -2
- data/test/plugin/test_out_ec2_metadata.rb +10 -2
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 6ee9946a828877a04eb144f77d133e8e323d66b6
|
4
|
+
data.tar.gz: 88dfce584d35db6c01607ad33be8b5d6c3535c5a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 10d687358f19ce66463c52d1519a6785aa579d038e904dfbb2fd23191aab594dbf8fa2c06ad14e6b50361e205ed298977b59c6c85127dea37f078d1c62a6e25f
|
7
|
+
data.tar.gz: 28b29b5c2e79ea3904ad09dd4c6b63e499bcc179a5aa46cc4e05fbc8fdf3b2e759814aa3e68a2ca1bfa8d6576f56f9c1bc4ff8f0e82586ae73ac0e96e51f992c
|
data/.travis.yml
CHANGED
@@ -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.13"
|
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}
|
@@ -15,7 +15,6 @@ module Fluent
|
|
15
15
|
@map = {}
|
16
16
|
conf.elements.select { |element| element.name == 'record' }.each { |element|
|
17
17
|
element.each_pair { |k, v|
|
18
|
-
element.has_key?(k)
|
19
18
|
@map[k] = v
|
20
19
|
}
|
21
20
|
}
|
@@ -24,10 +23,10 @@ module Fluent
|
|
24
23
|
|
25
24
|
# get metadata first and then setup a refresh thread
|
26
25
|
@ec2_metadata = Hash.new
|
27
|
-
set_metadata
|
26
|
+
set_metadata
|
28
27
|
set_tag
|
29
28
|
@refresh_thread = Thread.new {
|
30
|
-
while true
|
29
|
+
while true
|
31
30
|
sleep @metadata_refresh_seconds
|
32
31
|
set_metadata
|
33
32
|
set_tag
|
@@ -144,7 +143,7 @@ module Fluent
|
|
144
143
|
end
|
145
144
|
|
146
145
|
def expand(str)
|
147
|
-
str.gsub(/(\${[a-z_]+(\[-?[0-9]+\])?}|__[A-Z_]+__)/) {
|
146
|
+
str.gsub(/(\${[a-z_:\-]+(\[-?[0-9]+\])?}|__[A-Z_]+__)/) {
|
148
147
|
$log.warn "ec2-metadata: unknown placeholder `#{$1}` found in a tag `#{@placeholders['${tag}']}`" unless @placeholders.include?($1)
|
149
148
|
@placeholders[$1]
|
150
149
|
}
|
data/test/cassettes/ec2-vpc.yml
CHANGED
data/test/helper.rb
CHANGED
@@ -12,6 +12,7 @@ class EC2MetadataOutputTest < Test::Unit::TestCase
|
|
12
12
|
aws_sec_key aws_sec
|
13
13
|
<record>
|
14
14
|
name ${tagset_name}
|
15
|
+
stack ${tagset_aws:cloudformation:stack-name}
|
15
16
|
instance_id ${instance_id}
|
16
17
|
az ${availability_zone}
|
17
18
|
</record>
|
@@ -33,7 +34,8 @@ class EC2MetadataOutputTest < Test::Unit::TestCase
|
|
33
34
|
aws_key_id aws_key
|
34
35
|
aws_sec_key aws_sec
|
35
36
|
<record>
|
36
|
-
name
|
37
|
+
name ${tagset_name}
|
38
|
+
stack ${tagset_aws:cloudformation:stack-name}
|
37
39
|
</record>
|
38
40
|
]
|
39
41
|
d = create_driver(conf=c)
|
@@ -55,6 +57,7 @@ class EC2MetadataOutputTest < Test::Unit::TestCase
|
|
55
57
|
assert_equal("subnet-00000000", d.instance.ec2_metadata['subnet_id'])
|
56
58
|
|
57
59
|
assert_equal("instance-name", d.instance.ec2_metadata['tagset_name'])
|
60
|
+
assert_equal("mystack", d.instance.ec2_metadata['tagset_aws:cloudformation:stack-name'])
|
58
61
|
end
|
59
62
|
end
|
60
63
|
|
@@ -92,7 +95,12 @@ class EC2MetadataOutputTest < Test::Unit::TestCase
|
|
92
95
|
assert_equal "i-0c0c0000.test", d.emits[1][0]
|
93
96
|
|
94
97
|
# record
|
95
|
-
mapped = {
|
98
|
+
mapped = {
|
99
|
+
'instance_id' => 'i-0c0c0000',
|
100
|
+
'az' => 'ap-northeast-1b',
|
101
|
+
'name' => 'instance-name',
|
102
|
+
'stack' => 'mystack'
|
103
|
+
}
|
96
104
|
assert_equal [
|
97
105
|
{"a" => 1}.merge(mapped),
|
98
106
|
{"a" => 2}.merge(mapped),
|
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.13
|
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
|
+
date: 2016-11-17 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: fluentd
|