haproxy2rpm 0.0.10 → 0.1.0

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## v 0.1.0
+
+* Make Syslog parsing independent from haproxy
+* Examples on how to use it with node.js and connect including a simple
+  node.js profiler
+
 ## v 0.0.10
 
 * Do not crash when an exception occurs during URI parsing (Knut

data/README.md

@@ -27,6 +27,10 @@ Tell haproxy to log to syslog. e.g:
 
 Check the examples folder
 
+## Node.js support
+
+Check the examples folder
+
 ## Supported RPM features
 
 * Response times in application server
@@ -46,6 +50,7 @@ Tested in production
 
 Passing manual integration test with test logs
 
+* mri-1.9.3
 * mri-1.9.2-p180
 * ree-1.8.7-2011.03
 * mri-1.8.7-p33

data/examples/connect_middleware.js

@@ -0,0 +1,35 @@
+/**
+ * Profile the duration of a request.
+ *
+ * Example Output:
+ *
+ *      GET / 200 2
+ *
+ *
+ * Example usage:
+ *
+ * npm install ain2
+ *
+ * var SysLogger = require('ain2');
+ * var profiler = require('./connect_middleware.js');
+ * app.use(profiler(new SysLogger({ tag : "newrelic", facility : 'local0' })));
+ *
+ *
+ * @api public
+ */
+module.exports = function profiler(_logger){
+    return function(req, res, next){
+        var end = res.end
+        , start = new Date()
+        , logger = _logger || console;
+
+    // proxy res.end()
+    res.end = function(data, encoding){
+        res.end = end;
+        res.end(data, encoding);
+        logger.log(req.method, req.url, res.statusCode, ((new Date) - start));
+    };
+
+    next();
+  }
+};

data/examples/connect_middleware_config.rb

@@ -0,0 +1,72 @@
+#
+# Expected format: Method Uri Status Time
+#
+# GET /test 200 2
+#
+class NodeJsLineParser
+
+  def initialize(line)
+     @parts = line.split("\s")
+  end
+
+  def response_time
+    @response_time ||= @parts[3].to_i
+  end
+
+
+  def status_code
+    @status_code ||= @parts[2].to_i
+  end
+
+  def http_method
+    @http_method ||= @parts[0]
+  end
+
+  def uri
+    @uri ||= URI.parse(@parts[1])
+  end
+
+  def http_path
+    uri.path
+  end
+
+  def http_query
+    uri.query
+  end
+
+  def is_error?
+    status_code >= 500
+  end
+
+end
+
+config.message_parser = lambda do |line|
+  NodeJsLineParser.new(line)
+end
+
+config.request_recorder = lambda do |request|
+  rpm_number_unit = 1000.0
+  params = {
+    'metric' => "Controller#{route_for(request.http_path)}"
+  }
+
+  if request.is_error?
+    params['is_error'] = true
+    params['error_message'] = "#{request.uri} : Status code #{request.status_code}"
+  end
+
+  record_transaction(request.response_time / rpm_number_unit, params)
+  Haproxy2Rpm.logger.debug "RECORDING (transaction) #{request.http_path}: #{params.inspect}"
+end
+
+config.routes = [
+  {
+    :pattern => %r{^/$},
+    :target => '/index'
+  },
+  {
+    :pattern => %r{(\.[a-zA-Z_]{2,4})$},
+    :target => '/static'
+  }
+]
+

data/lib/haproxy2rpm/line_parser.rb

@@ -2,13 +2,7 @@ module Haproxy2Rpm
   class LineParser
 
     def initialize(line)
-      @line = line
-
-      if @line.match "haproxy"
-        @parts = @line.split("haproxy")[1].split("\s")
-      else
-        @parts = @line.split("\s")
-      end
+      @parts = line.split("\s")
     end
 
     def tq
@@ -32,16 +26,16 @@ module Haproxy2Rpm
     end
 
     def status_code
-      @status_code ||= @parts[6].to_i
+      @status_code ||= @parts[5].to_i
     end
 
     # we need to chop \"
     def http_method
-      @http_method ||= @parts[13][1..-1]
+      @http_method ||= @parts[12][1..-1]
     end
 
     def uri
-      @uri ||= URI.parse(@parts[14])
+      @uri ||= URI.parse(@parts[13])
     end
 
     def http_path
@@ -59,7 +53,7 @@ module Haproxy2Rpm
     private
 
     def response_times
-      @response_times ||= @parts[5].split("/")
+      @response_times ||= @parts[4].split("/")
     end
   end
 end

data/lib/haproxy2rpm/syslog.rb

@@ -1,12 +1,45 @@
 # Taken from
 # https://raw.github.com/jordansissel/experiments/master/ruby/eventmachine-speed/basic.rb
+#
 module Haproxy2Rpm
   class SyslogHandler < EventMachine::Connection
+
+    def initialize(*args)
+      # 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
+      tag = '(?<tag>[a-zA-Z_\-\/\.0-9\[\]]+)'
+      message = "(?<message>[ -~]+)"  # ascii 32 to 126
+      re = "^#{pri}#{header} #{tag}:\s*#{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 receive_data(data)
-      message_start_index = data.index('haproxy')
-      message = data[message_start_index..-1]
-      Haproxy2Rpm.logger.debug "RECEIVED (syslog): #{message}"
+      match = parse_data(data)
+      puts match.inspect
+      message = match ? match[5] : ""
+      Haproxy2Rpm.logger.debug "RECEIVED (syslog): #{data}"
       Haproxy2Rpm.rpm.process_and_send(message)
     end
+
+    def parse_data(data)
+      @syslog3164_re.match(data)
+    end
+
   end
 end

data/lib/haproxy2rpm/version.rb

@@ -1,3 +1,3 @@
 module Haproxy2Rpm
-  VERSION = "0.0.10"
+  VERSION = "0.1.0"
 end

data/test/syslog_test.rb

@@ -0,0 +1,33 @@
+$LOAD_PATH.unshift( File.dirname(__FILE__) )
+
+require 'test_helper'
+
+FIXTURE_SYSLOG_MESSAGE = "<12>Jan  3 16:18:58 rechenschieber.local nodejs[36180]: message"
+
+class RpmTest < Test::Unit::TestCase
+  context 'regex maching' do
+    setup do
+      @match = Haproxy2Rpm::SyslogHandler.new(self).parse_data(FIXTURE_SYSLOG_MESSAGE)
+    end
+
+    should 'match the priority' do
+      assert_equal '12', @match[1]
+    end
+
+    should 'match  timestamp' do
+      assert_equal "Jan  3 16:18:58", @match[2]
+    end
+
+    should 'match the hostname' do
+      assert_equal "rechenschieber.local", @match[3]
+    end
+
+    should 'match the tag name' do
+      assert_equal 'nodejs[36180]', @match[4]
+    end
+
+    should 'match the message' do
+      assert_equal 'message', @match[5]
+    end
+  end
+end

data/test/test_helper.rb

@@ -17,7 +17,7 @@ class DummyLogger
 end
 Haproxy2Rpm.logger = DummyLogger.new
 
-def log_entry(options = {})
+def syslog_entry(options = {})
   defaults = {
                 :tq => 6559,
                 :tw => 100,
@@ -34,3 +34,21 @@ def log_entry(options = {})
 Aug  1 15:28:03 ip-10-58-122-30.eu-west-1.compute.internal haproxy[674]: 127.0.0.1:33319 [15/Oct/2003:08:31:57] relais-http Srv1 #{defaults[:tq]}/#{defaults[:tw]}/#{defaults[:tc]}/#{defaults[:tr]}/#{defaults[:tt]} #{defaults[:status_code]} 243 - - ---- 1/3/5 0/0 "#{defaults[:http_method]} #{defaults[:http_path]}#{defaults[:http_query] ? "?#{defaults[:http_query]}" : ''} HTTP/1.0"
 LOG_LINE
 end
+
+def log_entry(options = {})
+    defaults = {
+                :tq => 6559,
+                :tw => 100,
+                :tc => 7,
+                :tr => 147,
+                :tt => 6723,
+                :status_code => 200,
+                :http_path => '/',
+                :http_method => 'GET',
+                :http_query => 'example_param=test',
+            }
+  defaults.merge!(options)
+  log_line = <<LOG_LINE
+127.0.0.1:33319 [15/Oct/2003:08:31:57] relais-http Srv1 #{defaults[:tq]}/#{defaults[:tw]}/#{defaults[:tc]}/#{defaults[:tr]}/#{defaults[:tt]} #{defaults[:status_code]} 243 - - ---- 1/3/5 0/0 "#{defaults[:http_method]} #{defaults[:http_path]}#{defaults[:http_query] ? "?#{defaults[:http_query]}" : ''} HTTP/1.0"
+LOG_LINE
+end

metadata

@@ -1,81 +1,105 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: haproxy2rpm
-version: !ruby/object:Gem::Version
-  version: 0.0.10
+version: !ruby/object:Gem::Version 
+  hash: 27
   prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 0
+  version: 0.1.0
 platform: ruby
-authors:
+authors: 
 - Patrick Huesler
 - Martin Rehfeld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-02 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-01-03 00:00:00 +01:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: newrelic_rpm
-  requirement: &70241929478900 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70241929478900
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: eventmachine-tail
-  requirement: &70241929476180 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70241929476180
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &70241929470660 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70241929470660
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: shoulda-context
-  requirement: &70241929468160 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70241929468160
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: mocha
-  requirement: &70241929467720 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70241929467720
+  version_requirements: *id005
 description: Sending haproxy logs to new relic rpm
-email:
+email: 
 - patrick.huesler@wooga.com
 - martin.rehfeld@wooga.com
-executables:
+executables: 
 - haproxy2rpm
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - CHANGELOG.md
@@ -85,6 +109,8 @@ files:
 - Research.md
 - bin/haproxy2rpm
 - config/newrelic.yml.example
+- examples/connect_middleware.js
+- examples/connect_middleware_config.rb
 - examples/haproxy2rpm.monitrc
 - examples/routes.rb
 - examples/simple_config.rb
@@ -98,33 +124,45 @@ files:
 - test/fixtures/config.rb
 - test/haproxy2pm_test.rb
 - test/rpm_test.rb
+- test/syslog_test.rb
 - test/test_helper.rb
+has_rdoc: true
 homepage: https://github.com/wooga/haproxy2rpm
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Sending haproxy logs to new relic rpm
-test_files:
+test_files: 
 - test/fixtures/config.rb
 - test/haproxy2pm_test.rb
 - test/rpm_test.rb
+- test/syslog_test.rb
 - test/test_helper.rb