sensu-plugins-docker 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 645a9f3659b23cffcf10ff781afd499f9c7d3e4a
-  data.tar.gz: d767b667130c58182b49a838694ea20d5a6d59ae
+  metadata.gz: 46581d87a5a6c76cd794cc10d1df1f1586ff9805
+  data.tar.gz: afea81abc3af2f7a599c5251754deb89b5afd23c
 SHA512:
-  metadata.gz: 2fba877081039b53878f84ae9a9788bf035a3545942565d3e644edc99720bde99648627a0f2cb806b800d736868dc2ec03b0e85d60435a85ab2c35350cd0437c
-  data.tar.gz: 6badaf7ef560fb6052819500ee71cf9a35ec6d6a79a53e933836641cf6f1d0aa103bcb018af6abe42270d1a1291f67fe9849cdaaf6797aeb896462efc3e6aa4e
+  metadata.gz: baf23cafc166cf71d217124e3b5844aa8f8565ea579e153147f29c7213c2f390dfacc80f310566c6ddc6734dee3eab231b381643c68636d039206cf2e8811339
+  data.tar.gz: 29d55554d472b85e420385e7c4b64ea5dfd8e0c86a18fe02b0c92ffd395a76b9d71a656049d8277eee6a187f400ab345b34f6d133e3167349161a56c99810a2a

data/CHANGELOG.md

@@ -5,6 +5,14 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [1.1.1] - 2016-06-10
+### Fixed
+- metrics-docker-stats.rb: Fix error from trying to collect stats with multiple values. Stats that return array values are now excluded. (#29)
+
+### Changed
+- improved help messages
+- check-container.rb: issue a critical event if container state != running
+
 ## [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
@@ -46,7 +54,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.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-docker/compare/1.1.1...HEAD
+[1.1.1]: https://github.com/sensu-plugins/sensu-plugins-docker/compare/1.1.0...1.1.1
 [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

data/bin/check-container-logs.rb

@@ -37,7 +37,7 @@ require 'sensu-plugins-docker/client_helpers'
 
 class ContainerLogChecker < Sensu::Plugin::Check::CLI
   option :docker_host,
-         description: 'location of docker api: host:port or /path/to/docker.sock',
+         description: 'Docker socket to connect. TCP: "host:port" or Unix: "/path/to/docker.sock" (default: "127.0.0.1:2375")',
          short: '-H DOCKER_HOST',
          long: '--docker-host DOCKER_HOST',
          default: '127.0.0.1:2375'

data/bin/check-container.rb

@@ -46,6 +46,7 @@ class CheckDockerContainer < Sensu::Plugin::Check::CLI
   option :docker_host,
          short: '-h DOCKER_HOST',
          long: '--host DOCKER_HOST',
+         description: 'Docker socket to connect. TCP: "host:port" or Unix: "/path/to/docker.sock" (default: "127.0.0.1:2375")',
          default: '127.0.0.1:2375'
   option :container,
          short: '-c CONTAINER',
@@ -62,9 +63,11 @@ class CheckDockerContainer < Sensu::Plugin::Check::CLI
         critical "#{config[:container]} is not running on #{config[:docker_host]}"
       end
 
-      container_info = JSON.parse(response.body)
-      if container_info['State']['Status'] == 'running'
+      container_state = JSON.parse(response.body)['State']['Status']
+      if container_state == 'running'
         ok "#{config[:container]} is running on #{config[:docker_host]}."
+      else
+        critical "#{config[:container]} is #{container_state} on #{config[:docker_host]}."
       end
     rescue JSON::ParserError => e
       critical "JSON Error: #{e.inspect}"

data/bin/check-docker-container.rb

@@ -38,6 +38,7 @@ class CheckDockerContainers < Sensu::Plugin::Check::CLI
   option :docker_host,
          short: '-h docker_host',
          long: '--host DOCKER_HOST',
+         description: 'Docker socket to connect. TCP: "host:port" or Unix: "/path/to/docker.sock" (default: "127.0.0.1:2375")',
          default: '127.0.0.1:2375'
 
   option :warn_over,

data/bin/metrics-docker-container.rb

@@ -46,7 +46,7 @@ class DockerContainerMetrics < Sensu::Plugin::Metric::CLI::Graphite
          default: '/sys/fs/cgroup'
 
   option :docker_host,
-         description: 'docker host',
+         description: 'Docker host. TCP: "tcp://host:port" or Unix: "unix:///path/to/docker.sock" (default: "tcp://127.0.1.1:2376")',
          short: '-H DOCKER_HOST',
          long: '--docker-host DOCKER_HOST',
          default: 'tcp://127.0.1.1:2376'

data/bin/metrics-docker-stats.rb

@@ -1,11 +1,11 @@
 #! /usr/bin/env ruby
 #
-#   docker-container-metrics
+#   metrics-docker-stats
 #
 # DESCRIPTION:
 #
 # Supports the stats feature of the docker remote api ( docker server 1.5 and newer )
-# Currently only supports when docker is listening on tcp port.
+# Supports connecting to docker remote API over Unix socket or TCP
 #
 #
 # OUTPUT:
@@ -18,7 +18,16 @@
 #   gem: sensu-plugin
 #
 # USAGE:
-#   #YELLOW
+#   Gather stats from all containers on a host using socket:
+#   metrics-docker-stats.rb -p unix -H /var/run/docker.sock
+#
+#   Gather stats from all containers on a host using TCP:
+#   metrics-docker-stats.rb -p http -H localhost:2375
+#
+#   Gather stats from a specific container using socket:
+#   metrics-docker-stats.rb -p unix -H /var/run/docker.sock -c 5bf1b82382eb
+#
+#   See metrics-docker-stats.rb --help for full usage flags
 #
 # NOTES:
 #
@@ -28,7 +37,6 @@
 #   for details.
 #
 
-require 'rubygems' if RUBY_VERSION < '1.9.0'
 require 'sensu-plugin/metric/cli'
 require 'socket'
 require 'net_http_unix'
@@ -61,7 +69,7 @@ class DockerStatsMetrics < Sensu::Plugin::Metric::CLI::Graphite
          default: ''
 
   option :docker_host,
-         description: 'location of docker api, host:port or /path/to/docker.sock',
+         description: 'Docker socket to connect. TCP: "host:port" or Unix: "/path/to/docker.sock" (default: "127.0.0.1:2375")',
          short: '-H DOCKER_HOST',
          long: '--docker-host DOCKER_HOST',
          default: '127.0.0.1:2375'
@@ -98,7 +106,7 @@ class DockerStatsMetrics < Sensu::Plugin::Metric::CLI::Graphite
     dotted_stats = Hash.to_dotted_hash stats
     dotted_stats.each do |key, value|
       next if key == 'read' # unecessary timestamp
-      next if key.start_with? 'blkio_stats' # array values, figure out later
+      next if value.is_a?(Array)
       output "#{config[:scheme]}.#{container}.#{key}", value, @timestamp
     end
   end

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

@@ -2,7 +2,7 @@ module SensuPluginsDocker
   module Version
     MAJOR = 1
     MINOR = 1
-    PATCH = 0
+    PATCH = 1
 
     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.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-04 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api