slugly 0.0.4 → 0.0.6

data/bin/slugly

@@ -4,85 +4,123 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), %w{.. lib}))
 require 'optparse'
 require 'uri'
 require 'yaml'
+require 'rubygems'
 
 require 'slugly/server'
 require 'slugly/health_provider'
 require 'slugly/ssh_health_provider'
+require 'slugly/redis_memory_monitor'
 require 'slugly/wormly_api'
+require 'slugly/wormly_serializer0_91'
 
-options_h = {}
+def host(cfgfile)
+  begin
+    restart = false
 
-optparse = OptionParser.new do |options|
-  options.on('-c', '--config FILENAME', 'config file path') do |cfgfile|
-    options_h[:cfgfile] = cfgfile
-  end
+    providers = {
+     'HealthProvider'     => [HealthProvider, true],
+     'SSHHealthProvider'  => [SSHHealthProvider, true],
+     'RedisMemoryMonitor' => [RedisMemoryMonitor, false]
+    }
 
-  options.on('-h', '--help', 'display this screen') do
-    puts options
-    exit
-  end
-end
+    config = YAML.load_file(cfgfile)
+    wormly_key = config['wormly_key']
+    host  = config['host']
+    port  = config['port']
+    nodes = config['nodes']
+    tests_folder = config['tests_folder']
 
-begin
-  optparse.parse!
-  required = [:cfgfile]
-  missing = required.select{ |param| options_h[param].nil? }
-  if not missing.empty?
-    puts "missing required options: #{missing.join(', ')}"
-    puts optparse
-    exit
-  end
-rescue OptionParser::InvalidOption, OptionParser::MissingArgument
-  puts $!.to_s
-  puts optparse
-  exit
-end
+    slugly = Server.new(host, port)
 
-providers = {
- 'HealthProvider'    => HealthProvider,
- 'SSHHealthProvider' => SSHHealthProvider
-}
+    ['INT', 'TERM'].each do |sig|
+      trap(sig) { slugly.shutdown }
+    end
 
-config = YAML.load_file(options_h[:cfgfile])
-wormly_key = config['wormly_key']
-host  = config['host']
-port  = config['port']
-nodes = config['nodes']
+    trap('USR1') do
+      slugly.shutdown
+      restart = true
+    end
 
-wormly_url_list = []
+    wormly_url_list = []
+
+    nodes.each do |node|
+      path = node['path']
+      provider, register_wormly = providers[node['provider']]
+      options = node['options']
+      wormly_id = node['wormly_id']
+      p = provider.new(options)
+
+      if register_wormly
+        wormly_url_list.push([
+          wormly_id,
+          URI::HTTP.build({
+            :host => host,
+            :port => port,
+            :path => path
+          })
+        ]) if wormly_id and wormly_key
+
+        slugly.on_request path do |request, response|
+           response.body = WormlySerializer0_91.serialize(p)
+           response['X-Wormly-Version'] = WormlySerializer0_91.version
+        end
+
+      else
+        slugly.on_request path do |request, response|
+          response.body = p.status
+        end
+      end
+    end
 
-routes = {}
-nodes.each do |node| 
-  path = node['path']
-  provider = providers[node['provider']]
-  options = node['options']
-  wormly_id = node['wormly_id']
+    slugly.serve do
 
-  if wormly_id and wormly_key
-    uri = URI::HTTP.build({
-      :host => host, :port => port, :path => path
-    })
+      #once the server is running tell wormly we're up
+      #wormly verifies that the server responds so we avoid blocking with a new thread
 
-    wormly_url_list.push([wormly_id, uri])
-  end
+      Thread.new() do
+        wormly_api = WormlyAPI.new(wormly_key)
+        wormly_url_list.each do |wormly_id, uri|
+          res = wormly_api.enable_host_hm_linux(wormly_id, uri)
+          status = res.errorcode.zero? ? "succeeded" : "failed with error '#{res.errormsg}'"
+          puts "Enabling Health Monitoring for wormly_id #{wormly_id} at #{uri} #{status}."
+        end
+      end if wormly_key
 
-  routes[path] = provider.new(options)
+    end #slugly.serve
+  end while restart
 end
 
-slugly_server = Server.new(host, port, routes)
-slugly_server.serve() do 
-  #once the server is running tell wormly we're up
-  #wormly verifies that the server responds so we avoid blocking with a new thread
-  Thread.new() do
-    wormly_api = WormlyAPI.new(wormly_key)
-
-    wormly_url_list.each do |wormly_id, uri|
-      res = wormly_api.enable_host_hm_linux(wormly_id, uri)
-      status = res.errorcode.zero? ? "succeeded" : "failed with error '#{res.errormsg}'"
-      puts "Enabling Health Monitoring for wormly_id #{wormly_id} at #{uri} #{status}."
+def main
+  options_h = {}
+
+  begin
+    optparse = OptionParser.new do |options|
+      options.on('-c', '--config FILENAME', 'config file path') do |cfgfile|
+        options_h[:cfgfile] = cfgfile
+      end
+
+      options.on('-h', '--help', 'display this screen') do
+        puts options
+        exit
+      end
+    end # OptionParser.new
+
+    optparse.parse!
+    required = [:cfgfile]
+    missing = required.select{ |param| options_h[param].nil? }
+    if not missing.empty?
+      puts "missing required options: #{missing.join(', ')}"
+      puts optparse
+      exit
     end
-
+  rescue OptionParser::InvalidOption, OptionParser::MissingArgument
+    puts $!.to_s
+    puts optparse
+    exit
   end
 
+  host(options_h[:cfgfile])
 end
 
+main
+

data/lib/slugly/redis_memory_monitor.rb

@@ -0,0 +1,37 @@
+require 'net/ssh'
+
+class RedisMemoryMonitor
+  CMD_REDIS_MEM_CURRENT = "/usr/local/bin/redis-cli -a $(grep requirepass /etc/redis.conf | cut -d ' ' -f 2) info | grep used_memory: | cut -d : -f 2"
+  CMD_REDIS_MEM_MAX = "grep 'maxmemory ' /etc/redis.conf | cut -d ' ' -f 2"
+  CACHE_TIME = 15
+
+  def initialize(options)
+    @hostname = options['hostname']
+    @username = options['username']
+    @alert_percent = options['alert_percent'].to_f
+    @last_update = Time.now - 2*CACHE_TIME
+  end
+
+  def redis_mem_alert
+    update
+    @_redis_mem_alert
+  end
+
+  def status
+    redis_mem_alert ? "above" : "below"
+  end
+
+  private
+
+  def update()
+    delta = (Time.now - @last_update).to_i
+    if delta >= CACHE_TIME
+      Net::SSH.start(@hostname, @username) do |ssh|
+        redis_mem_current = ssh.exec!(CMD_REDIS_MEM_CURRENT).to_f
+        redis_mem_max     = ssh.exec!(CMD_REDIS_MEM_MAX).to_f
+        @_redis_mem_alert = (redis_mem_current / redis_mem_max) > @alert_percent
+        @last_update = Time.now
+      end
+    end
+  end
+end

data/lib/slugly/server.rb

@@ -1,18 +1,29 @@
 require 'webrick'
 require 'slugly/slugly_servlet'
-require 'slugly/wormly_serializer0_91'
 
 class Server
-  def initialize(host, port, routes)
+  def initialize(host, port)
     @host = host
     @port = port
-    @routes = routes
+    @routes = Hash.new
+    @server = nil
+  end
+
+  def on_request(path, &callback)
+    @routes[path] = callback
+  end
+
+  def remove_request_handler(path)
+    @routes.delete(path)
   end
 
   def serve(&f)
-    server = WEBrick::HTTPServer.new(:BindAddress => @host, :Port => @port, :StartCallback => f)
-    server.mount "/", SluglyServlet, @routes, WormlySerializer0_91.new()
-    ['INT', 'TERM'].each {|sig| trap(sig) {server.shutdown}}
-    server.start
+    @server = WEBrick::HTTPServer.new(:BindAddress => @host, :Port => @port, :StartCallback => f)
+    @server.mount "/", SluglyServlet, @routes
+    @server.start
+  end
+
+  def shutdown
+    @server.shutdown if @server
   end
 end

data/lib/slugly/slugly_servlet.rb

@@ -1,29 +1,27 @@
 require 'webrick'
 
 class SluglyServlet < WEBrick::HTTPServlet::AbstractServlet
-  def initialize(server, providers, wormlyserializer)
+  def initialize(server, providers)
     super(server)
-    @serializer = wormlyserializer
     @providers  = providers
   end
 
   def do_POST(request, response)
-    response['Content-Type'] = 'text/plain'
     begin
       if not @providers.has_key?(request.path)
         response.status = 404
+        response['Content-Type'] = 'text/plain'
         response.body = "Unknown Route"
       else
-        p = @providers[request.path]
-        response.body = @serializer.serialize(p)
         response.status = 200
-        response['X-Wormly-Version'] = @serializer.version
+        @providers[request.path].call(request, response)
       end
     rescue Exception => e  
+      response.status = 500
+      response.body = "Internal Server Error"
+
       puts e.message  
       puts e.backtrace.inspect  
-      response.body = "Internal Server Error"
-      response.status = 500
     end
   end
 

data/lib/slugly/wormly_serializer0_91.rb

@@ -1,11 +1,11 @@
 require 'slugly/wormly_serializer_base'
 
 class WormlySerializer0_91 < WormlySerializerBase
-  def version
+  def self.version
       '0.91'
   end
 
-  def serialize(provider)
+  def self.serialize(provider)
     meta1 = [
       [:moment, provider.time],
       [:version, version],

data/lib/slugly/wormly_serializer_base.rb

@@ -1,9 +1,9 @@
 class WormlySerializerBase
-  def version
+  def self.version
     # e.g. '0.91'
   end
 
-  def stanza(name, body = "", values ={})
+  def self.stanza(name, body = "", values ={})
     s = "[#{name}]\n"
     values.each do |k,v|
       s += "#{k}:#{v}\n"
@@ -11,7 +11,7 @@ class WormlySerializerBase
     s += "#{body}\n"
   end
 
-  def serialize(provider)
+  def self.serialize(provider)
     #serialize as per agent.php
   end
 end

metadata

@@ -1,105 +1,97 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: slugly
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 4
-  version: 0.0.4
+version: !ruby/object:Gem::Version
+  version: 0.0.6
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Alfred Rossi
+- Arthur Neuman
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-05 00:00:00 +00:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-05-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: net-ssh
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: httparty
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-description: Proxy for Wormly.com's health monitoring to enable monitoring of machines that are behind firewalls or where you don't want to run Wormly's HTTP and PHP-based monitoring script. Requires only Ruby on the proxy server and nothing at all on the machines being monitored when the SSH-based backend is used.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Proxy for Wormly.com's health monitoring to enable monitoring of machines
+  that are behind firewalls or where you don't want to run Wormly's HTTP and PHP-based
+  monitoring script. Requires only Ruby on the proxy server and nothing at all on
+  the machines being monitored when the SSH-based backend is used.
+email:
 - alfred@actionverb.com
-executables: 
+- arthur@actionverb.com
+executables:
 - slugly
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/slugly
-- lib/slugly/wormly_api.rb
-- lib/slugly/ssh_health_provider.rb
 - lib/slugly/health_provider.rb
-- lib/slugly/slugly_servlet.rb
-- lib/slugly/wormly_serializer_base.rb
+- lib/slugly/redis_memory_monitor.rb
 - lib/slugly/server.rb
+- lib/slugly/slugly_servlet.rb
+- lib/slugly/ssh_health_provider.rb
+- lib/slugly/wormly_api.rb
 - lib/slugly/wormly_serializer0_91.rb
+- lib/slugly/wormly_serializer_base.rb
 - LICENSE
 - README.md
 - config.yaml.example
-has_rdoc: true
-homepage: https://github.com/bombino/slugly
+homepage: https://github.com/actionverb/slugly
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Slugly is a health monitoring service for wormly with support for multiple backend machines.
+summary: Slugly is a health monitoring service for wormly with support for multiple
+  backend machines.
 test_files: []
-
+has_rdoc: