spoonsix-dognotgod 0.1.5 → 0.1.9

data/README.md

@@ -20,7 +20,7 @@ This will kick off a thin server on port 4567. It will also create the folder ~/
 The client sits on the target machine - the machine to be monitored - captures performance data and sends it to the server. Note that this works on the machine acting as the server as well.
 
     crontab -e
-    */1 * * * * dognotgod-client -a server-address -p port >> /dev/null 2>&1
+    */1 * * * * /path/to/dognotgod-client -a server-address -p port >> /dev/null 2>&1
 
 This will run the client every minute. By default, the server-address is 127.0.0.1 and the port is 4567.
 

data/app/models/file_system.rb

@@ -3,6 +3,10 @@ class FileSystem < Sequel::Model
   many_to_one :hosts
   one_to_many :disks
   
+  def latest_disk_entry
+    @latest_disk_entry ||= self.disks_dataset.order(:created_at).last
+  end
+  
 	unless table_exists?
 		set_schema do
 			primary_key :id
@@ -19,27 +23,20 @@ class FileSystem < Sequel::Model
 	end
 	
 	def size_in_Gb
-	  last_entry = DB[:disks].filter(:file_system_id => self.id).reverse_order(:created_at).last
-	  if last_entry
-      (last_entry[:available].to_i + last_entry[:used].to_i) / 1024 / 1024
-    else
-      0
-    end
+    available_in_Gb + used_in_Gb
   end
   
 	def used_in_Gb
-	  last_entry = DB[:disks].filter(:file_system_id => self.id).reverse_order(:created_at).last
-	  if last_entry
-      last_entry[:used] / 1024 / 1024
+	  if latest_disk_entry
+      latest_disk_entry.used / 1024 / 1024
     else
       0
     end
   end
   
 	def available_in_Gb
-	  last_entry = DB[:disks].filter(:file_system_id => self.id).reverse_order(:created_at).last
-	  if last_entry
-      last_entry[:available] / 1024 / 1024
+	  if latest_disk_entry
+      latest_disk_entry.available / 1024 / 1024
     else
       0
     end

data/app/models/host.rb

@@ -1,8 +1,18 @@
 class Host < Sequel::Model
 
   one_to_many :loads
+  
   one_to_many :file_systems
   one_to_many :memories
+
+  def latest_load_entry
+    @latest_load_entry ||= self.loads_dataset.order(:created_at).last
+  end
+  
+  def latest_memory_entry
+    @latest_memory_entry ||= self.memories_dataset.order(:created_at).last
+  end
+  
   
 	unless table_exists?
 		set_schema do
@@ -19,12 +29,16 @@ class Host < Sequel::Model
 	
 	# Timestamp of last entry in 'loads' table for this host
 	def last_contacted_on
-	  self.loads.last.created_at if self.loads.last
+	  self.latest_load_entry.created_at if self.latest_load_entry
   end
   
   # Seconds to timestamp of last entry in 'loads' table for this host
   def distance_to_last_heartbeat_in_seconds
-    (Time.now - self.loads.last.created_at) if self.loads.last
+    Time.now - last_contacted_on if last_contacted_on
+  end
+  
+  def loads_last
+    
   end
 
 
@@ -55,27 +69,20 @@ class Host < Sequel::Model
   ####################
   
   def total_memory_in_Mb
-    last_entry = DB[:memories].filter(:host_id => self.id).reverse_order(:created_at).last
-    if last_entry
-      (last_entry[:mem_available] + last_entry[:mem_used]) / 1024
-    else
-      0
-    end
+      available_memory_in_Mb + used_memory_in_Mb
   end
   
   def available_memory_in_Mb
-	  last_entry = DB[:memories].filter(:host_id => self.id).reverse_order(:created_at).last
-	  if last_entry
-      last_entry[:mem_available] / 1024
+	  if latest_memory_entry
+      latest_memory_entry.mem_available / 1024
     else
       0
     end
   end
   
   def used_memory_in_Mb
-	  last_entry = DB[:memories].filter(:host_id => self.id).reverse_order(:created_at).last
-	  if last_entry
-      last_entry[:mem_used] / 1024
+	  if latest_memory_entry
+      latest_memory_entry.mem_used / 1024
     else
       0
     end
@@ -118,27 +125,20 @@ class Host < Sequel::Model
   ####################
   
   def total_swap_in_Mb
-	  last_entry = DB[:memories].filter(:host_id => self.id).reverse_order(:created_at).last
-	  if last_entry
-      (last_entry[:swap_available] + last_entry[:swap_used]) / 1024
-    else
-      0
-    end
+    available_swap_in_Mb + used_swap_in_Mb
   end
   
   def available_swap_in_Mb
-	  last_entry = DB[:memories].filter(:host_id => self.id).reverse_order(:created_at).last
-	  if last_entry
-      last_entry[:swap_available] / 1024
+	  if latest_memory_entry
+      latest_memory_entry.swap_available / 1024
     else
       0
     end
   end
   
   def used_swap_in_Mb
-	  last_entry = DB[:memories].filter(:host_id => self.id).reverse_order(:created_at).last
-	  if last_entry
-      last_entry[:swap_used] / 1024
+	  if latest_memory_entry
+      latest_memory_entry.swap_used / 1024
     else
       0
     end
@@ -214,15 +214,15 @@ class Host < Sequel::Model
   end
 
   def load_5_min
-    self.loads.last.load_5_min if self.loads.last
+    self.latest_load_entry.load_5_min if self.latest_load_entry
   end
   
   def load_10_min
-    self.loads.last.load_10_min if self.loads.last
+    self.latest_load_entry.load_10_min if self.latest_load_entry
   end
   
   def load_15_min
-    self.loads.last.load_15_min if self.loads.last
+    self.latest_load_entry.load_15_min if self.latest_load_entry
   end
   
   def status

data/client.rb

@@ -66,4 +66,4 @@ module DogNotGod
   
 end
 
-DogNotGod::Client.new(ARGV).run!
+DogNotGod::Client.new(ARGV).run!

data/lib/base.rb

@@ -0,0 +1,7 @@
+class String
+
+  def camelize
+    self.split('_').map {|w| w.capitalize}.join
+  end
+
+end

data/lib/client_commands.rb

@@ -0,0 +1,121 @@
+module DogNotGod
+
+  class Shell
+    
+    def initialize
+      raise "StaticClass"
+    end
+    
+    def self.call(command)
+      `#{command}`
+    end
+  end
+
+  class Client
+    
+    def self.capture(array_of_command_symbols)
+     @@command_symbols = array_of_command_symbols
+    end
+    
+  end
+
+  #
+  #
+  #
+  module Commands
+    
+    def self.factory(command_name_symbol)
+      class_name = command_name_symbol.to_s.camelize
+      klass = self.const_get class_name
+      klass.new
+    end
+    
+    
+    class ClientCommand
+      
+      def run!(resource)
+        @resource = resource
+        _prepare
+        _execute
+      end
+      
+      def get_hostname_from_shell
+        DogNotGod::Shell.call("hostname").split("\n")[0]
+      end
+      
+    end
+    
+    # 
+    # Load average statistics
+    # 
+    class LoadStats < ClientCommand
+      
+      def _prepare
+        @hostname = get_hostname_from_shell
+        @load_averages = get_load_averages_from_shell
+      end
+            
+      def _execute
+        @resource["/load_stats"].post({:load_5_min => @load_averages[0], :load_10_min => @load_averages[1], :load_15_min => @load_averages[2], :hostname => @hostname})
+      end
+      
+      def get_load_averages_from_shell
+        DogNotGod::Shell.call("uptime").scan(/(\d+\.\d\d)/)
+      end
+      
+    end
+    
+    # 
+    # Disk statistics
+    #
+    class DiskStats < ClientCommand
+      
+      def _prepare
+        @hostname = get_hostname_from_shell
+        @disk_stats = get_disk_statistics_from_shell
+      end
+      
+      def _execute
+        @disk_stats.each do |line|
+          @resource["/file_system_stats"].post({:file_system_name => line[0], :mounted_on => line[-1], :used => line[2], :available => line[3], :hostname => @hostname})
+        end
+      end
+  
+      # 
+      # Extract disk data from df call
+      #
+      # - Only extract entries for filesystems starting with a /
+      # - Ignore capacity % column
+      # 
+      def get_disk_statistics_from_shell
+        DogNotGod::Shell.call("df -ak").scan(/^(\/[\w+\/-]+)\s+(\d+)\s+(\d+)\s+(\d+)\s+\d+\%\s+(\/.*)\n/)
+      end
+      
+    end
+    
+    #
+    # Memory statistics, including swap
+    #
+    class MemoryStats < ClientCommand
+      
+      def _prepare
+        @hostname = get_hostname_from_shell
+        @memory_stats = get_memory_and_swap_statistics_from_shell
+      end
+      
+      def _execute
+        @resource["/mem_stats"].post({:hostname => @hostname, :mem_available => @memory_stats[:mem_available], :mem_used => @memory_stats[:mem_used], :swap_available => @memory_stats[:swap_available], :swap_used => @memory_stats[:swap_used]})
+      end
+      
+      def get_memory_and_swap_statistics_from_shell
+        # Note: the 'free' command is not available on Mac OSX
+        mem = DogNotGod::Shell.call("free").split("\n")
+        mem.shift # lose column headers
+        
+        {:mem_available => mem[0].split(" ")[3], :mem_used => mem[0].split(" ")[2], :swap_available => mem[2].split(" ")[3], :swap_used  => mem[2].split(" ")[2] }
+      end
+
+    end
+  end
+  
+end

data/server.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'sinatra'
- 
+# require 'ruby-prof' 
+
 configure do
   DB_DIR = "#{ENV['HOME']}/.dognotgod"
   
@@ -59,6 +60,8 @@ get '/stylesheets/style.css' do
 end
 
 get "/" do
+  # result = RubyProf.profile do
+
   @hosts = Host.order(:hostname).all
 
   @end_now = Time.now.utc.to_fifteen_minute_grain_format
@@ -66,6 +69,10 @@ get "/" do
   @start_6h_ago = @end_now - (60*60*6)
   
   haml :main
+# end
+  # Print a graph profile to text
+  # printer = RubyProf::GraphPrinter.new(result)
+  # printer.print(File.new("tmp/profile.log",  "w"), 0)
 end 
 
 post "/load_stats" do

data/views/main.haml

@@ -1,6 +1,6 @@
 %h2 Summary
 #summary-section
-  %table{:id => "summary-table", :cellspacing => 0, :cellpading => 0}
+  %table{:class => "summary-table", :cellspacing => 0, :cellpading => 0}
     %tr
       %th Host
       %th Last heartbeat

data/views/style.sass

@@ -43,34 +43,34 @@ h4
   :padding-bottom 20px
   :border-bottom 1px solid #DDD
 
-#summary-table
+// summary-table
+
+.summary-table
   :border-top 1px solid #DDD
   :border-left 1px solid #DDD
   
-  
-#summary-table tr.level4, #summary-table tr.level5
+.summary-table tr.level4, .summary-table tr.level5
   :background-color #99FF99
 
-#summary-table tr.level3
+.summary-table tr.level3
   :background-color #999933
   
-#summary-table tr.level1, #summary-table tr.level2
+.summary-table tr.level1, .summary-table tr.level2
   :background-color #DD3333
   
-#summary-table tr.level0
+.summary-table tr.level0
   :background-color #EFEFEF
   
-#summary-table th, #summary-table td
+.summary-table th, #summary-table td
   :border-bottom 1px solid #DDD  
   :border-right 1px solid #DDD
-  
 
-#summary-table th
+.summary-table th
   :background-color #EFEFEF
   :padding-left 15px
   :padding-right 15px
 
-#summary-table td
+.summary-table td
   :padding-left 5px
   :padding-right 5px
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spoonsix-dognotgod
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.9
 platform: ruby
 authors: 
 - Luis Correa d'Almeida
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-03 00:00:00 -08:00
+date: 2009-03-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,7 +82,6 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- app/models
 - app/models/disk.rb
 - app/models/file_system.rb
 - app/models/host.rb
@@ -98,6 +97,8 @@ files:
 - config/thin.yml
 - server.rb
 - client.rb
+- bin/dognotgod
+- bin/dognotgod-client
 has_rdoc: false
 homepage: http://github.com/spoonsix/dognotgod
 post_install_message: