what 0.0.5 → 0.0.6

data/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2011 Academia, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -1,7 +1,7 @@
 What? A simple server monitoring tool.
 ======================================
 
-![WHAT !](http://i.imgur.com/f6lrv.png)
+![WHAT !](http://rwfitzge.github.com/what.png)
 
 What is a modular, easily-extensible server monitoring tool which is still in
 the early stages of development.

data/example/what.yml

@@ -1,5 +1,8 @@
 # Config file for the What monitoring system.
 
+### Choose between JSON and YAML formatting. (default: json)
+formatter: yaml
+
 ### Set the polling interval for all services.
 interval: 10
 
@@ -10,6 +13,7 @@ interval: 10
 ### List all modules to be monitored.
 modules:
 - unicorn
+#- processes
 
 ### Pass parameters into modules.
 module_config:
@@ -17,6 +21,10 @@ module_config:
     # minimum number of workers before warning and alert statuses
     warning: 1
     alert: 0
+#  processes:
+#    postgres: postgres
+#    beanstalkd: beanstalkd
+#    redis: redis-server
 
 ### Specify any other config files to load.
 # configs:

data/lib/what/config.rb

@@ -40,4 +40,15 @@ class What::Config
   def self.all
     @config
   end
+
+  def self.formatter
+    @formatter ||= case @config['formatter']
+                   when 'json'
+                     What::JsonFormatter.new
+                   when 'yaml'
+                     What::YamlFormatter.new
+                   else
+                     What::JsonFormatter.new
+                   end
+  end
 end

data/lib/what/formatters.rb

@@ -0,0 +1,19 @@
+class What::JsonFormatter
+  def mime
+    'application/json'
+  end
+
+  def format(hash)
+    JSON.unparse(hash) + "\n"
+  end
+end
+
+class What::YamlFormatter
+  def mime
+    'application/x-yaml'
+  end
+
+  def format(hash)
+    hash.to_yaml
+  end
+end

data/lib/what/modules/processes.rb

@@ -0,0 +1,33 @@
+class What::Modules::Processes < What::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
+

data/lib/what/modules/unicorn.rb

@@ -1,5 +1,8 @@
 class What::Modules::Unicorn < What::Modules::Base
-  @unicorns = []
+  def initialize
+    super
+    @unicorns = []
+  end
 
   def check!
     @unicorns = `ps aux`.split("\n").grep(/unicorn_rails worker/).map do |ln|

data/lib/what/server.rb

@@ -7,8 +7,8 @@ class What::Server
   def call(_)
     [
       What::Status[:health] != :alert ? 200 : 503,
-      {'Content-Type' => 'application/json'},
-      JSON.unparse(What::Status.all) + "\n"
+      {'Content-Type' => What::Config.formatter.mime},
+      What::Config.formatter.format(What::Status.all)
     ]
   end
 end

data/lib/what/version.rb

@@ -1,3 +1,3 @@
 module What
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/what.rb

@@ -8,6 +8,7 @@ require 'rack'
 
 require 'what/version'
 require 'what/helpers'
+require 'what/formatters'
 require 'what/config'
 require 'what/status'
 require 'what/modules'

data/what.gemspec

@@ -10,9 +10,9 @@ Gem::Specification.new do |s|
   s.email       = ["team@academia.edu"]
   s.homepage    = "http://academia.edu/"
   s.summary     = %q{Simple server monitoring tool}
-  s.description = "What uses WEBrick to serve a JSON object representing the" +
-                  "state of services running on a machine. It currently only" +
-                  "includes a module for monitoring Unicorn workers, but" +
+  s.description = "What uses WEBrick to serve a JSON object representing the " +
+                  "state of services running on a machine. It currently only " +
+                  "includes a module for monitoring Unicorn workers, but " +
                   "it's easy to add custom modules."
 
   s.rubyforge_project = "what"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: what
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Ryan Lower
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-10 00:00:00 -07:00
+date: 2011-05-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,7 +49,7 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
-description: What uses WEBrick to serve a JSON object representing thestate of services running on a machine. It currently onlyincludes a module for monitoring Unicorn workers, butit's easy to add custom modules.
+description: What uses WEBrick to serve a JSON object representing the state of services running on a machine. It currently only includes a module for monitoring Unicorn workers, but it's easy to add custom modules.
 email: 
 - team@academia.edu
 executables: 
@@ -61,15 +61,18 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - bin/what
 - example/what.yml
 - lib/what.rb
 - lib/what/config.rb
+- lib/what/formatters.rb
 - lib/what/helpers.rb
 - lib/what/modules.rb
 - lib/what/modules/base.rb
+- lib/what/modules/processes.rb
 - lib/what/modules/unicorn.rb
 - lib/what/monitor.rb
 - lib/what/server.rb