sensu-plugins-docker 1.1.5 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22859b2cd9171cec6717e9d745f3f9c61b032836
-  data.tar.gz: 73dcf2f816ea66c6639dd98df6dc6b025dcfa37d
+  metadata.gz: 481a29741da795dcebfcfaa118a632c598b59727
+  data.tar.gz: bb15b30628a2a1ba3bf8ccab1fbb6094ee7dd2fc
 SHA512:
-  metadata.gz: 99f88d5de72110bb8f2027fcc8a35c7fe803f9c95e7e377b29a2b4aa798a17592241861e05910420736a3acbf36b047a67b120104e6c9645e347597f4016a4b2
-  data.tar.gz: 9a9f8043a80181eb68db768f9aeeba8f7496774302a23fcb24ea7edc9f7fde70cc49ca2fd1243a9a5a5f4668a452a97ef5e82da78f0121adc452cec43a06e9d4
+  metadata.gz: 3ae1c762dc2e30912e8c6aa12fb9bc0ab4d1c2b377f440e9368e770bb0c16607cd854e8d5c1ec29c7c65da00d7a3734889bd426a1a19a23924e106dff7eb6948
+  data.tar.gz: 817fe789d493e9e880bd8182a626e0e76fe926572bc86bcb7376ef41175751f4fdd66623149da465222bf14c2acf7b772c305805e58372e987d6757281630247

data/CHANGELOG.md

@@ -5,6 +5,10 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [1.2.0] - 2017-02-08
+### Added
+- check-container.rb: add an option to test image's tag (@obazoud)
+
 ## [1.1.5] - 2016-11-26
 ### Changed
 - Loosen `sensu-plugin` dependency to `~> 1.2` (#44)
@@ -72,7 +76,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.1.5...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-docker/compare/1.2.0...HEAD
+[1.2.0]: https://github.com/sensu-plugins/sensu-plugins-docker/compare/1.1.5...1.2.0
 [1.1.5]: https://github.com/sensu-plugins/sensu-plugins-docker/compare/1.1.4...1.1.5
 [1.1.4]: https://github.com/sensu-plugins/sensu-plugins-docker/compare/1.1.3...1.1.4
 [1.1.3]: https://github.com/sensu-plugins/sensu-plugins-docker/compare/1.1.2...1.1.3

data/bin/check-container.rb

@@ -52,6 +52,9 @@ class CheckDockerContainer < Sensu::Plugin::Check::CLI
          short: '-c CONTAINER',
          long: '--container CONTAINER',
          required: true
+  option :tag,
+         short: '-t TAG',
+         long: '--tag TAG'
 
   def run
     client = create_docker_client
@@ -62,9 +65,16 @@ class CheckDockerContainer < Sensu::Plugin::Check::CLI
       if response.body.include? 'no such id'
         critical "#{config[:container]} is not running on #{config[:docker_host]}"
       end
-
-      container_state = JSON.parse(response.body)['State']['Status']
+      body = JSON.parse(response.body)
+      container_state = body['State']['Status']
       if container_state == 'running'
+        if config[:tag]
+          image = body['Config']['Image']
+          match = image.match(/^(?:([^\/]+)\/)?(?:([^\/]+)\/)?([^@:\/]+)(?:[@:](.+))?$/)
+          unless match && match[4] == config[:tag]
+            critical "#{config[:container]}'s tag is '#{match[4]}', excepting '#{config[:tag]}'"
+          end
+        end
         ok "#{config[:container]} is running on #{config[:docker_host]}."
       else
         critical "#{config[:container]} is #{container_state} on #{config[:docker_host]}."

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-docker
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-26 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -199,11 +199,11 @@ description: |-
                                 metrics via `docker ps`
 email: "<sensu-users@googlegroups.com>"
 executables:
-- metrics-docker-stats.rb
 - check-container.rb
-- check-container-logs.rb
 - metrics-docker-container.rb
+- metrics-docker-stats.rb
 - check-docker-container.rb
+- check-container-logs.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -244,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for docker