Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate to use v0.14 API #10

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Migrate to use v0.14 API #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00330d5
Migrate to use v0.14 API
cosmo0920 Apr 6, 2017
998283d
Remove needless $log global variable adjustment
cosmo0920 Apr 6, 2017
403b110
Depends on Fluentd v0.14 and specify Ruby 2.1.0 or later into require…
cosmo0920 Apr 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions fluent-plugin-docker_metadata_filter.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ Gem::Specification.new do |gem|
gem.require_paths = ["lib"]
gem.has_rdoc = false

gem.required_ruby_version = '>= 1.9.3'
gem.required_ruby_version = '>= 2.1.0'

gem.add_runtime_dependency "fluentd"
gem.add_runtime_dependency "fluentd", [">= 0.14.0", "< 2"]
gem.add_runtime_dependency "docker-api"
gem.add_runtime_dependency "lru_redux"

Expand Down
9 changes: 5 additions & 4 deletions lib/fluent/plugin/filter_docker_metadata.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
module Fluent
class DockerMetadataFilter < Fluent::Filter
require 'fluent/plugin/filter'

module Fluent::Plugin
class DockerMetadataFilter < Fluent::Plugin::Filter
Fluent::Plugin.register_filter('docker_metadata', self)

config_param :docker_url, :string, :default => 'unix:///var/run/docker.sock'
Expand Down Expand Up @@ -57,7 +59,7 @@ def filter_stream(tag, es)
metadata = @cache.getset(container_id){DockerMetadataFilter.get_metadata(container_id)}

if metadata
new_es = MultiEventStream.new
new_es = Fluent::MultiEventStream.new

es.each {|time, record|
record['docker'] = {
Expand All @@ -72,7 +74,6 @@ def filter_stream(tag, es)
}
end
end

return new_es
end
end
Expand Down
4 changes: 2 additions & 2 deletions test/helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
require 'fileutils'
require 'fluent/log'
require 'fluent/test'
require 'fluent/test/driver/filter'
require 'fluent/test/helpers'
require 'webmock/test_unit'
require 'vcr'

Expand Down Expand Up @@ -62,5 +64,3 @@ def ipv6_enabled?
false
end
end

$log = Fluent::Log.new(Fluent::Test::DummyLogDevice.new, Fluent::Log::LEVEL_WARN)
30 changes: 16 additions & 14 deletions test/plugin/test_filter_docker_metadata.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,15 @@

class DockerMetadataFilterTest < Test::Unit::TestCase
include Fluent
include Fluent::Test::Helpers

setup do
Fluent::Test.setup
@time = Fluent::Engine.now
end

def create_driver(conf = '')
Test::FilterTestDriver.new(DockerMetadataFilter).configure(conf, true)
Test::Driver::Filter.new(Plugin::DockerMetadataFilter).configure(conf)
end

sub_test_case 'configure' do
Expand Down Expand Up @@ -66,30 +67,31 @@ def messages

def emit(config, msgs, tag='df14e0d5ae4c07284fa636d739c8fc2e6b52bc344658de7d3f08c36a2e804115')
d = create_driver(config)
d.run {
d.run(default_tag: tag) {
msgs.each { |msg|
d.emit_with_tag(tag, {'foo' => 'bar', 'message' => msg}, @time)
d.feed(@time, {'foo' => 'bar', 'message' => msg})
}
}.filtered
}
d.filtered.map{|e| e.last}
end

test 'docker metadata' do
VCR.use_cassette('docker_metadata') do
es = emit('', messages)
assert_equal(4, es.instance_variable_get(:@record_array).size)
assert_equal('df14e0d5ae4c07284fa636d739c8fc2e6b52bc344658de7d3f08c36a2e804115', es.instance_variable_get(:@record_array)[0]['docker']['id'])
assert_equal('k8s_fabric8-console-container.efbd6e64_fabric8-console-controller-9knhj_default_8ae2f621-f360-11e4-8d12-54ee7527188d_7ec9aa3e', es.instance_variable_get(:@record_array)[0]['docker']['name'])
assert_equal('fabric8-console-controller-9knhj', es.instance_variable_get(:@record_array)[0]['docker']['container_hostname'])
assert_equal('b2bd1a24a68356b2f30128e6e28e672c1ef92df0d9ec01ec0c7faea5d77d2303', es.instance_variable_get(:@record_array)[0]['docker']['image_id'])
assert_equal('fabric8/hawtio-kubernetes:latest', es.instance_variable_get(:@record_array)[0]['docker']['image'])
filtered = emit('', messages)
assert_equal(4, filtered.size)
assert_equal('df14e0d5ae4c07284fa636d739c8fc2e6b52bc344658de7d3f08c36a2e804115', filtered[0]['docker']['id'])
assert_equal('k8s_fabric8-console-container.efbd6e64_fabric8-console-controller-9knhj_default_8ae2f621-f360-11e4-8d12-54ee7527188d_7ec9aa3e', filtered[0]['docker']['name'])
assert_equal('fabric8-console-controller-9knhj', filtered[0]['docker']['container_hostname'])
assert_equal('b2bd1a24a68356b2f30128e6e28e672c1ef92df0d9ec01ec0c7faea5d77d2303', filtered[0]['docker']['image_id'])
assert_equal('fabric8/hawtio-kubernetes:latest', filtered[0]['docker']['image'])
end
end

test 'nonexistent docker metadata' do
VCR.use_cassette('nonexistent_docker_metadata') do
es = emit('', messages, '1111111111111111111111111111111111111111111111111111111111111111')
assert_equal(4, es.instance_variable_get(:@record_array).size)
assert_nil(es.instance_variable_get(:@record_array)[0]['docker'])
filtered = emit('', messages, '1111111111111111111111111111111111111111111111111111111111111111')
assert_equal(4, filtered.size)
assert_nil(filtered[0]['docker'])
end
end
end
Expand Down