logstash-input-cloudflare 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 085cf38020417111f4172fe95693004884b01246
-  data.tar.gz: 3425837336a0f57199abcc04f9c4eb960277d867
+  metadata.gz: 7c255265d2e8dab0a73b53ac9f63b8ff0e220e65
+  data.tar.gz: 5325e7cdfea4207b7e7ef030fd68c2c10f02a6ca
 SHA512:
-  metadata.gz: f094121047dd883418352a333ad2fc45dcf1e23a17bfd7bb2f888bffa1affe4b12b018798d03bd373ff3df1de87b6ea763aaf3f456c0410b46f0613de5f2fba7
-  data.tar.gz: 02388bd90d140c45298c30b26e640e201d95865fdf72cb8c0cddc0e7caafd71a7617fd4b42b77a82efed035feca1d5741f1b078b042f8cc81cf4d31ad908e484
+  metadata.gz: 2c879cae30e927317d5960027fb5b931a040690ba9ca0b544bbc3aab0b696b6822a997eedf2bf9dd2d7df825e5295071e0eab4d32d6fbf06d0bbca5b98b25ceb
+  data.tar.gz: eebb3408aad44064bfafcbf4e1b3d9407af0e5bfa8782aaaffad8fd13be29a68351343c57d6b6a40dca769be972d7b6654ca45b7757d780cc3cddbc1c2825354

data/CHANGELOG.md

@@ -1,2 +1,12 @@
+## 0.9.3
+- CloudFlare API now works with start_id & count \o/
+
+## 0.9.2
+- fixing situations when you have no visits and the API would be constantly requested
+- fixed address in gemspec
+
+## 0.9.1
+- first working version of plugin
+
 ## 0.1.0
- - Initial version of the Cloudflare input plugin
+- Initial version of the Cloudflare input plugin

data/lib/logstash/inputs/cloudflare.rb

@@ -72,6 +72,7 @@ class LogStash::Inputs::Cloudflare < LogStash::Inputs::Base
          validate: :string, default: '/tmp/cf_logstash_metadata.json', required: false
   config :poll_time, validate: :number, default: 15, required: false
   config :start_from_secs_ago, validate: :number, default: 1200, required: false
+  config :batch_size, validate: :number, default: 1000, required: false
   config :fields, validate: :array, default: DEFAULT_FIELDS, required: false
 
   public
@@ -126,6 +127,7 @@ class LogStash::Inputs::Cloudflare < LogStash::Inputs::Base
         raise CloudflareAPIError.new(uri.to_s, response, content),
               'Error calling Cloudflare API'
       end
+      @logger.info("Received response from Cloudflare API (status_code: #{response.code})")
       lines = parse_content(content)
       return lines if multi_line
       return lines[0]
@@ -143,26 +145,13 @@ class LogStash::Inputs::Cloudflare < LogStash::Inputs::Base
 
   def cf_params(metadata)
     params = {}
-    # if we have ray_id, we use that as a starting point and and use
-    # timestamp + 120 seconds as end because the API doesn't support the
-    # `count` parameter
-    if metadata['last_ray_id'] && metadata['last_timestamp']
-      dt_tstamp = DateTime.strptime("#{metadata['last_timestamp']}", '%s')
-      @logger.info('last_ray_id from previous run detected: '\
-                   "#{metadata['last_ray_id']}")
-      @logger.info('last_timestamp from previous run detected: '\
-                   "#{metadata['last_timestamp']} #{dt_tstamp}")
-      params['start_id'] = metadata['last_ray_id']
-      params['end'] = metadata['last_timestamp'].to_i + 120
-      metadata['first_ray_id'] = metadata['last_ray_id']
+    # if we have ray_id, we use that as a starting point
+    if metadata['last_ray_id']
+      @logger.info("Previous ray_id detected: #{ray_id}")
+      params['start_id'] = ray_id
+      params['count'] = @batch_size
+      metadata['first_ray_id'] = ray_id
       metadata['first_timestamp'] = nil
-    # not supported by the API yet which is why it's commented out
-    # elsif ray_id
-    #   @logger.info("Previous ray_id detected: #{ray_id}")
-    #   params['start_id'] = ray_id
-    #   params['count'] = 100 # not supported in the API yet
-    #   metadata['first_ray_id'] = ray_id
-    #   metadata['first_timestamp'] = nil
     elsif metadata['last_timestamp']
       dt_tstamp = DateTime.strptime(metadata['last_timestamp'], '%s')
       @logger.info('last_timestamp from previous run detected: '\

data/logstash-input-cloudflare.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-input-cloudflare'
-  s.version = '0.9.2'
+  s.version = '0.9.3'
   s.licenses = ['Apache License (2.0)']
   s.summary = 'This logstash input plugin fetches logs from Cloudflare using'\
               'their API'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-cloudflare
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Igor Serko
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement