logstash-output-azure_service_bus 0.1.5 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d1ab85ffd5040b91fbe44ed966e44d14b56b7f67e601bacad8728df74d3b79c
-  data.tar.gz: c09bf977588ee59480e675e408319f5ba8e522760b2d4fa78f23ca6134e6ae27
+  metadata.gz: af1daf5ab0f287bfe29993a09437eb840063c5195d5dc9c247985fae757a09bd
+  data.tar.gz: afb35cc44123159129fc63fe5fcb374c7cb77ac98137b3b2ae0e513e96b12f09
 SHA512:
-  metadata.gz: c0423f46cc7f83c93c8ff4c1cbdc334d113f3d711955528cca585ffe41269d193f6c59a151a49e4398a9779b55f0de03831c00a5423ca3f3353e76e194558347
-  data.tar.gz: 41dd6bf7c6b813ebf3c88a6e1e61c565d200a64b0e78c0ad6d90f68a3115b44c526a1baedde37fdad568c4d10934c9e3698862048c1d2bc9a46152cfbad3e515
+  metadata.gz: 3727d297acacbee56d2570ac67aca3e05bcc2f677b6ab5ab50c3acfa84aa721c683be70810fdcc26203124d615cbd99e6bb19fc5f1d68d3eccefd859e288d0e9
+  data.tar.gz: a72b4442be6118a0b933b2d3e9b6736a282e3024f32f00dd9bb4506b6096c02a824777ebe7535340d53eb9c152121b8e9bf2bf70c00d9d5b05b9ccb67307306e

data/README.md

@@ -22,6 +22,22 @@ output {
     }
 }
 ```
+There is one optional setting (`messageid_field`) which sets the Service Bus `MessageId` value to an existing, unique field. If this setting is not used, Service Bus will generate an id when the message is created.  The value of the provided field _must_ be unique or Service Bus will reject the message. A sample config might look like:
+```
+input { ... }
+filter {
+    uuid {
+        target => "uuid"
+    }
+}
+output {
+    azure_service_bus {
+        service_bus_namespace => "service-bus-name"
+        service_bus_entity => "queue-or-topic-name"
+        messageid_field => "uuid"
+    }
+}
+```
 
 ## Service Bus Configuration
 This plugin will retry sending messages if the Service Bus connection times out or returns a bad response. To avoid idempotence issues, you should enable duplicate detection on the destination queue or topic.

data/lib/logstash/outputs/azure_service_bus.rb

@@ -10,6 +10,7 @@ class LogStash::Outputs::AzureServiceBus < LogStash::Outputs::Base
 
   config :service_bus_namespace, :validate => :string, :required => true
   config :service_bus_entity, :validate => :string, :required => true
+  config :messageid_field, :validate => :string
 
   def register
     retry_options = {
@@ -20,13 +21,13 @@ class LogStash::Outputs::AzureServiceBus < LogStash::Outputs::Base
       retry_statuses: [429, 500],
       exceptions: [Faraday::ConnectionFailed, Faraday::TimeoutError, Faraday::RetriableResponse],
       methods: %i[get post],
-      retry_block: ->(_env, _options, retries, exception) { @logger.error("Error (#{exception}) for #{env.method.upcase} #{env.url} - #{retries + 1} retry(s) left") }
+      retry_block: ->(env, _options, retries, exception) { @logger.warn("Error (#{exception}) for #{env.method.upcase} #{env.url} - #{retries + 1} retry(s) left") }
     }
     @token_conn = Faraday.new(
       url: 'http://169.254.169.254/metadata/identity/oauth2/token',
       params: { 'api-version' => '2018-02-01', 'resource' => 'https://servicebus.azure.net/' },
       headers: { 'Metadata' => 'true' },
-      request: { timeout: 1 }
+      request: { timeout: 4 }
     ) do |f|
       f.request :retry, retry_options
     end
@@ -48,7 +49,11 @@ class LogStash::Outputs::AzureServiceBus < LogStash::Outputs::Base
   def send_events(events)
     messages = []
     events.each do |event|
-      messages.append({ 'Body' => JSON.generate(event.to_hash), 'BrokerProperties' => { 'ContentType' => 'application/json' } })
+      if @messageid_field.nil?
+        messages.append({ 'Body' => JSON.generate(event.to_hash), 'BrokerProperties' => { 'ContentType' => 'application/json' } })
+      else
+        messages.append({ 'Body' => JSON.generate(event.to_hash), 'BrokerProperties' => { 'ContentType' => 'application/json', 'MessageId' => event.get(@messageid_field) } })
+      end
     end
     post_messages(messages)
   end

data/logstash-output-azure_service_bus.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-output-azure_service_bus'
-  s.version       = '0.1.5'
+  s.version       = '0.2.1'
   s.licenses      = ['Apache-2.0']
   s.summary       = 'Send Logstash messages to Azure Service Bus.'
   s.homepage      = 'https://github.com/gharryg/logstash-output-azure_service_bus'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-azure_service_bus
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.1
 platform: ruby
 authors:
 - Harrison Golden
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-04 00:00:00.000000000 Z
+date: 2022-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement