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.

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

plugin-api 2.0 #9

Merged
merged 5 commits into from
May 6, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
sudo: false
jdk:
- oraclejdk8
language: ruby
cache: bundler
rvm:
- jruby-1.7.23
script:
- jruby-1.7.25
before_install:
- git clone -b feature/event_interface https://github.com/elastic/logstash
script:
- bundle exec rspec spec
8 changes: 7 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
source 'https://rubygems.org'
gemspec
gemspec

# this is temporary for the feature/plugin-api-2_0 branch and is meant for travis testing
gem "logstash-core", :path => "./logstash/logstash-core"
gem "logstash-core-plugin-api", :path => "./logstash/logstash-core-plugin-api"
gem "logstash-core-event-java", :path => "./logstash/logstash-core-event-java"
gem "logstash-devutils", :github => "elastic/logstash-devutils", :branch => "feature/plugin-api-2_0"
3 changes: 1 addition & 2 deletions lib/logstash/filters/clone.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@ def register

public
def filter(event)

@clones.each do |type|
clone = event.clone
clone["type"] = type
clone.set("type", type)
filter_matched(clone)
@logger.debug("Cloned event", :clone => clone, :event => event)

Expand Down
2 changes: 1 addition & 1 deletion logstash-filter-clone.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Gem::Specification.new do |s|
s.metadata = { "logstash_plugin" => "true", "logstash_group" => "filter" }

# Gem dependencies
s.add_runtime_dependency "logstash-core-plugin-api", "~> 1.0"
s.add_runtime_dependency "logstash-core-plugin-api", "~> 2.0"

s.add_development_dependency 'logstash-devutils'
end
Expand Down
34 changes: 17 additions & 17 deletions spec/filters/clone_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
insist { subject.length } == 4
subject.each_with_index do |s,i|
if i == 0 # last one should be 'original'
insist { s["type"] } == "original"
insist { s.get("type") } == "original"
else
insist { s["type"]} == "clone"
insist { s.get("type")} == "clone"
end
insist { s["message"] } == "hello world"
insist { s.get("message") } == "hello world"
end
end
end
Expand All @@ -44,21 +44,21 @@
insist { subject }.is_a? Array
insist { subject.length } == 3

insist { subject[0]["type"] } == "nginx-access"
insist { subject[0].get("type") } == "nginx-access"
#Initial event remains unchanged
insist { subject[0]["tags"] }.include? "TESTLOG"
reject { subject[0]["tags"] }.include? "RABBIT"
reject { subject[0]["tags"] }.include? "NO_ES"
insist { subject[0].get("tags") }.include? "TESTLOG"
reject { subject[0].get("tags") }.include? "RABBIT"
reject { subject[0].get("tags") }.include? "NO_ES"
#All clones go through filter_matched
insist { subject[1]["type"] } == "nginx-access-clone1"
reject { subject[1]["tags"] }.include? "TESTLOG"
insist { subject[1]["tags"] }.include? "RABBIT"
insist { subject[1]["tags"] }.include? "NO_ES"
insist { subject[1].get("type") } == "nginx-access-clone1"
reject { subject[1].get("tags") }.include? "TESTLOG"
insist { subject[1].get("tags") }.include? "RABBIT"
insist { subject[1].get("tags") }.include? "NO_ES"

insist { subject[2]["type"] } == "nginx-access-clone2"
reject { subject[2]["tags"] }.include? "TESTLOG"
insist { subject[2]["tags"] }.include? "RABBIT"
insist { subject[2]["tags"] }.include? "NO_ES"
insist { subject[2].get("type") } == "nginx-access-clone2"
reject { subject[2].get("tags") }.include? "TESTLOG"
insist { subject[2].get("tags") }.include? "RABBIT"
insist { subject[2].get("tags") }.include? "NO_ES"
end
end

Expand All @@ -73,8 +73,8 @@
CONFIG

sample("type" => "bug-1225", "message" => "unused", "number" => 5) do
insist { subject[0]["number"] } == 5
insist { subject[1]["number"] } == 5
insist { subject[0].get("number") } == 5
insist { subject[1].get("number") } == 5
end
end

Expand Down