qnotifier 0.6.5 → 0.6.7

data/Manifest

@@ -2,10 +2,12 @@ Manifest
 Rakefile
 bin/qnotifier
 config/qnotifier_config.yml
+config/README
 gem-public_cert.pem
 lib/command.rb
 lib/plugin.rb
 lib/qnotifier.rb
+lib/qnotifierd.rb
 lib/storage.rb
 lib/web_service.rb
 plugins/apache.rb
@@ -19,3 +21,5 @@ plugins/rails.rb
 plugins/ruby.rb
 plugins/system.rb
 plugins/urls.rb
+init.d/qnotifier
+

data/Rakefile

@@ -7,7 +7,7 @@ Echoe.new('qnotifier', '0.6.0') do |p|
   p.url            = "http://qnotifier.com/qnotifier_gem"
   p.author         = "Gersham Meharg"
   p.email          = "gersham@qnotifier.com"
-  p.ignore_pattern = ["var/*"]
+  p.ignore_pattern = ["var/*", "tmp/*"]
   p.runtime_dependencies = ["rest-client >=1.4.2", "json >=1.2.3", "elif >=0.1.0"]
   p.development_dependencies = ["rest-client >=1.4.2", "json >=1.2.3", "elif >=0.1.0"]
   p.executable_pattern = ["bin/*"]

data/bin/qnotifier

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 $LOAD_PATH.unshift( File.join( File.dirname(__FILE__), '../lib' ) )
 require "command"
-
 Qnotifier::Command.run(ARGV)
 

data/config/README

@@ -0,0 +1 @@
+Plugin Development

data/config/qnotifier_config.yml

@@ -14,7 +14,7 @@
 # Whether to resend alerts 
 resend_alerts: true
 # resend_alert_time: Resend alerts every X seconds
-resend_alert_time: 1 #14400 # Four hours
+resend_alert_time: 14400 # Four hours
 
 # alert_email_address: if this is defined any alerts will be copied to this email address
 # Note that is in addition to the Qnotifier notifications
@@ -24,11 +24,6 @@ resend_alert_time: 1 #14400 # Four hours
 # PLUGINS
 #
 
-# Where to look for user generated plugins
-# To add your own plugin subclass the Qnotifier::Plugin class and put this in to this directory
-# You may add configuration parameters here based on the name of your plugin class
-plugin_directory: "/var/lib/qnotifier/plugins"
-
 # The System Plugin must be enabled, this gives basic stats like load average, disk use, memory, etc
 System:
     # use_load: either one_minute, five_minute or fifteen_minutes
@@ -64,8 +59,16 @@ Iostat:
 Mysql:
     # Enabled, set to either true or false
     enabled: false
-    username: "username"
-    password: "password"
+    username:
+    password:
+    # The name of the mysqladmin binary
+    mysqladmin: "mysqladmin"         
+    # Uncomment and edit to set a remote host
+    #hostname: "hostname"
+    # MySQL Port if not localhost, must be used with hostname above  
+    #port: 3306 
+    # Queries per second over which to generate an alert
+    #alert_qps_threshold: 100 
 
 # The Network Interface built-in plugin  
 Network:
@@ -100,7 +103,7 @@ Rails:
 # The Ruby built-in plugin
 Ruby:
     enabled: true
-    list_gems: true
+    list_gems: false
 
 #
 # Other settings that you generally will not need to modify

data/lib/command.rb

@@ -1,65 +1,179 @@
 #!/usr/bin/env ruby
-require "optparse"
 require "qnotifier"
+require "robustthread"
 
 module Qnotifier
   class Command
-    
-    def self.parse_options(argv)
-      options = {}
-      
-      op = OptionParser.new do |opts|
-        
-        opts.banner = "\nQnotifier is an agent for the Qnotifer server reporting and alerting system"
-        opts.separator "See http://qnotifier.com for details."
-        opts.separator "\nUsage:"
         
-        opts.on("-r", "--register CODE", String, "Register agent with code.") do |register_code|
-          qnotifier = Qnotifier::Process.new
-          qnotifier.debug = true if @debug
-          qnotifier.register(register_code)
-          exit
-        end
-        opts.on("-w", "--wipe", "Wipes the saved variables, including registration.  You must recreate the server and reregister after this.") do
-          qnotifier = Qnotifier::Process.new
-          qnotifier.debug = true if @debug
+    def self.run(argv)
+      unless Process.euid == 0
+        puts "QNotifier can only be started by root"
+        exit
+      end
+      
+      if has_api_key?
+        if argv.first == 'stop'
+          stop
+          
+        elsif argv.first == 'start'
+          start
+          
+        elsif argv.first == 'restart'
+          stop
+          start
+          
+        elsif argv.first == 'zap'
+          zap
+          
+        elsif argv.first == 'reset'
+          print "\nWould you like to reset the state of the saved variables? (y/n):"
+          response = STDIN.gets.chomp.downcase!
+          if response == "y" || response == "yes"
+            `rm /var/lib/qnotifier/saved_variables.yml`
+          end
+          
+        elsif argv.first == 'register'  
+          qnotifier = Qnotifier::MainProcess.new
           qnotifier.wipe
-          exit
+          setup_registration
+          
+        elsif argv.first == 'debug'
+          puts "Running once in debug mode (use this mode to debug your plugins)\n\n"
+          qnotifier = Qnotifier::MainProcess.new
+          $qnotifier_debug = true
+          qnotifier.run
+          
+        else
+          puts "usage: qnotifier start | stop | restart | zap | reset | register | debug"
+          puts "see http://qnotifier.com for more details"
         end
-        opts.on("-v", "--version", "Displays the agent version") do |version|
-          puts "Qnotifier Agent Version: #{Qnotifier::VERSION}"
-          exit
-        end
-        opts.on("-d", "--debug", "Run in debug mode") do |debug|
-          @debug = true
+
+      else
+        setup_directories
+        setup_registration
+      end
+    end
+        
+    def self.has_api_key?
+      api_key = nil
+      begin
+        api_key_file = File.open("/var/lib/qnotifier/api_key")
+        while (line = api_key_file.readline)
+          api_key = line
         end
-        opts.on("-h", "--help", "Shows this help") do 
-          puts opts
+      rescue EOFError 
+      rescue Exception => e
+      end
+      if api_key
+        return true 
+      else 
+        return false
+      end
+    end
+    
+    def self.setup_directories
+      var_dir = "/var/lib/qnotifier"
+      unless File.exists?(var_dir)
+        begin
+          puts "Creating #{var_dir}"
+          FileUtils.mkdir_p var_dir
+          FileUtils.mkdir_p "#{var_dir}/plugins"
+          default_config_file = File.dirname(__FILE__) + "/../config/qnotifier_config.yml"
+          `cp #{default_config_file} #{var_dir}/qnotifier_config.yml`
+          readme_file = File.dirname(__FILE__) + "/../config/README"
+          `cp #{readme_file} #{var_dir}/plugins/README`
+        rescue Exception => e
+          puts "Can't setup the var directory: #{e}"
+          puts "Exiting"
           exit
         end
-        opts.separator "\n"
       end
+    end
+  
+    def self.setup_registration
+      puts "Starting QNotifier Agent Setup\n\n"
+      puts "In order to use this agent you must enter the six number Registration Code that was presented to you when the server was created in the QNotifier system (in the iPhone/iPad/Website).\n\n"
+      print "Registration Code: "
+      register_code = STDIN.gets.chomp
       
-      begin
-        op.parse!(argv)
-        @usage = op.to_s
-      rescue OptionParser::InvalidOption
-         puts op
-         exit
-      rescue OptionParser::MissingArgument
-        puts op
+      if register_code and register_code.size == 6
+        qnotifier = Qnotifier::MainProcess.new
+        if qnotifier.register(register_code) 
+          puts "\nOK, the server has been successfully registered."
+          puts "You now can control the agent as a daemon using 'qnotifier start|stop|restart'"
+          copy_init
+          puts "Doing initial update..."
+          qnotifier.run
+          puts "\nPlease start the qnotifier daemon now."
+        else
+          puts "Exiting."
+        end
+      else
+        puts "\nInvalid code, please enter a six number Registration Code to use this agent.\n"
         exit
       end
-      options
     end
     
-    def self.run(argv)
-      argv.push("--help") if argv.first == 'help'
-      options = parse_options(argv)
-      qnotifier = Qnotifier::Process.new
-      qnotifier.debug = true if @debug
-      qnotifier.run
+    def self.copy_init
+      print "\nWould you like to install the qnotifier init script in /etc/init.d? (y/n):"
+      response = STDIN.gets.chomp.downcase!
+      if response == "y" || response == "yes"
+        init_file = File.dirname(__FILE__) + "/../init/qnotifier"
+        `cp #{init_file} /etc/init.d/`
+      end
+    end
+    
+    def self.running
+      pid_file = "/var/lib/qnotifier/qnotifer.pid"
+      if File.exists?(pid_file)
+        begin
+          pid = `cat #{pid_file}`.to_i
+          Process.getpgid(pid)
+          return true
+        rescue
+          `rm #{pid_file}`
+          return false
+        end
+      else
+        return false
+      end
+    end
+  
+    def self.zap
+      pid_file = "/var/lib/qnotifier/qnotifer.pid"
+      if File.exists?(pid_file)
+        `rm #{pid_file}`
+      end
+    end
+  
+    def self.start
+      puts "Starting QNotifier..."
+      pid_file = "/var/lib/qnotifier/qnotifer.pid"
+      if running
+        puts "Daemon is already running, check pid #{pid_file}"
+        exit
+      end
+      
+      pid = fork do
+        qnotifier = Qnotifier::MainProcess.new
+        RobustThread.loop(:seconds => 30) do
+          qnotifier.run
+        end
+        sleep
+      end
+      Process.detach pid
+      `echo #{pid} > /var/lib/qnotifier/qnotifer.pid`
+      puts "Running (#{pid})"
+    end
+    
+    def self.stop
+      puts "Stopping QNotifier..."
+      pid_file = "/var/lib/qnotifier/qnotifer.pid"
+      if running
+        pid = `cat #{pid_file}`.to_i
+        Process.kill "TERM", pid
+        `rm /var/lib/qnotifier/qnotifer.pid`
+      end
     end
   end
-end
-
+end

data/lib/plugin.rb

@@ -27,7 +27,7 @@ module Qnotifier
       # Only run this plugin if it's enabled
       return unless @options["enabled"]
       
-      Qnotifier.log.debug("Plugin #{@class_name} running")
+      #Qnotifier.log.info("Plugin #{@class_name} running")
       main
     end
     
@@ -45,15 +45,13 @@ module Qnotifier
     # Alert is an alert to the adminstrators that something requires looking at
     # Severity should usually be 3
     def alert(name, message, severity = 3)
-      @alerts = {@class_name => []} unless @alerts
-      @alert_count += 1
       # Only send the alert if we haven't already
       if Qnotifier::Storage.get("AlertTime_#{@class_name}-#{name}")
         # Check to see if we need to resend the alert
         if @config["resend_alerts"] and Qnotifier::Storage.get("AlertTime_#{@class_name}-#{name}") < Time.now - @config["resend_alert_time"]
           add_alert(name, message, severity)
         else
-          Qnotifier.log.debug("Already sent alert: #{message}")
+          Qnotifier.log.debug("Already sent alert: #{message} (resends every #{@config["resend_alert_time"]}s)")
         end
       else 
         add_alert(name, message, severity)
@@ -62,7 +60,8 @@ module Qnotifier
     
     # Add the alert to the outbound queue
     def add_alert(name, message, severity)
-          	
+    	@alerts = {@class_name => []} unless @alerts
+      @alert_count += 1
       if severity == 1 # emergency
         log.fatal message
       elsif severity == 2 # critical

data/lib/qnotifier.rb

@@ -12,7 +12,11 @@ module Qnotifier
   def self.log
     unless @logger
       begin
-        @logger = Logger.new("/var/log/qnotifier.log","monthly") 
+        if $qnotifier_debug
+          @logger = Logger.new($stdout) 
+        else
+          @logger = Logger.new("/var/lib/qnotifier/qnotifier.log", "monthly") 
+        end
       rescue Exception => e 
         puts "Error starting logging - using stdout (#{e.message})"
         @logger = Logger.new($stdout) 
@@ -21,10 +25,8 @@ module Qnotifier
     return @logger
   end
       
-  class Process
-    
-    attr_accessor :debug
-    
+  class MainProcess
+        
     def initialize
       Qnotifier::Storage.restore
       
@@ -36,8 +38,7 @@ module Qnotifier
     
     def start_logging
       # Logging
-      if @debug
-        puts "Starting in debug mode"
+      if $qnotifier_debug
         Qnotifier.log.level = Logger::DEBUG 
       else
         Qnotifier.log.level = Logger::INFO 
@@ -47,25 +48,11 @@ module Qnotifier
     def run
       start_logging
       load_config
-      
-      last_run = Qnotifier::Storage.get("last_run")
-      
+            
       if Qnotifier::Storage.get("server_disabled_pings")
         Qnotifier.log.fatal "Disabled by the Qnotifer API, please re-register (qnotifier --register key) this agent to enable. Exiting."
         exit
       end
-                  
-      # Start up
-      Qnotifier.log.info "Running#{", last run: #{last_run}" if last_run}"
-      Qnotifier::Storage.put("last_run", Time.now) unless @debug
-      unless @debug
-        if last_run and (Time.now - last_run) < 120
-          message = "Starting too frequently, please run every 5 minutes (use debug mode to override)\nLast start up: #{last_run}"
-          puts message
-          Qnotifier.log.fatal message
-          exit
-        end
-      end
       
       unless @config["api_key"]
         error_message =  "Missing API Key, please register this agent first."
@@ -80,7 +67,7 @@ module Qnotifier
       end
       
       # Load the user plugins
-      Dir[@config["plugin_directory"] + '/*.rb'].each do |file| 
+      Dir['/var/lib/qnotifier/plugins/*.rb'].each do |file| 
         process_plugin_file(file)
       end
             
@@ -120,6 +107,7 @@ module Qnotifier
       rescue Errno::ENOENT => e
         Qnotifier.log.error "#{class_name} Plugin Error: #{e.message}" 
       end
+            
       @alerts.merge!(plugin.alerts) if plugin.alerts
       @reports.merge!(plugin.reports) if plugin.reports
       @stats.merge!(plugin.stats) if plugin.stats
@@ -132,7 +120,7 @@ module Qnotifier
       load_config
             
       if @config["api_key"]
-        Qnotifier.log.error "Server already registered.  You should not keep registering the server, you only need to do this once."
+        Qnotifier.log.error "Server was already registered. Re-registering."
       end
       
       Qnotifier::Storage.wipe
@@ -141,8 +129,12 @@ module Qnotifier
       webservice.config = @config
       api_key = webservice.register_server(code)
       
-      save_api_key(api_key)
-      
+      if api_key
+        save_api_key(api_key)
+        return api_key
+      else
+        return nil
+      end
     end
     
     def wipe
@@ -156,38 +148,24 @@ module Qnotifier
       return unless api_key
       @config["api_key"] = api_key
       begin
-        var_dir = "/var/lib/qnotifier"
-        FileUtils.mkdir_p var_dir unless File.exists?(var_dir)
         File.open("/var/lib/qnotifier/api_key", 'w') {|f| f.write(api_key) }
         File.chmod(0600, "/var/lib/qnotifier/api_key")
       rescue Exception => e
         Qnotifier.log.fatal "Can't save API Key #{e.message}"
       end
     end
-    
+            
     def load_config
-      
-      # Load from /etc/qnotifier_config.yml if the file is there
+      # Load from /var/lib/qnotifier/qnotifier_config.yml if the file is there
       begin
-        @config = YAML::load(File.open('/etc/qnotifier_config.yml'))
+        @config = YAML::load(File.open('/var/lib/qnotifier/qnotifier_config.yml'))
       rescue Exception => e
-        Qnotifier.log.error "Can't open /etc/qnotifier_config.yml (loading default config and copying it to /etc/qnotifier_config.yml)"
-        begin
-          default_config_file = File.dirname(__FILE__) + "/../config/qnotifier_config.yml"
-          @config = YAML::load(File.open(default_config_file))
-          `cp #{default_config_file} /etc/qnotifier_config.yml`
-        rescue Exception => e
-          Qnotifier.log.fatal "Can't open default config #{e.message}"
-          exit
-        end
+        Qnotifier.log.error "Can't open /var/lib/qnotifier/qnotifier_config.yml"
+        exit
       end
       
       unless @config["api_key"]
         begin
-          # Make the var dir if it doesn't exist
-          var_dir = "/var/lib/qnotifier"
-          FileUtils.mkdir_p var_dir unless File.exists?(var_dir)
-
           api_key_file = File.open("/var/lib/qnotifier/api_key")
           while (line = api_key_file.readline)
             @config["api_key"] = line

data/lib/storage.rb

@@ -14,7 +14,7 @@ module Qnotifier
         FileUtils.mkdir_p var_dir unless File.exists?(var_dir)
         @@stored_variables = YAML::load(File.open(saved_variables))
       rescue Exception => e
-        Qnotifier.log.debug "Error loading stored variables file. #{e.message}"
+        # Qnotifier.log.debug "Error loading stored variables file. #{e.message}"
       end
       @@restored = true
     end

data/lib/web_service.rb

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 require 'rest_client'
 require 'json'
-require "storage"
+require 'storage'
+require 'pp'
 
 module Qnotifier
   class WebService
@@ -14,10 +15,17 @@ module Qnotifier
     end
         
     def send_alerts(alerts)
-      
+          
       return if alerts.empty?
-      Qnotifier.log.debug "Sending #{alerts.count} alerts"
 
+      if $qnotifier_debug
+        puts "\nAlerts:"
+        pp alerts
+        puts "\nNot sending alerts to server due to debug mode."
+      end
+      
+      Qnotifier.log.info "Sending #{alerts.count} alerts #{alerts}"
+      
       # Hostname
       unless @config["hostname"]
         @hostname = `hostname`.strip
@@ -38,7 +46,11 @@ module Qnotifier
         response = resource["/send_alert"].post(message, :content_type => 'application/json')
         
         if response.code == 200
-          Qnotifier.log.debug "Server Response: HTTP #{response.code} #{response.body}"
+          body = JSON.parse(response.body)
+          if body[:poll_interval]
+            @@poll_interval = body[:poll_interval].to_i
+          end
+          Qnotifier.log.debug "Server Response: HTTP #{response.code} #{body[:message]}"
         else
           Qnotifier.log.warn "Server Response: HTTP #{response.code} #{response.body}"
         end
@@ -55,8 +67,21 @@ module Qnotifier
     
     def send_reports_stats(reports, stats, alert_count)
       
+      # Only send reports every 300s
+      last_run = Qnotifier::Storage.get("last_run")
+      if $qnotifier_debug
+        puts "\nStats:"
+        pp stats
+        puts "\nReports:"
+        pp reports
+        puts "\nNot sending data to server due to debug mode."
+        return
+      end
+      return if last_run and (Time.now - last_run) <= 300
+      Qnotifier::Storage.put("last_run", Time.now)
+
       return if reports.empty? and stats.empty?
-      Qnotifier.log.debug "Sending Reports and Stats"
+      Qnotifier.log.info "Sending Reports and Stats"
       
       # Hostname
       unless @config["hostname"]
@@ -80,7 +105,11 @@ module Qnotifier
         response = resource["/update_server"].post(message, :content_type => 'application/json')
         
         if response.code == 200
-          Qnotifier.log.debug "Server Response: HTTP #{response.code} #{response.body}"
+          body = JSON.parse(response.body)
+          if body[:poll_interval]
+            @@poll_interval = body[:poll_interval].to_i
+          end
+          Qnotifier.log.debug "Server Response: HTTP #{response.code} #{body[:message]}"
         else
           Qnotifier.log.warn "Server Response: HTTP #{response.code} #{response.body}"
         end
@@ -102,6 +131,7 @@ module Qnotifier
       message = {"temp_key" => temp_key, "hostname" => `hostname`.strip}.to_json
             
       begin 
+        puts "Connecting to the QNotifier web service..."
         resource = RestClient::Resource.new(@config["api_endpoint"],
                 :timeout => 30, 
                 :headers => { :user_agent => "Qnotifier-#{Qnotifier::VERSION}" })
@@ -109,9 +139,6 @@ module Qnotifier
         
         if response.code == 200 and response.body
           Qnotifier.log.debug "Registration Request Response: HTTP #{response.code} #{response.body}"
-          puts "OK, the server has been successfully registered."
-          puts "You now need to call this script from cron every 5 minutes, add to root's crontab (sudo crontab -e):"
-          puts "*/5 * * * * qnotifier"
           return response.body
         else
           Qnotifier.log.warn "Registration Request Response: HTTP #{response.code} #{response.body}"
@@ -119,14 +146,14 @@ module Qnotifier
         
       rescue Exception => e
         if e.message == "Bad Request"
-          puts "Can\'t find that key to register the server, please check it and try again. The key may have expired."
-          Qnotifier.log.error "Can\'t find that key to register the server, please check it and try again.  The key may have expired."
+          puts "QNotifer web service: Can\'t find that code, please check it and try again.\n"
+          Qnotifier.log.error "QNotifer web service: Can\'t find that code, please check it and try again."
         else
           Qnotifier.log.error "Registering Server: Can't connect to #{@config["api_endpoint"]} - #{e.message}"
         end
       end
       
       return nil
-    end
+    end    
   end
 end

data/plugins/apache.rb

@@ -8,6 +8,34 @@ module Qnotifier
     end
     
     def main
+      
+      #       require "net/http", "uri"
+      # 
+      #       url = URI.parse(option("server_url"))
+      # req = Net::HTTP::Get.new(url.path + "?" + url.query.to_s)
+      #       res = Net::HTTP.start(url.host, url.port) {|http|
+      #         http.request(req)
+      #       }
+      # values = {}
+      # res.body.split("\n").each do |item|
+      #   k, v = item.split(": ")
+      #   values[k] = v
+      # end
+      # total_accesses = values['Total Accesses'].to_i
+      # if (memory(:last_run_total_accesses) && memory(:last_run_time))
+      #   accesses_since_last_run = total_accesses - memory(:last_run_total_accesses)
+      #   seconds_since_last_run = Time.now - memory(:last_run_time)
+      # else
+      #   accesses_since_last_run = total_accesses
+      #   seconds_since_last_run = values['Uptime'].to_i
+      # end
+      # 
+      # current_accesses_per_second = accesses_since_last_run / seconds_since_last_run
+      # 
+      # report(:current_load => current_accesses_per_second)
+      #       remember(:last_run_time => Time.now)
+      #       remember(:last_run_total_accesses => total_accesses)
+      #       
     end
   end
 end

data/plugins/mysql.rb

@@ -4,10 +4,47 @@ module Qnotifier
 
     def initialize
       @defaults = {
+        "port" => 3306,
+        "mysqladmin" => "mysqladmin"
       }
     end
     
     def main
+      begin
+        require 'mysql'
+      rescue LoadError => e
+        raise "Can't load the MySQL gem, please make sure it's installed"
+      end
+      
+      unless @options["username"] and @options["password"]
+        raise "Username and/or password missing for MySQL"
+      end
+      
+      if @options["hostname"]
+        mysql_status = `#{@options["mysqladmin"]} status -u #{@options["username"]} -p#{@options["password"]} -h #{@options["hostname"]} -P #{@options["port"]}`
+      else
+        mysql_status = `#{@options["mysqladmin"]} status -u #{@options["username"]} -p#{@options["password"]}`
+      end
+            
+      if $?.exitstatus == 1
+        alert("connection", "Can't connect to MySQL")
+        raise "Can't connect to mysql"
+      else
+        reset_alert("connection", "Connection to MySQL now OK")
+      end
+        
+      if mysql_status =~ /Queries per second avg: ([\d.]+)(,*)\Z/        
+        qps = $1
+        report("Queries/s", qps)
+        if @options["alert_qps_threshold"] and qps.to_f > @options["alert_qps_threshold"]
+          alert("qps", "MySQL is at #{qps} queries/s")
+        elsif @options["alert_qps_threshold"] 
+          reset_alert("qps", "MySQL is now #{qps} queries/s")
+        end
+        stat("status", mysql_status)
+      else
+        Qnotifier.log.error "Can't get mysqladmin status, check auth info and database"
+      end
     end
   end
 end

data/plugins/nginx.rb

@@ -4,6 +4,7 @@ module Qnotifier
 
     def initialize
       @defaults = {
+        "status_url" => "http://127.0.0.1/nginx_status"
       }
     end
     

data/plugins/ruby.rb

@@ -11,16 +11,18 @@ module Qnotifier
       # Ruby Info
       ruby_info = [RUBY_VERSION, RUBY_RELEASE_DATE, RUBY_PATCHLEVEL, RUBY_PLATFORM]
       stat("Ruby", "ruby %s (%s patchlevel %s) [%s]" % ruby_info)
-      
+            
       # Gems
-      gem_list = `gem list`.split("\n")
-      gems = []
-      if gem_list
-        for line in gem_list
-          next if line.match(/^[\*\n]/)
-          gems << line.strip
-        end
-        stat("Gems", gems.join(", "))
+      if @config["list_gems"]
+        gem_list = `gem list`.split("\n")
+        gems = []
+        if gem_list
+          for line in gem_list
+            next if line.match(/^[\*\n]/)
+            gems << line.strip
+          end
+          stat("Gems", gems.join(", "))
+        end      
       end
     end
   end

data/plugins/system.rb

@@ -19,7 +19,7 @@ module Qnotifier
     def main
       
       # Uptime, Users and Load Average
-      uptime = `uptime`.strip
+      uptime = `uptime 2> /dev/null`.strip
       if uptime
         if uptime =~ /load average(s*): ([\d.]+)(,*) ([\d.]+)(,*) ([\d.]+)\Z/        
           load_one_minute = $2.to_f
@@ -42,7 +42,7 @@ module Qnotifier
           end
         
           report("Load", load_average)
-	  stat("Load", load_average)
+	        stat("Load", load_average)
         
           if @options["alert_load_threshold"] != 0 and load_average >= @options["alert_load_threshold"]
             alert("load", "Load is at #{load_average} #{"(normalized)" if @options[:normalize_load]}")
@@ -57,31 +57,6 @@ module Qnotifier
         stat("Uptime", uptime)      
       end
     
-      # CPU 
-      vmstat = `vmstat | tail -1`
-      if vmstat 
-        vmstat = vmstat.split
-        if vmstat.size == 16
-          
-          cpu = "User: #{vmstat[12].to_i}%, System: #{vmstat[13].to_i}%, Idle: #{vmstat[14].to_i}%, Wait: #{vmstat[15].to_i}%"
-          cpu_percent = (100 - vmstat[14].to_i)
-          
-          stat("CPU", cpu)
-          report("CPU %", cpu_percent)
-                    
-          if @options["alert_cpu_threshold"] != 0 and cpu_percent >= @options["alert_cpu_threshold"]
-            alert("cpu", "CPU is at #{cpu_percent}%")
-          else
-            reset_alert("cpu", "CPU is now #{cpu_percent}%")
-          end
-
-        else
-          raise "Can't parse vmstat"
-        end
-      else
-        raise "Can't run vmstat, is it installed/supported?"
-      end
-      
       # Disk
       df = `df -Phl`
       if df
@@ -106,48 +81,109 @@ module Qnotifier
       else
         raise "Can't run df -Phl"
       end
-      
+    
+      # CPU 
+      if RUBY_PLATFORM =~ /linux/
+        vmstat = `vmstat | tail -1`
+        if vmstat 
+          vmstat = vmstat.split
+          if vmstat.size >= 16
+
+            cpu = "User: #{vmstat[12].to_i}%, System: #{vmstat[13].to_i}%, Idle: #{vmstat[14].to_i}%, Wait: #{vmstat[15].to_i}%"
+            cpu_percent = (100 - vmstat[14].to_i)
+
+            stat("CPU", cpu)
+            report("CPU %", cpu_percent)
+
+            if @options["alert_cpu_threshold"] != 0 and cpu_percent >= @options["alert_cpu_threshold"]
+              alert("cpu", "CPU is at #{cpu_percent}%")
+            else
+              reset_alert("cpu", "CPU is now #{cpu_percent}%")
+            end
+
+          else
+            Qnotifier.log.error "Can't parse vmstat, is it installed?"
+          end
+        else
+          Qnotifier.log.error "Can't parse vmstat, is it installed?"
+        end
+        
+      elsif RUBY_PLATFORM =~ /darwin/
+        iostat = `iostat | tail -1`
+        if iostat
+          iostat = iostat.split
+          if iostat.size >= 9
+            cpu = "User: #{iostat[3].to_i}%, System: #{iostat[4].to_i}%, Idle: #{iostat[5].to_i}%"
+            cpu_percent = (100 - iostat[5].to_i)
+        
+            stat("CPU", cpu)
+            report("CPU %", cpu_percent)
+            
+            if @options["alert_cpu_threshold"] != 0 and cpu_percent >= @options["alert_cpu_threshold"]
+              alert("cpu", "CPU is at #{cpu_percent}%")
+            else
+              reset_alert("cpu", "CPU is now #{cpu_percent}%")
+            end
+            
+          else
+            Qnotifier.log.error "Can't parse iostat"
+          end
+        else
+          Qnotifier.log.error "Can't parse iostat"
+        end
+      else
+        Qnotifier.log.error "Can't parse CPU for this platform - #{RUBY_PLATFORM}"
+      end
       
       # Uname
       stat("Uname", `uname -srm`.strip)
       
       # Memory
-      meminfo = {}
-      `cat /proc/meminfo`.each_line do |line|
-        _, key, value = *line.match(/^(\w+):\s+(\d+)\s/)
-        meminfo[key] = value.to_i
-      end
+      if RUBY_PLATFORM =~ /linux/
+        meminfo = {}
+        `cat /proc/meminfo`.each_line do |line|
+          _, key, value = *line.match(/^(\w+):\s+(\d+)\s/)
+          meminfo[key] = value.to_i
+        end
 
-      memory = {}
-      unless meminfo.empty?
-        memory["Free"] = meminfo['MemFree'] / 1024
-        memory["Total"] = meminfo['MemTotal'] / 1024
-        memory_percent = ((memory["Total"] - memory["Free"]) / memory["Total"] * 100).to_i
-        memory["Percent"] = memory_percent
-        
-        stat("Memory", "Free: #{memory["Free"]}M, Total: #{memory["Total"]}M")
-        report("Memory %", memory_percent)
+        memory = {}
+        unless meminfo.empty?
+          memory["Free"] = meminfo['MemFree'] / 1024
+          memory["Total"] = meminfo['MemTotal'] / 1024
+          memory_percent = ((memory["Total"] - memory["Free"]) / memory["Total"] * 100).to_i
+          memory["Percent"] = memory_percent
+
+          stat("Memory", "Free: #{memory["Free"]}M, Total: #{memory["Total"]}M")
+          report("Memory %", memory_percent)
 
-        if @options["alert_memory_threshold"] != 0 and memory_percent >= @options["alert_memory_threshold"]
-          alert("memory", "Memory is at #{memory_percent}%")
+          if @options["alert_memory_threshold"] != 0 and memory_percent >= @options["alert_memory_threshold"]
+            alert("memory", "Memory is at #{memory_percent}%")
+          else
+            reset_alert("memory", "Memory is now #{memory_percent}%")
+          end
         else
-          reset_alert("memory", "Memory is now #{memory_percent}%")
+          Qnotifier.log.error "Can't get memory information from /proc/meminfo (is it supported by this OS?)"
         end
+        
+      elsif RUBY_PLATFORM =~ /darwin/
+        # Not supported on OSX currently
       else
-        raise "Can't get memory information from /proc/meminfo (is it supported by this OS?)"
+        Qnotifier.log.error "Can't parse Memory for this platform - #{RUBY_PLATFORM}"
       end
-      
-      
+
     end
-    
 
     def count_cpus
       if get("cpu_count")      
         @cpu_count = get("cpu_count") 
       else
-        cpu_count = `cat /proc/cpuinfo | grep "model name" | wc -l`.to_i
-        if cpu_count != 0
-          @cpu_count = cpu_count
+        if RUBY_PLATFORM =~ /linux/
+          cpu_count = `cat /proc/cpuinfo | grep "model name" | wc -l`.to_i
+          if cpu_count != 0
+            @cpu_count = cpu_count
+          else
+            @cpu_count = 1
+          end
         else
           @cpu_count = 1
         end

data/qnotifier.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{qnotifier}
-  s.version = "0.6.5"
+  s.version = "0.6.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gersham Meharg"]
@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
   s.email = %q{gersham@qnotifier.com}
   s.executables = ["qnotifier"]
   s.extra_rdoc_files = ["bin/qnotifier", "lib/command.rb", "lib/plugin.rb", "lib/qnotifier.rb", "lib/storage.rb", "lib/web_service.rb"]
-  s.files = ["Manifest", "Rakefile", "bin/qnotifier", "config/qnotifier_config.yml", "gem-public_cert.pem", "lib/command.rb", "lib/plugin.rb", "lib/qnotifier.rb", "lib/storage.rb", "lib/web_service.rb", "plugins/apache.rb", "plugins/iostat.rb", "plugins/mysql.rb", "plugins/network.rb", "plugins/nginx.rb", "plugins/passenger.rb", "plugins/processes.rb", "plugins/rails.rb", "plugins/ruby.rb", "plugins/system.rb", "plugins/urls.rb", "qnotifier.gemspec"]
+  s.files = ["Manifest", "Rakefile", "bin/qnotifier", "config/README", "config/qnotifier_config.yml", "gem-public_cert.pem", "lib/command.rb", "lib/plugin.rb", "lib/qnotifier.rb", "lib/storage.rb", "lib/web_service.rb", "plugins/apache.rb", "plugins/iostat.rb", "plugins/mysql.rb", "plugins/network.rb", "plugins/nginx.rb", "plugins/passenger.rb", "plugins/processes.rb", "plugins/rails.rb", "plugins/ruby.rb", "plugins/system.rb", "plugins/urls.rb", "init.d/qnotifier", "qnotifier.gemspec"]
   s.homepage = %q{http://qnotifier.com/qnotifier_gem}
-  s.post_install_message = %q{Qnotifier installed,  please register by running 'qnotifier -r CODE' in order to register this server.}
+  s.post_install_message = %q{Qnotifier installed,  please register by running 'qnotifier' in order to register this server.}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Qnotifier"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{qnotifier}
@@ -31,23 +31,21 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rest-client>, [">= 1.4.2"])
       s.add_runtime_dependency(%q<json>, [">= 1.2.3"])
       s.add_runtime_dependency(%q<elif>, [">= 0.1.0"])
+      s.add_runtime_dependency(%q<robustthread>, [">= 0.5.2"])
       s.add_development_dependency(%q<rest-client>, [">= 1.4.2"])
       s.add_development_dependency(%q<json>, [">= 1.2.3"])
       s.add_development_dependency(%q<elif>, [">= 0.1.0"])
+      s.add_development_dependency(%q<robustthread>, [">= 0.5.2"])
     else
       s.add_dependency(%q<rest-client>, [">= 1.4.2"])
       s.add_dependency(%q<json>, [">= 1.2.3"])
       s.add_dependency(%q<elif>, [">= 0.1.0"])
-      s.add_dependency(%q<rest-client>, [">= 1.4.2"])
-      s.add_dependency(%q<json>, [">= 1.2.3"])
-      s.add_dependency(%q<elif>, [">= 0.1.0"])
+      s.add_dependency(%q<robustthread>, [">= 0.5.2"])
     end
   else
     s.add_dependency(%q<rest-client>, [">= 1.4.2"])
     s.add_dependency(%q<json>, [">= 1.2.3"])
     s.add_dependency(%q<elif>, [">= 0.1.0"])
-    s.add_dependency(%q<rest-client>, [">= 1.4.2"])
-    s.add_dependency(%q<json>, [">= 1.2.3"])
-    s.add_dependency(%q<elif>, [">= 0.1.0"])
+    s.add_dependency(%q<robustthread>, [">= 0.5.2"])
   end
 end

data.tar.gz.sig

@@ -1,3 +1,2 @@
-��ʧ�N�}H�5
O�w�yw��7�����g�'I94��3�՟(�� ��x�~8���2�XD�w��?�e
��]��%?_�~�`��F�����Q�����[�Om�G8<@0Q�YX��`�0*���:B�
-C�@�9�t����%r
-��@'�_����
;2�3?��;�O+�v.�����pñk9��o��
+�zk?J���DB[�)�<��^ax|��Xl�T��xFg��D��A�V	�e�߅��Zq
+��r�У��ՋQ�N��ꣲ‚o%�����&��DH�IZww�rhu���ǃ毘

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: qnotifier
 version: !ruby/object:Gem::Version 
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 6
-  - 5
-  version: 0.6.5
+  - 7
+  version: 0.6.7
 platform: ruby
 authors: 
 - Gersham Meharg
@@ -42,9 +43,11 @@ dependencies:
   name: rest-client
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 1
         - 4
@@ -56,9 +59,11 @@ dependencies:
   name: json
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 1
         - 2
@@ -70,9 +75,11 @@ dependencies:
   name: elif
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 0
         - 1
@@ -81,47 +88,85 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rest-client
+  name: robustthread
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 5
+        - 2
+        version: 0.5.2
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rest-client
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 1
         - 4
         - 2
         version: 1.4.2
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 1
         - 2
         - 3
         version: 1.2.3
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: elif
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 0
         - 1
         - 0
         version: 0.1.0
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: robustthread
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 5
+        - 2
+        version: 0.5.2
+  type: :development
+  version_requirements: *id008
 description: The server side agent for the QNotifier monitoring system.  This software will monitor local Linux system parameters and upload them to the QNotifier servers where users can use iPhone/iPad applications to view those stats and recieve alerts.
 email: gersham@qnotifier.com
 executables: 
@@ -139,6 +184,7 @@ files:
 - Manifest
 - Rakefile
 - bin/qnotifier
+- config/README
 - config/qnotifier_config.yml
 - gem-public_cert.pem
 - lib/command.rb
@@ -157,12 +203,13 @@ files:
 - plugins/ruby.rb
 - plugins/system.rb
 - plugins/urls.rb
+- init.d/qnotifier
 - qnotifier.gemspec
 has_rdoc: true
 homepage: http://qnotifier.com/qnotifier_gem
 licenses: []
 
-post_install_message: Qnotifier installed,  please register by running 'qnotifier -r CODE' in order to register this server.
+post_install_message: Qnotifier installed,  please register by running 'qnotifier' in order to register this server.
 rdoc_options: 
 - --line-numbers
 - --inline-source
@@ -171,16 +218,20 @@ rdoc_options:
 require_paths: 
 - lib
 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 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 11
       segments: 
       - 1
       - 2
@@ -188,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: qnotifier
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: The server side agent for the QNotifier monitoring system

metadata.gz.sig

@@ -1,4 +1 @@
-(���k�u�Odˑ��E�d�m��
-�%[�2����P�ѕbs��b����[�4�b�)qz�@�4���z+�#i�fp�I���Djy�|Zu�N��)<�67�kܗ.>�*��d옠�LտiF<��\u=
-�s��'���*X+�(��Ծ�s��
-׾�w�	2�s�d���J~[ܛ�hWE�P�iz\(��He���+��._� �~?�����\J_�-�n줆���ݦg���*0�
+�d�q���`�#W�	ھ��Rl7y�k����U;�#���[��3^dx4�a��8xg.F)�2U�0�@E�T?Iw�K�qZ_6�D�xF�P+��`�>��i����/�6JUG���I�^�@��B:�l2�X/'y״�f�{�ir�e-8���)�nJkTahx6y?�O��L�!�̿CЄG��Y�� nq�HZ�mp��t�SRt9XuTڥv�����'��hG.�c!��_�%���DFm��K�נx;