haproxy2rpm 0.0.1 → 0.0.2

data/README.md

@@ -4,11 +4,13 @@ such as erlang or node.js based applications
 
 ## Installation
 
+gem install haproxy2rpm or clone it
+
 * copy your newrelic.yml file to $HOME/.newrelic/newrelic.yml
 * or set $NRCONFIG to point to your newrelic.yml file
 
 ## Running it
-haproxy2rpm /path/to/logfile
+haproxy2rpm /path/to/logfile or ./bin/haproxy2rpm /path/to/log/file
 
 ## Analyzing it
 
@@ -28,5 +30,5 @@ At the moment, it only works with custom views
 ## Roadmap
 
 * daemonize option
-* syslog (udp maybe tcp) server with https://github.com/melito/em-syslog and then point HaProxy to that port. Why touch the disk if we don't have to?
+* syslog (udp maybe tcp) server with https://github.com/loggly/logporter and then point HaProxy to that port. Why touch the disk if we don't have to?
 * Figure out how to report rpms and response times so that they show up inside the newrelic application view and not only as a custom metric

data/Rakefile

@@ -2,6 +2,8 @@ require 'bundler/gem_tasks'
 
 require 'rake/testtask'
 
+task :default => ['test:units']
+
 namespace :test do
   Rake::TestTask.new(:units) do |t|
     t.libs << "test"

data/bin/haproxy2rpm

@@ -16,14 +16,17 @@ Basic Command Line Usage:
   Coniguration for newrelic is read from #{NEW_RELIC_CONFIG_PATH}
 HELP
 
-options = { :daemonize => false, :version => false }
+options = { :daemonize => false, :version => false, :syslog => false }
 
 opts = OptionParser.new do |opts|
   opts.banner = help
   opts.on("-D", "--daemonize", "Daemonize") do
     options[:daemonize] = true
   end
-  
+
+  opts.on("-s", "--syslog", "Run syslog server") do
+    options[:syslog] = true
+  end  
   opts.on("-v", "--version", "Print the version number and exit") do
     options[:version] = true
   end
@@ -40,7 +43,7 @@ if(options[:version])
  exit(0)
 end
 
-unless File.exists?(log_file)
+unless options[:syslog] || File.exists?(log_file)
   puts 'please proivde a valid path to a haproxy log file'
   puts ''
   puts help
@@ -52,12 +55,8 @@ unless File.exists?(NEW_RELIC_CONFIG_PATH)
   exit(1)
 end
 
-if(options[:daemonize])
-  puts 'dameon mode not implemented yet'
-else
-  trap("SIGINT") { 
-    Haproxy2Rpm.stop
-    exit(0)
-  }
-  Haproxy2Rpm.run(log_file)
-end
+trap("SIGINT") { 
+  Haproxy2Rpm.stop
+  exit(0)
+}
+Haproxy2Rpm.run(log_file, options)

data/haproxy2rpm.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |s|
   s.description = "Sending haproxy logs to new relic rpm"
   s.add_dependency "newrelic_rpm"
   s.add_dependency "eventmachine-tail"
+  s.add_development_dependency "rake"
   s.add_development_dependency "shoulda-context"
 
   s.files         = `git ls-files`.split("\n")

data/lib/haproxy2rpm/rpm.rb

@@ -0,0 +1,13 @@
+module Haproxy2Rpm
+  class Rpm
+    def initialize()
+      NewRelic::Agent.manual_start
+      @stats_engine = NewRelic::Agent.agent.stats_engine
+    end
+    
+    def send(line)
+      request = LineParser.new(line)
+      @stats_engine.get_stats('Custom/HAProxy/response_times',false).record_data_point(request.tr)
+    end
+  end
+end

data/lib/haproxy2rpm/syslog.rb

@@ -0,0 +1,50 @@
+# Taken from
+# https://raw.github.com/jordansissel/experiments/master/ruby/eventmachine-speed/basic.rb
+module Haproxy2Rpm
+  class SyslogHandler < EventMachine::Connection
+    def initialize
+      @rpm = Rpm.new
+      @count = 0
+      @buffer = BufferedTokenizer.new
+      @start = Time.now
+
+      # The syslog parsing stuff here taken from the 'logporter' gem.
+      pri = "(?:<(?<pri>[0-9]{1,3})>)?"
+      month = "(?:Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)"
+      day = "(?: [1-9]|[12][0-9]|3[01])"
+      hour = "(?:[01][0-9]|2[0-4])"
+      minute = "(?:[0-5][0-9])"
+      second = "(?:[0-5][0-9])"
+      time = [hour, minute, second].join(":")
+      timestamp = "(?<timestamp>#{month} #{day} #{time})"
+      hostname = "(?<hostname>[A-Za-z0-9_.:]+)"
+      header = timestamp + " " + hostname
+      message = "(?<message>[ -~]+)"  # ascii 32 to 126
+      re = "^#{pri}#{header} #{message}$"
+
+      if RUBY_VERSION =~ /^1\.8/
+        # Ruby 1.8 doesn't support named captures
+        # replace (?<foo> with (
+        re = re.gsub(/\(\?<[^>]+>/, "(")
+      end
+
+      @syslog3164_re = Regexp.new(re)
+    end # def initialize
+
+    def receive_data(data)
+      # In jruby+netty, we probaby should use the DelimiterBasedFrameDecoder
+      # But for the sake of simplicity, we'll use EM's BufferedTokenizer for
+      # all implementations.
+      @buffer.extract(data).each do |line|
+        receive_line(line.chomp)
+      end
+    end # def receive_event
+
+    def receive_line(line)
+      @count += 1
+      # Just try matching, don't need to do anything with it for this benchmark.
+      m = @syslog3164_re.match(line)
+      @rpm.send(m[:message])
+    end
+  end
+end

data/lib/haproxy2rpm/version.rb

@@ -1,3 +1,3 @@
 module Haproxy2Rpm
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/haproxy2rpm.rb

@@ -6,15 +6,20 @@ require "eventmachine-tail"
 require "haproxy2rpm/version"
 require "haproxy2rpm/file_parser"
 require "haproxy2rpm/line_parser"
+require "haproxy2rpm/syslog"
+require "haproxy2rpm/rpm"
 
 module Haproxy2Rpm
-  def self.run(log_file)
-    NewRelic::Agent.manual_start
-    stats_engine = NewRelic::Agent.agent.stats_engine
-    EventMachine.run do
-      EventMachine::file_tail(log_file) do |filetail, line|
-        request = LineParser.new(line)
-        stats_engine.get_stats('Custom/HAProxy/response_times',false).record_data_point(request.tr)
+  def self.run(log_file, options)
+    @rpm = Rpm.new
+    if(options[:daemonize])
+      puts 'daemonizing'
+      run_daemonized(log_file, options)
+    else
+      if(options[:syslog])
+        run_syslog_server(options)
+      else
+        default_run(log_file, options)
       end
     end
   end
@@ -23,4 +28,45 @@ module Haproxy2Rpm
     puts 'stopping new relic agent'
     NewRelic::Agent.shutdown
   end
-end
+  
+  def self.run_syslog_server(options)
+    NewRelic::Agent.manual_start
+    EventMachine::run do
+      EventMachine.start_server("0.0.0.0", 3333, SyslogHandler)
+    end      
+  end
+  
+  def self.default_run(log_file,options)
+    EventMachine.run do
+      EventMachine::file_tail(log_file) do |filetail, line|
+        @rpm.send(line)
+      end
+    end
+  end
+    
+  def self.run_daemonized(log_file, options)
+      Signal.trap('HUP') {}
+      
+      pid = fork do
+        begin
+          if(options[:syslog])
+            run_syslog_server(options)
+          else
+            default_run(log_file, options)
+          end
+        rescue => e
+          puts e.message
+          puts e.backtrace.join("\n")
+          abort "There was a fatal system error while starting haproxy2rpm"
+        end
+      end
+      
+      if options[:pid]
+        File.open(options[:pid], 'w') { |f| f.write pid }
+      end
+      
+      ::Process.detach pid
+      
+      exit
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: haproxy2rpm
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Patrick Huesler
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-08 00:00:00 +02:00
+date: 2011-07-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,7 +36,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: shoulda-context
+  name: rake
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -46,6 +46,17 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: shoulda-context
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: Sending haproxy logs to new relic rpm
 email: 
 - patrick.huesler@gmail.com
@@ -65,6 +76,8 @@ files:
 - lib/haproxy2rpm.rb
 - lib/haproxy2rpm/file_parser.rb
 - lib/haproxy2rpm/line_parser.rb
+- lib/haproxy2rpm/rpm.rb
+- lib/haproxy2rpm/syslog.rb
 - lib/haproxy2rpm/version.rb
 - test/fixtures/haproxy.log
 - test/haproxy2pm_test.rb