logstash-input-http_poller 4.0.5 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8b6a0c83d9ba60c4adc79c717e782e5f5eba221de0bb7cd1988c995562c70f7
-  data.tar.gz: 0ba31f25341fe58cca2e9e1218942ab2892e6f14b84fbe375275c0e779e42cd4
+  metadata.gz: dae0f4077b0291250677f8c0dec67e0c713bba9d6994b4b2406fbffb47f92459
+  data.tar.gz: 05a45a34f59b148c8c04c73501f06fe1d7c41e3bde6ab6f814ca0e7a07a9f1e7
 SHA512:
-  metadata.gz: a747f8e2e313bcc2a400e14fa52f6fc577781302747f1ae50f7ac64352d873f6bcf81df0e92f615ff814746193048a4ea7234a3290b034b5db7acfcecff42f1f
-  data.tar.gz: 48c3480f8afbc36cc645b9ef91cb191284fdaa5a4faae0a3bd25689cdce96f432b2e633fe3293f9317f4edd4c8c9fcf0a418ae4766f49b4e72be809ab81b5cb6
+  metadata.gz: 9522d889fe4f3ae718783963437ed7c360e59755979d9e9db98cb5aef4569e1c4ffb10ca9f92d2f0de0d9c072104edf78b1d1c6b55a2209fdade646c2b14bd01
+  data.tar.gz: 7dd5226d0a736cc25a4189a3751d3bf4bfa6f11c028858f2fc35cea2286e3b35ee5237b349df143d66f5316391bf33ed07302352d3be04d36be4dca770da5105

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 5.0.0
+ - Removed obsolete field `interval`
+
+## 4.0.6
+  - Changed `schedule` entry to show that it is required
+  [#102](https://github.com/logstash-plugins/logstash-input-http_poller/pull/102)
+
 ## 4.0.5
   - Docs: Set the default_codec doc attribute.
 

data/docs/index.asciidoc

@@ -114,7 +114,7 @@ This plugin supports the following configuration options plus the <<plugins-{typ
 | <<plugins-{type}s-{plugin}-proxy>> |<<,>>|No
 | <<plugins-{type}s-{plugin}-request_timeout>> |<<number,number>>|No
 | <<plugins-{type}s-{plugin}-retry_non_idempotent>> |<<boolean,boolean>>|No
-| <<plugins-{type}s-{plugin}-schedule>> |<<hash,hash>>|No
+| <<plugins-{type}s-{plugin}-schedule>> |<<hash,hash>>|Yes
 | <<plugins-{type}s-{plugin}-socket_timeout>> |<<number,number>>|No
 | <<plugins-{type}s-{plugin}-target>> |<<string,string>>|No
 | <<plugins-{type}s-{plugin}-truststore>> |a valid filesystem path|No

data/lib/logstash/inputs/http_poller.rb

@@ -17,8 +17,6 @@ class LogStash::Inputs::HTTP_Poller < LogStash::Inputs::Base
   # The name and the url will be passed in the outputed event
   config :urls, :validate => :hash, :required => true
 
-  config :interval, :validate => :number, :obsolete => "The interval options is obsolete. Use schedule instead"
-
   # Schedule of when to periodically poll from the urls
   # Format: A hash with
   #   + key: "cron" | "every" | "in" | "at"
@@ -165,7 +163,7 @@ class LogStash::Inputs::HTTP_Poller < LogStash::Inputs::Base
     # If there is a usable response. HEAD requests are `nil` and empty get
     # responses come up as "" which will cause the codec to not yield anything
     if body && body.size > 0
-      @codec.decode(body) do |decoded|
+      decode_and_flush(@codec, body) do |decoded|
         event = @target ? LogStash::Event.new(@target => decoded.to_hash) : decoded
         handle_decoded_event(queue, name, request, response, event, execution_time)
       end
@@ -175,6 +173,12 @@ class LogStash::Inputs::HTTP_Poller < LogStash::Inputs::Base
     end
   end
 
+  private
+  def decode_and_flush(codec, body, &yielder)
+    codec.decode(body, &yielder)
+    codec.flush(&yielder)
+  end
+
   private
   def handle_decoded_event(queue, name, request, response, event, execution_time)
     apply_metadata(event, name, request, response, execution_time)

data/logstash-input-http_poller.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'logstash-input-http_poller'
-  s.version         = '4.0.5'
+  s.version         = '5.0.0'
   s.licenses    = ['Apache License (2.0)']
   s.summary     = "Decodes the output of an HTTP API into events"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
@@ -20,11 +20,12 @@ Gem::Specification.new do |s|
   # Gem dependencies
   s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
   s.add_runtime_dependency 'logstash-codec-plain'
-  s.add_runtime_dependency 'logstash-mixin-http_client', ">= 6.0.0", "< 7.0.0"
+  s.add_runtime_dependency 'logstash-mixin-http_client', "~> 7"
   s.add_runtime_dependency 'stud', "~> 0.0.22"
   s.add_runtime_dependency 'rufus-scheduler', "~>3.0.9"
 
   s.add_development_dependency 'logstash-codec-json'
+  s.add_development_dependency 'logstash-codec-line'
   s.add_development_dependency 'logstash-devutils'
   s.add_development_dependency 'flores'
   s.add_development_dependency 'timecop'

data/spec/inputs/http_poller_spec.rb

@@ -462,6 +462,40 @@ describe LogStash::Inputs::HTTP_Poller do
           expect(event.get(target)).to include(payload_normalized)
         end
       end
+
+      context 'using a line codec' do
+        let(:opts) do
+          default_opts.merge({"codec" => "line"})
+        end
+        subject(:events) do
+          [].tap do |events|
+            events << queue.pop until queue.empty?
+          end
+        end
+
+        context 'when response has a trailing newline' do
+          let(:response_body) { "one\ntwo\nthree\nfour\n" }
+          it 'emits all events' do
+            expect(events.size).to equal(4)
+            messages = events.map{|e| e.get('message')}
+            expect(messages).to include('one')
+            expect(messages).to include('two')
+            expect(messages).to include('three')
+            expect(messages).to include('four')
+          end
+        end
+        context 'when response has no trailing newline' do
+          let(:response_body) { "one\ntwo\nthree\nfour" }
+          it 'emits all events' do
+            expect(events.size).to equal(4)
+            messages = events.map{|e| e.get('message')}
+            expect(messages).to include('one')
+            expect(messages).to include('two')
+            expect(messages).to include('three')
+            expect(messages).to include('four')
+          end
+        end
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-http_poller
 version: !ruby/object:Gem::Version
-  version: 4.0.5
+  version: 5.0.0
 platform: ruby
 authors:
 - Elastic
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-06 00:00:00.000000000 Z
+date: 2019-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -48,23 +48,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.0.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: '7'
   name: logstash-mixin-http_client
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.0.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: '7'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -107,6 +101,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: logstash-codec-line
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -188,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key:
 specification_version: 4
 summary: Decodes the output of an HTTP API into events