htmon-icinga 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c30dda56c7d503eb052a3e9cbbbe1587394c5de
-  data.tar.gz: a9a1745d46c54753913c2064df67468a0ee994e2
+  metadata.gz: 32cf3cc2f46c2ae90b728f96657808794d1ed2d1
+  data.tar.gz: 2a91b3c31ed381a5c3878e1a82f49fb826e1261f
 SHA512:
-  metadata.gz: 1b5081a09b4bf191337d41e81d9c744bc1a8adc6adef30a4bd73de630228cc4647ce4d083a374fce8f513c8c232a1fd3105b0b40b18033781576d713590592ce
-  data.tar.gz: 14fc9b5615d8bdca01b300d85d8834d12690778871462be766a000e474b24844a567cf6ffd2297085af7c2127db1bbced9a07308b36be0f61ac00053fccf1264
+  metadata.gz: a88849136a5614184deddcb7ab36b5b8625967b05785a7e41937419b58c7c0d6ea7aff6cca2192cd161350e3f0ddfcf700fc1ec302d9bfeb34714cb8ac0f6029
+  data.tar.gz: 4178f732670e44a59859d71ef25f0a5176b758fc9009da40f27c22659347cdcba51d781f8fff77dc3332fdc84b3181050634120a9485e801842b214f500eb53e

data/icinga_conf/commands.conf

@@ -38,4 +38,11 @@ object CheckCommand "htmon-process" {
   vars.htmon_metric = "process::$htmon_process$"
 }
 
+object CheckCommand "htmon-load" {
+	import "htmon-command"
+
+	command = [ LocalBin + "/check_htmon" ]
+
+	vars.htmon_metric = "load"
+}
 

data/icinga_conf/hosts.conf

@@ -8,6 +8,7 @@ object Host "sample.moo.gl" {
   ]
   
   vars.htmon_hostname = "peter.moo.gl"
+  vars.htmon_loadwarn = 1
 
 }
 

data/icinga_conf/services.conf

@@ -17,4 +17,13 @@ apply Service "process " for (process in host.vars.htmon_processes)  {
   assign where host.vars.htmon_processes != null
 }
 
+apply Service "htmon_load" {
+  import "generic-service"
+
+  check_command = "htmon-load"
+ 
+  vars.htmon_warn = host.vars.htmon_loadwarn
+  vars.htmon_hostname = host.vars.htmon_hostname
+  assign where host.vars.htmon_hostname && host.vars.htmon_loadwarn
+}
 

data/lib/htmon/icinga/modules/load.rb

@@ -13,14 +13,14 @@ module Htmon
         callback :on_ok do |value, warn, thresh|
           if value.avg5 < warn.to_i
             "Load values are #{value.avg1}, #{value.avg5}, #{value.avg1}"+
-              "| avg1=#{value.avg1} avg5=#{value.avg5},#{warn.to_i} avg15=#{value.avg15}"
+              "| avg1=#{value.avg1} avg5=#{value.avg5};#{warn.to_i} avg15=#{value.avg15}"
           end
         end
 
         callback :on_warn do |value, warn, thresh|
           if value.avg5 >= warn.to_i
             "Load values are #{value.avg1}, #{value.avg5}, #{value.avg1}"+
-              "| avg1=#{value.avg1} avg5=#{value.avg5},#{warn.to_i} avg15=#{value.avg15}"
+              "| avg1=#{value.avg1} avg5=#{value.avg5};#{warn.to_i} avg15=#{value.avg15}"
           end
         end
 

data/lib/htmon/icinga/modules/packages.rb

@@ -5,16 +5,16 @@ module Htmon
       class Packages < Module
         
         callback :on_ok do |value, warn, thresh|
-          if value.amount < warn.to_i
-            "#{value} packages are out of date."+
-              "| packages=#{value.amount}"
+          if value.to_i < warn.to_i
+            "#{value.to_i} packages are out of date."+
+              "| packages=#{value.amount};#{warn.to_i}"
           end
         end
         
         callback :on_warn do |value, warn, thresh|
-          if value.amount >= warn.to_i
-            "#{value} packages are out of date, update needed."+
-              "| packages=#{value.amount},#{warn.to_i}"
+          if value.to_i >= warn.to_i
+            "#{value.to_i} packages are out of date, update needed."+
+              "| packages=#{value.amount};#{warn.to_i}"
           end
         end
 

data/lib/htmon/icinga/version.rb

@@ -1,5 +1,5 @@
 module Htmon
   module Icinga
-    VERSION = "0.3.2"
+    VERSION = "0.3.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: htmon-icinga
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Tim Foerster