sensu-plugins-sensu 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db61d659c304cbb69bab103dc96810acc18b303e
-  data.tar.gz: 65d88dbf81a056122cf421e2eef2a354e0cb7971
+  metadata.gz: a41669c0e26a07efba58456daa34b954a6b5fd2a
+  data.tar.gz: dee205425b435940dc7cc0a7259c5809db7ecbbb
 SHA512:
-  metadata.gz: 87ba1a72154774b05550e1969d7e3f6a7129921371cff565bb29067f74b3502d499628886929efb20450b0633dda14d2a37083dd391ce9121c1ff6a573863308
-  data.tar.gz: 06d0d10142e70be953d73eef0b233eda4e4b4ef25d2b1632d4c7a2fee9b11dedd26a6e5bcadcf1e89008e15033abd7db4c930768ddd88e5b0ed00e92cb452c12
+  metadata.gz: 85edf389d8f682d779c59df352607039d787dc3890b075d4e996f91458f4ad6d79af45b69b40690efbe0fa13a4543ea59e3f5d7c59f2c495dec32961d3d421ec
+  data.tar.gz: 57c3945315d07a507a57a774656884f483ab2e683a87ac230c241b615b7a14662dda3bdec20ceb63f66820c052b0f1eba31fb301226da489d4de33c3c912a405

data/CHANGELOG.md

@@ -1,10 +1,19 @@
 # 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]
 
+## [2.1.1] - 2017-00-09
+### Fixed
+- metrics-aggregates.rb: Refactored to support new named aggregates introduced in Sensu 0.24 (@oba11)
+
+### Changed
+- check-stale-results.rb: made invocation of ok more idiomatic (@rbanffy)
+- updated the location for our changelog guidelines (@majormoses)
+
 ## [2.1.0] - 2017-08-29
 ### Added
 - check-stale-results.rb: new script to check for stale results in sensu (@m4ce)
@@ -12,9 +21,9 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## [2.0.0] - 2017-08-20
 ### Breaking Changes
-- check-aggregates.rb: Changed the default behaviour to alert with the severity of the aggregated checks.
+- check-aggregates.rb: Changed the default behavior to alert with the severity of the aggregated checks. (@Moozaliny)
 
-### Added
+### AddedMoozaliny
 - check-aggregates.rb: Added new flag to ignore severities. If --ignore-severity is supplied all non-ok will count for critical, critical_count, warning and warning_count option.
 
 ### Fixed
@@ -70,6 +79,7 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 - initial release
 
 [Unreleased]: https://github.com/sensu-plugins/sensu-plugins-sensu/compare/2.1.0...HEAD
+[2.1.1]: https://github.com/sensu-plugins/sensu-plugins-sensu/compare/2.1.0...2.1.1
 [2.1.0]: https://github.com/sensu-plugins/sensu-plugins-sensu/compare/2.0.0...2.1.0
 [2.0.0]: https://github.com/sensu-plugins/sensu-plugins-sensu/compare/1.1.1...2.0.0
 [1.1.1]: https://github.com/sensu-plugins/sensu-plugins-sensu/compare/1.1.0...1.1.1

data/bin/check-stale-results.rb

@@ -104,6 +104,6 @@ class CheckStaleResults < Sensu::Plugin::Check::CLI
       warning(msg)
     end
 
-    ok("No stale check results found (>= #{config[:warn]})")
+    ok "No stale check results found (>= #{config[:warn]})"
   end
 end

data/bin/metrics-aggregate.rb

@@ -24,8 +24,9 @@
 # LICENSE for details.
 
 require 'sensu-plugin/metric/cli'
-require 'rest-client'
 require 'json'
+require 'net/http'
+require 'net/https'
 
 class AggregateMetrics < Sensu::Plugin::Metric::CLI::Graphite
   option :api,
@@ -68,20 +69,18 @@ class AggregateMetrics < Sensu::Plugin::Metric::CLI::Graphite
          description: 'Verbose output'
 
   def api_request(resource)
-    request = RestClient::Resource.new(config[:api] + resource, timeout: config[:timeout],
-                                                                user: config[:user],
-                                                                password: config[:password])
-    JSON.parse(request.get, symbolize_names: true)
-  rescue RestClient::ResourceNotFound
-    warning "Resource not found: #{resource}"
+    uri = URI.parse(config[:api])
+    http = Net::HTTP.new(uri.host, uri.port)
+    if uri.scheme == 'https'
+      http.use_ssl = true
+    end
+    req = Net::HTTP::Get.new(resource)
+    r = http.request(req)
+    JSON.parse(r.body)
   rescue Errno::ECONNREFUSED
     warning 'Connection refused'
-  rescue RestClient::RequestFailed
-    warning 'Request failed'
-  rescue RestClient::RequestTimeout
+  rescue Timeout::Error
     warning 'Connection timed out'
-  rescue RestClient::Unauthorized
-    warning 'Missing or incorrect Sensu API credentials'
   rescue JSON::ParserError
     warning 'Sensu API returned invalid JSON'
   end
@@ -95,27 +94,29 @@ class AggregateMetrics < Sensu::Plugin::Metric::CLI::Graphite
 
   def get_aggregate(check)
     uri = "/aggregates/#{check}"
-    issued = api_request(uri + "?age=#{config[:age]}")
-    unless issued.empty?
-      issued_sorted = issued.sort
-      time = issued_sorted.pop
-      unless time.nil?
-        uri += "/#{time}"
-        [time, api_request(uri)]
-      else
-        warning "No aggregates older than #{config[:age]} seconds"
-      end
-    else
+    issued = api_request(uri + "?max_age=#{config[:age]}")
+    if issued.empty?
       warning "No aggregates for #{check}"
+    else
+      issued
     end
   end
 
   def run
+    timestamp = Time.now.to_i
     acquire_checks.each do |check|
-      timestamp, aggregate = get_aggregate(check[:check])
-      puts "#{check[:check]} aggregates: #{aggregate}" if config[:debug]
+      aggregate = get_aggregate(check['name'])
+      puts "#{check['name']} aggregates: #{aggregate}" if config[:debug]
       aggregate.each do |result, count|
-        output "#{config[:scheme]}.#{check[:check]}.#{result}", count, timestamp
+        # in 0.24 they changed the api results for aggregates this helps
+        # maintain backwards compatibility with 0.23 and newer versions.
+        if count.is_a?(Hash)
+          count.each do |x, y|
+            output "#{config[:scheme]}.#{check['name']}.#{x}", y, timestamp
+          end
+        else
+          output "#{config[:scheme]}.#{check['name']}.#{result}", count, timestamp
+        end
       end
     end
     ok

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-sensu
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-29 00:00:00.000000000 Z
+date: 2017-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-plugin
@@ -245,7 +245,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 sensu