riemann-aws 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 199a0f07d158b41eb67f84586294c9814d5b5681
-  data.tar.gz: 0d7f7526f9dac21f0b9197c610861bc4a2f82490
+  metadata.gz: 37695dfc59446cc30f7cec56a94367969031265b
+  data.tar.gz: 5e7cbfece2ce15ecfa723d47fae31ef1da35b357
 SHA512:
-  metadata.gz: fb5e093683424c54ebb2c52183a9770e40346cfadfbcdf566b2535e5acd575a6fc1f7c53119248810697568b9461dfb8f0e7c0ad9c869d2e9e1dfebbc5feb6bc
-  data.tar.gz: 0bceced5e54574f926ffd8449196f2bafafb083d7803361e330f513167ea73289344da2dd43fb568cd33319efb794d1ab84d2371450d0cb67f827cfea9e3181b
+  metadata.gz: 946250c9caefa65b370c8b5caebcbf14279f05631d89d4dcb1f3947d92df6a185d8ab107289437aed588a0f2b8966fdb783461f5053a117aec1649b328833e10
+  data.tar.gz: c13fcfca6bf0105600202ff3e0116625c5f93ced44736f555eae92839c14915d8ded99278611f1fd94d18c69e9119f487a73cf7b125e2d75475839d44758bbf1

data/bin/riemann-aws-billing

@@ -34,9 +34,9 @@ class Riemann::Tools::AWSBilling
         creds = { :use_iam_profile => true }
       end
       @cloudwatch = Fog::AWS::CloudWatch.new(creds)
-      @start_time = (Time.now.utc - opts[:time_start]).iso8601
-      @end_time = (Time.now.utc - opts[:time_end]).iso8601
     end
+    @start_time = (Time.now.utc - opts[:time_start]).iso8601
+    @end_time = (Time.now.utc - opts[:time_end]).iso8601
   end
 
   def tick

data/bin/riemann-s3-list

@@ -14,7 +14,7 @@ class Riemann::Tools::S3Metrics
   opt :aws_access, "AWS Access Key", :type => String
   opt :aws_secret, "AWS Secret Key", :type => String
   opt :aws_region, "AWS Region", :type => String, :default => "eu-west-1"
-  opt :buckets, "Buckets to pull metrics from, multi=true", :type => String, :multi => true, :required => true
+  opt :buckets, "Buckets to pull metrics from, multi=true, can have a prefix like mybucket/prefix", :type => String, :multi => true, :required => true
   opt :max_objects, "Max number of objects to list before stopping to save bandwidth", :default => -1
 
 
@@ -40,21 +40,25 @@ class Riemann::Tools::S3Metrics
       end
     end
 
-    options[:buckets].each do |bucket|
-
-      directory = connection.directories.get(bucket)
+    options[:buckets].each do |url|
+      split = url.split('/')
+      bucket = split[0]
+      prefix = ""
+      if (split[1])
+        prefix = url[(split[0].length+1)..-1]
+      end
       count = 0
-      directory.files.each do |file|
+      connection.directories.get(bucket, prefix: prefix).files.map do |file|
         count = count +1
         if (options[:max_objects]>0 && count>options[:max_objects])
           break
         end
       end
       if (options[:max_objects]>0 && count>options[:max_objects])
-        event = event(bucket, "objectCount", count, "count was bigger than threshold #{options[:max_objects]}", "warning")
+        event = event(url, "objectCount", count, "count was bigger than threshold #{options[:max_objects]}", "warning")
         report(event)
       else
-        event = event(bucket, "objectCount", count, "All objects counted, threshold=#{options[:max_objects]}", "ok")
+        event = event(url, "objectCount", count, "All objects counted, threshold=#{options[:max_objects]}", "ok")
         report(event)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riemann-aws
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Kyle Kingsbury
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2018-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-tools
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.11
+        version: 0.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.11
+        version: 0.2.13
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
@@ -55,13 +55,13 @@ dependencies:
 description: 
 email: aphyr@aphyr.com
 executables:
-- riemann-aws-billing
+- riemann-s3-list
+- riemann-s3-status
+- riemann-elb-metrics
 - riemann-aws-rds-status
 - riemann-aws-sqs-status
+- riemann-aws-billing
 - riemann-aws-status
-- riemann-elb-metrics
-- riemann-s3-list
-- riemann-s3-status
 extensions: []
 extra_rdoc_files: []
 files:
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: riemann-aws
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Submits AWS stats to riemann.