sensu-plugins-docker 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e659758bc790607fd97fc818de58d96c425dd02c
-  data.tar.gz: 72f2aa348fbcda0b4ad425ceb86fdc8abe113075
+  metadata.gz: 13e0d41ce9b79a3f6f2219724fc7b3c8b406c87e
+  data.tar.gz: 7253c2517084083dc67b63af02d1aad9e673763c
 SHA512:
-  metadata.gz: a2b9f204d1985de2e26a74cd16136a3c4448ae73fcc98a804417fc0ab5411c0fc9ba1137b3ca20cff8f5f36b38a42b336fc34a92b5479f279f48a8f0cdb97898
-  data.tar.gz: d97813329a96d0db5f459b0de92ab64e4db580be43221df83c32cfc24954c458ce5c4ba2d49ae935fc22b1b797926d0115c77b3dc179cb59991ddfac433c6a46
+  metadata.gz: 2f7c6e32000108b4eea041a666e315ec18eb44f019ffa70c932ab496cbbd83ef919830bac397c980af71526c1cde5e483c5885276c76cf53dcba2b815f9a865c
+  data.tar.gz: 39db1365fc49d39b10b50808308b0b028cf8b59a39377acf0c015d3d93d1243b5212b3a1a118fa0c10fa1e3ee05f93d89e12fd437cf14d85962e85e02f2ebf04

data/CHANGELOG.md

@@ -5,6 +5,13 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [1.1.4] - 2016-11-26
+### Changed
+- metrics-docker-stats.rb: Fix JSON parse error if there is more than one chunk
+  of response data needed to result in valid JSON because of large datasets.
+  (#18)
+
+## [1.1.3] - 2016-08-11
 ### Changed
 - dependencies: use net\_http\_unix = 0.2.2
 
@@ -61,7 +68,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.3...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-docker/compare/1.1.4...HEAD
+[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
 [1.1.2]: https://github.com/sensu-plugins/sensu-plugins-docker/compare/1.1.1...1.1.2
 [1.1.1]: https://github.com/sensu-plugins/sensu-plugins-docker/compare/1.1.0...1.1.1

data/bin/metrics-docker-stats.rb

@@ -113,35 +113,18 @@ class DockerStatsMetrics < Sensu::Plugin::Metric::CLI::Graphite
 
   def docker_api(path)
     if config[:docker_protocol] == 'unix'
-      begin
-        NetX::HTTPUnix.start("unix://#{config[:docker_host]}") do |http|
-          request = Net::HTTP::Get.new "/#{path}"
-          http.request request do |response|
-            response.read_body do |chunk|
-              @response = JSON.parse(chunk)
-              http.finish
-            end
-          end
-        end
-      rescue NoMethodError
-        # using http.finish to prematurely kill the stream causes this exception.
-        return @response
-      end
+      session = NetX::HTTPUnix.new("unix://#{config[:docker_host]}")
+      request = Net::HTTP::Get.new "/#{path}"
     else
       uri = URI("#{config[:docker_protocol]}://#{config[:docker_host]}/#{path}")
-      begin
-        Net::HTTP.start(uri.host, uri.port) do |http|
-          request = Net::HTTP::Get.new uri.request_uri
-          http.request request do |response|
-            response.read_body do |chunk|
-              @response = JSON.parse(chunk)
-              http.finish
-            end
-          end
-        end
-      rescue NoMethodError
-        # using http.finish to prematurely kill the stream causes this exception.
-        return @response
+      session = Net::HTTP.new(uri.host, uri.port)
+      request = Net::HTTP::Get.new uri.request_uri
+    end
+
+    session.start do |http|
+      http.request request do |response|
+        response.value
+        return JSON.parse(response.read_body)
       end
     end
   end
@@ -162,7 +145,7 @@ class DockerStatsMetrics < Sensu::Plugin::Metric::CLI::Graphite
   end
 
   def container_stats(container)
-    path = "containers/#{container}/stats"
+    path = "containers/#{container}/stats?stream=0"
     @stats = docker_api(path)
   end
 end

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

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