logstash-input-cloudwatch 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ca8079400562640f3ccc4d9cb2db97e79f0f1ee
-  data.tar.gz: ac7eaf6358e575ca75b70b8897f27bfa95db7436
+  metadata.gz: 19f8076571146fdd2d9389da822af98a1bd4c39c
+  data.tar.gz: 629b32cc06fe2b35ff42b9e946958c4002486efe
 SHA512:
-  metadata.gz: d2e9ffb25fac13a85a12dc7771b3ab325ab0ad42d9431fc902d1e92b1739e22b3e24f453f616499a94add388f50a98e0d2732a2d6bf7ca7767fbd5810155c563
-  data.tar.gz: 5379f1f46bf773a53c996fe07acad735aa9ba2edf3e574c18bd27641bb561d51f888196b5d1cc7f487817f27e112fdcff27883ac7ee4c47e659735ee4367b3b9
+  metadata.gz: 845991221fa1db8357394350eac10506d52e3643e320824be2779021a59d9daa7ace19398a2406aeb7247422acca44567310712b9a343421bb86bea2125a9510
+  data.tar.gz: 43a6be158a2383d810ec866ee08258f4f3cd115fa6b16c7a4d3c49abae90fa7aa2be5c0393f0a167687f42dcecc531b0fc0a0e44b4b3d985f9af00210858a333

data/lib/logstash/inputs/cloudwatch.rb

@@ -94,8 +94,8 @@ class LogStash::Inputs::CloudWatch < LogStash::Inputs::Base
     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
+      if @instance_refresh > 0 && (Time.now - @last_check) > @instance_refresh
+        @instances = nil
         @last_check = Time.now
       end
 
@@ -108,6 +108,9 @@ class LogStash::Inputs::CloudWatch < LogStash::Inputs::Base
             event['@timestamp'] = LogStash::Timestamp.new(dp[:timestamp])
             event['metric'] = metric
             event['instance'] = instance
+            @instance_tags[instance].each do |tag|
+              event[tag[:key]] = tag[:value]
+            end
             decorate(event)
             queue << event
           end
@@ -154,13 +157,14 @@ class LogStash::Inputs::CloudWatch < LogStash::Inputs::Base
   def instance_ids
     return @instances unless @instances.nil?
 
-    @instances = []
+    @instance_tags = {}
     @ec2.describe_instances(filters: [ { name: "tag:#{@tag_name}", values: @tag_values } ])[:reservation_set].each do |reservation|
       @logger.debug reservation
       reservation[:instances_set].each do |instance|
-        @instances.push instance[:instance_id]
+        @instance_tags[instance[:instance_id]] = instance[:tag_set]
       end
     end
+    @instances = @instance_tags.keys
     @logger.debug 'Fetching metrics for the following instances', instances: @instances
     @instances
   end

data/logstash-input-cloudwatch.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-input-cloudwatch'
-  s.version         = '0.2.0'
+  s.version = '0.2.1'
   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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-cloudwatch
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Jurgens du Toit