sensu-plugins-docker 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdd8b18ca5f1f21fdb938571b8f4f530a1f8daaa
-  data.tar.gz: 1dd8364c04b0c3ac9538a0d6f2145608204981bd
+  metadata.gz: 645a9f3659b23cffcf10ff781afd499f9c7d3e4a
+  data.tar.gz: d767b667130c58182b49a838694ea20d5a6d59ae
 SHA512:
-  metadata.gz: 6d94f617e811e3cb122e047dccb7eba2b3769f4197827db89bb05424c098d0b0f137c8b9879a2673dca48bf53cba6287556b4211267a55f724355738247b4091
-  data.tar.gz: 4ef39a0eb65a4420e08de03a5cf7345c1b39ba4c4b636b52c348705ab05d762a93466ef3ed78b2f430843d8b8d0433ba19112f580ab5e93e91b8b34cb2d203b7
+  metadata.gz: 2fba877081039b53878f84ae9a9788bf035a3545942565d3e644edc99720bde99648627a0f2cb806b800d736868dc2ec03b0e85d60435a85ab2c35350cd0437c
+  data.tar.gz: 6badaf7ef560fb6052819500ee71cf9a35ec6d6a79a53e933836641cf6f1d0aa103bcb018af6abe42270d1a1291f67fe9849cdaaf6797aeb896462efc3e6aa4e

data/CHANGELOG.md

@@ -5,12 +5,16 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
-## 1.0.0 - 2016-05-24
+## [1.1.0] - 2016-06-03
+### Added
+- check-container-logs.rb: added `-s|--seconds-ago` option to be able to set time interval more precisely
+
+## [1.0.0] - 2016-05-24
 Note: this release changes how connections are made to the Docker API and also
 changes some options. Review your check commands before deploying this version.
 
 ### Added
-- Added check-container-logs.rb to check docker logs for matching strings 
+- Added check-container-logs.rb to check docker logs for matching strings
 - Support for Ruby 2.3.0
 - metrics-docker-container.rb: add option to override the default path to cgroup.proc
 
@@ -42,7 +46,8 @@ changes some options. Review your check commands before deploying this version.
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-docker/compare/1.0.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-docker/compare/1.1.0...HEAD
+[1.1.0]: https://github.com/sensu-plugins/sensu-plugins-docker/compare/1.0.0...1.1.0
 [1.0.0]: https://github.com/sensu-plugins/sensu-plugins-docker/compare/0.0.4...1.0.0
 [0.0.4]: https://github.com/sensu-plugins/sensu-plugins-docker/compare/0.0.3...0.0.4
 [0.0.3]: https://github.com/sensu-plugins/sensu-plugins-docker/compare/0.0.2...0.0.3

data/bin/check-container-logs.rb

@@ -77,8 +77,14 @@ insensitive',
          long: '--hours-ago HOURS',
          required: false
 
-  def calculate_timestamp(hours)
-    seconds_ago = hours.to_i * 3600
+  option :seconds_ago,
+         description: 'Amount of time in seconds to look back for log strings',
+         short: '-s SECONDS',
+         long: '--seconds-ago SECONDS',
+         required: false
+
+  def calculate_timestamp(seconds_ago = nil)
+    seconds_ago = yield if block_given?
     (Time.now - seconds_ago).to_i
   end
 
@@ -86,8 +92,11 @@ insensitive',
     client = create_docker_client
     path = "/containers/#{container_name}/logs?stdout=true&stderr=true"
     if config.key? :hours_ago
-      path = "#{path}&since=#{calculate_timestamp config[:hours_ago]}"
+      timestamp = calculate_timestamp { config[:hours_ago].to_i * 3600 }
+    elsif config.key? :seconds_ago
+      timestamp = calculate_timestamp config[:seconds_ago].to_i
     end
+    path = "#{path}&since=#{timestamp}"
     req = Net::HTTP::Get.new path
 
     client.request req do |response|

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-docker
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-24 00:00:00.000000000 Z
+date: 2016-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api