logstash-input-azuretopicthreadable 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a437fd1ee21ad00b2e8247d0c67f77b101a1744
-  data.tar.gz: 1b77407063b1026f83cb9835fee892a8d993bbb5
+  metadata.gz: 96ef88174ba7b964804e3b621e4e5b539d975c50
+  data.tar.gz: abf57a4361a44010378e1ce5c1394b55513ee334
 SHA512:
-  metadata.gz: 80c99411492aef16752d31bd3c5a1abd2cd43a19ae8f0d4e34fb643a0c20d50b2d12fcebe860ae8e00d54bc52a40da1ce0a9e9f0a77c82b006991f345ae720eb
-  data.tar.gz: 2794b69ff5277d9843c81344fbaac00598cf4bdf30f54009bdf6f0bf3b8c5c665067cd2107e1d9e72e1cef930eec9e3b7ddcec85cd9bf5a8a468928b1aba52c3
+  metadata.gz: 6c891ca43799d62e4e6454942a010efccdd7d09150f1e06167b6638de2705f10d991e0034994ac039c19a947ea922c79530b5822edc3ddbe8246026412309de4
+  data.tar.gz: 587745c2398b4b782140c3446c2f0058cfaf200c377d12cb15ece9c9ba306f83f6ac824dcba39934cce433d89e1cce33235b071f71b23404ae089a00edd44d0f

data/README.md

@@ -16,6 +16,10 @@ __*namespace*__
 
 The Service Bus namespace.
 
+__*access_key_name*__
+
+Optional: The SAS policy name to the Service Bus resource. If undefined, plugin will assume ACS is used.
+
 __*access_key*__
 
 The access key to the Service Bus resource.
@@ -39,15 +43,16 @@ Specifies the number of threads to use to read the messages. The default value i
 
 __*thread_sleep_time*__
 
-Specifies the number of seconds each thread should sleep before starting another loop of processing. The default value is 1/50.
+Specifies the number of seconds each thread should sleep before starting another loop of processing when topic is empty. The default value is 1/50.
 
 ### Examples
 ```
 input
 {
-    azuretopic
+    azuretopicthreadable
     {
         namespace => "mysbns"
+        access_key_name => "mySASkeyname"
         access_key => "VGhpcyBpcyBhIGZha2Uga2V5Lg=="
         subscription => "mytopicsubscription"
         topic => "mytopic"

data/lib/logstash/inputs/azuretopicthreadable.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 require "logstash/inputs/base"
 require "logstash/namespace"
-
 require "thread"
 require "azure"
 
@@ -11,33 +10,44 @@ class LogStash::Inputs::Azuretopicthreadable < LogStash::Inputs::Base
 
   config_name "azuretopicthreadable"
   milestone 1
-  
+
   default :codec, "json" # default json codec
-  
+
   config :namespace, :validate => :string
+  config :access_key_name, :validate => :string, :required => false
   config :access_key, :validate => :string
   config :subscription, :validate => :string
   config :topic, :validate => :string
   config :deliverycount, :validate => :number, :default => 10
   config :threads, :validate => :number, :default => 1
   config :thread_sleep_time, :validate => :number, :default => 1.0/50.0
-  
+
   def initialize(*args)
   super(*args)
   end # def initialize
-  
+
   public
   def register
     # Configure credentials
     Azure.configure do |config|
       config.sb_namespace = @namespace
       config.sb_access_key = @access_key
+      config.sb_sas_key_name = @access_key_name
+      config.sb_sas_key = @access_key
     end
   end # def register
-  
+
   def process(output_queue, pid)
     # Get a new instance of a service
-    azure_service_bus = Azure::ServiceBus::ServiceBusService.new
+    if @access_key_name
+        # SAS key used
+        signer = Azure::ServiceBus::Auth::SharedAccessSigner.new
+        sb_host = "https://#{Azure.sb_namespace}.servicebus.windows.net"
+        azure_service_bus = Azure::ServiceBus::ServiceBusService.new(sb_host, { signer: signer})
+    else
+        # ACS key
+        azure_service_bus = Azure::ServiceBus::ServiceBusService.new
+    end
     while !stop?
       begin
         # check if we have a message in the subscription
@@ -45,12 +55,14 @@ class LogStash::Inputs::Azuretopicthreadable < LogStash::Inputs::Base
         if message
           # decoding returns a yield
           codec.decode(message.body) do |event|
-          decorate(event)
-          output_queue << event
-        end # codec.decode
-        # delete the message after reading it
-        azure_service_bus.delete_subscription_message(message)
-      end
+              decorate(event)
+              output_queue << event
+          end
+          # delete the message after reading it
+          azure_service_bus.delete_subscription_message(message)
+        else
+          Stud.stoppable_sleep(@thread_sleep_time) { stop? } #topic is probably empty. sleep. 
+        end
       rescue LogStash::ShutdownSignal => e
         raise e
       rescue => e
@@ -58,11 +70,11 @@ class LogStash::Inputs::Azuretopicthreadable < LogStash::Inputs::Base
         if message and message.delivery_count > @deliverycount
           azure_service_bus.delete_subscription_message(message)
         end
+        Stud.stoppable_sleep(@thread_sleep_time) { stop? }
       end
-      sleep(@thread_sleep_time)
     end
   end # def process
-  
+
   public
   def run(output_queue)
     threads = []
@@ -71,8 +83,8 @@ class LogStash::Inputs::Azuretopicthreadable < LogStash::Inputs::Base
       end
     threads.each { |thr| thr.join }
   end # def run
- 
+
   public
   def teardown
   end # def teardown
-end # class LogStash::Inputs::Azuretopic
+end # class LogStash::Inputs::Azuretopic

data/logstash-input-azuretopicthreadable.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-input-azuretopicthreadable'
-  s.version       = '0.9.7'
+  s.version       = '0.9.8'
   s.licenses      = ['Apache License (2.0)']
   s.summary       = "This plugin reads messages from Azure Service Bus Topics."
   s.description   = "This gem is a Logstash plugin. It reads messages from Azure Service Bus Topics using multiple threads."

metadata

@@ -1,18 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-azuretopicthreadable
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Microsoft Corporation
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2017-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: logstash-core-plugin-api
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -20,7 +19,10 @@ dependencies:
     - - "<="
       - !ruby/object:Gem::Version
         version: '2.99'
-  requirement: !ruby/object:Gem::Requirement
+  name: logstash-core-plugin-api
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
@@ -28,36 +30,34 @@ dependencies:
     - - "<="
       - !ruby/object:Gem::Version
         version: '2.99'
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: azure
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.1
+  name: azure
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.1
+- !ruby/object:Gem::Dependency
   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. It reads messages from Azure Service Bus Topics using multiple threads.
 email: azdiag@microsoft.com
 executables: []