sensu-plugins-docker 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a0c669db204f3d8f22810459efda23ae2deb92e
-  data.tar.gz: cc6319e61a7c19d261ab14a3c368173b6a428f60
+  metadata.gz: b1e2c1bb477a34e521406ffdf082d93d26e120d2
+  data.tar.gz: abd002d60d649ea8f027284a9a95bd3b53cdfd1d
 SHA512:
-  metadata.gz: a8290f04f055c64d86316f0cb2a1739a26ef1b078b0384a53fae609d96aa6f93d82ab412ab1f3549d4cca7089db9ce1423d26e78bd26d9ec2261ea04a74d522a
-  data.tar.gz: 28d541dee490616f29e48ff003aac8c77e2b849a8a3c75d7a3f21e10fd642b488e9e570c786934ce2a422cc0312d6cddeff6350adab4dca31d55c83896fbbc3c
+  metadata.gz: ba3beabd4ed6dc8b0bf0728b0532668bf5c5fe53d2b436d6a3a1514f1357efcb9e37c07b04ce643b40f00374ec9e9997596a97a41253828e261d676d810aeb01
+  data.tar.gz: 5655e96207a5063dadd89510e83fdce1c236ba4d5fa14b7f09526d47fc25c0aa448bdf6e62a61be6a9d029426f68b724dfe6572b9bfb68f56c7bf0fdf9cc7121

data/CHANGELOG.md

@@ -1,10 +1,18 @@
 # Change Log
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
+This CHANGELOG follows the format listed at [Our CHANGELOG Guidelines ](https://github.com/sensu-plugins/community/blob/master/HOW_WE_CHANGELOG.md).
+Which is based on [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
 
+## [1.5.0] - 2017-09-09
+### Added
+- metrics-docker-stats.rb: Include metric with cpu usage percentage calculated based on docker stats (@alcasim)
+
+### Changed
+- updated CHANGELOG guidelines location (@majormoses)
+
 ## [1.4.0] - 2017-08-08
 ### Added
 - metrics-docker-info.rb: general information metrics from docker (@alcasim)
@@ -96,7 +104,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.4.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-docker/compare/1.5.0...HEAD
+[1.5.0]: https://github.com/sensu-plugins/sensu-plugins-docker/compare/1.4.0..1.5.0
 [1.4.0]: https://github.com/sensu-plugins/sensu-plugins-docker/compare/1.3.1...1.4.0
 [1.3.1]: https://github.com/sensu-plugins/sensu-plugins-docker/compare/1.3.0...1.3.1
 [1.3.0]: https://github.com/sensu-plugins/sensu-plugins-docker/compare/1.2.0...1.3.0

data/bin/metrics-docker-stats.rb

@@ -111,6 +111,13 @@ class DockerStatsMetrics < Sensu::Plugin::Metric::CLI::Graphite
          boolean: true,
          default: false
 
+  option :cpupercent,
+         description: 'add cpu usage percentage metric',
+         short: '-P',
+         long: '--percentage',
+         boolean: true,
+         default: false
+
   def run
     @timestamp = Time.now.to_i
 
@@ -150,6 +157,7 @@ class DockerStatsMetrics < Sensu::Plugin::Metric::CLI::Graphite
         output "#{config[:scheme]}.#{container}.#{key}", value, @timestamp
       end
     end
+    output "#{config[:scheme]}.#{container}.cpu_stats.usage_percent", calculate_cpu_percent(stats), @timestamp if config[:cpupercent]
   end
 
   def docker_api(path)
@@ -212,4 +220,17 @@ class DockerStatsMetrics < Sensu::Plugin::Metric::CLI::Graphite
     end
     stats_out
   end
+
+  def calculate_cpu_percent(stats)
+    cpu_percent = 0.0
+    previous_cpu = stats['precpu_stats']['cpu_usage']['total_usage']
+    previous_system = stats['precpu_stats']['system_cpu_usage']
+    cpu_delta = stats['cpu_stats']['cpu_usage']['total_usage'] - previous_cpu
+    system_delta = stats['cpu_stats']['system_cpu_usage'] - previous_system
+    if system_delta > 0 && cpu_delta > 0
+      number_of_cpu = stats['cpu_stats']['cpu_usage']['percpu_usage'].length
+      cpu_percent = (cpu_delta.to_f / system_delta.to_f) * number_of_cpu * 100
+    end
+    format('%.2f', cpu_percent)
+  end
 end

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

@@ -1,7 +1,7 @@
 module SensuPluginsDocker
   module Version
     MAJOR = 1
-    MINOR = 4
+    MINOR = 5
     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.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-09 00:00:00.000000000 Z
+date: 2017-09-09 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-logs.rb
 - metrics-docker-container.rb
 - metrics-docker-info.rb
-- metrics-docker-stats.rb
 - check-container.rb
+- check-container-logs.rb
+- metrics-docker-stats.rb
 - check-docker-container.rb
 extensions: []
 extra_rdoc_files: []
@@ -246,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for docker