varnishops 0.0.3 → 0.1.0

data/README.md

@@ -4,7 +4,9 @@ varnishops is a tool for analyzing and categorizing traffic on your varnish serv
 
 It gathers the output of varnishncsa and create statistics such as request rate, output bandwidth or hitratio.
 
-URLs from varnishncsa are categorized using custom regular expressions, based on your assets' paths and classification (example provided in **ext/**)
+URLs from varnishncsa can be categorized in two ways:
+ * using custom regular expressions applied on URL, based on your assets' paths and classification (example provided in **ext/**)
+ * using host header, if you have several assets domains (with -H switch)
 
 varnishops is written in Ruby (tested with MRI 1.9.3 and MRI 1.8.7) and depends only on varnishncsa.
 

data/lib/cmdline.rb

@@ -20,6 +20,11 @@ class CmdLine
         @config[:avg_period] = avg_period
       end
 
+      @config[:host_mode] = false
+      opt.on '-H', '--host-mode', "Categorize requests using hostnames instead of url regexps" do |host_mode|
+        @config[:host_mode] = true
+      end
+
       opt.on_tail '-h', '--help', 'Show usage info' do
         puts opts
         exit

data/lib/ui.rb

@@ -50,7 +50,8 @@ class UI
 
     attrset(color_pair(1))
     setpos(0,0)
-    addstr(sprintf "%-#{@key_col_width}s%-#{@url_col_width}s%s", "request pattern", "last url", @stat_cols.join)
+    
+    addstr(sprintf "%-#{@key_col_width}s%-#{@url_col_width}s%s", (@config[:host_mode]) ? "hostname" : "request pattern", "last url", @stat_cols.join)
   end
 
   def footer

data/lib/varnish_pipe.rb

@@ -16,6 +16,7 @@ class VarnishPipe
 
     @semaphore = Mutex.new
     @avg_period = config[:avg_period]
+    @host_mode = config[:host_mode]
     @default_key = "other"
 
     @regexs = regexs
@@ -26,19 +27,23 @@ class VarnishPipe
     @start_time = Time.new.to_f
     @start_ts = @start_time.to_i
 
-    IO.popen("varnishncsa -F '%U %{Varnish:hitmiss}x %b'").each_line do |line|
-      if line =~ /^(\S+) (\w+) (\d+)$/
-        url, status, bytes = $1, $2, $3
+    IO.popen("varnishncsa -F '%{Host}i %U %{Varnish:hitmiss}x %b'").each_line do |line|
+      if line =~ /^(\S+) (\S+) (\w+) (\d+)$/
+        host, url, status, bytes = $1, $2, $3, $4
         key = nil
 
-        @regexs.each do |k,v|
-          if k.match(url)
-            key = v.map{|x| "#{$~[x]}" }.join(":")
-            break
+        if (@host_mode) 
+          key = host;
+        else
+          @regexs.each do |k,v|
+            if k.match(url)
+              key = v.map{|x| "#{$~[x]}" }.join(":")
+              break
+            end
           end
+          key = @default_key unless key
         end
 
-        key = @default_key unless key
 
         @semaphore.synchronize do
           duration = (Time.now.to_i - @start_ts)

data/varnishops.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "varnishops"
-  gem.version       = "0.0.3"
+  gem.version       = "0.1.0"
   gem.authors       = ["Jonathan Amiez"]
   gem.email         = ["jonathan.amiez@fotolia.com"]
   gem.description   = %q{varnishops - a realtime varnish log analyzer}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: varnishops
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-05-28 00:00:00.000000000 Z
 dependencies: []
 description: varnishops - a realtime varnish log analyzer
 email: