sensu-plugins-dcos 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d59fc68efa3e25906528db2a05013a96efe3e07d
-  data.tar.gz: 0478823b7d1a93b33b0adcb723816ae053dd169f
+  metadata.gz: 8a03eda3e661cc220f14f51940955d69351479d8
+  data.tar.gz: 243ecb43f6827b4787720c581a48bdb44b6307a5
 SHA512:
-  metadata.gz: 8f731f5374cc18cfc8ee963223aa3dea6cc200cd7099727750f58e3476067f712bf98b83850f00f97eae3c3715c1685544d32c593402d7a6323d91ccaca56546
-  data.tar.gz: 3cdf8e82100867b083729130c8205acf232b30a17db46d539281681834645b9d61b6146eed4445c859b439da0486978d0e7f6b30402312d04a3e5b2fc5fc4cba
+  metadata.gz: 00d554a5899608aa9c2dca86a516074411421cd9715ace71743d2a90037c933303e03b2e1b9821616468a1c236bbb3238046b5796bc60865180f93adbd9297c0
+  data.tar.gz: 715f1f6e7d1b62ffcae3d84074cac9b71bf514176ada02c729f2ef9632bc3ec0340f7c2954d5a3885c7aa9d5edf58aa0fa763393855ee0cf66cf02eec87335eb

data/CHANGELOG.md

@@ -4,17 +4,28 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
+### [0.0.3] - 2017-08-12
+### Changed
+- switched from vagrant to docker testing as it's lighter weight (@majormoses)
+- switched from bats to serverspec as it gives us more flexibility (@majormoses) (@luisdavim)
+- upgraded rubocop and appeased it (@majormoses)
+- standard `.rubocop.yml`, `CHANGELOG.md`, `Rakefile` files
+
+### Removed
+- removed various misc files from trnasfer such as circle-ci stuff (@majormoses)
+
 
 ## [0.0.2] - 2017-08-03
 ### Added
 - New DC/OS Component Health check
 - Extending get_value function to provide the ability to override field names
+
 ## [0.0.1] - 2017-04-18
 
 ### Added
 - Initial release
 
-
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-dcos/compare/0.0.2...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-dcos/compare/0.0.3...HEAD
+[0.0.3]: https://github.com/sensu-plugins/sensu-plugins-dcos/compare/0.0.2...0.0.3
 [0.0.2]: https://github.com/sensu-plugins/sensu-plugins-dcos/compare/0.0.1...0.0.2
 [0.0.1]:https://github.com/sensu-plugins/sensu-plugins-dcos/compare/9c72afb596622f6c1a51f95281f52bd53791ede9...0.0.1

data/bin/check-dcos-component-health.rb

@@ -73,7 +73,7 @@ class CheckDcosComponentHealth < Sensu::Plugin::Check::CLI
     if config[:component]
       value = get_value(config[:url], config[:component], config[:filter], 'id', 'health', 'units')
       message "#{config[:component]} = #{value}"
-      if value == 0
+      if value.zero?
         ok
       else
         critical
@@ -85,7 +85,7 @@ class CheckDcosComponentHealth < Sensu::Plugin::Check::CLI
         failed += unit['health']
       end
       message "components.unhealthy = #{failed}"
-      if failed == 0
+      if failed.zero?
         ok
       else
         critical

data/bin/check-dcos-container-count.rb

@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 # check-dcos-metrics
 #

data/bin/check-dcos-container-metrics.rb

@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 # check-dcos-metrics
 #
@@ -117,17 +119,19 @@ class CheckDcosContainersApi < Sensu::Plugin::Check::CLI
       db = Daybreak::DB.new '/tmp/dcos-metrics.db', default: 0
     end
     containers = get_data(config[:url])
-    containers.each do |container|
-      v = get_value("#{config[:url]}/#{container}", config[:metric], config[:filter])
-      if config[:delta]
-        prev_value = db["#{container}_#{config[:metric]}"]
-        db.lock do
-          db["#{container}_#{config[:metric]}"] = v
+    unless containers.nil? || containers.empty?
+      containers.each do |container|
+        v = get_value("#{config[:url]}/#{container}", config[:metric], config[:filter])
+        if config[:delta]
+          prev_value = db["#{container}_#{config[:metric]}"]
+          db.lock do
+            db["#{container}_#{config[:metric]}"] = v
+          end
+          v -= prev_value
         end
-        v -= prev_value
+        data[container] = v
       end
-      data[container] = v
-    end unless containers.nil? || containers.empty?
+    end
     if config[:delta]
       db.flush
       db.compact

data/bin/check-dcos-metrics.rb

@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 # check-dcos-metrics
 #

data/bin/check-dcos-ping.rb

@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 # check-dcos-ping
 #
@@ -58,7 +60,7 @@ class CheckDcosPing < Sensu::Plugin::Check::CLI
   def run
     value = get_data(config[:url])['ok']
     message "OK = #{value}"
-    if value === true
+    if value == true
       ok
     else
       critical

data/bin/metrics-dcos-containers.rb

@@ -79,25 +79,30 @@ class DCOSMetrics < Sensu::Plugin::Metric::CLI::Graphite
 
   def run
     containers = get_data("http://#{config[:server]}:#{config[:port]}#{config[:uri]}")
-    containers.each do |container|
-      all_metrics = get_data("http://#{config[:server]}:#{config[:port]}#{config[:uri]}/#{container}")
-      if all_metrics.key?('datapoints')
-        all_metrics['datapoints'].each do |metric|
+    unless containers.nil? || containers.empty? # rubocop:desable Style/MultilineIfModifier
+      containers.each do |container|
+        all_metrics = get_data("http://#{config[:server]}:#{config[:port]}#{config[:uri]}/#{container}")
+        if all_metrics.key?('datapoints')
+          all_metrics['datapoints'].each do |metric|
+            metric['name'].tr!('/', '.')
+            metric['name'].squeeze!('.')
+            output([config[:scheme], container, metric['unit'], metric['name']].join('.'), metric['value'])
+          end
+        end
+        app_metrics = get_data("http://#{config[:server]}:#{config[:port]}#{config[:uri]}/#{container}/app")
+        next if app_metrics['datapoints'].nil?
+        app_metrics['datapoints'].each do |metric|
+          unless metric['tags'].nil?
+            metric['tags'].each do |k, v|
+              metric['name'] = [metric['name'], k, v].join('.')
+            end
+          end
           metric['name'].tr!('/', '.')
           metric['name'].squeeze!('.')
-          output([config[:scheme], container, metric['unit'], metric['name']].join('.'), metric['value'])
+          output([config[:scheme], container, 'app', metric['unit'], metric['name']].join('.'), metric['value'])
         end
       end
-      app_metrics = get_data("http://#{config[:server]}:#{config[:port]}#{config[:uri]}/#{container}/app")
-      app_metrics['datapoints'].each do |metric|
-        metric['tags'].each do |k, v|
-          metric['name'] = [metric['name'], k, v].join('.')
-        end unless metric['tags'].nil?
-        metric['name'].tr!('/', '.')
-        metric['name'].squeeze!('.')
-        output([config[:scheme], container, 'app', metric['unit'], metric['name']].join('.'), metric['value'])
-      end unless app_metrics['datapoints'].nil?
-    end unless containers.nil? || containers.empty?
+    end
     ok
   end
 end

data/bin/metrics-dcos-host.rb

@@ -1,4 +1,6 @@
 #! /usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 #   dcos-metrics
 #

data/lib/sensu-plugins-dcos/common.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # LICENCE:
 #    PTC http://www.ptc.com/
 #    Copyright 2017 PTC Inc.

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

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module SensuPluginsDcos
   module Version
     MAJOR = 0
     MINOR = 0
-    PATCH = 2
+    PATCH = 3
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/lib/sensu-plugins-dcos.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require 'sensu-plugins-dcos/version'
 require 'sensu-plugins-dcos/common'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-dcos
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - PTC and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-03 00:00:00.000000000 Z
+date: 2017-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -94,6 +94,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: mixlib-shellout
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +176,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: 0.49.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: 0.49.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +198,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: serverspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.36.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.36.1
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
@@ -193,19 +227,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: kitchen-vagrant
+  name: kitchen-docker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: kitchen-localhost
   requirement: !ruby/object:Gem::Requirement
@@ -239,13 +273,13 @@ description: |-
                                 for monitoring and metrics collection.
 email: "<sensu-users@googlegroups.com>"
 executables:
-- check-dcos-component-health.rb
-- check-dcos-container-count.rb
-- check-dcos-ping.rb
 - check-dcos-metrics.rb
+- metrics-dcos-host.rb
+- check-dcos-container-count.rb
 - check-dcos-container-metrics.rb
+- check-dcos-component-health.rb
+- check-dcos-ping.rb
 - metrics-dcos-containers.rb
-- metrics-dcos-host.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -264,7 +298,7 @@ files:
 - lib/sensu-plugins-dcos/version.rb
 homepage: https://github.com/PTC-Global/sensu-plugins-dcos
 licenses:
-- APACHE 2.0
+- Apache-2.0
 metadata:
   maintainer: PTC
   development_status: active
@@ -288,7 +322,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for dcos-metrics checks and metrics