logstash-input-blueliv 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 619bba88fd2fbfccd22b94d218ad26b6b967393e
-  data.tar.gz: dc4e01515eacb241eb72b4d9ca79340e02c8d3f7
+  metadata.gz: b09d14b8d68852d80f77673edc11b61f7a258069
+  data.tar.gz: b02e35ce0e731ed93d6f5f0c1cfd0ab331d02b0c
 SHA512:
-  metadata.gz: 2f586e735ed6b7a93ed9e93d519fc7eb2b5183e5793128fa3db446aadf49a68cc2183b4fd5fa3a9a414bd1e910b3a8c78ed94febd3a60f3ed3d0b4bb446e9fa1
-  data.tar.gz: 6021fb5582fd0e0fa4ce5ba8f8e9fb5d3b8105fa65676dfe9af6ee52d165e21f0432da3c5baa7941f75210f76b10739033a279df3b388da7655b746d427e9908
+  metadata.gz: c121a96e0d0ad99afe5680e78f0546b3ccf0b810bf41c2157c225e3f27b439be377dbc95dd0e55749e9e416d7fde2476f1e5543518077e8a7fb912d5afc0a17f
+  data.tar.gz: c5930953179f85ea3c8e1056239094536779f25f7e6f98f34e9b64f146636e152bf6bbac96ada0425f574534b9338f8b1cd33fd591a293221b058b2e6e36ac53

data/lib/logstash/inputs/blueliv.rb

@@ -11,17 +11,16 @@ require "securerandom"
 USER_AGENT = "Logstash v0.1.2"
 API_CLIENT = "6ee37a93-d064-464b-b4c1-c37e9656273f"
 
-ONE_DAY_IN_SECONDS = 86400
-
 RESOURCES = {
   :crimeservers => {
     :items => "crimeServers",
     :endpoint => "/v1/crimeserver",
     :feeds => {
-      :all => {
-        900 => "/last",
-        3600 => "/recent",
-        ONE_DAY_IN_SECONDS => "/online"
+      :last => {
+        900 => "/last"
+      },
+      :recent => {
+        3600 => "/recent"
       },
       :test => {
         900 => "/test"
@@ -53,10 +52,9 @@ RESOURCES = {
 
 DEFAULT_CONFIG = {
   "crimeservers" => {
-      "active" => false,
+      "active" => true,
       "feed_type" => "test",
-      "interval" => 900,
-      "initialize" => true
+      "interval" => 900
     },
     "botips" => {
       "active" => false,
@@ -96,19 +94,8 @@ class LogStash::Inputs::Blueliv < LogStash::Inputs::Base
       threads = []
       @feeds.each do |name, conf|
         if feeds[name]["active"]
-          if feeds[name]["initialize"]
-            if not db_updated?(DateTime.now)
-              threads << Thread.new do
-                url, interval = get_url(name, @feeds[name]["feed_type"], ONE_DAY_IN_SECONDS)
-                get_feed(queue, name, url) { write_last_update_db(DateTime.now) }
-                url, interval = get_url(name, @feeds[name]["feed_type"], @feeds[name]["interval"])
-                get_feed_each(queue, name, url, interval) { write_last_update_db(DateTime.now) }
-              end
-            end
-          else
-            url, interval = get_url(name, @feeds[name]["feed_type"], @feeds[name]["interval"])
-            threads << Thread.new(get_feed_each(queue, name, url, interval))
-          end
+          url, interval = get_url(name, @feeds[name]["feed_type"], @feeds[name]["interval"])
+          threads << Thread.new(get_feed_each(queue, name, url, interval))
         end
       end
 
@@ -172,6 +159,7 @@ class LogStash::Inputs::Blueliv < LogStash::Inputs::Base
   end
 
   def get_feed(queue, name, url, &block)
+    @logger.info("Start getting #{url} feed")
     loop do
       begin
         response = client.get("#{url}?key=#{API_CLIENT}", :Authorization => @auth, :timeout => @timeout,
@@ -182,17 +170,20 @@ class LogStash::Inputs::Blueliv < LogStash::Inputs::Base
           it["location"] = [it["longitude"].to_f, it["latitude"].to_f]
           collection = RESOURCES[name.to_sym][:items].downcase
           it["@collection"] = collection
-          it["_id"] = SecureRandom.base64(32) unless it.has_key?("_id")
+          it["document_id"] = if it.has_key?("_id") then it["_id"] else SecureRandom.base64(32) end
+          it.delete("_id") if it.has_key?("_id")
+          @logger.info("#{it}")
           evt =  LogStash::Event.new(it)
           decorate(evt)
           queue << evt
         end
+        @logger.info("End getting data from #{url}")
         block.call if block
         break
       rescue RestClient::Exception => e
         case e.http_code
           when 401, 403
-            @logger.info("You do not have access to this resource! Please contact #{@contact}")
+            @logger.info("You do not have access to this resource #{url}! Please contact #{@contact}")
             break
           when 404
             @logger.info("Resource #{url} not found")

data/logstash-input-blueliv.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "logstash-input-blueliv"
-  s.version = "0.2.0"
+  s.version = "1.0.0"
   s.licenses = ["Apache License (2.0)"]
   s.summary = "This plugin allows users to access Blueliv Crime Servers and Bot IPs feeds."
   s.description = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install logstash-input-blueliv. This gem is not a stand-alone program"

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-blueliv
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Blueliv
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-02-11 00:00:00.000000000 Z
+date: 2016-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: logstash-core
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.0
-  name: logstash-core
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: logstash-codec-plain
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.4.0
-- !ruby/object:Gem::Dependency
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-plain
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: rest-client
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+        version: 1.8.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.0
-  name: rest-client
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.8.0
-- !ruby/object:Gem::Dependency
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-devutils
   prerelease: false
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install logstash-input-blueliv. This gem is not a stand-alone program
 email: community@blueliv.com
 executables: []