htmon-icinga 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9952df5eb685c8cb83f8d80e175e25b003c6f1f5
-  data.tar.gz: 0342bdf7363b641578d3df89af853c80af597e02
+  metadata.gz: 975f860c3dbe63fa993da6d88ed798598d07050b
+  data.tar.gz: 8107e4dbfa9b736eeaeed59a74142ba3a5fd87b3
 SHA512:
-  metadata.gz: f8ab6af47d9c15c4a5d0cd34ed562b60b5b29408903af40b296d40879f69860361914c3cd399496232e1cc736492544540b70d4d92b6650db1d602bc0e2ea950
-  data.tar.gz: 6f26765b79b1521370cbd6c4bf104cd6376d7db2e570681e29b7c82dd5b9e6b09a7c6d16b50d0428aa890f73b48dce1254a4ab0a9f1dfa20cfdbf6e3a1a09f4e
+  metadata.gz: 49794963fa57bb71e01a6b103cf175fc33d1482629a7f0eb5f8431ffbfc4ab3cb952ba7c6b17ef51cf48bdea8367d0d545bab806bb091f1857d29824d2972a27
+  data.tar.gz: 26251938ccfe89451a5868225bdd30ef5c63248d43a8fd6d4c2555841285d41e64988de58b620056b78efae809d5ae23920cc5823565ebe0ff2efcd3bb6e8df4

data/htmon-icinga.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
 
   spec.add_dependency "redis"
+  spec.add_dependency "activesupport"
 end

data/lib/htmon/icinga/module.rb

@@ -4,10 +4,11 @@ module Htmon
 
     def self.new hostname: nil, metric: nil, thresh: nil, warn: nil, redis: nil
       a = Module.modules.find do |x|
-        x.metric_name.to_s == metric.to_s
+        x.metric_name.to_s == metric.to_s[/^[^:]+/]
       end
       if a
-        a.new(hostname: hostname, thresh: thresh, warn: warn, redis: redis)
+        a.new(hostname: hostname, thresh: thresh, warn: warn, 
+              redis: redis, metric: metric)
       else
         raise "No module found"
       end
@@ -63,7 +64,7 @@ module Htmon
         end
 
         def metric_name
-          @metric_name || name.downcase[/::([^:]+)$/,1]
+          @metric_name || name.gsub(/^Htmon::Icinga::Module::/, '').underscore
         end
 
         def callback method, &block
@@ -77,10 +78,10 @@ module Htmon
 
       end
 
-      attr_accessor :hostname, :thresh, :warn, :redis
+      attr_accessor :hostname, :thresh, :warn, :redis, :metric
 
-      def initialize hostname: nil, thresh: nil, warn: nil, redis: nil
-        @hostname, @thresh, @warn, @redis = hostname, thresh, warn, redis
+      def initialize hostname: nil, thresh: nil, warn: nil, redis: nil, metric: nil
+        @hostname, @thresh, @warn, @redis, @metric = hostname, thresh, warn, redis, metric
       end
 
       def redis
@@ -89,7 +90,7 @@ module Htmon
 
       def result
         hv = self.class.callbacks[:handle_value]
-        post_value = hv ? hv.call(value) : value 
+        post_value = hv ? hv.call(value, self.metric) : value 
         %i{on_ok on_warn on_crit}.map do |type|
           c = self.class.callbacks[type]
           ret = Result.new
@@ -106,7 +107,7 @@ module Htmon
       end
 
       def value
-        @value ||= redis.get "metric::#{hostname}::#{self.class.metric_name}"
+        @value ||= redis.get "metric::#{hostname}::#{self.metric}"
       end
 
     end
@@ -114,4 +115,5 @@ module Htmon
 end
 
 require_relative 'modules/keepalive'
+require_relative 'modules/process'
 

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

@@ -14,10 +14,6 @@ module Htmon
           "Keepalive not received" if value.nil?
         end
 
-        performance_data do |value|
-          "signals=#{value}"
-        end
-
       end
     end
   end

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

@@ -0,0 +1,27 @@
+
+module Htmon
+  module Icinga
+    class Module
+      class Process < Module
+        
+        Value ||= Struct.new(:amount,:name)
+
+        callback :handle_value do |value, metric|
+          Value.new(value.to_i, metric.split("::").last)
+        end
+
+        callback :on_ok do |value, warn, thresh|
+          if value.amount > 0
+            "Process #{value.name.inspect} are #{value.amount} times present "+
+              "| signals=#{value.amount}"
+          end
+        end
+
+        callback :on_crit do |value, warn, thresh|
+          "Process #{value.name.inspect} not running" unless value.amount > 0
+        end
+
+      end
+    end
+  end
+end

data/lib/htmon/icinga/version.rb

@@ -1,5 +1,5 @@
 module Htmon
   module Icinga
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

data/lib/htmon/icinga.rb

@@ -1,4 +1,5 @@
 require 'redis'
+require 'active_support/all'
 require "htmon/icinga/version"
 require "htmon/icinga/module"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: htmon-icinga
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Tim Foerster
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - github@mailserver.1n3t.de
@@ -88,6 +102,7 @@ files:
 - lib/htmon/icinga.rb
 - lib/htmon/icinga/module.rb
 - lib/htmon/icinga/modules/keepalive.rb
+- lib/htmon/icinga/modules/process.rb
 - lib/htmon/icinga/version.rb
 homepage: https://github.com/timmyArch/htmon-icinga
 licenses: