qnotifier 0.7.3 → 0.7.4

data/bin/qnotifier

@@ -40,6 +40,11 @@ module Qnotifier
           setup_registration
           
         elsif argv.first == 'debug'
+          runlock_file = "/var/lib/qnotifier/.runlock"
+          if File.exists?(runlock_file)
+            `rm #{runlock_file}`
+          end
+          
           puts "Running once in debug mode (use this mode to debug your plugins)\n\n"
           require "qnotifier"
           qnotifier = Qnotifier::MainProcess.new
@@ -117,7 +122,8 @@ module Qnotifier
           copy_init
           puts "Doing initial update..."
           qnotifier.run
-          puts "\nPlease start the qnotifier daemon now ('sudo qnotifier start')"
+          puts "\nStarting Qnotifier daemon (qnotifier start)"
+          `qnotifier start`
         else
           puts "Exiting."
         end
@@ -128,11 +134,15 @@ module Qnotifier
     end
     
     def self.copy_init
-      print "\nWould you like to install the qnotifier init script in /etc/init.d? (y/n):"
+      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"
-        `cp #{init_file} /etc/init.d/`
+        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
     
@@ -178,16 +188,16 @@ module Qnotifier
       end
       
       pid = fork do
-        `echo #{Process.pid} > /var/lib/qnotifier/qnotifer.pid`
         $0 = 'qnotifierd'
         Process.setsid
-        #Process.euid = 65534
         exit if fork
         File.umask 0000
         STDIN.reopen "/dev/null"
         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"

data/config/qnotifier_config.yml

@@ -43,6 +43,7 @@ System:
         - "/"
     
 # The Apache built-in plugin
+# Not currently supported
 Apache:
     # Enabled, set to either true or false
     enabled: false
@@ -51,6 +52,7 @@ Apache:
     password: "password"
     
 # The IOStat built-in plugin
+# Not currently supported
 Iostat:
     # Enabled, set to either true or false
     enabled: false
@@ -67,10 +69,14 @@ Mysql:
     #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 URL Monitor built-in plugin, will watch a URL for non-200 HTTP responses
+Url:
+    enabled: false
+    url: "http://localhost"
 
 # The Network Interface built-in plugin  
+# Not currently supported
 Network:
     # Enabled, set to either true or false
     enabled: false
@@ -81,20 +87,15 @@ Network:
 Nginx:
     # Enabled, set to either true or false
     enabled: false
-    username: "username"
-    password: "password"
+    url: "http://username:password@127.0.0.1/nginx_status"
  
 # The Passenger Phusion built-in plugin   
 Passenger:
     # Enabled, set to either true or false
     enabled: false
- 
-# The Process List built-in plugin   
-Processes:
-    # 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

data/init.d/qnotifier

@@ -0,0 +1,38 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          qnotifier
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Qnotifier initscript
+# Description:       Qnotifier server monitoring daemon, see http://qnotifier.com
+### END INIT INFO
+
+# Author: Gersham Meharg <gersham@qnotifier.com>
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin:/opt/local/bin
+DESC="Qnotifier Monitoring Daemon"
+NAME=qnotifier
+DAEMON=QNOTIFIER_DAEMON_LOCATION
+
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
+case "$1" in
+  start)
+		$DAEMON start
+		;;
+  stop)
+		$DAEMON stop
+        ;;
+  restart)
+		$DAEMON restart
+        ;;
+  *)
+        echo "Usage: $SCRIPTNAME {start|stop|status}" >&2
+        exit 3
+        ;;
+esac
+
+:

data/lib/web_service.rb

@@ -79,7 +79,7 @@ module Qnotifier
         return
       end
       if last_run and (Time.now - last_run) <= @@poll_interval
-        Qnotifier.log.info "Not running yet, waiting until #{last_run + @@poll_interval}"
+        Qnotifier.log.info "Not reporting to the service yet, waiting until #{last_run + @@poll_interval}"
         return
       end
       Qnotifier::Storage.put("last_run", Time.now)

data/plugins/apache.rb

@@ -8,34 +8,7 @@ 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)
-      #       
+      Qnotifier.log.error "Apache stats plugin not yet supported in this beta version"
     end
   end
 end

data/plugins/iostat.rb

@@ -8,6 +8,7 @@ module Qnotifier
     end
     
     def main
+      Qnotifier.log.error "IOStats plugin not yet supported in this beta version"
     end
   end
 end

data/plugins/network.rb

@@ -8,6 +8,7 @@ module Qnotifier
     end
     
     def main
+      Qnotifier.log.error "Network plugin not yet supported in this beta version"
     end
   end
 end

data/plugins/nginx.rb

@@ -1,14 +1,39 @@
 #!/usr/bin/env ruby
+require 'open-uri'
+
 module Qnotifier
   class Nginx < Qnotifier::Plugin
 
     def initialize
       @defaults = {
-        "status_url" => "http://127.0.0.1/nginx_status"
       }
     end
     
     def main
+      
+      return if @options["url"].empty?
+        
+      total, requests, reading, writing, waiting = nil
+    	
+    	begin
+        open( @options["url"]) {|f|
+      	  f.each_line do |line|
+      		total = $1 if line =~ /^Active connections:\s+(\d+)/
+      		if line =~ /^Reading:\s+(\d+).*Writing:\s+(\d+).*Waiting:\s+(\d+)/
+      		  reading = $1
+      		  writing = $2
+      		  waiting = $3
+      		end
+      		requests = $3 if line =~ /^\s+(\d+)\s+(\d+)\s+(\d+)/  
+      	  end
+      	}
+    	
+      	report("Connections", total)
+        stat("Activity", "total: #{total} reading: #{reading} writing: #{writing} waiting: #{waiting}")
+        
+      rescue Exception => e
+        Qnotifier.log.error "Can not check Nginx Status #{e}"
+      end
     end
   end
 end

data/plugins/passenger.rb

@@ -8,6 +8,34 @@ module Qnotifier
     end
     
     def main
+      
+      status = `passenger-status`
+      if status
+        max, count, active, inactive = 0
+
+        for line in status.split("\n")
+
+          s = line.split('=')
+          if s.length == 2
+            c = s[1].strip
+
+            if line =~ /max/  
+              max = c
+            elsif line =~ /count/ 
+              count = c
+            elsif line =~ /active/      
+              active = c
+            elsif line =~ /inactive/      
+              inactive = c
+            end
+          end
+        end
+        report("Active", active)
+        stat("Handlers", "max: #{max} count: #{count} active: #{active} inactive: #{inactive}")
+        
+      else
+        Qnotifier.log.error "Can't read passenger-status"
+      end
     end
   end
 end

data/plugins/rails.rb

@@ -12,8 +12,7 @@ module Qnotifier
     end
     
     def main
-      puts "here"
-      #log_file = read_backwards_to_timestamp(@options[:rails_log_file], last_summary)
+      Qnotifier.log.error "Rails plugin not yet supported in this beta version"
     end
     
     def patch_elif

data/plugins/system.rb

@@ -84,7 +84,9 @@ module Qnotifier
     
       # CPU 
       if RUBY_PLATFORM =~ /linux/
-        vmstat = `vmstat | tail -1`
+        
+        # Need to rewrite this, vmstat is only giving stats since system boot, not instant stats
+        vmstat = nil #`vmstat | tail -1`
         if vmstat 
           vmstat = vmstat.split
           if vmstat.size >= 16
@@ -150,10 +152,12 @@ module Qnotifier
         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
+          memory["Buffers"] = meminfo['Buffers'] / 1024
+          memory["Cached"] = meminfo['Cached'] / 1024
+          memory_usable = memory["Free"] + memory["Buffers"] + memory["Cached"]
+          memory_percent = 100 - (memory_usable * 100 / memory["Total"])
 
-          stat("Memory", "Free: #{memory["Free"]}M, Total: #{memory["Total"]}M")
+          stat("Memory", "Total: #{memory["Total"]}M, Free: #{memory["Free"]}M, Buffers: #{memory["Buffers"]}M, Cached: #{memory["Cached"]}M,")
           report("Memory %", memory_percent)
 
           if @options["alert_memory_threshold"] != 0 and memory_percent >= @options["alert_memory_threshold"]

data/plugins/urls.rb

@@ -1,4 +1,8 @@
 #!/usr/bin/env ruby
+require 'net/http'
+require 'net/https'
+require 'uri'
+
 module Qnotifier
   class Urls < Qnotifier::Plugin
 
@@ -8,6 +12,50 @@ module Qnotifier
     end
     
     def main
+      
+      url = @options["url"].strip
+      if url.empty?
+        Qnotifier.log.error "No URL specified for URL Monitor"
+      end
+
+      unless url =~ %r{\Ahttps?://}
+        url = "http://#{url}"
+      end
+
+      uri = URI.parse(url)
+      response = nil
+      stat("URL", url)
+      
+      start_time = Time.now.usec
+      
+      begin
+        http = Net::HTTP.new(uri.host,uri.port)
+        http.use_ssl = url =~ %r{\Ahttps://}
+        http.start(){|http|
+              http.open_timeout = 10
+              req = Net::HTTP::Get.new((uri.path != '' ? uri.path : '/' ) + (uri.query ? ('?' + uri.query) : ''))
+              if uri.user && uri.password
+                req.basic_auth uri.user, uri.password
+              end
+              response = http.request(req)
+        }
+      rescue Exception => e
+        puts "Exception #{e}"
+        stat("Code", 0)
+        alert("response", "HTTP connection error: #{e.message} #{url}")
+        return
+      end
+      
+      response_time = (Time.now.usec - start_time) / 1000 
+      report("Latency msec", response_time)
+        
+      if response.code == 200
+        stat("Code", 200)
+        reset_alert("response", "HTTP OK #{url}")
+      else
+        stat("Code", response.code)
+        alert("response", "HTTP #{response.code} #{url}")
+      end
     end
   end
 end

data/qnotifier.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{qnotifier}
-  s.version = "0.7.3"
+  s.version = "0.7.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gersham Meharg"]
-  s.date = %q{2010-06-13}
+  s.date = %q{2010-06-28}
   s.default_executable = %q{qnotifier}
   s.description = %q{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.}
   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/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.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/iostat.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.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"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 3
-  version: 0.7.3
+  - 4
+  version: 0.7.4
 platform: ruby
 authors: 
 - Gersham Meharg
@@ -35,7 +35,7 @@ cert_chain:
   wu7A8rLN6CU0SfWf
   -----END CERTIFICATE-----
 
-date: 2010-06-13 00:00:00 -07:00
+date: 2010-06-28 00:00:00 -07:00
 default_executable: qnotifier
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -187,7 +187,6 @@ files:
 - plugins/network.rb
 - plugins/nginx.rb
 - plugins/passenger.rb
-- plugins/processes.rb
 - plugins/rails.rb
 - plugins/ruby.rb
 - plugins/system.rb

data/plugins/processes.rb

@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-module Qnotifier
-  class Processes < Qnotifier::Plugin
-
-    def initialize
-      @defaults = {
-      }
-    end
-    
-    def main
-    end
-  end
-end