sensu-plugins-docker 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 481a29741da795dcebfcfaa118a632c598b59727
-  data.tar.gz: bb15b30628a2a1ba3bf8ccab1fbb6094ee7dd2fc
+  metadata.gz: 4b330bfae0d9fdbb983a2bb04565ef5a1e25a226
+  data.tar.gz: 8edf685a414d2fb53dd5847bb1d74df843c22943
 SHA512:
-  metadata.gz: 3ae1c762dc2e30912e8c6aa12fb9bc0ab4d1c2b377f440e9368e770bb0c16607cd854e8d5c1ec29c7c65da00d7a3734889bd426a1a19a23924e106dff7eb6948
-  data.tar.gz: 817fe789d493e9e880bd8182a626e0e76fe926572bc86bcb7376ef41175751f4fdd66623149da465222bf14c2acf7b772c305805e58372e987d6757281630247
+  metadata.gz: f4b2ab0f7e86f764225e03aaa96aced833fbcf6789f75e6d240fedb5147c657db64c5ddad5c603265c3f6dd4b3d3f581b58a688ec2e534b55696017f633d5e10
+  data.tar.gz: e8e86d5befe88b8a368a379a1841b9d07de4715242cb9c452a8677a64815f60d625a4c5df5fc1c84d520a9298d0821084ccea755b4d18bc16e44537133cfbf83

data/CHANGELOG.md

@@ -4,6 +4,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
+## [1.3.0] - 2017-06-04
+### Added
+- metrics-docker-stats.rb: Add an option to ouput a portion of the docker
+  container name using by splitting on a delimiter of the users choice.
+
+### Fixed
+- check-container.rb: Fix support for docker versions >= 1.18. The key-pair [State][Status] was replaced with [State][Running] and also logic was updated (#45)
 
 ## [1.2.0] - 2017-02-08
 ### Added
@@ -76,7 +83,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.2.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-docker/compare/1.3.0...HEAD
+[1.3.0]: https://github.com/sensu-plugins/sensu-plugins-docker/compare/1.2.0...1.3.0
 [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

data/README.md

@@ -7,10 +7,11 @@
 [![Dependency Status](https://gemnasium.com/sensu-plugins/sensu-plugins-docker.svg)](https://gemnasium.com/sensu-plugins/sensu-plugins-docker)
 
 ## Functionality
+This check supports docker versions >= 1.18. Check docker-engine API for more information  
 
 ## Files
  * check-container.rb
- * check-container-logs.rb 
+ * check-container-logs.rb
  * check-docker-container.rb
  * metrics-docker-container.rb
  * metrics-docker-stats.rb
@@ -22,3 +23,4 @@
 [Installation and Setup](http://sensu-plugins.io/docs/installation_instructions.html)
 
 ## Notes
+[docker-engine API](https://docs.docker.com/engine/api/v1.29/#section/Versioning)

data/bin/check-container.rb

@@ -66,8 +66,8 @@ class CheckDockerContainer < Sensu::Plugin::Check::CLI
         critical "#{config[:container]} is not running on #{config[:docker_host]}"
       end
       body = JSON.parse(response.body)
-      container_state = body['State']['Status']
-      if container_state == 'running'
+      container_running = body['State']['Running']
+      if container_running
         if config[:tag]
           image = body['Config']['Image']
           match = image.match(/^(?:([^\/]+)\/)?(?:([^\/]+)\/)?([^@:\/]+)(?:[@:](.+))?$/)

data/bin/metrics-docker-stats.rb

@@ -87,6 +87,18 @@ class DockerStatsMetrics < Sensu::Plugin::Metric::CLI::Graphite
          boolean: true,
          default: false
 
+  option :name_parts,
+         description: 'Partial names by spliting and returning at index(es). \
+                       eg. -m 3,4 my-docker-container-process_name-b2ffdab8f1aceae85300 for process_name.b2ffdab8f1aceae85300',
+         short: '-m index',
+         long: '--match index'
+
+  option :delim,
+         description: 'the deliminator to use with -m',
+         short: '-d',
+         long: '--deliminator',
+         default: '-'
+
   def run
     @timestamp = Time.now.to_i
 
@@ -97,7 +109,16 @@ class DockerStatsMetrics < Sensu::Plugin::Metric::CLI::Graphite
            end
     list.each do |container|
       stats = container_stats(container)
-      output_stats(container, stats)
+      if config[:name_parts]
+        scheme = ''
+        config[:name_parts].split(',').each do |key|
+          scheme << '.' unless scheme == ''
+          scheme << container.split(config[:delim])[key.to_i]
+        end
+      else
+        scheme = container
+      end
+      output_stats(scheme, stats)
     end
     ok
   end
@@ -137,6 +158,8 @@ class DockerStatsMetrics < Sensu::Plugin::Metric::CLI::Graphite
     @containers.each do |container|
       list << if config[:friendly_names]
                 container['Names'][0].delete('/')
+              elsif config[:name_parts]
+                container['Names'][0].delete('/')
               else
                 container['Id']
               end

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

@@ -1,7 +1,7 @@
 module SensuPluginsDocker
   module Version
     MAJOR = 1
-    MINOR = 2
+    MINOR = 3
     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.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2017-06-04 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:
-- check-container.rb
+- check-container-logs.rb
 - metrics-docker-container.rb
 - metrics-docker-stats.rb
+- check-container.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.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for docker