gltail 0.1.6 → 0.1.7

data/History.txt

@@ -1,3 +1,10 @@
+== 0.1.7 / 2008-07-13
+
+* Handle empty host in URLs logged by Rails (Steve Purcell <steve@sanityinc.com>)
+* Local File source (George Swinnerton)
+* PostgreSQL Syslog support (Lionel Bouton)
+* Cisco ASA parser (Jeff Bryner <jeff@jeffbryner.com>)
+
 == 0.1.6 / 2008-05-31
 
 * Use net-ssh version < 1.2 when loading gem

data/dist/config.yaml

@@ -15,6 +15,12 @@ servers:
         files: /var/www/apps/funapp/current/log/production.log
         parser: rails
         color: 0.2, 0.2, 1.0, 1.0
+    dev:
+        host: clockingit.com
+        source: local
+        files: /var/www/clockingit/logs/production.log
+        parser: rails
+        color: 0.2, 0.2, 1.0, 1.0
 config:
     dimensions: 1200x600
     min_blob_size: 0.004
@@ -61,6 +67,23 @@ config:
             database:
                 order: 9
                 size: 10
+            firewall:
+                order: 10
+                size: 15
+            action:
+                order: 11
+                size: 15
+                auto_clean: false
+                show: total
+            sourceinterface:
+                order: 12
+                size: 15	
+            sourcehost:
+                order: 13
+                size: 15	
+            sourceport:
+                order: 14
+                size: 15
 
     right_column:
         size: 25
@@ -96,6 +119,23 @@ config:
             warnings:
                 order: 8
                 size: 5
+            destinationinterface:
+                order: 9
+                size: 15
+            ipprotocol:
+                order: 10
+                size: 15
+            destinationhost:
+                order: 11
+                size: 15
+            destinationport:
+                order: 12
+                size: 15
+            info:
+                order: 13
+                size: 15
+                auto_clean: false
+                show: total
 resolver:
     reverse_ip_lookups: true
     reverse_timeout: 0.5

data/lib/gl_tail.rb

@@ -5,7 +5,7 @@
 #
 
 module GlTail
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end
 
 begin
@@ -43,7 +43,16 @@ begin
 rescue LoadError
   puts "Missing gem net-ssh."
   puts "Ubuntu:"
-  puts "  sudo gem install -y net-ssh -r"
+  puts "  sudo gem install -y net-ssh -v 1.1.4 -r"
+  exit
+end
+
+begin
+  require 'file/tail'
+rescue LoadError
+  puts "Missing gem file-tail."
+  puts "Ubuntu:"
+  puts "  sudo gem install -y file-tail -r"
   exit
 end
 
@@ -59,6 +68,7 @@ require 'gl_tail/config/yaml_parser'
 # future options: JMS queue, spread.org, local tail, etc
 require 'gl_tail/sources/base'
 require 'gl_tail/sources/ssh'
+require 'gl_tail/sources/local'
 
 %w( engine activity block item element parser resolver blob_store font_store).each {|f| require "gl_tail/#{f}" }
 

data/lib/gl_tail/config/yaml_parser.rb

@@ -35,11 +35,18 @@ module GlTail
 
       self.yaml['servers'].each do |server|
 
-        src = GlTail::Source::SSH.new(@config)
+        name = server.shift
+        data = server.shift
 
-        src.name = server.shift
+        if data['source'] && data['source'].downcase == 'local'
+          src = GlTail::Source::Local.new(@config)
+        else 
+          src = GlTail::Source::SSH.new(@config)
+        end
+        
+        src.name = name
 
-        apply_values(src, server.shift)
+        apply_values(src, data)
 
         @config.sources << src
       end

data/lib/gl_tail/parsers/postgresql.rb

@@ -18,10 +18,15 @@ class PostgreSQLParser < Parser
 
     _, database, datetime, activity, description = /^\[(.*), (.* .* .*)\] LOG:  ([a-zA-Z0-9\s]*): (.*)/.match(line).to_a
 
+    unless _
+      _, database, datetime, activity, description = /postgres\[\d+\]: \[\d+-\d+\] \[(.*), (.* .* .*)\] LOG:  ([a-zA-Z0-9\s]*): (.*)/.match(line).to_a
+      syslog = true if _
+    end
+
     if database
       add_activity(:block => 'database', :name => database, :size => 0.2)
     else
-      _, datetime, activity, description = /^(.* .* .*) LOG:  ([a-zA-Z0-9\s]*): (.*)/.match(line).to_a
+      _, datetime, activity, description = /(.* .* .*) LOG:  ([a-zA-Z0-9\s]*): (.*)/.match(line).to_a
     end
 
     if activity

data/lib/gl_tail/parsers/rails.rb

@@ -11,7 +11,7 @@ class RailsParser < Parser
     _, ms, url = /^Completed in ([\d.]+) .* \[([^\]]+)\]/.match(line).to_a
 
     if url
-      _, host, url = /^http[s]?:\/\/([^\/]+)(.*)/.match(url).to_a
+      _, host, url = /^http[s]?:\/\/([^\/]*)(.*)/.match(url).to_a
 
       add_activity(:block => 'sites', :name => host, :size => ms.to_f) # Size of activity based on request time.
       add_activity(:block => 'urls', :name => HttpHelper.generalize_url(url), :size => ms.to_f)

data/lib/gl_tail/sources/local.rb

@@ -3,10 +3,26 @@ module GlTail
   module Source
 
     class Local < Base
-      config_attribute :command, "The Command to run"
+      config_attribute :source, "The type of Source"
+      config_attribute :host
       config_attribute :files, "The files to tail", :deprecated => "Should be embedded in the :command"
 
-      # TODO: code to run comand locally and parse streams
+        def init
+            @log = File.open(files)
+            @log.extend(File::Tail)
+            @log.max_interval = 5
+            @log.return_if_eof = true
+        end
+      
+        def process
+          @log.tail(1) { |line|
+            parser.parse(line) 
+          }
+        end
+        
+        def update
+        end
+        
     end
   end
 end

data/lib/gl_tail/sources/ssh.rb

@@ -4,6 +4,7 @@ module GlTail
   module Source
 
     class SSH < Base
+      config_attribute :source, "The type of Source"
       config_attribute :command, "The Command to run"
       config_attribute :files, "The files to tail", :deprecated => "Should be embedded in the :command"
       config_attribute :host, "The Host to connect to"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gltail
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - Erlend Simonsen
@@ -29,11 +29,12 @@ cert_chain:
   /UfNqVgtDGy57Xw9DBNRbUm92FVILwpudQs3SX1z2Gik08RrKReELwpRciY=
   -----END CERTIFICATE-----
 
-date: 2008-05-31 00:00:00 +02:00
+date: 2008-07-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ruby-opengl
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -43,6 +44,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -52,12 +54,13 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.1
+        version: 1.7.0
     version: 
 description: "== FEATURES: * Real-Time OpenGL view * Multiple logfiles on multiple servers * Configurable layout * Multiple logfile parsers (Apache Combined, Rails, IIS, Postfix/spamd/clamd, Nginx, Squid, PostgreSQL, PureFTPD, MySQL, TShark, qmail/vmpop3d) * Custom events * Show rate, total or average * If you can 'tail' it, you can visualize it * Written in Ruby using net-ssh & libopengl-ruby * Free!  == RUNNING: gl_tail --help gl_tail --new gl_tail.yaml gl_tail  You can press 'f' while running to toggle the attempted frames per second. Or 'b' to change default blob type, and space to toggle bouncing.  == REQUIREMENTS: * rubygems    0.9.4 * ruby-opengl 0.40.1 * net-ssh     1.1.2 * opengl/ruby development packages (ruby1.8-dev libgl1-mesa-dev libglu1-mesa-dev libglut3-dev)"
 email: mr@fudgie.org
@@ -133,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: gltail
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: View real-time data and statistics from any logfile on any server with SSH, in an intuitive and entertaining way.