sensu-plugins-docker 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00d6b43c8b66736073dd792abffe2d13f99034f0981795bf21663412ec64865e
-  data.tar.gz: 3f1fd2aedfcd7ac02eb06a8f5656b3527d670ef77fc61d192901b5d78770af37
+  metadata.gz: 8841539510e3098e3c808b8774b61cde67707ce91c56e03a4024145371e062ae
+  data.tar.gz: a6c66042b42c2927d87e7985a63dc3819409183ea24c66fde1fe4334f547c867
 SHA512:
-  metadata.gz: 58a4c4cf16098e2e57d0b28b38e6061b842d54df4deecca9c4e08f0bbca288541ac4faf095801b5f33627438aa56d2d4db01d99a7170e3f05cb8ec4a5225654f
-  data.tar.gz: 57fcb788326eee5cdb4a4df9aa731637f7407b8d51eacd901da12d1573e035c4f060884304bb00478a6ba48f35aae3610107c10429a43982fbed85bd3990e369
+  metadata.gz: c5df4424ffa14dd44f5c9f92dc0f9347b5d352fe8ec2c8767f2ee73a478ab02b5d3883d837b5acccefa7e7068a507b3fa9a1e496088bfb0b57afd50a37648d78
+  data.tar.gz: f7e9772c95e1ac6e390c18075c0e62ea43a21bf9942be8e61a97c3836858b2fba1fb9295758a931bce9a97fa8499123bc67b2bd7ae5bc378b1f2dfde9200a1c7

data/CHANGELOG.md

@@ -6,6 +6,11 @@ Which is based on [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
 
+## [3.1.0] - 2018-05-07
+### Added
+ - intergration test for container check (@antonidabek)
+ - check-container.rb: -x (--allow-exited) to avoid raising alerts when container exited without error, useful for task oriented containers monitoring. (@antonidabek)
+
 ## [3.0.0] - 2018-02-17
 ### Breaking Changes
 - Default docker host defined by DockerApi Class ( ENV[DOCKER_URL] => ENV[DOCKER_HOST] => /var/run/docker.sock )
@@ -141,7 +146,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/3.0.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-docker/compare/3.1.0...HEAD
+[3.1.0]: https://github.com/sensu-plugins/sensu-plugins-docker/compare/3.0.0...3.1.0
 [3.0.0]: https://github.com/sensu-plugins/sensu-plugins-docker/compare/2.0.0...3.0.0
 [2.0.0]: https://github.com/sensu-plugins/sensu-plugins-docker/compare/1.5.0...2.0.0
 [1.5.0]: https://github.com/sensu-plugins/sensu-plugins-docker/compare/1.4.0..1.5.0

data/bin/check-container.rb

@@ -56,6 +56,12 @@ class CheckDockerContainer < Sensu::Plugin::Check::CLI
          short: '-t TAG',
          long: '--tag TAG'
 
+  option :allowexited,
+         short: '-x',
+         long: '--allow-exited',
+         boolean: true,
+         description: 'Do not raise alert if container has exited without error'
+
   def run
     @client = DockerApi.new(config[:docker_host])
     path = "/containers/#{config[:container]}/json"
@@ -74,6 +80,12 @@ class CheckDockerContainer < Sensu::Plugin::Check::CLI
         end
       end
       ok "#{config[:container]} is running on #{@client.uri}."
+    elsif config[:allowexited] && body['State']['Status'] == 'exited'
+      if (body['State']['ExitCode']).zero?
+        ok "#{config[:container]} has exited without error on #{@client.uri}."
+      else
+        critical "#{config[:container]} has exited with status code #{body['State']['ExitCode']} on #{@client.uri}."
+      end
     else
       critical "#{config[:container]} is #{body['State']['Status']} on #{@client.uri}."
     end

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

@@ -1,7 +1,7 @@
 module SensuPluginsDocker
   module Version
     MAJOR = 3
-    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: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-18 00:00:00.000000000 Z
+date: 2018-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: kitchen-docker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +178,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.40.0
+- !ruby/object:Gem::Dependency
+  name: test-kitchen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.16.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.16.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement