sensu-plugins-mesos 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21411bface3e1d88fc6c4041e0b5dac80044a364
-  data.tar.gz: 806ab66415a37de8c8e724078d74ca66696607ca
+  metadata.gz: d9a60518371445db07e174b8ff10c0c725ed8b2d
+  data.tar.gz: 6a28f31a75653fb66b6be2c2c024dfe930128a17
 SHA512:
-  metadata.gz: c5a02b94924115f6fed7d4fc57d4cd960624c0caf674b834375cf1733ba1275105c6cb9af26c6893eac04e95a5ca8cde46516fa0ebc390fd17e7118132653fd9
-  data.tar.gz: fab71f56c0672988d61d098e40e61ae47ebcdeca229e61588f02877630b57d72643cefe493e5298f7e46d22d7cc171d0aa4de54a6ab28257dfa9dbac305096eb
+  metadata.gz: 22f78de809bc7fbd96fe0894eb13507d605e61f0f96abe26fabd606fe6524baa25614e1446d258a7fb0195c3dfefaaa0e8ce95d2ce015edfd36ad79915492573
+  data.tar.gz: f514750c677704952d80ed2aec1e4f95af54f45ab1bc4bc6850afb311f25e07ad54217fa66057a86356a78d23cf0b788e74e1dd813ecc782a1b6f8c42f6f7187

data/CHANGELOG.md

@@ -1,9 +1,14 @@
-#Change Log
+# Change Log
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
+
+### [1.1.0] - 2017-07-10
+### Added
+- metrics-mesos.rb: Added option "include_role" to inject in metric fields whether a master node is leader or standby
+
 ## [1.0.0] - 2017-05-05
 ### Breaking Change
 - check-mesos.rb: removed the `mode` parameter (@luisdavim)
@@ -61,7 +66,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/1.0.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-mesos/compare/1.1.0...HEAD
+[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
 [0.1.1]: https://github.com/sensu-plugins/sensu-plugins-mesos/compare/0.1.0...0.1.1
 [0.1.0]: https://github.com/sensu-plugins/sensu-plugins-mesos/compare/0.0.4...0.1.0

data/bin/metrics-mesos.rb

@@ -75,6 +75,12 @@ class MesosMetrics < Sensu::Plugin::Metric::CLI::Graphite
          proc: proc(&:to_i),
          default: 5
 
+  option :include_role,
+         description: 'Include master role in metrics',
+         short: '-r INCLUDE_ROLE',
+         long: '--host INCLUDE_ROLE',
+         default: 'false'
+
   def run
     uri = config[:uri]
     case config[:mode]
@@ -86,9 +92,19 @@ class MesosMetrics < Sensu::Plugin::Metric::CLI::Graphite
     scheme = "#{config[:scheme]}.mesos-#{config[:mode]}"
     begin
       r = RestClient::Resource.new("http://#{config[:server]}:#{port}#{uri}", timeout: config[:timeout]).get
-      JSON.parse(r).each do |k, v|
+      results = JSON.parse(r)
+      if config[:include_role] == 'true' && config[:mode] == 'master'
+        add_metric = if results['master/elected'] != 0.0
+                       'leader.'
+                     else
+                       'standby.'
+                     end
+      else
+        add_metric = ''
+      end
+      results.each do |k, v|
         k_copy = k.tr('/', '.')
-        output([scheme, k_copy].join('.'), v)
+        output([scheme, add_metric + k_copy].join('.'), v)
       end
     rescue Errno::ECONNREFUSED
       critical "Mesos #{config[:mode]} is not responding"

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

@@ -1,7 +1,7 @@
 module SensuPluginsMesos
   module Version
     MAJOR = 1
-    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: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Sensu Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-05 00:00:00.000000000 Z
+date: 2017-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client