fluent-plugin-ec2-metadata 0.0.6 → 0.0.7
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/fluent-plugin-ec2-metadata.gemspec +2 -1
- data/lib/fluent/plugin/out_ec2_metadata.rb +9 -4
- metadata +16 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: c0f13a6ea4989c62ead4ef258cad346b6b19d2c0
|
|
4
|
+
data.tar.gz: 7a48850d4f3e027599a86c6121c988dcd28322dd
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 446371e638020cb2846282187438eee1b273c31a2566685f00ceb648e5dad02c8794498e414d6349eb563e9a47d501780844d9df40ebff5caeef165e6e24a949
|
|
7
|
+
data.tar.gz: 43289dc890d6303202240c94d4e1acd7ee4250303436cbe8ec40649161f22bbcde8d3c8a7bf931a72daac7e2403e80c4f037d3a2cb40c799bfeec099aaa2ea6e
|
|
@@ -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.7"
|
|
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}
|
|
@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
|
|
|
18
18
|
spec.require_paths = ["lib"]
|
|
19
19
|
|
|
20
20
|
spec.add_development_dependency "rake"
|
|
21
|
+
spec.add_development_dependency "test-unit", ">= 3.1.0"
|
|
21
22
|
spec.add_runtime_dependency "fluentd"
|
|
22
23
|
spec.add_runtime_dependency "aws-sdk-v1"
|
|
23
24
|
end
|
|
@@ -2,6 +2,11 @@ module Fluent
|
|
|
2
2
|
class EC2MetadataOutput < Output
|
|
3
3
|
Fluent::Plugin.register_output('ec2_metadata', self)
|
|
4
4
|
|
|
5
|
+
# Define `router` method of v0.12 to support v0.10 or earlier
|
|
6
|
+
unless method_defined?(:router)
|
|
7
|
+
define_method("router") { Fluent::Engine }
|
|
8
|
+
end
|
|
9
|
+
|
|
5
10
|
def initialize
|
|
6
11
|
super
|
|
7
12
|
require 'net/http'
|
|
@@ -9,8 +14,8 @@ module Fluent
|
|
|
9
14
|
|
|
10
15
|
config_param :output_tag, :string
|
|
11
16
|
|
|
12
|
-
config_param :aws_key_id, :string, :default => ENV['AWS_ACCESS_KEY_ID']
|
|
13
|
-
config_param :aws_sec_key, :string, :default => ENV['AWS_SECRET_ACCESS_KEY']
|
|
17
|
+
config_param :aws_key_id, :string, :default => ENV['AWS_ACCESS_KEY_ID'], :secret => true
|
|
18
|
+
config_param :aws_sec_key, :string, :default => ENV['AWS_SECRET_ACCESS_KEY'], :secret => true
|
|
14
19
|
|
|
15
20
|
def configure(conf)
|
|
16
21
|
super
|
|
@@ -37,7 +42,7 @@ module Fluent
|
|
|
37
42
|
@ec2_metadata['subnet_id'] = get_metadata("network/interfaces/macs/#{@ec2_metadata['mac']}/subnet-id")
|
|
38
43
|
|
|
39
44
|
# get tags
|
|
40
|
-
if @map.values.any? { |v| v.match(/^\${tagset_/) }
|
|
45
|
+
if @map.values.any? { |v| v.match(/^\${tagset_/) } || @output_tag =~ /\${tagset_/
|
|
41
46
|
require 'aws-sdk-v1'
|
|
42
47
|
|
|
43
48
|
if @aws_key_id and @aws_sec_key then
|
|
@@ -60,7 +65,7 @@ module Fluent
|
|
|
60
65
|
tag_parts = tag.split('.')
|
|
61
66
|
es.each { |time, record|
|
|
62
67
|
new_tag, new_record = modify(@output_tag, record, tag, tag_parts)
|
|
63
|
-
|
|
68
|
+
router.emit(new_tag, time, new_record)
|
|
64
69
|
}
|
|
65
70
|
chain.next
|
|
66
71
|
rescue => e
|
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.7
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- SAKAMOTO Takumi
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-
|
|
11
|
+
date: 2015-08-20 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rake
|
|
@@ -24,6 +24,20 @@ dependencies:
|
|
|
24
24
|
- - ">="
|
|
25
25
|
- !ruby/object:Gem::Version
|
|
26
26
|
version: '0'
|
|
27
|
+
- !ruby/object:Gem::Dependency
|
|
28
|
+
name: test-unit
|
|
29
|
+
requirement: !ruby/object:Gem::Requirement
|
|
30
|
+
requirements:
|
|
31
|
+
- - ">="
|
|
32
|
+
- !ruby/object:Gem::Version
|
|
33
|
+
version: 3.1.0
|
|
34
|
+
type: :development
|
|
35
|
+
prerelease: false
|
|
36
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
37
|
+
requirements:
|
|
38
|
+
- - ">="
|
|
39
|
+
- !ruby/object:Gem::Version
|
|
40
|
+
version: 3.1.0
|
|
27
41
|
- !ruby/object:Gem::Dependency
|
|
28
42
|
name: fluentd
|
|
29
43
|
requirement: !ruby/object:Gem::Requirement
|