sensu-plugins-aws 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d3bd06b2e135c2aa0476252fb837eb022432933
-  data.tar.gz: f8fa65a2aac1d049b5e2fe160c5c9025a6e579be
+  metadata.gz: 68d4ea876c28d7359360a917eb6208074e95faf7
+  data.tar.gz: a9e7724749ef0d6d5c8b940287fc1069aed5001c
 SHA512:
-  metadata.gz: ee628849a14a95a447b7bc7d776bc92966d4772a4e3a4fe094c9e5905a5e6c5665974ecd0ee6a6e1df17287c84a0e3f989a410d5d33fe5a46780e27771a8a26f
-  data.tar.gz: ae0efd4a9705832898109d163d552251e5fa77bbe32c61b51ed79282b6ededd9ddd1a9d657b0e60ac0d1aea71a8c9dd77118609ccdbb1278c3cee7beebf88313
+  metadata.gz: 02fe49c09376fbeddb8a610f6cea37e37a66152d0aad1e41d53f63d79e00ac999ba6bb5d963cabb991b82a40338045060bb447787b786db4b6d810847a802aa7
+  data.tar.gz: 17c3f83d4a95eca2c3a61350a88beccd3dd93ca057d9a1439cf219b8a73200ca32d579125c37cc4acea6c53237a52c708065d180e5612830ee90b862b48889cd

data/CHANGELOG.md

@@ -4,6 +4,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
+## [5.1.0] - 2017-05-09
+- check-s3-object.rb: Add an option to check a file by his prefix (@julio-ogury)
 
 ## [5.0.0] - 2017-05-03
 ### Breaking Change
@@ -297,7 +299,8 @@ WARNING:  This release contains major breaking changes that will impact all user
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/5.0.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/5.1.0...HEAD
+[5.1.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/5.1.0...5.0.0
 [5.0.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/5.0.0...4.1.0
 [4.1.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/4.1.0...4.0.0
 [4.0.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/3.2.1...4.0.0

data/bin/check-s3-object.rb

@@ -64,8 +64,12 @@ class CheckS3Object < Sensu::Plugin::Check::CLI
   option :key_name,
          short: '-n KEY_NAME',
          long: '--key-name',
-         description: 'The name of key in the bucket',
-         required: true
+         description: 'The name of key in the bucket'
+
+  option :key_prefix,
+         short: '-p KEY_PREFIX',
+         long: '--key-prefix',
+         description: 'Prefix key to search on the bucket'
 
   option :warning_age,
          description: 'Warn if mtime greater than provided age in seconds',
@@ -124,15 +128,20 @@ class CheckS3Object < Sensu::Plugin::Check::CLI
     op
   end
 
-  def run_check(type, level, value, msg)
+  def run_check(type, level, value, element, msg)
     key = "#{level}_#{type}".to_sym
     return if config[key].nil?
     to_check = config[key].to_i
-    send(level, msg % [config[:key_name], value, config[:bucket_name]]) if operator.call type, value, to_check
+    send(level, msg % [element, value, config[:bucket_name]]) if operator.call type, value, to_check
   end
 
   def run
     aws_config = {}
+
+    if (config[:key_name].nil? && config[:key_prefix].nil?) || (!config[:key_name].nil? && !config[:key_prefix].nil?)
+      critical 'Need one option between "key_name" and "key_prefix"'
+    end
+
     if config[:use_iam_role].nil?
       aws_config[:access_key_id] = config[:aws_access_key]
       aws_config[:secret_access_key] = config[:aws_secret_access_key]
@@ -140,27 +149,42 @@ class CheckS3Object < Sensu::Plugin::Check::CLI
 
     s3 = Aws::S3::Client.new(aws_config.merge!(region: config[:aws_region]))
     begin
-      output = s3.head_object(bucket: config[:bucket_name], key: config[:key_name])
-      age = Time.now.to_i - output[:last_modified].to_i
-      size = output[:content_length]
+      if !config[:key_name].nil?
+        key_search = config[:key_name]
+        key_fullname = key_search
+        output = s3.head_object(bucket: config[:bucket_name], key: key_search)
+        age = Time.now.to_i - output[:last_modified].to_i
+        size = output[:content_length]
+      elsif !config[:key_prefix].nil?
+        key_search = config[:key_prefix]
+        output = s3.list_objects(bucket: config[:bucket_name], prefix: key_search)
+        key_fullname = output.contents[0].key
+
+        if output.contents.size.to_i > 1
+          critical "Your prefix \"#{key_search}\" return too much files, you need to be more specific"
+        end
+
+        age = Time.now.to_i - output.contents[0].last_modified.to_i
+        size = output.contents[0].size
+      end
 
       [:critical, :warning].each do |level|
-        run_check('age', level, age, 'S3 object %s is %s seconds old (bucket %s)')
+        run_check('age', level, age, key_fullname, 'S3 object %s is %s seconds old (bucket %s)')
       end
 
-      if size == 0
-        critical "S3 object #{config[:key_name]} is empty (bucket #{config[:bucket_name]})" unless config[:ok_zero_size]
+      if size.zero?
+        critical "S3 object #{key_fullname} is empty (bucket #{config[:bucket_name]})" unless config[:ok_zero_size]
       else
         [:critical, :warning].each do |level|
-          run_check('size', level, size, 'S3 %s object\'size : %s octets (bucket %s)')
+          run_check('size', level, size, key_fullname, 'S3 %s object\'size : %s octets (bucket %s)')
         end
       end
 
-      ok("S3 object #{config[:key_name]} exists in bucket #{config[:bucket_name]}")
+      ok("S3 object #{key_fullname} exists in bucket #{config[:bucket_name]}")
     rescue Aws::S3::Errors::NotFound => _
-      critical "S3 object #{config[:key_name]} not found in bucket #{config[:bucket_name]}"
+      critical "S3 object #{key_fullname} not found in bucket #{config[:bucket_name]}"
     rescue => e
-      critical "S3 object #{config[:key_name]} in bucket #{config[:bucket_name]} - #{e.message} - #{e.backtrace}"
+      critical "S3 object #{key_fullname} in bucket #{config[:bucket_name]} - #{e.message} - #{e.backtrace}"
     end
   end
 end

data/lib/sensu-plugins-aws/version.rb

@@ -1,7 +1,7 @@
 module SensuPluginsAWS
   module Version
     MAJOR = 5
-    MINOR = 0
+    MINOR = 1
     PATCH = 0
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-aws
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-04 00:00:00.000000000 Z
+date: 2017-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk