riemann-aws 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfd02105846c4a1f953688c2899cdd5125e9153a
-  data.tar.gz: 82b7d4a48d0f9567bc176a40413dc3a4c47324e4
+  metadata.gz: 53369cc4951c585ad4512b0f5cb8787fc62afc30
+  data.tar.gz: 1b8d9e2dce92e426dd0f3776caef75b3b2ab25de
 SHA512:
-  metadata.gz: 760e425010f9352254fd32657add826d4ed8376cfa3de73871e3e10f21795ccf14559152fae058d442264d4bd952fe69a990228866df5e0148260c664bb3112c
-  data.tar.gz: 8ce13919f5fc5ac10304d6d35bfdc8320ad9e24d02554978a098e6856f5faf02116d0af645b5c4601c803b91a92853f3b0726f9a6d682cb008d3b6a27d17cd76
+  metadata.gz: 8833446b2ac85047da34dbdaa2d2a4e2f8e1fe798b0ec6ad682739dd8af15ef1d7948c551e2a0568a03ef01208b4134b8d263af6eb685ef91612952fd2bf9dce
+  data.tar.gz: 2bd11a72ed228865e285db7bc0ea05e4eeb47633f4a5adac002f35856f99b96c2363217f66dbe91381dea8a92142a0ccb2c142f92765e5b4c4155b87b88f0026

data/bin/riemann-elb-metrics

@@ -127,10 +127,13 @@ class Riemann::Tools::ELBMetrics
           # the given time period, values for these metrics will not be recorded in CloudWatch"
           #next if result.body["GetMetricStatisticsResult"]["Datapoints"].empty? && metric_type =~ /[2345]XX/
           #
-          # BUG:
-          # Metrics are reported every 60 seconds, but sometimes there isn't one there yet.
-          # We can skip that, or do something else?
-          next if result.body["GetMetricStatisticsResult"]["Datapoints"].empty?
+          if result.body["GetMetricStatisticsResult"]["Datapoints"].empty?
+            standard_metrics[metric_type]['Statistics'].each do |stat_type|
+              event = event(lb, az, metric_type, stat_type, 0.0)
+              report(event)
+            end
+            next
+          end
 
           # We should only ever have a single data point
           result.body["GetMetricStatisticsResult"]["Datapoints"][0].keys.sort.each do |stat_type|
@@ -139,22 +142,25 @@ class Riemann::Tools::ELBMetrics
 
             unit = result.body["GetMetricStatisticsResult"]["Datapoints"][0]["Unit"]
             metric = result.body["GetMetricStatisticsResult"]["Datapoints"][0][stat_type]
-            event = Hash.new
-            event = {
-              host: lb,
-              service: "elb.#{az}.#{metric_type}.#{stat_type}",
-              ttl: 60,
-              description: "#{lb} #{metric_type} #{stat_type} (#{unit})",
-              tags: [ "production", "elb_metrics" ],
-              metric: metric
-            }
-
+            event = event(lb, az, metric_type, stat_type, metric, unit)
             report(event)
           end
         end
       end
     end
   end
+
+  private
+  def event(lb, az, metric_type, stat_type, metric, unit=nil)
+    event = {
+      host: lb,
+      service: "elb.#{az}.#{metric_type}.#{stat_type}",
+      ttl: 60,
+      description: "#{lb} #{metric_type} #{stat_type} (#{unit})",
+      tags: ["elb_metrics"],
+      metric: metric
+    }
+  end
 end
 
 Riemann::Tools::ELBMetrics.run

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riemann-aws
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Kyle Kingsbury
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-tools