sensu-plugins-edgelab 1.14.0 → 1.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e25e0c5ae2a5c5b6d69cc607b9d87e115aa3d71f
-  data.tar.gz: 8c680d4beab1d89e0d33c6b58d018c3eac7d8af2
+SHA256:
+  metadata.gz: cac9db6c64318afdd3af552c867128d4e220b304afa9ce52e315f17c5f091b1e
+  data.tar.gz: d84928b4ccde348c7da971fe0638c18859b6f4d9ee8aeaa75579f47daf7d212e
 SHA512:
-  metadata.gz: fe7ce51186caf435880c94b7b97662dbfe2b9cea1ff87c85573d290bd7bfa7bb02d0d1cd2a3c4df01a7ce9d5f5371dfe1c6f22cd0d893918db8fc5b874d08106
-  data.tar.gz: 7e30e3e28ac3080e213ad0daff4f434fde1334fc496b6756551fbb2e843bf1280df8311b2a3ea48825bb62bb7ce22c92bd1cd1e1ce008f7a9245c558b547afe3
+  metadata.gz: 8eb1971adf0e30ac0aa670d6353ffe3b03459d729271070737147ccae8cabdb50719547235acb50f8deeabbfebfbea2ef7d2942d28a4376b6acc26294e379dcd
+  data.tar.gz: 2b7ded62142c3443fef65d8f0b5b04a6ff003a2626c4e031c4961842bd6bf3ff47d00f924de3af9c1e112f691a58e9700eeb542b897187ba5ffeafca52079670

data/bin/check-apt-expired-keys.rb

@@ -1,5 +1,6 @@
 #! /usr/bin/env ruby
 # frozen_string_literal: true
+
 #
 #   check-apt-expired-keys
 #
@@ -39,7 +40,7 @@ class APTKey < Sensu::Plugin::Check::CLI
 
     expired = expired_keys
 
-    if expired.count > 0
+    if expired.count.positive?
       if expired.count == 1
         verb = 'is'
         noun = 'key'

data/bin/check-cassandra-nodes.rb

@@ -108,9 +108,9 @@ class CheckCassandraNode < Sensu::Plugin::Check::CLI
       ok_nodes << "#{address} is normal (#{node[:status]}#{node[:state]})"
     end
 
-    if error_nodes.count > 0
+    if error_nodes.count.positive?
       criticial error_nodes.join(', ')
-    elsif warning_nodes.count > 0
+    elsif warning_nodes.positive?
       warning warning_nodes.join(', ')
     else
       ok ok_nodes.join(', ')

data/bin/check-logstash-pipeline.rb

@@ -123,7 +123,7 @@ class CheckLogstashPipeline < Sensu::Plugin::Check::CLI
       tries += 1
       response = RestClient.post(url, body)
       found = JSON.parse(response)['responses'][0]['hits']['total']
-      break if found > 0
+      break if found.positive?
     end
 
     duration = Time.now.to_i - sent_at.to_i

data/bin/check-nomad-jobs.rb

@@ -74,7 +74,7 @@ class CheckNomadAllocations < Sensu::Plugin::Check::CLI
         reasons << "Constraint #{constraint} filtered #{count} nodes"
       end
 
-      if metrics['NodesExhausted'] > 0
+      if (metrics['NodesExhausted']).positive?
         reasons << "Resources exhausted on #{metrics['NodesExhausted']} nodes"
       end
 
@@ -110,13 +110,12 @@ class CheckNomadAllocations < Sensu::Plugin::Check::CLI
     end
 
     # System jobs don't have blocked evaluation, only one evaluation per job.
-    if (job['Type'] == 'system' || blocked) && !last_failed.nil?
-      failure_reasons = placement_failures_reasons last_failed
+    return unless (job['Type'] == 'system' || blocked) && !last_failed.nil?
 
-      if failure_reasons.any?
-        failed << "#{job['ID']}: Placemement failure [" + failure_reasons.join(' / ') + ']'
-      end
-    end
+    failure_reasons = placement_failures_reasons last_failed
+    return unless failure_reasons.any?
+
+    failed << "#{job['ID']}: Placemement failure [" + failure_reasons.join(' / ') + ']'
   end
 
   # Check for service/system job if he is running.
@@ -180,7 +179,7 @@ class CheckNomadAllocations < Sensu::Plugin::Check::CLI
     now = Time.new.to_i
 
     allocations.each do |alloc|
-      if %w(running pending).include? alloc['ClientStatus']
+      if %w[running pending].include? alloc['ClientStatus']
         next if alloc['TaskStates'].nil?
 
         alloc['TaskStates'].each do |_, state|

data/bin/handler-multi-hipchat.rb

@@ -51,10 +51,10 @@ class HipChatNotif < Sensu::Handler
     room = @event['client']['hipchat_room'] || @event['check']['hipchat_room'] || settings[json_config]['room']
 
     mentions = @event['check']['hipchat_mentions'] || []
-    if not mentions.kind_of?(Array)
+    unless mentions.is_a?(Array)
       mentions = [mentions]
     end
-    mentions = mentions.map{ |e| String(e) }
+    mentions = mentions.map { |e| String(e) }
 
     puts "Will mentions: #{mentions}"
     puts "Will send to room: #{room}"
@@ -68,7 +68,7 @@ class HipChatNotif < Sensu::Handler
     if @event['check']['playbook']
       begin
         uri = URI.parse(@event['check']['playbook'])
-        playbook << if %w( http https ).include?(uri.scheme)
+        playbook << if %w[http https].include?(uri.scheme)
                       "  [<a href='#{@event['check']['playbook']}'>Playbook</a>]"
                     else
                       "  Playbook:  #{@event['check']['playbook']}"
@@ -78,10 +78,10 @@ class HipChatNotif < Sensu::Handler
       end
     end
 
-    if message_template && File.readable?(message_template)
-      template = File.read(message_template)
-    else
-      template = '''<%=
+    template = if message_template && File.readable?(message_template)
+                 File.read(message_template)
+               else
+                 '<%=
       [
         @event["action"].eql?("resolve") ? "RESOLVED" : "ALERT",
         " - [#{event_name}] - ",
@@ -89,8 +89,9 @@ class HipChatNotif < Sensu::Handler
         playbook,
         "."
       ].join
-      %>'''
-    end
+      %>'
+               end
+
     eruby = ERB.new(template)
     message = eruby.result(binding)
 
@@ -105,9 +106,9 @@ class HipChatNotif < Sensu::Handler
       notify = true
     end
 
-    mentions = mentions.map{|user| "@#{user}"}.join(", ")
+    mentions = mentions.map { |user| "@#{user}" }.join(', ')
 
-    if mentions and message_format != "html" and not @event['action'].eql?('resolve')
+    if mentions && message_format != 'html' && !@event['action'].eql?('resolve')
       # Add the mention only if the action is not resolved.
       message = "#{message} #{mentions}"
     end
@@ -123,17 +124,17 @@ class HipChatNotif < Sensu::Handler
       puts "Timed out while attempting to message #{room}"
     end
 
-    if message_format == 'html' and mentions and not @event['action'].eql?('resolve')
-      # HTML messages won't notify when using @mentions.
-      begin
-        Timeout.timeout(5) do
-          hipchatmsg[room].send(from, mentions,
-                                color: color,
-                                message_format: "text")
-        end
-      rescue Timeout::Error
-        puts "Timed out while attempting to send mentions to #{room}"
+    return unless message_format == 'html' && mentions && !@event['action'].eql?('resolve')
+
+    # HTML messages won't notify when using @mentions.
+    begin
+      Timeout.timeout(5) do
+        hipchatmsg[room].send(from, mentions,
+                              color: color,
+                              message_format: 'text')
       end
+    rescue Timeout::Error
+      puts "Timed out while attempting to send mentions to #{room}"
     end
   end
 end

data/bin/metrics-aws-rds.rb

@@ -129,11 +129,8 @@ class RDSMetrics < Sensu::Plugin::Metric::CLI::Graphite
       r = cloud_watch_metric key, rdsname
       result[config[:scheme] + '.' + rdsname + '.' + key] = r[:datapoints][0] unless r[:datapoints][0].nil?
     end
-    unless result.nil?
-      result.each do |key, value|
-        output key.to_s, value.average, value[:timestamp].to_i
-      end
+    result.each do |key, value|
+      output key.to_s, value.average, value[:timestamp].to_i
     end
-    exit
   end
 end

data/bin/metrics-cassandra-basic.rb

@@ -62,7 +62,7 @@ class CassandraBasicMetrics < Sensu::Plugin::Metric::CLI::Graphite
   def connect
     @cluster = Cassandra.cluster(
       hosts: [config[:hostname]],
-      port: config[:port],
+      port: config[:port]
     )
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-edgelab
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.14.1
 platform: ruby
 authors:
 - Edgelab
@@ -80,20 +80,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.8.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.8.6
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -170,32 +156,32 @@ 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
 description: Sensu plugins developed by Edgelab
 email: 
 executables:
-- check-nomad-leader.rb
-- metrics-es-indices.rb
+- check-apt-expired-keys.rb
+- check-cassandra-nodes.rb
 - check-consul-services.rb
+- check-logstash-pipeline.rb
 - check-nomad-jobs.rb
-- metrics-aws-rds.rb
-- check-apt-expired-keys.rb
-- metrics-swarm-cluster.rb
+- check-nomad-leader.rb
 - check-swarm-cluster.rb
-- metrics-cassandra-basic.rb
-- metrics-redis-key-pattern.rb
-- check-cassandra-nodes.rb
-- metrics-aws-elb.rb
 - handler-multi-hipchat.rb
-- check-logstash-pipeline.rb
 - metrics-aws-asg.rb
+- metrics-aws-elb.rb
+- metrics-aws-rds.rb
+- metrics-cassandra-basic.rb
+- metrics-es-indices.rb
+- metrics-redis-key-pattern.rb
+- metrics-swarm-cluster.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -233,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Contains Edgelab plugins for Sensu