logstash-output-application_insights 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3218d55e7606dde93f2414ddaf149afc7793c2ad
-  data.tar.gz: 51b48f9e2438b62892070a4a1fc729d59eed4404
+  metadata.gz: bfd7fa91c562aaf482965ae4b0243dc64529f053
+  data.tar.gz: 605bd30348073847a7eb42cc2d492f8c8b088fcb
 SHA512:
-  metadata.gz: 8795709d9c9d9ab0a33b5b2298dfb0d8259cf7c1d10849cbc7074eff14f8d6915b868ca8e9832e17e5aeffb5d1739ac104d2e3fffb6d4f710ca8728117cd5650
-  data.tar.gz: 4eaa0df1d5fdf204c667f848c028e4daaa24ed4311bb936c9194f848a5a98362a72cc3b8aa9e70dfadd4fe3dd885ff525dea48d6c34e4d3ea52ff8eed8e6ad37
+  metadata.gz: 019136969939d09b9fc152155f226c118aef4328909a94bd168ca76b212f69b73f4eb52b5c1aa5e953e3c1601be14712cc8fdf370506d60ecaa4e20252b0ed65
+  data.tar.gz: e9b0cddd450f56f5afd3379418e71494d7d88ded7f365d8bcf6f4add8233e933b7367aa1fb542ed38ec80d75963debccbf9cb30a90ed244bbe216aca2de03252

data/README.md

@@ -14,6 +14,8 @@
 
 * Logstash 2.3.2
 * Logstash 2.3.4
+* Logstash 2.4.0
+* Logstash 5.0.0
 
 Note: 
 
@@ -122,6 +124,7 @@ storage_account_name_key => [ ["my-storage-account1", "key1"], "my-storage-accou
 
 storage_account_name_key => [ ["my-storage-account1", ["key11", "key12"]], ["my-storage-account1", "key2"], ["my-storage-account1", ["key3"] ]
 ```
+**Note: the storage account must be of "General purpose" kind.**
 
 ### azure_storage_table_prefix
 A prefix for the azure storage tables name used by this Logstash instance. Default host name

data/lib/logstash/outputs/application_insights.rb

@@ -309,6 +309,10 @@ class LogStash::Outputs::Application_insights < LogStash::Outputs::Base
 
   def register
 
+    # puts "++ SETTINGS: #{LogStash::SETTINGS.to_hash}"
+    # @logger.info("test test", :xx => "xx", :yy => 1)
+    # puts "++ LOGSTASH_HOME: #{LogStash::Environment::LOGSTASH_HOME}"
+
     # logstash define: @original_params = original_params
     # logstash define: @config = params
 
@@ -321,7 +325,6 @@ class LogStash::Outputs::Application_insights < LogStash::Outputs::Base
 
     # be careful don't use here @logger, as it will override Logstash @logger, and may create starnge behaviour
     @private_logger = configuration[:logger]
-
     @private_logger.info { "configuration: #{masked_configuration}" }
 
     @telemetry = Telemetry.instance
@@ -334,14 +337,14 @@ class LogStash::Outputs::Application_insights < LogStash::Outputs::Base
     @shutdown_recovery = Shutdown_recovery.instance
 
     if @validate_notification
-      status = Validate_notification.new.validate
-      raise ConfigurationError, "Failed to access application insights at #{configuration[:application_insights_endpoint]}, due to error #{status[:error].inspect}" unless status[:success]
+      result = Validate_notification.new.validate
+      raise ConfigurationError, "Failed to access application insights at #{configuration[:application_insights_endpoint]}, due to error #{result[:error].inspect}" unless result[:success]
     end
 
     if @validate_storage
-      result = Validate_storage.new.validate
-      result.each do |storage_account_name, status|
-        raise ConfigurationError, "Failed access azure storage account #{storage_account_name}, due to error #{status[:error].inspect}" unless status[:success]
+      results = Validate_storage.new.validate
+      results.each do |result|
+        raise ConfigurationError, "Failed to #{result[:test]} in azure storage account #{result[:storage_account_name]}, due to error #{result[:error].inspect}" unless result[:success]
       end
     end
 

data/lib/logstash/outputs/application_insights/blob.rb

@@ -269,6 +269,9 @@ class LogStash::Outputs::Application_insights
         elsif 500 == e.status_code  && "Unknown" == e.type && e.description.include?("Processing error")
           :notification_process_down
 
+        elsif 501 == e.status_code
+          :not_implemented
+
         elsif 503 == e.status_code
           :service_unavailable
 

data/lib/logstash/outputs/application_insights/config.rb

@@ -215,6 +215,7 @@ class LogStash::Outputs::Application_insights
 
       configuration[:state_table_name] = AZURE_STORAGE_TABLE_LOGSTASH_PREFIX + configuration[:azure_storage_table_prefix] + STATE_TABLE_NAME
       configuration[:test_storage_container] = AZURE_STORAGE_CONTAINER_LOGSTASH_PREFIX + configuration[:azure_storage_container_prefix] + "-" + STORAGE_TEST_CONTAINER_NAME
+      configuration[:test_storage_table] = AZURE_STORAGE_TABLE_LOGSTASH_PREFIX + configuration[:azure_storage_table_prefix] + STORAGE_TEST_TABLE_NAME
       configuration[:partition_key_prefix] = configuration[:azure_storage_blob_prefix].gsub( "/", "" )
       configuration[:local_file_prefix] = LOCAL_FS_FILE_PREFIX + configuration[:azure_storage_blob_prefix].gsub( "/", "_" )
 
@@ -231,6 +232,9 @@ class LogStash::Outputs::Application_insights
         masked_keys = keys.map { |key| "*****************" }
         [ name, masked_keys ]
       }
+      masked_configuration.each_pair do |key, value|
+        masked_configuration[key] = "nil" if value.nil?
+      end
       masked_configuration[:storage_account_name_key] = masked_storage_account_name_key
       masked_configuration
     end

data/lib/logstash/outputs/application_insights/constants.rb

@@ -152,6 +152,7 @@ class LogStash::Outputs::Application_insights
 
   STATE_TABLE_NAME = "BlobsState"
   STORAGE_TEST_CONTAINER_NAME = "test-container"
+  STORAGE_TEST_TABLE_NAME = "TestTable"
 
   AZURE_STORAGE_CONTAINER_LOGSTASH_PREFIX = "logstash" # lower case only, dash allowed
   AZURE_STORAGE_BLOB_LOGSTASH_PREFIX = "logstash"

data/lib/logstash/outputs/application_insights/test_storage.rb

@@ -26,17 +26,34 @@ class LogStash::Outputs::Application_insights
       # super first parameter must be nil. blob first parameter is channel, otherwise it will pass storage_account_name as channel
       super( nil )
       @storage_account_name = storage_account_name
+      @test_storage_container = @configuration[:test_storage_container]
+      @test_storage_table = @configuration[:test_storage_table]
       @action = :test_storage
-      @info = "#{@action} #{@storage_account_name}"
-      @recoverable = [ :invalid_storage_key, :container_exist, :create_container ]
+      @base_info = "#{@action} #{@storage_account_name}"
+      @recoverable = [ :invalid_storage_key, :container_exist, :create_container, :table_exist, :create_table ]
       @force_client = true # to enable get a client even if all storage_accounts marked dead
     end
 
     def test
+      test_container
+    end
+
+    def test_container
+      @max_tries = 1
+      @info = "#{@base_info} - create #{@test_storage_container} container"
+      storage_io_block {
+        if @recovery.nil? || :invalid_storage_key == @recovery
+          @client.blobClient.create_container( @test_storage_container ) unless @configuration[:disable_blob_upload]
+        end
+      }
+    end
+
+    def test_table
       @max_tries = 1
+      @info = "#{@base_info} - create #{@test_storage_table} table"
       storage_io_block {
         if @recovery.nil? || :invalid_storage_key == @recovery
-          @client.blobClient.create_container( @configuration[:test_storage_container] ) unless @configuration[:disable_blob_upload]
+          @client.tableClient.create_table( @test_storage_table ) unless @configuration[:disable_blob_upload]
         end
       }
     end

data/lib/logstash/outputs/application_insights/validate_storage.rb

@@ -30,10 +30,11 @@ class LogStash::Outputs::Application_insights
     end
 
     def validate
-      result = {}
+      result = []
       @storage_account_name_key.each do |storage_account_name, storage_account_keys|
         test_storage = Test_storage.new( storage_account_name )
-        result[storage_account_name] = {:success => test_storage.test, :error => test_storage.last_io_exception }
+        result << { :storage_account_name => storage_account_name, :test => "create container", :success => test_storage.test_container, :error => test_storage.last_io_exception }
+        result << { :storage_account_name => storage_account_name, :test => "create table", :success => test_storage.test_table, :error => test_storage.last_io_exception }
       end
       result
     end

data/lib/logstash/outputs/application_insights/version.rb

@@ -20,5 +20,5 @@
 # ----------------------------------------------------------------------------------
 
 # class LogStash::Outputs::Application_insights
-  APPLICATION_INSIGHTS_VERSION ||= "0.2.0"
+  APPLICATION_INSIGHTS_VERSION ||= "0.2.1"
 # end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-application_insights
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Microsoft Corporation
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-11-09 00:00:00.000000000 Z
+date: 2016-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement