what 0.0.16 → 0.1.0

data/example/modules/custom_module.rb

@@ -8,12 +8,10 @@ class What::Modules::CustomModule < What::Modules::Base
     'world' => 'world'
   }
 
-  # You can use the initialize method to set up any data structures you'll be
-  # using. If you do write an initialize, make sure to call super to populate
-  # the @config object.
+  # You can use the initialize_module method to set up any data structures
+  # you'll be using.
   # (optional)
-  def initialize
-    super
+  def initialize_module
     @hellos = 1
   end
 

data/example/what.yml

@@ -1,55 +1,60 @@
 # Config file for the What monitoring system.
 
-### Choose between JSON and YAML formatting. (default: json)
-formatter: json
+# Choose between JSON and YAML formatting.
+#formatter: json
 
-### Set the polling interval for all services, in seconds. (default: 10)
-interval: 10
+# Set the polling interval for all services, in seconds.
+#interval: 10
 
-### Set an optional token that must be provided as a query string to retrieve
-### status via HTTP.
-# secret_token: il1k3tUr7l3z
+# Set an optional token that must be provided as a query string to retrieve
+# status via HTTP.
+#secret_token: il1k3tUr7l3z
 
-### Specify paths containing custom modules to load, relative to this file.
+# Specify paths containing custom modules to load, relative to this file.
 module_paths:
 - modules
 
-### List all modules to be monitored.
+# List all modules to run.
 modules:
-- custom_module
-#- disk
-#- processes
-#- unicorn
-#- what
-#- existence
-
-### Pass parameters into modules.
-module_config:
-  custom_module:
+- name: unicorn
+  type: unicorn
+  config:
+    warning: 1
+    alert: 0
+- name: hello world
+  type: custom_module
+  config:
+    hello: hello
+    world: world
+- name: world hello
+  type: custom_module
+  config:
     hello: world
     world: hello
-#  disk:
-#    # percentage of disk space filled
-#    "/$":
-#      warning: 70%
-#      alert: 80%
-#    "/Volumes/BOOTCAMP":
-#      warning: 80%
-#      alert: 90%
-#  processes:
-#    postgres: postgres
-#    beanstalkd: beanstalkd
-#    redis: redis-server
-#  unicorn:
-#    # minimum number of workers before warning and alert statuses
-#    warning: 1
-#    alert: 0
-#  what:
-#    some_host: somehost.com
-#  existence:
+#- name: Macintosh HD
+#  type: disk
+#- name: Boot Camp
+#  type: disk
+#  config:
+#    regexp: "/Volumes/BOOTCAMP"
+#- name: postgres
+#  type: process
+#- name: beanstalk
+#  type: process
+#  config:
+#    regexp: beanstalkd
+#- name: redis
+#  type: process
+#  config:
+#    regexp: redis-server
+#- type: existence
+#  config:
 #    paths:
-#      - /mnt/a_drive
+#    - /mnt/a_drive
+#- type: what
+#  config:
+#    some_host: somehost.com
 
-### Specify any other config files to load.
-# configs:
-# - more_config/stuff.yml
+# Specify any other config files to load.
+#configs:
+#- more_config/stuff.yml

data/lib/what/config.rb

@@ -5,8 +5,7 @@ module What
       'formatter'     => 'json',
       'configs'       => [],
       'module_paths'  => [],
-      'modules'       => [],
-      'module_config' => {}
+      'modules'       => []
     }
 
     @config = {}

data/lib/what/modules/base.rb

@@ -1,11 +1,14 @@
 module What
   class Modules::Base
-    def initialize
-      @config = if defined?(DEFAULTS)
-                  DEFAULTS.merge(Config['module_config'][self.name] || {})
-                else
-                  Config['module_config'][self.name]
-                end
+    def initialize(params={})
+      defaults = (self.class)::DEFAULTS rescue {}
+      @name = params['name']
+      @config = defaults.merge(params['config'] || {})
+      @max = params['max'] || 'alert'
+      initialize_module
+    end
+
+    def initialize_module
     end
 
     def name
@@ -16,7 +19,18 @@ module What
     end
 
     def status
-      {'health' => health}.merge(details)
+      status = {}
+      status['name'] = @name if @name
+      status['type'] = name # FIXME
+      status['health'] = if @max == 'ok' || health == 'ok'
+                           'ok'
+                         elsif @max == 'warning' || health == 'warning'
+                           'warning'
+                         else
+                           'alert'
+                         end
+      status['details'] = details
+      status
     end
 
     def health

data/lib/what/modules/disk.rb

@@ -1,60 +1,45 @@
 module What
   class Modules::Disk < Modules::Base
-    def initialize
-      super
-      @config.each do |name, config|
-        if config.is_a?(Hash)
-          @config[name] = {
-            'warning' => config['warning'].to_i,
-            'alert'   => config['alert'].to_i
-          }
-        else
-          @config[name] = {
-            'warning' => config.to_i,
-            'alert'   => 100
-          }
-        end
-      end
-      @drives = {}
+    DEFAULTS = {
+      'regexp' => '/$',
+      'warning' => '90%',
+      'alert'   => '99%'
+    }
+
+    def initialize_module
+      @regexp = Regexp.new(@config['regexp'])
     end
 
     def check!
-      @config.each do |name, config|
-        ln = `df -h`.split("\n").grep(Regexp.new(name)).first
-        if ln
-          fields = ln.split(/\s+/)
-          @drives[name] = {
-            'size'     => fields[1],
-            'used'     => fields[2],
-            'avail'    => fields[3],
-            'use%'     => fields[4].to_i,
-            'warning%' => config['warning'],
-            'alert%'   => config['alert']
-          }
-        else
-          @drives[name] = nil
-        end
-      end
+      line = `df -h`.split("\n").grep(@regexp).first
+      @info = if line
+                fields = line.split(/\s+/)
+                {
+                  'size'     => fields[1],
+                  'used'     => fields[2],
+                  'avail'    => fields[3],
+                  'use%'     => fields[4].to_i,
+                  'warning%' => @config['warning'].to_i,
+                  'alert%'   => @config['alert'].to_i,
+                  'regexp'   => @config['regexp']
+                }
+              end
     end
 
     def health
-      healths = @drives.map do |name, attrs|
-                  puts name, attrs.inspect
-                  if attrs.nil?
-                    'alert'
-                  elsif attrs['use%'] >= attrs['alert%']
-                    'alert'
-                  elsif attrs['use%'] >= attrs['warning%']
-                    'warning'
-                  else
-                    'ok'
-                  end
-                end
-      Helpers.overall_health(healths)
+      if @info.nil?
+        'alert'
+      elsif @info['use%'] >= @info['alert%']
+        'alert'
+      elsif @info['use%'] >= @info['warning%']
+        'warning'
+      else
+        'ok'
+      end
     end
 
     def details
-      @drives
+      @info
     end
   end
 end

data/lib/what/modules/existence.rb

@@ -4,8 +4,7 @@ module What
       'paths' => []
     }
 
-    def initialize
-      super
+    def initialize_module
       @paths = {}
     end
 

data/lib/what/modules/process.rb

@@ -0,0 +1,27 @@
+module What
+  class Modules::Process < Modules::Base
+    def initialize_module
+      @regexp = Regexp.new(@config['regexp'] || @name)
+      @processes = []
+    end
+
+    def check!
+      @processes = `ps aux`.split("\n").grep(@regexp).map do |ln|
+                     ln =~ /^\w+\s+(\d+).*(\d+:\d\d(?:\.\d\d)?) (.*)$/
+                     {'pid' => $1, 'cpu_time' => $2, 'proctitle' => $3.strip}
+                   end
+    end
+
+    def health
+      if @processes.count > 0
+        'ok'
+      else
+        'alert'
+      end
+    end
+
+    def details
+      {'processes' => @processes}
+    end
+  end
+end

data/lib/what/modules/unicorn.rb

@@ -5,8 +5,7 @@ module What
       'alert'   => 0
     }
 
-    def initialize
-      super
+    def initialize_module
       @unicorns = []
     end
 

data/lib/what/modules/what.rb

@@ -1,8 +1,7 @@
 # This module assumes the other servers are using the JSON formatter.
 module What
   class Modules::What < Modules::Base
-    def initialize
-      super
+    def initialize_module
       @config.each do |name, host|
         @config[name] = "http://#{host}:9428"
       end

data/lib/what/monitor.rb

@@ -2,9 +2,9 @@ module What
   class Monitor
     # don't worry, these method names are ironic
     def self.go!
-      @modules = Config['modules'].map do |m|
-        name = Helpers.camelize(m)
-        Modules.const_get(name).new
+      @modules = Config['modules'].map do |mod|
+        name = Helpers.camelize(mod.delete('type'))
+        Modules.const_get(name).new(mod)
       end
 
       Thread.abort_on_exception = true
@@ -12,14 +12,17 @@ module What
     end
 
     def self.do_it(modules)
+      Status['details'] = []
       loop do
+        statuses = []
         healths = []
         modules.each do |mod|
           mod.check!
-          healths << mod.health
-          Status[mod.name] = mod.status
+          healths << mod.status['health']
+          statuses << mod.status
         end
         Status['health'] = Helpers.overall_health(healths)
+        Status['details'] = statuses
         sleep Config['interval']
       end
     end

data/lib/what/version.rb

@@ -1,3 +1,3 @@
 module What
-  VERSION = "0.0.16"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: what
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 27
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 16
-  version: 0.0.16
+  version: 0.1.0
 platform: ruby
 authors: 
 - Ryan Fitzgerald
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-20 00:00:00 -07:00
+date: 2011-06-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -100,7 +100,7 @@ files:
 - lib/what/modules/base.rb
 - lib/what/modules/disk.rb
 - lib/what/modules/existence.rb
-- lib/what/modules/processes.rb
+- lib/what/modules/process.rb
 - lib/what/modules/unicorn.rb
 - lib/what/modules/what.rb
 - lib/what/monitor.rb

data/lib/what/modules/processes.rb

@@ -1,34 +0,0 @@
-module What
-  class Modules::Processes < Modules::Base
-    def initialize
-      super
-      @config.each do |name, regexp_str|
-        @config[name] = Regexp.new(regexp_str)
-      end
-      @processes = {}
-    end
-
-    def check!
-      @config.each do |name, regexp|
-        @processes[name] = `ps aux`.split("\n").grep(regexp).map do |ln|
-                             ln =~ /^\w+\s+(\d+).*(\d+:\d\d(?:\.\d\d)?) (.*)$/
-                             {'pid' => $1, 'cpu_time' => $2, 'proctitle' => $3.strip}
-                           end
-      end
-    end
-
-    def health
-      all_ok = true
-      @processes.each do |name, results|
-        if results.count == 0
-          all_ok = false
-        end
-      end
-      all_ok ? 'ok' : 'alert'
-    end
-
-    def details
-      @processes
-    end
-  end
-end