logstash-input-cloudwatch 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd905939912c0289d1f422f637b80f0bd4abc723
-  data.tar.gz: 7da492dea138521b8b92e2756ffd3d4be2cfe615
+  metadata.gz: 7ca8079400562640f3ccc4d9cb2db97e79f0f1ee
+  data.tar.gz: ac7eaf6358e575ca75b70b8897f27bfa95db7436
 SHA512:
-  metadata.gz: 09eadecfe87039ba40806927cd530e8a0c1f838e95b1d5ae3c69a784120173af75023c5f7436b5bceac6e91491dfe77018cd4c1d1f6706a609e473778c9ba350
-  data.tar.gz: 91f39d44ffb49e98a3ccfd855a5e01606728b9a0b4baa714ee23d6f0ce3e738853c1eaf51c10b8016329d4d355afd8bab2275c43e40f7741b42a0e2b9bc4cf12
+  metadata.gz: d2e9ffb25fac13a85a12dc7771b3ab325ab0ad42d9431fc902d1e92b1739e22b3e24f453f616499a94add388f50a98e0d2732a2d6bf7ca7767fbd5810155c563
+  data.tar.gz: 5379f1f46bf773a53c996fe07acad735aa9ba2edf3e574c18bd27641bb561d51f888196b5d1cc7f487817f27e112fdcff27883ac7ee4c47e659735ee4367b3b9

data/lib/logstash/inputs/cloudwatch.rb

@@ -25,7 +25,7 @@ class LogStash::Inputs::CloudWatch < LogStash::Inputs::Base
   # The default, `900`, means check every 15 minutes
   config :interval, :validate => :number, :default => (60 * 15)
 
-  # Set the granularity of the retruned datapoints.
+  # Set the granularity of the returned datapoints.
   #
   # Must be at least 60 seconds and in multiples of 60.
   config :period, :validate => :number, :default => 60
@@ -54,6 +54,13 @@ class LogStash::Inputs::CloudWatch < LogStash::Inputs::Base
   # takes precedence.
   config :tag_values, :validate => :array
 
+  # Set how frequently the available instances should be refreshed. Making it less
+  # than `interval` doesn't really make sense. This cannot be used along with the
+  # `instances` setting.
+  #
+  # The default, -1, means never refresh
+  config :instance_refresh, :validate => :number, :default => -1
+
   # Specify the metrics to fetch for each instance
   config :metrics, :validate => :array, :default => [ 'CPUUtilization', 'DiskReadOps', 'DiskWriteOps', 'NetworkIn', 'NetworkOut' ]
 
@@ -70,14 +77,29 @@ class LogStash::Inputs::CloudWatch < LogStash::Inputs::Base
     require "aws-sdk"
     AWS.config(:logger => @logger)
 
+    if @instances
+      raise LogStash::ConfigurationError, 'Should not specify both `instance_refresh` and `instances`' if @instance_refresh > 0
+      raise LogStash::ConfigurationError, 'Should not specify both `tag_name` and `instances`' unless @tag_name.nil?
+      raise LogStash::ConfigurationError, 'Should not specify both `tag_values` and `instances`' unless @tag_values.nil?
+    else
+      raise LogStash::ConfigurationError, 'Both `tag_name` and `tag_values` need to be specified if no `instances` are specified' if @tag_name.nil? || @tag_values.nil?
+    end
+
     @cloudwatch = AWS::CloudWatch::Client.new(aws_options_hash)
     @ec2 = AWS::EC2::Client.new(aws_options_hash)
-
+    @last_check = Time.now
   end # def register
 
   def run(queue)
     Stud.interval(@interval) do
       @logger.debug('Polling CloudWatch API')
+      # Set up the instance_refresh check
+      if @instance_refresh > 0
+        @instances = nil if (Time.now - @last_check) > @instance_refresh
+        @last_check = Time.now
+      end
+
+      # Poll the instances
       instance_ids.each do |instance|
         metrics(instance).each do |metric|
           opts = options(metric, instance)
@@ -132,7 +154,6 @@ class LogStash::Inputs::CloudWatch < LogStash::Inputs::Base
   def instance_ids
     return @instances unless @instances.nil?
 
-    raise('Both the tag_name and tag_values needs to be set if no instances are specified') if @tag_name.nil? || @tag_values.nil?
     @instances = []
     @ec2.describe_instances(filters: [ { name: "tag:#{@tag_name}", values: @tag_values } ])[:reservation_set].each do |reservation|
       @logger.debug reservation

data/logstash-input-cloudwatch.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-input-cloudwatch'
-  s.version         = '0.1.0'
+  s.version         = '0.2.0'
   s.licenses = ['Apache License (2.0)']
   s.summary = "Retrieve stats from AWS CloudWatch."
   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"

metadata

@@ -1,112 +1,114 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-cloudwatch
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jurgens du Toit
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-14 00:00:00.000000000 Z
+date: 2015-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: logstash-codec-plain
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: stud
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: stud
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-mixin-aws
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: logstash-mixin-aws
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: aws-sdk
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-devutils
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: logstash-devutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
-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
+  prerelease: false
+  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
 email: jrgns@jadeit.co.za
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - DEVELOPER.md
 - Gemfile
@@ -114,7 +116,6 @@ files:
 - README.md
 - Rakefile
 - lib/logstash/inputs/cloudwatch.rb
-- lib/logstash/inputs/test.rb
 - logstash-input-cloudwatch.gemspec
 - spec/inputs/cloudwatch_spec.rb
 homepage: http://jadeit.co.za
@@ -123,24 +124,24 @@ licenses:
 metadata:
   logstash_plugin: 'true'
   logstash_group: input
-post_install_message:
+post_install_message: 
 rdoc_options: []
 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: []
-rubyforge_project:
-rubygems_version: 2.4.5
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.4.6
+signing_key: 
 specification_version: 4
 summary: Retrieve stats from AWS CloudWatch.
 test_files:

data/lib/logstash/inputs/test.rb

@@ -1,95 +0,0 @@
-# encoding: utf-8
-require "logstash/inputs/base"
-require "logstash/namespace"
-require "logstash/plugin_mixins/aws_config"
-require 'pp'
-require 'logger'
-
-class LogStash::Inputs::Test < LogStash::Inputs::Base
-  include LogStash::PluginMixins::AwsConfig
-
-  config_name "cloudwatch"
-
-  # If undefined, Logstash will complain, even if codec is unused.
-  default :codec, "plain"
-
-  public
-  def aws_service_endpoint(region)
-    {
-      region: region
-    }
-  end
-
-  public
-  def register
-    require "aws-sdk"
-    AWS.config(:logger => Logger.new($stdout))
-    AWS.config(:log_level => :debug)
-
-    @interval  = 60 * 15
-    @region    = 'eu-west-1'
-    @namespace = 'AWS/EC2'
-    @metrics   = [ 'CPUUtilization' ]
-    @period    = 60
-    @statistics = ["SampleCount", "Average", "Minimum", "Maximum", "Sum"]
-    @tag_name = 'Managed'
-    @tag_values = [ 'Yes' ]
-
-    @cloudwatch = ::AWS::CloudWatch::Client.new(aws_options_hash)
-    @ec2 = ::AWS::EC2::Client.new(aws_options_hash)
-  end
-
-  def tryit
-    instance_ids.each do |instance|
-      metrics(instance).each do |metric|
-        opts = {
-          namespace: @namespace,
-          metric_name: metric,
-          dimensions: [ { name: 'InstanceId', value: instance } ],
-          start_time: (Time.now - @interval).iso8601,
-          end_time: Time.now.iso8601,
-          period: @period,
-          statistics: @statistics
-        }
-        puts "#{instance} #{metric}"
-        @cloudwatch.get_metric_statistics(opts)[:datapoints].each do |dp|
-          puts dp.inspect
-          # event = Logstash::Event.new(dp)
-          # puts event.inspect
-          # decorate(event)
-          # queue << event
-        end
-      end
-    end
-  end
-
-  def metrics(instance)
-    metrics_available(instance) & @metrics
-  end
-
-  def instance_ids
-    @instances = []
-    @ec2.describe_instances(filters: [ { name: "tag:#{@tag_name}", values: @tag_values } ])[:reservation_set].each do |reservation|
-      reservation[:instances_set].each do |instance|
-        @instances.push instance[:instance_id]
-      end
-    end
-    @instances
-  end
-
-  def metrics_available(instance)
-    opts = { namespace: @namespace, dimensions: [ { name: 'InstanceId', value: instance } ] }
-    results = []
-    @cloudwatch.list_metrics(opts)[:metrics].each do |metrics|
-      results.push metrics[:metric_name]
-    end
-    results
-  end
-end
-
-puts "Starting up"
-test = LogStash::Inputs::Test.new
-puts "Registering"
-test.register
-puts "Get the instances"
-test.tryit