logstash-output-azure_loganalytics 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5a4524f2d0aaed4ee9c1436606f9e2ad3c8d904
-  data.tar.gz: fa42aaced172f03f08182e36dbf518d61bce44f2
+  metadata.gz: f5703dcf7467f52e043faed81a31e4ac16326a28
+  data.tar.gz: a1626400b84f10787997929640fce9dcc51fad4e
 SHA512:
-  metadata.gz: 9662329d14d3d0c968cffb17de307545bd2a95e2e4247383759f094437c148a53cc39705dffa0ea11f631e73c0da1fdceb10928a82509939fcf46f2e418fe203
-  data.tar.gz: 50259e8e408a4398e931304d60f4c65b2d1f129f7f01c5ebc401449c06d3ffb52517ad61a91170775b9a6355b47b861890cf365eaee05bf7cc2af655668a5548
+  metadata.gz: 63e25706eec6fad297468afd439ac9dd93c567d838f584124bc276d3568f663ae6923bf6b4fcff2d15caea3dcde26b067ba788db5a3bf4203f0789d3e321bf92
+  data.tar.gz: b2492d86bbcd2ac2aaf00c6274bc6d039a19f256e557026f3a6b011df45a53e798583b48d1c65f1c7f6a2d9bf69187516f250a2feaef9127f03beb851deffd32

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.5.2
+
+* Fixed using sprintf in log_type - [PR #16](https://github.com/yokawasa/logstash-output-azure_loganalytics/pull/16) by [@daniel-chambers](https://github.com/daniel-chambers)
+
 ## 0.5.1
 
 * Change base [azure-loganalytics-datacollector-api](https://github.com/yokawasa/azure-log-analytics-data-collector) to ">= 0.5.0"

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/lib/logstash/outputs/azure_loganalytics.rb

@@ -51,10 +51,6 @@ class LogStash::Outputs::AzureLogAnalytics < LogStash::Outputs::Base
   def register
     require 'azure/loganalytics/datacollectorapi/client'
 
-    #if not @log_type.match(/^[[:alpha:]]+$/)
-    #  raise ArgumentError, 'log_type must be only alpha characters' 
-    #end
-
     @key_types.each { |k, v|
       t = v.downcase
       if ( !t.eql?('string') && !t.eql?('double') && !t.eql?('boolean') ) 
@@ -75,7 +71,6 @@ class LogStash::Outputs::AzureLogAnalytics < LogStash::Outputs::Base
 
   public
   def receive(event)
-    @log_type = event.sprintf(@log_type)
     # Simply save an event for later delivery
     buffer_receive(event)
   end # def receive
@@ -84,9 +79,12 @@ class LogStash::Outputs::AzureLogAnalytics < LogStash::Outputs::Base
   public
   def flush (events, close=false)
   
-    documents = []  #this is the array of hashes to add Azure Log Analytics
+    documentsByLogType = {}  # This is a map of log_type to list of documents (themselves maps) to send to Log Analytics
     events.each do |event|
       document = {}
+      
+      log_type_for_event = event.sprintf(@log_type)
+
       event_hash = event.to_hash()
       if @key_names.length > 0
         # Get the intersection of key_names and keys of event_hash
@@ -104,26 +102,32 @@ class LogStash::Outputs::AzureLogAnalytics < LogStash::Outputs::Base
       # Skip if document doesn't contain any items
       next if (document.keys).length < 1
 
-      documents.push(document)
+      if documentsByLogType[log_type_for_event] == nil then
+        documentsByLogType[log_type_for_event] = []
+      end
+      documentsByLogType[log_type_for_event].push(document)
     end
 
     # Skip in case there are no candidate documents to deliver
-    if documents.length < 1
-      @logger.debug("No documents in batch for log type #{@log_type}. Skipping")
+    if documentsByLogType.length < 1
+      @logger.debug("No documents in batch. Skipping")
       return
     end
 
-    begin
-      @logger.debug("Posting log batch (log count: #{documents.length}) as log type #{@log_type} to DataCollector API. First log: " + (documents[0].to_json).to_s)
-      res = @client.post_data(@log_type, documents, @time_generated_field)
-      if Azure::Loganalytics::Datacollectorapi::Client.is_success(res)
-        @logger.debug("Successfully posted logs as log type #{@log_type} with result code #{res.code} to DataCollector API")
-      else
-        @logger.error("DataCollector API request failure: error code: #{res.code}, data=>" + (documents.to_json).to_s)
+    documentsByLogType.each do |log_type_for_events, events|
+      begin
+        @logger.debug("Posting log batch (log count: #{events.length}) as log type #{log_type_for_events} to DataCollector API. First log: " + (events[0].to_json).to_s)
+        res = @client.post_data(log_type_for_events, events, @time_generated_field)
+        if Azure::Loganalytics::Datacollectorapi::Client.is_success(res)
+          @logger.debug("Successfully posted logs as log type #{log_type_for_events} with result code #{res.code} to DataCollector API")
+        else
+          @logger.error("DataCollector API request failure: error code: #{res.code}, data=>" + (events.to_json).to_s)
+        end
+      rescue Exception => ex
+        @logger.error("Exception occured in posting to DataCollector API: '#{ex}', data=>" + (events.to_json).to_s)
       end
-    rescue Exception => ex
-      @logger.error("Exception occured in posting to DataCollector API: '#{ex}', data=>" + (documents.to_json).to_s)
     end
+    
   end # def flush
 
   private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-azure_loganalytics
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Yoichi Kawasaki
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-21 00:00:00.000000000 Z
+date: 2020-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement