qnotifier 0.7.6 → 1.0.0

data/Rakefile

@@ -2,14 +2,14 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('qnotifier', '0.6.0') do |p|
+Echoe.new('qnotifier', '1.0.0') do |p|
   p.description    = "The server side agent for the QNotifier monitoring system"
   p.url            = "http://qnotifier.com/qnotifier_gem"
   p.author         = "Gersham Meharg"
   p.email          = "gersham@qnotifier.com"
   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.runtime_dependencies = ["json_pure >=1.2.3"]
+  p.development_dependencies = ["json_pure >=1.2.3"]
   p.executable_pattern = ["bin/*"]
   p.install_message = "Qnotifier installed,  please register by running 'qnotifier -r CODE' in order to register this server."
 end

data/bin/qnotifier

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 $LOAD_PATH.unshift( File.join( File.dirname(__FILE__), '../lib' ) )
 require 'fileutils'
+require "qnotifier"
 
 module Qnotifier
   class Command
@@ -8,8 +9,7 @@ module Qnotifier
     def self.run(argv)
             
       unless Process.euid == 0
-        puts "QNotifier should be only started by root (the daemon will drop privs)"
-        exit
+        puts "WARNING: QNotifier should be only run by root"
       end
       
       if has_api_key?
@@ -37,7 +37,12 @@ module Qnotifier
           require "qnotifier"
           qnotifier = Qnotifier::MainProcess.new
           qnotifier.alert(argv[1], argv[2], 3)
-                      
+                 
+        elsif argv.first == 'reset_alert'
+          require "qnotifier"
+          qnotifier = Qnotifier::MainProcess.new
+          qnotifier.alert(argv[1], argv[2], 6)
+             
         elsif argv.first == 'register'  
           require "qnotifier"
           qnotifier = Qnotifier::MainProcess.new
@@ -60,7 +65,7 @@ module Qnotifier
           setup_directories
           
         else
-          puts "usage: qnotifier start | stop | restart | zap | reset | register | debug"
+          puts "usage: qnotifier start | stop | restart | zap | reset | register | debug | alert | reset_alert"
           puts "see http://qnotifier.com for more details"
         end
 
@@ -100,8 +105,6 @@ module Qnotifier
           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
@@ -110,6 +113,18 @@ module Qnotifier
           exit
         end
       end
+      config_file = "/var/lib/qnotifier/qnotifier_config.yml"
+      unless File.exists?(config_file)
+        begin
+          puts "Setting default config file to #{config_file} (make your edits here)"
+          default_config_file = File.dirname(__FILE__) + "/../config/qnotifier_config.yml"
+          `cp #{default_config_file} #{var_dir}/qnotifier_config.yml`
+        rescue Exception => e
+          puts "Can't copy default config over: #{e}"
+          puts "Exiting"
+          exit
+        end
+      end
     end
   
     def self.setup_registration
@@ -124,9 +139,6 @@ module Qnotifier
         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 "\nStarting Qnotifier daemon (qnotifier start)"
           `qnotifier start`
         else
@@ -138,21 +150,8 @@ module Qnotifier
       end
     end
     
-    def self.copy_init
-      print "\nWould you like to install a 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"
-        qnotifier_location = `which qnotifier`
-        if qnotifier_location
-          `cat #{init_file} | sed 's/QNOTIFIER_DAEMON_LOCATION/#{qnotifier_location}/' > /etc/init.d/qnotifier;chmod a+x /etc/init.d/qnotifier`
-          puts "Qnotifier init.d installed at /etc/init.d/qnotifier - you'll need to set it to start at various run levels"
-        end
-      end
-    end
-    
     def self.running
-      pid_file = "/var/lib/qnotifier/qnotifer.pid"
+      pid_file = "/var/lib/qnotifier/qnotifier.pid"
       if File.exists?(pid_file)
         begin
           pid = `cat #{pid_file}`.to_i
@@ -168,7 +167,7 @@ module Qnotifier
     end
   
     def self.zap
-      pid_file = "/var/lib/qnotifier/qnotifer.pid"
+      pid_file = "/var/lib/qnotifier/qnotifier.pid"
       if File.exists?(pid_file)
         `rm #{pid_file}`
       end
@@ -186,7 +185,7 @@ module Qnotifier
         `rm #{runlock_file}`
       end
       
-      pid_file = "/var/lib/qnotifier/qnotifer.pid"
+      pid_file = "/var/lib/qnotifier/qnotifier.pid"
       if running
         puts "Daemon is already running, check pid #{pid_file}"
         exit
@@ -201,29 +200,20 @@ module Qnotifier
         STDOUT.reopen "/dev/null", "a"
         STDERR.reopen STDOUT
         trap("TERM") {daemon.stop; exit}
-        `echo #{Process.pid} > /var/lib/qnotifier/qnotifer.pid`
-        #Process.euid = 65534
-        loop do
-          cpid = fork do
-            require "qnotifier"
-            $0 = 'qnotifier-runner'
-            qnotifier = Qnotifier::MainProcess.new
-            qnotifier.run
-          end
-          Process.detach cpid
-          sleep 30
-        end
+        `echo #{Process.pid} > /var/lib/qnotifier/qnotifier.pid`
+        qnotifier = Qnotifier::MainProcess.new
+        qnotifier.run
       end      
       Process.detach pid
     end
     
     def self.stop
       puts "Stopping QNotifier..."
-      pid_file = "/var/lib/qnotifier/qnotifer.pid"
+      pid_file = "/var/lib/qnotifier/qnotifier.pid"
       if running
         pid = `cat #{pid_file}`.to_i
         Process.kill "TERM", pid
-        `rm /var/lib/qnotifier/qnotifer.pid`
+        `rm /var/lib/qnotifier/qnotifier.pid`
       end
     end
   end

data/config/qnotifier_config.yml

@@ -33,7 +33,7 @@ System:
     # Alert if the memory is above this percent usage, 0 disables             
     alert_memory_threshold: 90
     # Alert if the load is above this percent usage, 0 disables          
-    alert_load_threshold: 1.5
+    alert_load_threshold: 2.0
     # Alert if the disk is above this percent usage, 0 disables
     alert_disk_threshold: 90
     # Partitions which to monitor for free disk space
@@ -66,14 +66,6 @@ Urls:
     enabled: false
     url: "http://localhost"
 
-# The Network Interface built-in plugin  
-# Not currently supported
-Network:
-    # Enabled, set to either true or false
-    enabled: false
-    interfaces: 
-        - eth0
-
 # The Nginx built-in plugin
 # You must compile nginx with --with-http_stub_status_module and point this url to the stub_status location
 Nginx:
@@ -86,13 +78,6 @@ Passenger:
     # Enabled, set to either true or false
     enabled: false
    
-# The Rails built-in plugin  
-# Not currently supported
-Rails:
-    # Enabled, set to either true or false
-    enabled: false
-    log_file: "/var/www/rails/log/production.log"
-
 # The Ruby built-in plugin
 Ruby:
     enabled: true

data/lib/plugin.rb

@@ -12,15 +12,15 @@ module Qnotifier
     attr_accessor :stats    
     attr_accessor :config
     attr_accessor :alert_count
-     
+    
     # The run method, do not override
-    def run
+    def run   
       @class_name = self.class.to_s.split("::").last
       @alert_count = 0
       @alerts = nil
       @reports = nil
       @stats = nil
-      
+         
       # Read the options from the global config and mix them in to the defaults for this plugin      
       if @config[@class_name]
         @options = @defaults.update(@config[@class_name])
@@ -31,7 +31,8 @@ module Qnotifier
       # Only run this plugin if it's enabled
       return unless @options["enabled"]
       
-      #Qnotifier.log.info("Plugin #{@class_name} running")
+      puts "Plugin #{@class_name} running" if $qnotifier_debug
+
       main
     end
     

data/lib/qnotifier.rb

@@ -9,7 +9,7 @@ require "web_service"
 require "storage"
 
 module Qnotifier
-  VERSION = "0.7.0".freeze
+  VERSION = "1.0.0".freeze
 
   def self.log
     unless @logger
@@ -44,62 +44,63 @@ module Qnotifier
       end
     end
     
-    def run      
-      Qnotifier.log.debug "QNotifier Running"
-      
-      runlock_file = "/var/lib/qnotifier/.runlock"
-      if File.exists?(runlock_file)
-        puts "Runlock exists at #{runlock_file} - process already running? Exiting."
-        exit
-      else
-        `echo #{Process.pid} > #{runlock_file}`
-      end
-      
+    def run
       start_logging
       load_config
       
-      @alerts = {}
-      @reports = {}
-      @stats = {}
-      @report_count = 0
-            
+      Qnotifier.log.info "QNotifier Starting"
+
       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
-      
+
       unless @config["api_key"]
         error_message =  "Missing API Key, please register this agent first."
         puts error_message
         Qnotifier.log.fatal error_message
         exit
       end
-      
+
+      # Our Plugins
+      @plugins = []
+
       # Load the built in plugins
       Dir[File.dirname(__FILE__) + '/../plugins/*.rb'].each do |file| 
-        process_plugin_file(file)
+        load_plugin_file(file)
       end
-      
+
       # Load the user plugins
       Dir['/var/lib/qnotifier/plugins/*.rb'].each do |file| 
-        process_plugin_file(file)
+        load_plugin_file(file)
       end
-            
-      # Send the alerts, reports and stats to the API
+
+      # Load the web service
       webservice = Qnotifier::WebService.new
       webservice.config = @config
-      webservice.send_alerts(@alerts)
-      webservice.send_reports_stats(@reports, @stats, @alert_count)
-      
-      Qnotifier::Storage.save
-      
-      # Done, clean up and save
-      Qnotifier::Storage.save
-      
-      `rm #{runlock_file}`
+
+      loop do
+        @alerts = {}
+        @reports = {}
+        @stats = {}
+        @report_count = 0
+        
+        for plugin in @plugins
+          run_plugin(plugin)
+        end
+
+        # Send the alerts, reports and stats to the API
+        webservice.send_alerts(@alerts)
+        webservice.send_reports_stats(@reports, @stats, @alert_count)
+
+        Qnotifier::Storage.save
+        
+        Qnotifier.log.debug "QNotifier Check Complete"
+        sleep 30
+      end
     end
-    
-    def process_plugin_file(file)
+        
+    def load_plugin_file(file)
       return unless file =~ /\.rb/
       require file
       class_name = "Qnotifier::#{File.basename(file, ".rb").split(/[^a-z0-9]/i).map{|w| w.capitalize}.join}"
@@ -114,6 +115,10 @@ module Qnotifier
         Qnotifier.log.fatal "Attempted to load a non Qnotifier::Plugin plugin subclass at #{file} - make sure this directory only includes Qnotifier::Plugin subclasses"
         return
       end
+      @plugins << plugin
+    end
+    
+    def run_plugin(plugin)
       begin
         Timeout.timeout 30 do
           plugin.run
@@ -123,7 +128,6 @@ 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
@@ -140,11 +144,11 @@ module Qnotifier
       end
       
       Qnotifier::Storage.wipe
-      
+          
       webservice = Qnotifier::WebService.new
       webservice.config = @config
       api_key = webservice.register_server(code)
-      
+            
       if api_key
         save_api_key(api_key)
         return api_key
@@ -186,6 +190,7 @@ module Qnotifier
       begin
         @config = YAML::load(File.open('/var/lib/qnotifier/qnotifier_config.yml'))
       rescue Exception => e
+        puts "Can't open /var/lib/qnotifier/qnotifier_config.yml"
         Qnotifier.log.error "Can't open /var/lib/qnotifier/qnotifier_config.yml"
         exit
       end

data/lib/web_service.rb

@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
-require 'rest_client'
-require 'json'
+require 'json/pure'
 require 'storage'
-require 'pp'
+require 'net/http'
 
 module Qnotifier
   class WebService
@@ -11,28 +10,28 @@ module Qnotifier
     
     def initialize
       @@poll_interval = 300
-      RestClient.proxy = ENV['http_proxy']
     end
         
     def send_alerts(alerts)
           
       return if alerts.empty?
 
+      unless @hostname
+        unless @config["hostname"]
+          @hostname = `hostname`.strip
+        else
+          @hostname = @config["hostname"]
+        end
+      end
+      
       if $qnotifier_debug
         puts "\nAlerts:"
-        pp alerts
+        puts alerts
         puts "\nNot sending alerts to server due to debug mode."
         return
       end
       
       Qnotifier.log.info "Sending alerts #{alerts}"      
-      
-      # Hostname
-      unless @config["hostname"]
-        @hostname = `hostname`.strip
-      else
-        @hostname = @config["hostname"]
-      end
 
       message = {"api_key" => @config["api_key"], 
                  "api_version" => "1.0",
@@ -41,28 +40,27 @@ module Qnotifier
                  "alerts" => alerts}.to_json
       
       begin 
-        resource = RestClient::Resource.new(@config["api_endpoint"],
-                :timeout => 30, 
-                :headers => { :user_agent => "Qnotifier-#{Qnotifier::VERSION}" })
-        response = resource["/send_alert"].post(message, :content_type => 'application/json')
-        
-        if response.code == 200
-          body = JSON.parse(response.body)
-          if body[:poll_interval]
-            @@poll_interval = body[:poll_interval].to_i
+        url = URI.parse("#{@config["api_endpoint"]}/send_alert")
+        req = Net::HTTP::Post.new(url.path)
+        req.body = message
+        req["Content-Type"] = "Qnotifier-#{Qnotifier::VERSION}"
+        req["User-Agent"] = "application/json"
+        res = Net::HTTP.new(url.host, url.port).start {|http| http.request(req) }
+        case res
+        when Net::HTTPSuccess
+          body = JSON.parse(res.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}"
+          Qnotifier.log.warn "Server Response: HTTP #{res.code} #{res.body}"
+          if res.code.to_i == 402 
+            Qnotifier::Storage.put("server_disabled_pings", Time.now)
+            Qnotifier.log.error "Server has asked us to disable pings"
+          end
         end
-        
       rescue Exception => e
-        Qnotifier.log.error "Sending Alerts: Can't connect to #{@config["api_endpoint"]} - #{e.message}"
-        if e.message == "HTTP status code 402"
-          # The server doesn't want to hear from us any more, disable pinging
-          Qnotifier::Storage.put("server_disabled_pings", Time.now)
-          Qnotifier.log.error "Server has asked us to disable pings"
-        end
+        Qnotifier.log.error "Sending Alert: Can't connect to #{@config["api_endpoint"]} - #{e.message}"
       end
     end
     
@@ -72,11 +70,11 @@ module Qnotifier
       last_run = Qnotifier::Storage.get("last_run")
       if $qnotifier_debug
         puts "\nStats:"
-        pp stats
+        puts stats
         puts "\nReports:"
-        pp reports
+        puts reports
         puts "\nNot sending data to server due to debug mode."
-        return
+        exit
       end
       if last_run and (Time.now - last_run) <= @@poll_interval
         return
@@ -84,15 +82,16 @@ module Qnotifier
       Qnotifier::Storage.put("last_run", Time.now)
 
       return if reports.empty? and stats.empty?
-      Qnotifier.log.info "Sending Reports and Stats"
-      
-      # Hostname
-      unless @config["hostname"]
-        @hostname = `hostname`.strip
-      else
-        @hostname = @config["hostname"]
+      Qnotifier.log.debug "Sending Reports and Stats"
+            
+      unless @hostname
+        unless @config["hostname"]
+          @hostname = `hostname`.strip
+        else
+          @hostname = @config["hostname"]
+        end
       end
-      
+            
       message = {"api_key" => @config["api_key"], 
                  "api_version" => "1.0",
                  "agent_version" => Qnotifier::VERSION,
@@ -102,62 +101,55 @@ module Qnotifier
                  "reports" => reports}.to_json
             
       begin 
-        resource = RestClient::Resource.new(@config["api_endpoint"],
-                :timeout => 30, 
-                :headers => { :user_agent => "Qnotifier-#{Qnotifier::VERSION}" })
-        response = resource["/update_server"].post(message, :content_type => 'application/json')
-        
-        if response.code == 200
-          body = JSON.parse(response.body)
-          #Qnotifier.log.info "Response #{body.inspect}"
+        url = URI.parse("#{@config["api_endpoint"]}/update_server")
+        req = Net::HTTP::Post.new(url.path)
+        req.body = message
+        req["Content-Type"] = "Qnotifier-#{Qnotifier::VERSION}"
+        req["User-Agent"] = "application/json"
+        res = Net::HTTP.new(url.host, url.port).start {|http| http.request(req) }
+        puts res.body
+        case res
+        when Net::HTTPSuccess
+          body = JSON.parse(res.body)
           if body["poll_interval"]
-            @@poll_interval = body["poll_interval"].to_i
-            #Qnotifier.log.info "Report polling interval is #{@@poll_interval}"
+           @@poll_interval = body["poll_interval"].to_i
           end
-          Qnotifier.log.debug "Server Response: HTTP #{response.code} #{body[:message]}"
+          Qnotifier.log.debug "Server Response: HTTP #{res.code} #{body[:message]}"
         else
-          Qnotifier.log.warn "Server Response: HTTP #{response.code} #{response.body}"
+          Qnotifier.log.warn "Server Response: HTTP #{res.code} #{res.body}"
+          if res.code.to_i == 402 
+           puts "disabling pings"
+           Qnotifier::Storage.put("server_disabled_pings", Time.now)
+           Qnotifier.log.error "Server has asked us to disable pings"
+          end
         end
-        
       rescue Exception => e
-        Qnotifier.log.error "Sending Reports/Stats: Can't connect to #{@config["api_endpoint"]} - #{e.message}"
-        if e.message == "HTTP status code 402"
-          # The server doesn't want to hear from us any more, disable pinging
-          Qnotifier::Storage.put("server_disabled_pings", Time.now)
-          Qnotifier.log.error "Server has asked us to disable pings"
-        end
+       Qnotifier.log.error "Sending Reports/Stats: Can't connect to #{@config["api_endpoint"]} - #{e.message}"
       end
     end
     
     def register_server(temp_key)
       return if temp_key.empty?
-      Qnotifier.log.info "Registering Server"
-            
-      message = {"temp_key" => temp_key, "hostname" => `hostname`.strip}.to_json
-            
+      Qnotifier.log.info "Registering Server"      
       begin 
-        puts "Connecting to the QNotifier web service..."
-        resource = RestClient::Resource.new(@config["api_endpoint"],
-                :timeout => 30, 
-                :headers => { :user_agent => "Qnotifier-#{Qnotifier::VERSION}" })
-        response = resource["/register_server"].post(message, :content_type => 'application/json')
-        
-        if response.code == 200 and response.body
-          Qnotifier.log.debug "Registration Request Response: HTTP #{response.code} #{response.body}"
-          return response.body
+        puts "Connecting to the QNotifier web service..."        
+        url = URI.parse("#{@config["api_endpoint"]}/register_server")
+        req = Net::HTTP::Post.new(url.path)
+        req.body = {"temp_key" => temp_key, "hostname" => @hostname}.to_json
+        req["Content-Type"] = "Qnotifier-#{Qnotifier::VERSION}"
+        req["User-Agent"] = "application/json"
+        res = Net::HTTP.new(url.host, url.port).start {|http| http.request(req) }
+        puts res.body
+        case res
+        when Net::HTTPSuccess
+          Qnotifier.log.debug "Registration Request Response: HTTP #{res.code} #{res.body}"
+          return res.body
         else
-          Qnotifier.log.warn "Registration Request Response: HTTP #{response.code} #{response.body}"
+          Qnotifier.log.warn "Registration Request Response: HTTP #{res.code} #{res.body}"
         end
-        
       rescue Exception => e
-        if e.message == "Bad Request"
-          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
+        Qnotifier.log.error "Registering Server: Can't connect to #{@config["api_endpoint"]} - #{e.message}"
       end
-      
       return nil
     end    
   end

data/plugins/system.rb

@@ -36,9 +36,9 @@ module Qnotifier
           when "one_minute"
             load_average = load_one_minute
           when "five_minute"
-            load_average = load_one_minute
+            load_average = load_five_minute
           else
-            load_average = load_one_minute
+            load_average = load_fifteen_minute
           end
         
           report("Load", load_average)
@@ -130,7 +130,7 @@ module Qnotifier
           Qnotifier.log.error "Can't parse /proc/stat"
         end
       else
-        Qnotifier.log.error "Can't parse CPU for this platform - #{RUBY_PLATFORM}"
+        Qnotifier.log.debug "Can't parse CPU for this platform - #{RUBY_PLATFORM}"
       end
       
       # Uname
@@ -166,7 +166,7 @@ module Qnotifier
         end
         
       else
-        Qnotifier.log.error "Can't parse Memory for this platform - #{RUBY_PLATFORM}"
+        Qnotifier.log.debug "Can't parse Memory for this platform - #{RUBY_PLATFORM}"
       end
 
     end

data/qnotifier.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{qnotifier}
-  s.version = "0.7.6"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gersham Meharg"]
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.email = %q{gersham@qnotifier.com}
   s.executables = ["qnotifier"]
   s.extra_rdoc_files = ["bin/qnotifier", "lib/plugin.rb", "lib/qnotifier.rb", "lib/storage.rb", "lib/web_service.rb"]
-  s.files = ["Manifest", "Rakefile", "bin/qnotifier", "config/README", "config/qnotifier_config.yml", "gem-public_cert.pem", "lib/plugin.rb", "lib/qnotifier.rb", "lib/storage.rb", "lib/web_service.rb", "plugins/apache.rb", "plugins/mysql.rb", "plugins/network.rb", "plugins/nginx.rb", "plugins/passenger.rb", "plugins/rails.rb", "plugins/ruby.rb", "plugins/system.rb", "plugins/urls.rb", "init.d/qnotifier", "qnotifier.gemspec"]
+  s.files = ["Manifest", "Rakefile", "bin/qnotifier", "config/README", "config/qnotifier_config.yml", "gem-public_cert.pem", "lib/plugin.rb", "lib/qnotifier.rb", "lib/storage.rb", "lib/web_service.rb", "plugins/apache.rb", "plugins/mysql.rb", "plugins/nginx.rb", "plugins/passenger.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' in order to register this server.}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Qnotifier"]
@@ -28,24 +28,12 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      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"])
+      s.add_runtime_dependency(%q<json_pure>, [">= 1.2.3"])
+      s.add_development_dependency(%q<json_pure>, [">= 1.2.3"])
     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<robustthread>, [">= 0.5.2"])
+      s.add_dependency(%q<json_pure>, [">= 1.2.3"])
     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<robustthread>, [">= 0.5.2"])
+    s.add_dependency(%q<json_pure>, [">= 1.2.3"])
   end
 end

metadata

@@ -3,10 +3,10 @@ name: qnotifier
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
+  - 1
   - 0
-  - 7
-  - 6
-  version: 0.7.6
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Gersham Meharg
@@ -39,24 +39,9 @@ date: 2010-07-06 00:00:00 -07:00
 default_executable: qnotifier
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rest-client
+  name: json_pure
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 2
-        version: 1.4.2
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -67,56 +52,11 @@ dependencies:
         - 3
         version: 1.2.3
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: elif
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        - 0
-        version: 0.1.0
-  type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: robustthread
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        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 
-        segments: 
-        - 1
-        - 4
-        - 2
-        version: 1.4.2
-  type: :development
-  version_requirements: *id005
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: json_pure
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -127,37 +67,7 @@ dependencies:
         - 3
         version: 1.2.3
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: elif
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        - 0
-        version: 0.1.0
-  type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: robustthread
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 5
-        - 2
-        version: 0.5.2
-  type: :development
-  version_requirements: *id008
+  version_requirements: *id002
 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: 
@@ -183,10 +93,8 @@ files:
 - lib/web_service.rb
 - plugins/apache.rb
 - plugins/mysql.rb
-- plugins/network.rb
 - plugins/nginx.rb
 - plugins/passenger.rb
-- plugins/rails.rb
 - plugins/ruby.rb
 - plugins/system.rb
 - plugins/urls.rb

metadata.gz.sig

@@ -1,2 +1,2 @@
-�\�_�UE��G��-8B�������7�|���B��~��`�~� 0T
-�ۏݫam�Y��M�jS�w�L��_�U�sc”��N��kl&E�X�XP� )� �+q��i�eߥ�`�P��,n��`��	W�Q�v���'�G6���CS��B��G]2Cx�X3�"P
+���r���>��Kk���S@��h�
+�o굃��B�=� �u�1�Æ�o��hi[Ny��Q5[

data/plugins/network.rb

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-module Qnotifier
-  class Network < Qnotifier::Plugin
-
-    def initialize
-      @defaults = {
-      }
-    end
-    
-    def main
-      Qnotifier.log.error "Network plugin not yet supported in this beta version"
-    end
-  end
-end

data/plugins/rails.rb

@@ -1,47 +0,0 @@
-#!/usr/bin/env ruby
-require "elif"
-
-module Qnotifier
-  class Rails < Qnotifier::Plugin
-
-    def initialize
-      @defaults = {
-        :rails_log_file => "/var/www/rails/log/production.log"
-      }
-      patch_elif
-    end
-    
-    def main
-      Qnotifier.log.error "Rails plugin not yet supported in this beta version"
-    end
-    
-    def patch_elif
-      if Elif::VERSION < "0.2.0"
-        Elif.send(:define_method, :pos) do
-          @current_pos +
-          @line_buffer.inject(0) { |bytes, line| bytes + line.size }
-        end
-      end
-    end
-    
-    def read_backwards_to_timestamp(path, timestamp)
-      start = nil
-      Elif.open(path) do |elif|
-        elif.each do |line|
-          if line =~ /\AProcessing .+ at (\d+-\d+-\d+ \d+:\d+:\d+)\)/
-            time_of_request = Time.parse($1)
-            if time_of_request < timestamp
-              break
-            else
-              start = elif.pos
-            end
-          end
-        end
-      end
-
-      file = open(path)
-      file.seek(start) if start
-      file
-    end
-  end
-end