sensu-plugins-mesos 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b392ea0583f41c9de4879adf2b0244d41323839a
-  data.tar.gz: b9442e37d652f22eb6c0a001a0eb8ddbf921a8b0
+  metadata.gz: 9bb2b08b42ff7321fea875982453469fd5bcec99
+  data.tar.gz: f29e66d69c0fc30184155bf626ef3ca923e899af
 SHA512:
-  metadata.gz: 8d54692b973fc4fec0415880f38fe019a8de8a323239ce66c5313eb827af66eecc92b7a9dfad72220012672af6fde58d8ea72180e36172989d53e71b4768cf1f
-  data.tar.gz: 95df61c707b333c517e7c7d70c73620241ddf80899541d2e8ecdb2500c6ec2cf56ef596713fffe58fcf79937d198592201c936aef2280e2917bc1c8c9daa0a15
+  metadata.gz: f802bd1574f2d06c538b7ad53fc07e84867bf8982d17ae9f0fb3358bed80623878ca805453fd45ca6dea3621640b31c1d2d6140f02b4968ac365d237b3461d67
+  data.tar.gz: 84b13e54808f809da09dc77e86daa24d9b61a5e42d94f7fb136c1f5d33466742d0b40644cd480742138e8488f939187d924c53c1de768e85f7c0a75f368e2817

data/CHANGELOG.md

@@ -5,6 +5,10 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [Unreleased]
 
+## [2.1.0] - 2017-10-20
+### Changed
+- check-marathon-task.rb: if instances are not defined, plugin will check number of configured instances in Marathon. Also removed Net::HTTP in favour of Restclient::Resource
+
 ## [2.0.0] - 2017-07-15
 ### Added
 - Ruby 2.3.0 testing
@@ -74,7 +78,8 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-mesos/compare/2.0.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-mesos/compare/2.1.0...HEAD
+[2.1.0]: https://github.com/sensu-plugins/sensu-plugins-mesos/compare/2.0.0...2.1.0
 [2.0.0]: https://github.com/sensu-plugins/sensu-plugins-mesos/compare/1.1.0...2.0.0
 [1.1.0]: https://github.com/sensu-plugins/sensu-plugins-mesos/compare/1.0.0...1.1.0
 [1.0.0]: https://github.com/sensu-plugins/sensu-plugins-mesos/compare/0.1.1...1.0.0

data/bin/check-marathon-task.rb

@@ -30,13 +30,13 @@
 #
 
 require 'sensu-plugin/check/cli'
-require 'net/http'
+require 'rest-client'
 require 'json'
 
 # This plugin checks that the given Mesos/Marathon task is running properly.
 #
 # This means that all of the following is true:
-# 1. There are N tasks for the app, as defined by the --instances parameter
+# 1. There are N tasks for the app, as defined by the --instances parameter or checks configured tasks in Marathon as fallback
 # 2. Each task's state is running
 # 3. No task is unhealthy, as defined in Marathon
 #
@@ -71,7 +71,8 @@ class MarathonTaskCheck < Sensu::Plugin::Check::CLI
   option :instances,
          short: '-i INSTANCES',
          long: '--instances INSTANCES',
-         required: true,
+         required: false,
+         default: 0,
          proc: proc(&:to_i)
 
   option :protocol,
@@ -89,11 +90,14 @@ class MarathonTaskCheck < Sensu::Plugin::Check::CLI
          long: '--password PASSWORD',
          required: false
 
-  def run
-    if config[:instances].zero?
-      unknown 'number of instances should be an integer'
-    end
+  option :timeout,
+         description: 'timeout in seconds',
+         short: '-T TIMEOUT',
+         long: '--timeout TIMEOUT',
+         proc: proc(&:to_i),
+         default: 5
 
+  def run
     if !config[:username].nil? && config[:password].nil? ||
        config[:username].nil? && !config[:password].nil?
       unknown 'You must provide both username and password'
@@ -103,28 +107,21 @@ class MarathonTaskCheck < Sensu::Plugin::Check::CLI
     uri = config[:uri]
     config[:server].split(',').each do |s|
       begin
-        url = URI.parse("#{config[:protocol]}://#{s}:#{config[:port]}#{uri}")
-        req = Net::HTTP::Get.new(url)
-        req.add_field('Accept', 'application/json')
-        if !config[:username].nil? && !config[:password].nil?
-          req.basic_auth(config[:username], config[:password])
-        end
-        r = Net::HTTP.start(url.host, url.port,
-                            use_ssl: config[:protocol] == 'https') do |h|
-          h.request(req)
-        end
+        auth_headers = {}
+        auth_headers = { Authorization: "#{config[:username]} #{config[:password]}" } if !config[:username].nil? && !config[:password].nil?
+        r = RestClient::Resource.new("#{config[:protocol]}://#{s}:#{config[:port]}#{uri}", auth_headers, config[:timeout]).get
+        expected = if config[:instances].zero?
+                     default_tasks(s)
+                   else
+                     config[:instances]
+                   end
+        ok_count, unhealthy = check_tasks r
 
-        ok_count, unhealthy = check_tasks r.body
+        message = "#{ok_count}/#{expected} #{config[:task]} tasks running"
 
-        message = "#{ok_count}/#{config[:instances]} #{config[:task]} tasks running"
+        message << ":\n" << unhealthy.join("\n") if unhealthy.any?
 
-        if unhealthy.any?
-          message << ":\n" << unhealthy.join("\n")
-        end
-
-        if unhealthy.any? || ok_count < config[:instances]
-          critical message
-        end
+        critical message if unhealthy.any? || ok_count < config[:instances]
 
         ok message
       rescue Errno::ECONNREFUSED, SocketError
@@ -173,4 +170,13 @@ class MarathonTaskCheck < Sensu::Plugin::Check::CLI
 
     [tasks.length, unhealthy]
   end
+
+  def default_tasks(server)
+    expected_tasks_url = "/v2/apps/#{config[:task]}"
+    auth_headers = {}
+    auth_headers = { Authorization: "#{config[:username]} #{config[:password]}" } if !config[:username].nil? && !config[:password].nil?
+    r = RestClient::Resource.new("#{config[:protocol]}://#{server}:#{config[:port]}#{expected_tasks_url}", auth_headers, config[:timeout]).get
+    n_tasks = JSON.parse(r)['app']['instances']
+    n_tasks
+  end
 end

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

@@ -1,7 +1,7 @@
 module SensuPluginsMesos
   module Version
     MAJOR = 2
-    MINOR = 0
+    MINOR = 1
     PATCH = 0
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-mesos
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Sensu Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-15 00:00:00.000000000 Z
+date: 2017-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -268,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Sensu plugins for checking mesos