logstash-input-blueliv 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae7ab2caf237124564d8f1bd2f7b3af11e67a181
-  data.tar.gz: ffa24ce670c67859941b74da03b693e0d521f295
+  metadata.gz: 301e9a57ed9e76018fa0feaacaae77f07db9d7d4
+  data.tar.gz: 2f8e5788e8186dd266ab739d4764007e992cfb98
 SHA512:
-  metadata.gz: 739dc701fc6fa95fa1983b0dc1aa69315ed8b9435f5fcf175e2a46ecdc1bc342712ab4337b74841465bb231aebe226b253f646e71eb497e93ad46cf1c00feebc
-  data.tar.gz: b038b72e748318190940c034cde2d2c730ba871f4bff108cfe394582d6782be2b485df8c8ff333a03f95e40424efecf00ff6ec499e55779dee331cd696bc8fcf
+  metadata.gz: 53ee56a4f0e4b374cc3e31e63dbe28698a1c1884d688af20a56bceb96c68be0f7b6922534fee906b3d9f3e9719960a845c37a9effc0363433fe046c156529fb7
+  data.tar.gz: 101f000cb9e9a5cd1483ea5cf3a5b8912f19fccbc0dee4801415745dac05d91637e82c0bb868ca1082cf16e31839b087ddd1278f3671feaab992bf7054d2397a

data/README.md

@@ -28,16 +28,16 @@ This plugin has the following configuration parameters:
 
 The default configuration for ``feeds`` field is the following:
 ```javascript
-  "crimeservers" => {
-      "active" => false,
-      "feed_type" => "test",
-      "interval" => 900,
-    },
-    "botips" => {
-      "active" => false,
-      "feed_type" => "test",
-      "interval" => 600
-    }
+"crimeservers" => {
+    "active" => false,
+    "feed_type" => "test",
+    "interval" => 900,
+  },
+  "botips" => {
+    "active" => false,
+    "feed_type" => "test",
+    "interval" => 600
+  }
 ```
 
 
@@ -45,17 +45,19 @@ The default configuration for ``feeds`` field is the following:
 
 ```javascript
 input {
-     blueliv { api_key => "7da63a74-bece-42b0-843b-15728e44740d"
-               feeds => { "botips" => {
-                                "active" => true
-                                "feed_type" => "non_pos"
-                          }
-                          "crimeservers" => {
-                                "active" => true
-                                "feed_type" => "all"
-                          }
-              }
-            }
+ blueliv {
+  api_key => "<YOUR API KEY>"
+  feeds => {
+    "botips" => {
+      "active" => true
+      "feed_type" => "non_pos"
+    }
+    "crimeservers" => {
+      "active" => true
+      "feed_type" => "all"
+    }
+  }
+ }
 }
 ```
 Be aware that if you do not specify a given field, the default value will be configured. In this case, we did not touch the ``interval`` field for the feeds, so the defaults will apply.

data/lib/logstash/inputs/blueliv.rb

@@ -7,6 +7,10 @@ require "logstash/namespace"
 require "rest-client"
 require "securerandom"
 
+
+USER_AGENT = "Logstash v0.1.2"
+API_CLIENT = "6ee37a93-d064-464b-b4c1-c37e9656273f"
+
 ONE_DAY_IN_SECONDS = 86400
 
 RESOURCES = {
@@ -170,7 +174,8 @@ class LogStash::Inputs::Blueliv < LogStash::Inputs::Base
   def get_feed(queue, name, url, &block)
     loop do
       begin
-        response = client.get url, :Authorization => @auth, :timeout => @timeout
+        response = client.get("#{url}?key=#{API_CLIENT}", :Authorization => @auth, :timeout => @timeout,
+          :user_agent => USER_AGENT, :headers => {"X-API-CLIENT" => API_CLIENT})
         response_json = JSON.parse(response.body)
         items = response_json[RESOURCES[name.to_sym][:items]]
         items.each do |it|

data/logstash-input-blueliv.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "logstash-input-blueliv"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
   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"

data/spec/inputs/blueliv_spec.rb

@@ -72,7 +72,8 @@ describe LogStash::Inputs::Blueliv do
        subject.auth = authorization
        subject.timeout = timeout
 
-       allow(subject.client).to receive(:get).with(url, :Authorization => authorization, :timeout => timeout).and_return(mock_response)
+       allow(subject.client).to receive(:get).with("#{url}?key=#{API_CLIENT}", :Authorization => authorization,
+        :timeout => timeout, :user_agent => USER_AGENT, :headers => {"X-API-CLIENT" => API_CLIENT}).and_return(mock_response)
        subject.get_feed logstash_queue, feed_name, url
        expect(logstash_queue.size).to eq(1)
        subject.teardown

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-blueliv
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Blueliv
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-06 00:00:00.000000000 Z
+date: 2015-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: logstash-core
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -19,10 +20,7 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
-  name: logstash-core
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -30,48 +28,50 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: logstash-codec-plain
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        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: []
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key:
 specification_version: 4
 summary: This plugin allows users to access Blueliv Crime Servers and Bot IPs feeds.