singularity_task_history 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 687770f9f92e63dbdcddc7761189f33d3d707080
-  data.tar.gz: dc4bad4bedfb7815ee9f47f18e24ec6356c5c596
+  metadata.gz: ed91835a8a8bec80d1e81db362b434f154025712
+  data.tar.gz: 6a287813b126a21a169731d306b2b1561695f858
 SHA512:
-  metadata.gz: 6bb03d89cd2f85562fb8d9e879694f7f2a3cc51c33da5b1fe9efd8695fa65e8c3feffb3d36759cb91b91c294fd7754d6fd93dd105ad49b6cbbd09943da0971d9
-  data.tar.gz: bb6f613acc9dbb353b52377c03c0ce4daf450e76ee2ba02deacd891d3f10686f4d36c86cb111ec50c739f909278c01d168cf340af6945375e5978c25106b488a
+  metadata.gz: 4939b891c7c27e572f86d8c32910419e68cae990fbbef51fed6eaf77470f418ec6d460d7d27e283e02a8b029ca944b0fd9840f52d6149fe10ee64149dde81811
+  data.tar.gz: ada94f025c3cdaaa934635ef0fa03677a86979eeaf7cd9063d93c81ff57dcce8cda133f9ad474432b5fd6134e797329ec4746e578cc99198ec2314a6b524ead9

data/bin/singularity_task_history

@@ -27,14 +27,14 @@ class SingularityTaskHistory < Sensu::Plugin::Check::CLI
          proc: proc { |n| n.to_i }
 
   def run
-    warn_list = {}
-    crit_list = {}
-    task_list.each do |task|
-      count = history_count(task)
-      crit_list[task] = count if count >= config[:critical]
-      warn_list[task] = count if count >= config[:warn]
+    alert_list = gen_alert_list(config[:warn], config[:critical])
+    if !alert_list[:crit].empty?
+      critical "Excessive task history\n#{report(alert_list)}"
+    elsif !alert_list[:warn].empty?
+      warning "Excessive task history\n#{report(alert_list)}"
+    else
+      ok 'Task history is fine'
     end
-    report(crit_list, warn_list)
   end
 
   def initialize
@@ -43,6 +43,19 @@ class SingularityTaskHistory < Sensu::Plugin::Check::CLI
     @history_node = '/singularity/tasks/history'
   end
 
+  def gen_alert_list(warn, crit)
+    alerts = { crit: {}, warn: {} }
+    task_list.each do |task|
+      count = history_count(task)
+      if count > crit
+        alerts[:crit][task] = count
+      elsif count > warn
+        alerts[:warn][task] = count
+      end
+    end
+    alerts
+  end
+
   def child_list(znode)
     children = @z.get_children(path: znode)
     children[:children]
@@ -56,23 +69,13 @@ class SingularityTaskHistory < Sensu::Plugin::Check::CLI
     child_list(@history_node + '/' + task).count
   end
 
-  def task_output(task_list)
-    if task_list.length == 0
-      ''
-    else
-      task_list.map { |k, v| "#{k}: #{v}" }.join("\n") + "\n"
-    end
-  end
-
-  def report(crit_list, warn_list)
-    warn_list.delete_if { |k, _v| crit_list.key?(k) }
-    detail = task_output(crit_list) + task_output(warn_list)
-    if crit_list.length > 0
-      critical "Excessive task history:\n#{detail}"
-    elsif warn_list.length > 0
-      warn "Excessive task history:\n#{detail}"
-    else
-      ok 'All task history within limits'
+  def report(task_list)
+    output = ''
+    task_list.keys.each do |key|
+      task_list[key].keys.each do |task|
+        output += "#{task}: #{task_list[key][task]}\n"
+      end
     end
+    output
   end
 end

data/lib/singularity_task_history/version.rb

@@ -1,3 +1,3 @@
 module SingularityTaskHistory
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: singularity_task_history
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Carl Flippin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-07 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zookeeper