logstash-input-azureblob 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 889e8f25463f49bee1d0f76ced9e4d24a56cb861
-  data.tar.gz: ec1b10b9f23756e0005d9b61613e301febe2c7b2
+  metadata.gz: 3fd5968bbd7056e36b008e65b85225fda1b2caf8
+  data.tar.gz: a67d26ffa67746d41857bf23bbecea73625a1677
 SHA512:
-  metadata.gz: e157a7fed829c6bb4e2ca5924e6771e4014cb80a3042137bedabfe747b0a4ec82e1796658417a2ca968b2531835636ca1253e50cadfb5b6b5989c44eeb4cfcc0
-  data.tar.gz: 7d9ec3ab108bb822b028d91eeef68676f3c9b56479e9afcf402c4c5da31134d98015fe4ef7d34dfc37794fbdbc39330d22f5978b72cfaa8326e25ea70e6c024f
+  metadata.gz: 0a5266260e3188d95c2b9cc1ac7f2dba3cfc4627d69d3469d10c2db263b8e4795837fc52208f11b4422eb4e86ebdb4f2a2e170ba0a89ebd583551aed63cd39a6
+  data.tar.gz: b050d8e392fa27827335c59a0a12de830bfe624b6d147ed1cfb67cb85279176674c345cfa9eac4dd795bdd9aadb0e17f05f090eb61600779aa75b1a17952848f

data/CHANGELOG.md

@@ -0,0 +1,4 @@
+## 2016.05.05
+* Made the plugin to respect Logstash shutdown signal.
+* Updated the *logstash-core* runtime dependency requirement to '~> 2.0'.
+* Updated the *logstash-devutils* development dependency requirement to '>= 0.0.16'

data/Gemfile

@@ -1,3 +1,2 @@
 source 'https://rubygems.org'
 gemspec
-gem 'azure', '~> 0.7.1'

data/README.md

@@ -1,91 +1,41 @@
-# Notice
-This plugin is a part of [Microsoft Azure Diagnostics with ELK](https://github.com/mspnp/semantic-logging/tree/v3/ELK).
-
-[See more documentation.](https://github.com/mspnp/semantic-logging/blob/v3/ELK/md/LogstashExtensions.md#azure-wad-table)
-
-# Logstash Plugin
-
-This is a plugin for [Logstash](https://github.com/elasticsearch/logstash).
-
-It is fully free and fully open source. The license is Apache 2.0, meaning you are pretty much free to use it however you want in whatever way.
-
-## Documentation
-
-Logstash provides infrastructure to automatically generate documentation for this plugin. We use the asciidoc format to write documentation so any comments in the source code will be first converted into asciidoc and then into html. All plugin documentation are placed under one [central location](http://www.elasticsearch.org/guide/en/logstash/current/).
-
-- For formatting code or config example, you can use the asciidoc `[source,ruby]` directive
-- For more asciidoc formatting tips, see the excellent reference here https://github.com/elasticsearch/docs#asciidoc-guide
-
-## Need Help?
-
-Need help? Try #logstash on freenode IRC or the https://discuss.elastic.co/c/logstash discussion forum.
-
-## Developing
-
-### 1. Plugin Developement and Testing
-
-#### Code
-- To get started, you'll need JRuby with the Bundler gem installed.
-
-- Create a new plugin or clone and existing from the GitHub [logstash-plugins](https://github.com/logstash-plugins) organization. We also provide [example plugins](https://github.com/logstash-plugins?query=example).
-
-- Install dependencies
-```sh
-bundle install
-```
-
-#### Test
-
-- Update your dependencies
-
-```sh
-bundle install
-```
-
-- Run tests
-
-```sh
-bundle exec rspec
-```
-
-### 2. Running your unpublished Plugin in Logstash
-
-#### 2.1 Run in a local Logstash clone
-
-- Edit Logstash `Gemfile` and add the local plugin path, for example:
-```ruby
-gem "logstash-filter-awesome", :path => "/your/local/logstash-filter-awesome"
-```
-- Install plugin
-```sh
-bin/plugin install --no-verify
-```
-- Run Logstash with your plugin
-```sh
-bin/logstash -e 'filter {awesome {}}'
-```
-At this point any modifications to the plugin code will be applied to this local Logstash setup. After modifying the plugin, simply rerun Logstash.
-
-#### 2.2 Run in an installed Logstash
-
-You can use the same **2.1** method to run your plugin in an installed Logstash by editing its `Gemfile` and pointing the `:path` to your local plugin development directory or you can build the gem and install it using:
-
-- Build your plugin gem
-```sh
-gem build logstash-filter-awesome.gemspec
-```
-- Install the plugin from the Logstash home
-```sh
-bin/plugin install /your/local/plugin/logstash-filter-awesome.gem
-```
-- Start Logstash and proceed to test the plugin
-
-## Contributing
-
-All contributions are welcome: ideas, patches, documentation, bug reports, complaints, and even something you drew up on a napkin.
-
-Programming is not a required skill. Whatever you've seen about open source and maintainers or community members  saying "send patches or die" - you will not see that here.
-
-It is more important to the community that you are able to contribute.
-
-For more information about contributing, see the [CONTRIBUTING](https://github.com/elasticsearch/logstash/blob/master/CONTRIBUTING.md) file.
+# Logstash input plugin for Azure Service Bus Topics
+
+## Summary
+This plugin reads and parses data from Azure Storage Blobs.
+
+## Installation
+You can install this plugin using the Logstash "plugin" or "logstash-plugin" (for newer versions of Logstash) command:
+```sh
+logstash-plugin install logstash-input-azureblob
+```
+For more information, see Logstash reference [Working with plugins](https://www.elastic.co/guide/en/logstash/current/working-with-plugins.html).
+
+## Configuration
+### Required Parameters
+__*storage_account_name*__
+
+The storage account name.
+
+__*storage_access_key*__
+
+The access key to the storage account.
+
+__*container*__
+
+The blob container name.
+
+### Examples
+```
+input
+{
+    azureblob
+    {
+        storage_account_name => "mystorageaccount"
+        storage_access_key => "VGhpcyBpcyBhIGZha2Uga2V5Lg=="
+        container => "mycontainer"
+    }
+}
+```
+
+## More information
+The source code of this plugin is hosted in GitHub repo [Microsoft Azure Diagnostics with ELK](https://github.com/Azure/azure-diagnostics-tools). We welcome you to provide feedback and/or contribute to the project.

data/lib/logstash/inputs/azureblob.rb

@@ -1,96 +1,96 @@
-# encoding: utf-8
-require "logstash/inputs/base"
-require "logstash/namespace"
-
-require "azure"
-require "securerandom"
-
-# Reads events from Azure Blobs
-class LogStash::Inputs::Azureblob < LogStash::Inputs::Base
-
-  config_name "azureblob"
-  milestone 0
-  
-  default :codec, "json_lines"
-  
-  config :storage_account_name, :validate => :string
-  config :storage_access_key, :validate => :string
-  
-  config :container, :validate => :string
-  config :sleep_time, :validate => :number, :default => 10
-  
-  def initialize(*args)
-    super(*args)
-  end # def initialize
-  
-  public
-  def register
-    Azure.configure do |config|
-      config.storage_account_name = @storage_account_name
-      config.storage_access_key = @storage_access_key
-    end
-    @azure_blob = Azure::Blob::BlobService.new
-  end # def register
-  
-  def list_blob_names
-    blob_names = Set.new []
-    loop do
-      continuation_token = NIL
-      entries = @azure_blob.list_blobs(@container, { :timeout => 10, :marker => continuation_token})
-      entries.each do |entry|
-        blob_names << entry.name
-      end
-      continuation_token = entries.continuation_token
-      break if continuation_token.empty?
-    end
-    return blob_names
-  end # def list_blobs
-  
-  def acquire_lock(blob_name)
-    @azure_blob.create_page_blob(@container, blob_name, 512)
-    @azure_blob.acquire_lease(@container, blob_name,{:duration=>60, :timeout=>10, :proposed_lease_id=>SecureRandom.uuid})
-    return true
-  rescue LogStash::ShutdownSignal => e
-    raise e
-  rescue => e
-    @logger.error("Caught exception while locking", :exception => e)
-    return false
-  end # def acquire_lock
-  
-  def lock_blob(blob_names)
-    real_blob_names = blob_names.select { |name| !name.end_with?(".lock") }
-    real_blob_names.each do |blob_name|
-      if !blob_names.include?(blob_name + ".lock")
-        if acquire_lock(blob_name + ".lock")
-          return blob_name
-        end
-      end
-    end
-    return NIL
-  end # def lock_blob
-  
-  def process(output_queue)
-    blob_names = list_blob_names
-    blob_name = lock_blob(blob_names)
-    return if !blob_name
-    blob, content = @azure_blob.get_blob(@container, blob_name)
-    @codec.decode(content) do |event|
-      output_queue << event
-    end
-  rescue LogStash::ShutdownSignal => e
-    raise e
-  rescue => e
-    @logger.error("Oh My, An error occurred.", :exception => e)
-  end # def process
-  
-  public
-  def run(output_queue)
-    while true
-      process(output_queue)
-    end # loop
-  end # def run
- 
-  public
-  def teardown
-  end # def teardown
-end # class LogStash::Inputs::Azuretopic
+# encoding: utf-8
+require "logstash/inputs/base"
+require "logstash/namespace"
+
+require "azure"
+require "securerandom"
+
+# Reads events from Azure Blobs
+class LogStash::Inputs::Azureblob < LogStash::Inputs::Base
+
+  config_name "azureblob"
+  milestone 1
+  
+  default :codec, "json_lines"
+  
+  config :storage_account_name, :validate => :string
+  config :storage_access_key, :validate => :string
+  
+  config :container, :validate => :string
+  config :sleep_time, :validate => :number, :default => 10
+  
+  def initialize(*args)
+    super(*args)
+  end # def initialize
+  
+  public
+  def register
+    Azure.configure do |config|
+      config.storage_account_name = @storage_account_name
+      config.storage_access_key = @storage_access_key
+    end
+    @azure_blob = Azure::Blob::BlobService.new
+  end # def register
+  
+  def list_blob_names
+    blob_names = Set.new []
+    loop do
+      continuation_token = NIL
+      entries = @azure_blob.list_blobs(@container, { :timeout => 10, :marker => continuation_token})
+      entries.each do |entry|
+        blob_names << entry.name
+      end
+      continuation_token = entries.continuation_token
+      break if continuation_token.empty?
+    end
+    return blob_names
+  end # def list_blobs
+  
+  def acquire_lock(blob_name)
+    @azure_blob.create_page_blob(@container, blob_name, 512)
+    @azure_blob.acquire_lease(@container, blob_name,{:duration=>60, :timeout=>10, :proposed_lease_id=>SecureRandom.uuid})
+    return true
+  rescue LogStash::ShutdownSignal => e
+    raise e
+  rescue => e
+    @logger.error("Caught exception while locking", :exception => e)
+    return false
+  end # def acquire_lock
+  
+  def lock_blob(blob_names)
+    real_blob_names = blob_names.select { |name| !name.end_with?(".lock") }
+    real_blob_names.each do |blob_name|
+      if !blob_names.include?(blob_name + ".lock")
+        if acquire_lock(blob_name + ".lock")
+          return blob_name
+        end
+      end
+    end
+    return NIL
+  end # def lock_blob
+  
+  def process(output_queue)
+    blob_names = list_blob_names
+    blob_name = lock_blob(blob_names)
+    return if !blob_name
+    blob, content = @azure_blob.get_blob(@container, blob_name)
+    @codec.decode(content) do |event|
+      output_queue << event
+    end
+  rescue LogStash::ShutdownSignal => e
+    raise e
+  rescue => e
+    @logger.error("Oh My, An error occurred.", :exception => e)
+  end # def process
+  
+  public
+  def run(output_queue)
+    while !stop?
+      process(output_queue)
+    end # loop
+  end # def run
+ 
+  public
+  def teardown
+  end # def teardown
+end # class LogStash::Inputs::Azuretopic

data/logstash-input-azureblob.gemspec

@@ -1,16 +1,16 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-input-azureblob'
-  s.version       = '0.9.4'
+  s.version       = '0.9.5'
   s.licenses      = ['Apache License (2.0)']
-  s.summary       = "This plugin will collect Microsoft Azure Diagnostics data from Azure Storage."
-  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 gemname. This gem is not a stand-alone program."
+  s.summary       = "This plugin collects Microsoft Azure Diagnostics data from Azure Storage Blobs."
+  s.description   = "This gem is a Logstash plugin. It reads and parses data from Azure Storage Blobs."
   s.authors       = ["Microsoft Corporation"]
   s.email         = 'azdiag@microsoft.com'
   s.homepage      = "https://github.com/Azure/azure-diagnostics-tools"
   s.require_paths = ["lib"]
 
   # Files
-  s.files = `git ls-files`.split($\)
+  s.files = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','Gemfile','LICENSE']
   # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
 
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "input" }
 
   # Gem dependencies
-  s.add_runtime_dependency 'logstash-core', '>= 1.4.0', '< 2.0.0'
+  s.add_runtime_dependency 'logstash-core', '~> 2.0'
   s.add_runtime_dependency 'azure', '~> 0.7.1'
-  s.add_development_dependency 'logstash-devutils'
+  s.add_development_dependency 'logstash-devutils', '>= 0.0.16'
 end

metadata

@@ -1,64 +1,58 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-azureblob
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Microsoft Corporation
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-09 00:00:00.000000000 Z
+date: 2016-05-06 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
-        version: 1.4.0
-    - - <
+        version: '2.0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
-  name: logstash-core
+        version: '2.0'
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: azure
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-- !ruby/object:Gem::Dependency
+        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.7.1
-- !ruby/object:Gem::Dependency
+        version: 0.0.16
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  name: logstash-devutils
+        version: 0.0.16
   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 gemname. This gem is not a stand-alone program.
+description: This gem is a Logstash plugin. It reads and parses data from Azure Storage Blobs.
 email: azdiag@microsoft.com
 executables: []
 extensions: []
@@ -68,7 +62,6 @@ files:
 - Gemfile
 - LICENSE
 - README.md
-- Rakefile
 - lib/logstash/inputs/azureblob.rb
 - logstash-input-azureblob.gemspec
 - spec/inputs/azureblob_spec.rb
@@ -84,12 +77,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -97,6 +90,6 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
-summary: This plugin will collect Microsoft Azure Diagnostics data from Azure Storage.
+summary: This plugin collects Microsoft Azure Diagnostics data from Azure Storage Blobs.
 test_files:
 - spec/inputs/azureblob_spec.rb

data/Rakefile

@@ -1 +0,0 @@
-require "logstash/devutils/rake"