commit 673d19ba89e235e82c653e9fed9faf8a4ff724f0
author mcp-jenkins <mcp-jenkins@mirantis.com> Tue Oct 03 14:23:01 2017 +0000
committer Gerrit Code Review <gerrit2@6a1f56eca807> Tue Oct 03 14:23:01 2017 +0000
tree 1d6ebe3778bb7e8387dc88bbfee01979c39ef883
parent 07f0ba10c487b155634551b4ebe24c1c62029aa8
parent b9324d49ee2965d80743cb1eb9854477e366537a

Merge "Add http_client_ip_address field for Apache WSGI logging"

heka/files/lua/decoders/apache_wsgi_log.lua

diff --git a/heka/files/lua/decoders/apache_wsgi_log.lua b/heka/files/lua/decoders/apache_wsgi_log.lua
index a40b609..e35b1ed 100644
--- a/heka/files/lua/decoders/apache_wsgi_log.lua
+++ b/heka/files/lua/decoders/apache_wsgi_log.lua
@@ -66,6 +66,9 @@
                 msg.Fields.http_response_time = msg.Fields.http_response_time / 1e6
             end
         end
+        if m.http_x_forwarded_for and patt.ip_address:match(m.http_x_forwarded_for) then
+            msg.Fields.http_client_ip_address = m.http_x_forwarded_for
+        end
 
         local request = m.request
         m = request_grammar:match(request)

heka/files/lua/decoders/keystone_wsgi_log.lua

diff --git a/heka/files/lua/decoders/keystone_wsgi_log.lua b/heka/files/lua/decoders/keystone_wsgi_log.lua
index 8ed9551..8cdc523 100644
--- a/heka/files/lua/decoders/keystone_wsgi_log.lua
+++ b/heka/files/lua/decoders/keystone_wsgi_log.lua
@@ -66,6 +66,9 @@
                 msg.Fields.http_response_time = msg.Fields.http_response_time / 1e6
             end
         end
+        if m.http_x_forwarded_for and patt.ip_address:match(m.http_x_forwarded_for) then
+            msg.Fields.http_client_ip_address = m.http_x_forwarded_for
+        end
 
         local request = m.request
         m = request_grammar:match(request)