spoonsix-dognotgod 0.1.2 → 0.1.3

data/{README → README.md}

@@ -1,41 +1,33 @@
 # dog not god: performance monitoring simplified
 
-dog not god is a performance monitoring tool for *nix based servers.
+dog not god is a performance monitoring tool for *nix based servers. The focus is on simplicity and on a 100% ruby implementation.
 
-## How does it work
+### Installation
 
-There are two components to dog not god.
+    gem sources -a http://gems.github.com
+    sudo gem install spoonsix-dognotgod
+    sudo gem install spoonsix-dognotgod-client
 
 ### Server
+The server captures performance data, and presents it via a web based interface.
 
-The server plays two roles. First, it captures performance data, second, it presents it via a web based interface.
-
-### Installation
-
-gem install dognotgod
-dognotgod start
+    dognotgod start
 
-This will kick off a thin server on port 4567. It will also create the folder ~/.dognotgod and store the sqlite database at this location.
+This will kick off a thin server on port 4567. It will also create the folder ~/.dognotgod and store the SQLite database at this location.
 
 ### Client
 
 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.
 
-### Installation
-
-gem install dognotgod-client
-
-Add an entry to crontab
-
-crontab -e
-*/1 * * * * ruby /path/to/gem/client.rb >> /dev/null 2>&1
+    crontab -e
+    */1 * * * * dognotgod-client -a server-address -p port >> /dev/null 2>&1
 
-This will run the client every minute.
+This will run the client every minute. By default, the server-address is 127.0.0.1 and the port is 4567.
 
 ## License
 
 dog not god: performance monitoring simplified
-Copyright (C) 2009 Luis Correa d'Almeida
+Copyright (C) 2009 spoonsix - Luis Correa d'Almeida
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License

data/app/models/disk.rb

@@ -0,0 +1,28 @@
+class Disk < Sequel::Model
+  
+  many_to_one :filesystems
+  
+	unless table_exists?
+		set_schema do
+			primary_key :id
+			integer :file_system_id
+			string :mounted_on
+			integer :used
+			integer :available
+			timestamp :created_at
+			timestamp :grain_5_min
+			timestamp :grain_15_min
+			timestamp :grain_30_min
+			timestamp :grain_60_min
+		end
+		create_table
+	end
+	
+  before_create do
+    self.created_at = Time.now.utc unless self.created_at
+    self.grain_5_min = self.created_at.to_five_minute_grain_format
+    self.grain_15_min = self.created_at.to_fifteen_minute_grain_format
+    self.grain_30_min = self.created_at.to_thirty_minute_grain_format
+    self.grain_60_min = self.created_at.to_sixty_minute_grain_format
+  end
+end

data/app/models/file_system.rb

@@ -0,0 +1,98 @@
+class FileSystem < Sequel::Model
+  
+  many_to_one :hosts
+  one_to_many :disks
+  
+	unless table_exists?
+		set_schema do
+			primary_key :id
+		  integer :host_id
+			string :name
+			string :mounted_on
+			timestamp :created_at
+		end
+		create_table
+	end
+	
+	def is_dev?
+	  self.name.scan(/^\/dev/).size > 0
+	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] + last_entry[:used]) / 1024 / 1024
+    else
+      0
+    end
+  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
+    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
+    else
+      0
+    end
+  end
+	
+  def disks_5_min_grain(start_time, end_time)
+    disk = DB.fetch("SELECT ROUND(AVG(available)/1024/1024, 1) AS available, ROUND(AVG(used)/1024/1024, 1) AS used, grain_5_min FROM disks WHERE file_system_id = #{self.id} AND grain_5_min >= '#{start_time.to_five_minute_grain_format.to_sql_format}' AND grain_5_min <= '#{end_time.to_five_minute_grain_format.to_sql_format}' GROUP BY grain_5_min;").all
+    
+    time_range = (start_time..end_time)
+    
+    series = []
+    series[0] = []
+    series[1] = []
+    series[2] = []
+    series[3] = []
+    time_range.step(300) do |five|
+      series[0] << five.to_minute_format
+      if disk.size > 0 and disk[0][:grain_5_min].to_minute_format == five.to_minute_format
+        disk_for_this_dim = disk.shift
+        series[1] << (disk_for_this_dim[:available] + disk_for_this_dim[:used])
+        series[2] << disk_for_this_dim[:used]
+      else
+        series[1] << -1
+        series[2] << -1
+      end
+    end
+    
+    series
+  end
+  
+  def disks_15_min_grain(start_time, end_time)
+    disk = DB.fetch("SELECT ROUND(AVG(available)/1024/1024, 1) AS available, ROUND(AVG(used)/1024/1024, 1) AS used, grain_15_min FROM disks WHERE file_system_id = #{self.id} AND grain_15_min >= '#{start_time.to_fifteen_minute_grain_format.to_sql_format}' AND grain_15_min <= '#{end_time.to_fifteen_minute_grain_format.to_sql_format}' GROUP BY grain_15_min;").all
+    
+    time_range = (start_time..end_time)
+    
+    series = []
+    series[0] = []
+    series[1] = []
+    series[2] = []
+    series[3] = []
+    time_range.step(900) do |fifteen|
+      series[0] << fifteen.to_minute_format
+      if disk.size > 0 and disk[0][:grain_15_min].to_minute_format == fifteen.to_minute_format
+        disk_for_this_dim = disk.shift
+        series[1] << (disk_for_this_dim[:available] + disk_for_this_dim[:used])
+        series[2] << disk_for_this_dim[:used]
+      else
+        series[1] << -1
+        series[2] << -1
+      end
+    end
+    
+    series
+  end
+	
+end

data/app/models/host.rb

@@ -1,6 +1,8 @@
 class Host < Sequel::Model
 
   one_to_many :loads
+  one_to_many :file_systems
+  one_to_many :memories
   
 	unless table_exists?
 		set_schema do
@@ -11,18 +13,141 @@ class Host < Sequel::Model
 		create_table
 	end
 	
+  ####################
+  # Heartbeat
+  ####################
+	
+	# Timestamp of last entry in 'loads' table for this host
 	def last_contacted_on
 	  self.loads.last.created_at if self.loads.last
   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
   end
 
-  def loads2(start_time, end_time)
-    load = DB.fetch("SELECT AVG(load_5_min) AS load_5_min, AVG(load_10_min) AS load_10_min, AVG(load_15_min) AS load_15_min, grain_5_min FROM loads WHERE host_id = #{self.id} AND grain_5_min >= '#{start_time.to_five_minute_grain_format.to_sql_format}' AND grain_5_min <= '#{end_time.to_five_minute_grain_format.to_sql_format}'  GROUP BY grain_5_min;").all
-  end
 
+  ####################
+  # Disk space
+  ####################
+  def total_disk_space_in_Gb
+    @total = 0
+    self.file_systems.each do |fs|
+      @total += fs.size_in_Gb
+    end
+    
+    @total
+  end
+  
+  def available_disk_space_in_Gb
+    @available = 0
+    self.file_systems.each do |fs|
+      @available += fs.available_in_Gb
+    end
+    
+    @available
+  end
+  
+  
+  ####################
+  # Memory
+  ####################
+  
+  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
+  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
+    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
+    else
+      0
+    end
+  end
+  
+  def memory_stats_15_min_grain(start_time, end_time)
+    data = DB.fetch("SELECT ROUND(AVG(mem_available)/1024,0) AS mem_available, ROUND(AVG(mem_used)/1024,0) AS mem_used, ROUND(AVG(swap_available)/1024,0) AS swap_available, ROUND(AVG(swap_used)/1024, 0) AS swap_used, grain_15_min FROM memories WHERE host_id = #{self.id} AND grain_15_min >= '#{start_time.to_fifteen_minute_grain_format.to_sql_format}' AND grain_15_min <= '#{end_time.to_fifteen_minute_grain_format.to_sql_format}' GROUP BY grain_15_min;").all
+    
+    time_range = (start_time..end_time)
+    
+    series = []
+    series[0] = []
+    series[1] = []
+    series[2] = []
+    series[3] = []
+    series[4] = []
+    
+    time_range.step(900) do |fifteen|
+      series[0] << fifteen.to_minute_format
+      if data.size > 0 and data[0][:grain_15_min].to_minute_format == fifteen.to_minute_format
+        fact_for_this_dim = data.shift
+        series[1] << fact_for_this_dim[:mem_available]
+        series[2] << fact_for_this_dim[:mem_used]
+        series[3] << fact_for_this_dim[:swap_available]
+        series[4] << fact_for_this_dim[:swap_used]
+      else
+        series[1] << -1
+        series[2] << -1
+        series[3] << -1
+        series[4] << -1
+      end
+    end
+    
+    series
+  end
+  
+  
+  ####################
+  # Swap
+  ####################
+  
+  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
+  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
+    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
+    else
+      0
+    end
+  end  
+  
+  ####################
+  # Load stats
+  ####################
+  
   def loads_5_min_grain(start_time, end_time)
     load = DB.fetch("SELECT ROUND(AVG(load_5_min),1) AS load_5_min, ROUND(AVG(load_10_min),1) AS load_10_min, ROUND(AVG(load_15_min),1) AS load_15_min, grain_5_min FROM loads WHERE host_id = #{self.id} AND grain_5_min >= '#{start_time.to_five_minute_grain_format.to_sql_format}' AND grain_5_min <= '#{end_time.to_five_minute_grain_format.to_sql_format}' GROUP BY grain_5_min;").all
     
@@ -70,6 +195,7 @@ class Host < Sequel::Model
     series[1] = []
     series[2] = []
     series[3] = []
+    i = 0
     time_range.step(900) do |fifteen|
       series[0] << fifteen.to_minute_format
       if load.size > 0 and load[0][:grain_15_min].to_minute_format == fifteen.to_minute_format
@@ -86,7 +212,7 @@ class Host < Sequel::Model
     
     series
   end
-  
+
   def load_5_min
     self.loads.last.load_5_min if self.loads.last
   end
@@ -113,8 +239,4 @@ class Host < Sequel::Model
     end
   end
   
-  def to_google_params
-    
-  end
-  
 end

data/app/models/load.rb

@@ -19,7 +19,7 @@ class Load < Sequel::Model
 	end
 	
   before_create do
-    self.created_at = Time.now unless self.created_at
+    self.created_at = Time.now.utc unless self.created_at
     self.grain_5_min = self.created_at.to_five_minute_grain_format
     self.grain_15_min = self.created_at.to_fifteen_minute_grain_format
     self.grain_30_min = self.created_at.to_thirty_minute_grain_format

data/app/models/memory.rb

@@ -0,0 +1,29 @@
+class Memory < Sequel::Model
+  
+  many_to_one :hosts
+  
+	unless table_exists?
+		set_schema do
+			primary_key :id
+		  integer :host_id
+			integer :mem_available
+			integer :mem_used
+			integer :swap_available
+			integer :swap_used
+			timestamp :created_at
+			timestamp :grain_5_min
+			timestamp :grain_15_min
+			timestamp :grain_30_min
+			timestamp :grain_60_min
+		end
+		create_table
+	end
+	
+  before_create do
+    self.created_at = Time.now.utc unless self.created_at
+    self.grain_5_min = self.created_at.to_five_minute_grain_format
+    self.grain_15_min = self.created_at.to_fifteen_minute_grain_format
+    self.grain_30_min = self.created_at.to_thirty_minute_grain_format
+    self.grain_60_min = self.created_at.to_sixty_minute_grain_format
+  end
+end

data/server.rb

@@ -14,7 +14,10 @@ configure do
  
   # require 'ostruct'
   require 'host'
+  require 'file_system'
   require 'load'
+  require 'disk'
+  require 'memory'
 end
  
 error do
@@ -27,64 +30,82 @@ error do
 end
  
 helpers do
-  def admin?
-    # request.cookies[Blog.admin_cookie_key] == Blog.admin_cookie_value
+  
+  def get_host_or_create_if_not_exist(hostname)
+    host = DB[:hosts].filter(:hostname => hostname).first
+
+    unless host
+      DB[:hosts] << {:hostname => hostname}
+      host = DB[:hosts].filter(:hostname => hostname).first
+    end
+    host
   end
- 
-  def auth
-    stop [ 401, 'Not authorized' ] unless admin?
+  
+  def get_fs_or_create_if_not_exist(host_id, fs_name, mounted_on)
+    fs = DB[:file_systems].filter(:name => fs_name, :mounted_on => mounted_on).first
+
+    unless fs
+      DB[:file_systems] << {:name => fs_name, :mounted_on => mounted_on, :host_id => host_id}
+      fs = DB[:file_systems].filter(:name => fs_name, :mounted_on => mounted_on).first
+    end
+    fs
   end
+  
 end
- 
+
+get '/stylesheets/style.css' do
+  header 'Content-Type' => 'text/css; charset=utf-8'
+  sass :style
+end
+
 get "/" do
   @hosts = Host.order(:hostname).all
 
-  @end_now = Time.now.to_fifteen_minute_grain_format
+  @end_now = Time.now.utc.to_fifteen_minute_grain_format
   @start_24h_ago = @end_now - (60*60*24)
   @start_6h_ago = @end_now - (60*60*6)
   
   haml :main
 end 
 
-get "/hosts/:id/loads.xml" do
-  @host = Host[params[:id]]
-  
-  @end_time = Time.now.to_five_minute_grain_format # Round to zero seconds on the minute
-  @start_time = @end_time - (60*60*24)
-  @time_range = (@start_time..@end_time)
-  
-  @loads = @host.loads2(@start_time, @end_time)
-  
-  content_type 'application/xml', :charset => 'utf-8'
-  haml :loads_xml, :layout => false
-end
+post "/load_stats" do
 
-post "/loads" do
-  host = DB[:hosts].filter(:hostname => params[:hostname]).first
-  
-  # create an entry for a new host if it doesn't exist
-  unless host
-    DB[:hosts] << {:hostname => params[:hostname]}
-    host = DB[:hosts].filter(:hostname => params[:hostname]).first
+  begin
+    host = get_host_or_create_if_not_exist(params[:hostname])
+    load_stats = Load.new({:load_5_min => params[:load_5_min], :load_10_min => params[:load_10_min], :load_15_min => params[:load_15_min], :host_id => host[:id]})
+    load_stats.save
+    status(201)
+  rescue
+    status(500)
   end
+end
+
+post "/mem_stats" do
   
-  @now = Time.now
-  
-  load = Load.new({:load_5_min => params[:load_5_min], :load_10_min => params[:load_10_min], :load_15_min => params[:load_15_min], :host_id => host[:id], :created_at => @now})
-  if load.save
+  begin
+    host = get_host_or_create_if_not_exist(params[:hostname])
+    mem_stats = Memory.new({:host_id => host[:id], :mem_available => params[:mem_available], :mem_used => params[:mem_used], :swap_available => params[:swap_available], :swap_used => params[:swap_used]})
+    mem_stats.save
     status(201)
-    # response['Location'] = ""
-  else
+  rescue
     status(500)
   end
 end
 
-get '/stylesheets/style.css' do
-  header 'Content-Type' => 'text/css; charset=utf-8'
-  sass :style
+post "/file_system_stats" do
+  
+  begin
+    host = get_host_or_create_if_not_exist(params[:hostname])
+    fs   = get_fs_or_create_if_not_exist(host[:id], params[:file_system_name], params[:mounted_on])
+    
+    disk_stats = Disk.new({:file_system_id => fs[:id], :mounted_on => params[:mounted_on], :used => params[:used], :available => params[:available]})
+    disk_stats.save
+    status(201)
+  rescue
+    status(500)
+  end
 end
 
-
 class Time
   
   # Rounds up to the 5 min intervals

data/views/layout.haml

@@ -3,6 +3,10 @@
   %head
     %title dog not god
     %link{:rel=>'stylesheet', :href=>'/stylesheets/style.css', :type => "text/css"}
+    %script{:src => "http://www.google.com/jsapi"}
+    %script google.load("jquery", "1");
+    %script{:src => "/javascripts/flot/jquery.flot.pack.js"}
+
   
   %body
     #header

data/views/main.haml

@@ -3,17 +3,23 @@
   %table{:id => "summary-table", :cellspacing => 0, :cellpading => 0}
     %tr
       %th Host
+      %th Last heartbeat
       %th 5 min average
       %th 10 min average
       %th 15 min average
-      %th Last heartbeat
+      %th Free disk space
+      %th Free memory
+      %th Free swap space
     -for host in @hosts
       %tr{:class => "level#{host.status}"}
         %td= host.hostname
+        %td= "#{host.distance_to_last_heartbeat_in_seconds.to_i} seconds ago" unless host.status == 0
         %td= host.load_5_min
         %td= host.load_10_min
         %td= host.load_15_min
-        %td= "#{host.distance_to_last_heartbeat_in_seconds.to_i} seconds ago" unless host.status == 0
+        %td= "#{host.available_disk_space_in_Gb}Gb out of #{host.total_disk_space_in_Gb}Gb (#{sprintf('%.2f', (host.available_disk_space_in_Gb.to_f / host.total_disk_space_in_Gb) * 100)}%)" if host.total_disk_space_in_Gb > 0
+        %td= "#{host.available_memory_in_Mb}Mb out of #{host.total_memory_in_Mb}Mb (#{sprintf('%.2f', (host.available_memory_in_Mb.to_f / host.total_memory_in_Mb) * 100)}%)" if host.total_memory_in_Mb > 0
+        %td= "#{host.available_swap_in_Mb}Mb out of #{host.total_swap_in_Mb}Mb (#{sprintf('%.2f', (host.available_swap_in_Mb.to_f / host.total_swap_in_Mb) * 100)}%)" if host.total_swap_in_Mb > 0
       
 
 
@@ -21,17 +27,40 @@
   %tr
     -for host in @hosts
       - series_6h = host.loads_5_min_grain(@start_6h_ago, @end_now)
-      - params_for_6h = "cht=lc&chs=350x120&chco=FF0000,00FF00,0000FF&chm=r,DDDDDD,0,0.2,0.21&chxt=x,y&chxr=1,0,5,1&chds=0,5&chl=&chd=t:#{series_6h[1].join(",")}|#{series_6h[2].join(",")}|#{series_6h[3].join(",")}"
+      - params_for_6h = "cht=lc&chs=350x120&chco=FF0000,00FF00,0000FF&chm=r,DDDDDD,0,0.2,0.21&chxt=x,y&chxr=1,0,4,1&chds=0,4&chl=&chd=t:#{series_6h[1].join(",")}|#{series_6h[2].join(",")}|#{series_6h[3].join(",")}"
       - series_24h = host.loads_15_min_grain(@start_24h_ago, @end_now)
-      - params_for_24h = "cht=lc&chs=350x120&chco=FF0000,00FF00,0000FF&chm=r,DDDDDD,0,0.2,0.21&chxt=x,y&chxr=1,0,5,1&chds=0,5&chl=&chd=t:#{series_24h[1].join(",")}|#{series_24h[2].join(",")}|#{series_24h[3].join(",")}"
+      - params_for_24h = "cht=lc&chs=350x120&chco=FF0000,00FF00,0000FF&chm=r,DDDDDD,0,0.2,0.21&chxt=x,y&chxr=1,0,4,1&chds=0,4&chl=&chd=t:#{series_24h[1].join(",")}|#{series_24h[2].join(",")}|#{series_24h[3].join(",")}"
+      - mem_series_24h = host.memory_stats_15_min_grain(@start_24h_ago, @end_now)
+      - mem_params_for_24h = "cht=lc&chs=350x120&chco=FF0000,00FF00,0000FF&chm=r,DDDDDD,0,0.95,0.96&chxr=1,0,#{host.total_memory_in_Mb * 1.05}&chxt=x,y&chl=&chds=0,#{host.total_memory_in_Mb * 1.05}&chd=t:#{mem_series_24h[2].join(",")}"
+      - swap_params_for_24h = "cht=lc&chs=350x120&chco=FF0000,00FF00,0000FF&chm=r,DDDDDD,0,0.95,0.96&chxr=1,0,#{host.total_swap_in_Mb * 1.05}&chxt=x,y&chl=&chds=0,#{host.total_swap_in_Mb * 1.05}&chd=t:#{mem_series_24h[4].join(",")}"
       %td
         .section
           %h2=host.hostname
           %p== Last heard from on #{host.last_contacted_on}
+          
           %h4 Load averages for the last 24 hours
           %img{ :src => "http://chart.apis.google.com/chart?#{params_for_24h}"}
+          
           %h4 Load averages for the last 6 hours
           %img{ :src => "http://chart.apis.google.com/chart?#{params_for_6h}"}
           
+          %h4 Memory
+          %p{:style => "float:right;"}== Total memory is #{host.total_memory_in_Mb}Mb
+          %br
+          %img{ :src => "http://chart.apis.google.com/chart?#{mem_params_for_24h}"}
+          
+          %h4 Swap
+          %p{:style => "float:right;"}== Total memory is #{host.total_swap_in_Mb}Mb
+          %br
+          %img{ :src => "http://chart.apis.google.com/chart?#{swap_params_for_24h}"}
+          
+          - host.file_systems.each do |fs|
+            - if fs.is_dev? and fs.size_in_Gb > 0
+              - series_24h = fs.disks_15_min_grain(@start_24h_ago, @end_now)
+              - params_for_24h = "cht=lc&chs=350x120&chco=FF0000,00FF00,0000FF&chxr=1,0,#{fs.size_in_Gb * 1.05}&chxt=x,y&chds=0,#{fs.size_in_Gb * 1.05}&chl=&chd=t:#{series_24h[2].join(",")}"
+              %h4== #{fs.mounted_on} on #{fs.name}
+              %p{:style => "float:right;"}== Device size is #{fs.size_in_Gb}Gb
+              %br
+              %img{ :src => "http://chart.apis.google.com/chart?#{params_for_24h}"}
 
           

data/views/style.sass

@@ -4,6 +4,9 @@ body
   :font-family Courier
   :font-size 1.0em
 
+br
+  :clear both
+
 a, a:visited
   :color #AAA
 
@@ -22,7 +25,7 @@ h2
   :text-decoration underline
   
 h4
-  :margin 20px 10px 20px 5px
+  :margin 20px 10px 10px 0px
   :padding 5px
   :background-color #EFEFEF
 
@@ -45,13 +48,13 @@ h4
   :border-left 1px solid #DDD
   
   
-#summary-table tr.level5
+#summary-table tr.level4, #summary-table tr.level5
   :background-color #99FF99
 
 #summary-table tr.level3
   :background-color #999933
   
-#summary-table tr.level1
+#summary-table tr.level1, #summary-table tr.level2
   :background-color #DD3333
   
 #summary-table tr.level0
@@ -71,9 +74,13 @@ h4
   :padding-left 5px
   :padding-right 5px
 
+
 #section-table
   :border 0px
 
+#section-table td
+  :vertical-align top
+
 .section
   :margin-bottom 20px
   :margin-left 20px
@@ -83,6 +90,7 @@ p
   :font-size 0.7em
   :margin 0px
   :padding 0px
+  :margin-right 10px
 
 #footer
   :margin-top 20px

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spoonsix-dognotgod
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Luis Correa d'Almeida
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-28 00:00:00 -08:00
+date: 2009-03-01 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,38 +62,28 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.2.4
     version: 
-- !ruby/object:Gem::Dependency 
-  name: rest-client
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0.9"
-    version: 
 description: dog not god is a performance monitoring tool.
 email: luis.ca@gmail.com
 executables: 
 - dognotgod
-- dognotgod-client
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
 - app/models
+- app/models/disk.rb
+- app/models/file_system.rb
 - app/models/host.rb
 - app/models/load.rb
+- app/models/memory.rb
 - config.ru
-- README
+- README.md
 - views/layout.haml
-- views/loads_xml.haml
 - views/main.haml
 - views/style.sass
 - config/thin.yml
 - server.rb
-- client.rb
 has_rdoc: false
 homepage: http://github.com/spoonsix/dognotgod
 post_install_message: 

data/bin/dognotgod-client

@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-require 'rubygems'
-
-DOGNOTGOD_DIR = "#{File.dirname(__FILE__)}/.."
-Dir.chdir(DOGNOTGOD_DIR)
-load 'client.rb'

data/client.rb

@@ -1,64 +0,0 @@
-require 'rubygems'
-require 'optparse'
-require 'restclient'
-
-module DogNotGod
-
-  class Client
-
-    def initialize(argv)
-      @argv = argv
-      
-      # Default options values
-      @options = {
-        :server_addr                => "127.0.0.1",
-        :server_port                => "4567",
-        :timeout                    => 5
-      }
-      
-      parse!
-      
-      @endpoint = "http://#{@options[:server_addr]}:#{@options[:server_port]}"
-    end
-    
-    def parser
-      # NOTE: If you add an option here make sure the key in the +options+ hash is the
-      # same as the name of the command line option.
-      # +option+ keys are used to build the command line to launch other processes,
-      # see <tt>lib/thin/command.rb</tt>.
-      @parser ||= OptionParser.new do |opts|
-        opts.banner = "Usage: dognotgod-client [options]"
-        opts.separator ""
-        opts.separator "Server options:"
-
-        opts.on("-a", "--server-addr HOST", "HOST address to call (default: #{@options[:server_addr]})")  { |host| @options[:server_addr] = host }
-        opts.on("-p", "--server-port PORT", "use PORT (default: #{@options[:server_port]})")                  { |port| @options[:server_port] = port.to_i }
-        #opts.on("-t", "--timeout SECONDS", "timeout after SECONDS (default: #{@options[:timeout]})")                         { |port| @options[:timeout] = port.to_i }
-        opts.separator ""
-      end
-    end
-    
-    # Parse the options.
-    def parse!
-      parser.parse! @argv
-      @arguments = @argv
-    end
-
-    def run!
-      hostname = %x[hostname].split("\n")[0]
-      uptime = %x[uptime]
-      avgs = uptime.scan(/(\d+\.\d\d)/)
-      
-      begin
-        RestClient.post("#{@endpoint}/loads", :load_5_min => avgs[0], :load_10_min => avgs[1], :load_15_min => avgs[2], :hostname => hostname)
-        puts "OK"
-      rescue
-        puts "There was a problem connecting to the server on #{@endpoint}."
-      end
-    end
-    
-  end
-  
-end
-
-DogNotGod::Client.new(ARGV).run!

data/views/loads_xml.haml

@@ -1,23 +0,0 @@
-!!! XML
-%chart
-  %series
-    -i=0
-    -@time_range.step(300) do |five|
-      %value{:xid => i+=1}
-        =five.to_minute_format
-  %graphs
-    %graph{:gid => "1"}
-      -i=0
-      -load = Array.new(@loads)
-      -@time_range.step(300) do |five|
-        %value{:xid => i+=1}= load.shift[:load_5_min] if load.size > 0 and load[0][:grain_5_min].to_minute_format == five.to_minute_format
-    %graph{:gid => "2"}
-      -i=0
-      -load = Array.new(@loads)
-      -@time_range.step(300) do |five|
-        %value{:xid => i+=1}= load.shift[:load_10_min] if load.size > 0 and load[0][:grain_5_min].to_minute_format == five.to_minute_format
-    %graph{:gid => "3"}
-      -i=0
-      -load = Array.new(@loads)
-      -@time_range.step(300) do |five|
-        %value{:xid => i+=1}= load.shift[:load_15_min] if load.size > 0 and load[0][:grain_5_min].to_minute_format == five.to_minute_format