Skip to content

Commit

Permalink
Improve ECS field mapping in haproxy module
Browse files Browse the repository at this point in the history
- event.category
- event.kind
- event.outcome
- event.type
- related.ip
- switch haproxy pipeline to yaml

Closes #16162
  • Loading branch information
leehinman committed Feb 24, 2020
1 parent e1fa198 commit 88e8fb1
Show file tree
Hide file tree
Showing 8 changed files with 188 additions and 147 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Improve ECS categorization, container & process field mappings in auditd module. {issue}16153[16153] {pull}16280[16280]
- Improve ECS field mappings in aws module. {issue}16154[16154] {pull}16307[16307]
- Improve ECS categorization field mappings in googlecloud module. {issue}16030[16030] {pull}16500[16500]
- Improve ECS field mappings in haproxy module. {issue}16162[16162] {pull}16529[16529]

*Heartbeat*

Expand Down
146 changes: 0 additions & 146 deletions filebeat/module/haproxy/log/ingest/pipeline.json

This file was deleted.

138 changes: 138 additions & 0 deletions filebeat/module/haproxy/log/ingest/pipeline.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
description: Pipeline for parsing HAProxy http, tcp and default logs. Requires the
geoip plugin.
processors:
- grok:
field: message
patterns:
- '%{HAPROXY_DATE:haproxy.request_date} %{IPORHOST:haproxy.source} %{PROG:process.name}(?:\[%{POSINT:process.pid:long}\])?:
%{GREEDYDATA} %{IPORHOST:source.address}:%{POSINT:source.port:long} %{WORD}
%{IPORHOST:destination.ip}:%{POSINT:destination.port:long} \(%{WORD:haproxy.frontend_name}/%{WORD:haproxy.mode}\)'
- '(%{NOTSPACE:process.name}\[%{NUMBER:process.pid:long}\]: )?%{IP:source.address}:%{NUMBER:source.port:long}
\[%{NOTSPACE:haproxy.request_date}\] %{NOTSPACE:haproxy.frontend_name} %{NOTSPACE:haproxy.backend_name}/%{NOTSPACE:haproxy.server_name}
%{NUMBER:haproxy.http.request.time_wait_ms:long}/%{NUMBER:haproxy.total_waiting_time_ms:long}/%{NUMBER:haproxy.connection_wait_time_ms:long}/%{NUMBER:haproxy.http.request.time_wait_without_data_ms:long}/%{NUMBER:temp.duration:long}
%{NUMBER:http.response.status_code:long} %{NUMBER:haproxy.bytes_read:long} %{NOTSPACE:haproxy.http.request.captured_cookie}
%{NOTSPACE:haproxy.http.response.captured_cookie} %{NOTSPACE:haproxy.termination_state}
%{NUMBER:haproxy.connections.active:long}/%{NUMBER:haproxy.connections.frontend:long}/%{NUMBER:haproxy.connections.backend:long}/%{NUMBER:haproxy.connections.server:long}/%{NUMBER:haproxy.connections.retries:long}
%{NUMBER:haproxy.server_queue:long}/%{NUMBER:haproxy.backend_queue:long} (\{%{DATA:haproxy.http.request.captured_headers}\}
\{%{DATA:haproxy.http.response.captured_headers}\} |\{%{DATA}\} )?"%{GREEDYDATA:haproxy.http.request.raw_request_line}"'
- '(%{NOTSPACE:process.name}\[%{NUMBER:process.pid:long}\]: )?%{IP:source.address}:%{NUMBER:source.port:long}
\[%{NOTSPACE:haproxy.request_date}\] %{NOTSPACE:haproxy.frontend_name}/%{NOTSPACE:haproxy.bind_name}
%{GREEDYDATA:haproxy.error_message}'
- '%{HAPROXY_DATE} %{IPORHOST:haproxy.source} (%{NOTSPACE:process.name}\[%{NUMBER:process.pid:long}\]:
)?%{IP:source.address}:%{NUMBER:source.port:long} \[%{NOTSPACE:haproxy.request_date}\]
%{NOTSPACE:haproxy.frontend_name} %{NOTSPACE:haproxy.backend_name}/%{NOTSPACE:haproxy.server_name}
%{NUMBER:haproxy.total_waiting_time_ms:long}/%{NUMBER:haproxy.connection_wait_time_ms:long}/%{NUMBER:temp.duration:long}
%{NUMBER:haproxy.bytes_read:long} %{NOTSPACE:haproxy.termination_state} %{NUMBER:haproxy.connections.active:long}/%{NUMBER:haproxy.connections.frontend:long}/%{NUMBER:haproxy.connections.backend:long}/%{NUMBER:haproxy.connections.server:long}/%{NUMBER:haproxy.connections.retries:long}
%{NUMBER:haproxy.server_queue:long}/%{NUMBER:haproxy.backend_queue:long}'
ignore_missing: false
pattern_definitions:
HAPROXY_DATE: (%{MONTHDAY}[/-]%{MONTH}[/-]%{YEAR}:%{HOUR}:%{MINUTE}:%{SECOND})|%{SYSLOGTIMESTAMP}
- date:
if: ctx.event.timezone == null
field: haproxy.request_date
target_field: '@timestamp'
formats:
- dd/MMM/yyyy:HH:mm:ss.SSS
- MMM dd HH:mm:ss
on_failure:
- append:
field: error.message
value: '{{ _ingest.on_failure_message }}'
- date:
if: ctx.event.timezone != null
field: haproxy.request_date
target_field: '@timestamp'
formats:
- dd/MMM/yyyy:HH:mm:ss.SSS
- MMM dd HH:mm:ss
timezone: '{{ event.timezone }}'
on_failure:
- append:
field: error.message
value: '{{ _ingest.on_failure_message }}'
- remove:
field: haproxy.request_date
- remove:
field: message
- grok:
field: source.address
ignore_failure: true
patterns:
- ^%{IP:source.ip}$
- geoip:
field: source.ip
target_field: source.geo
ignore_missing: true
- geoip:
database_file: GeoLite2-ASN.mmdb
field: source.ip
target_field: source.as
properties:
- asn
- organization_name
ignore_missing: true
- rename:
field: source.as.asn
target_field: source.as.number
ignore_missing: true
- rename:
field: source.as.organization_name
target_field: source.as.organization.name
ignore_missing: true
- split:
field: haproxy.http.request.captured_headers
separator: \|
ignore_failure: true
- split:
field: haproxy.http.response.captured_headers
separator: \|
ignore_failure: true
- script:
lang: painless
source: ctx.event.duration = Math.round(ctx.temp.duration * params.scale)
params:
scale: 1000000
if: ctx.temp?.duration != null
- remove:
field: temp.duration
ignore_missing: true
- convert:
field: haproxy.bytes_read
target_field: http.response.bytes
type: long
if: ctx.containsKey('http')
- append:
field: related.ip
value: "{{source.ip}}"
if: "ctx?.source?.ip != null"
- append:
field: related.ip
value: "{{destination.ip}}"
if: "ctx?.destination?.ip != null"
- set:
field: event.kind
value: event
- append:
field: event.category
value: web
if: "ctx?.haproxy?.mode == 'HTTP' || ctx?.haproxy?.http != null"
- append:
field: event.category
value: network
if: "ctx?.source.ip != null && ctx?.destination?.ip != null"
- append:
field: event.type
value: connection
if: "ctx?.source.ip != null && ctx?.destination?.ip != null"
- set:
field: event.outcome
value: success
if: "ctx?.http?.response?.status_code != null && ctx.http.response.status_code < 400"
- set:
field: event.outcome
value: failure
if: "ctx?.http?.response?.status_code != null && ctx.http.response.status_code >= 400"
on_failure:
- set:
field: error.message
value: '{{ _ingest.on_failure_message }}'
2 changes: 1 addition & 1 deletion filebeat/module/haproxy/log/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ var:
- name: input
default: syslog

ingest_pipeline: ingest/pipeline.json
ingest_pipeline: ingest/pipeline.yml
input: config/{{.input}}.yml
12 changes: 12 additions & 0 deletions filebeat/module/haproxy/log/test/default.log-expected.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,17 @@
{
"destination.ip": "1.2.3.4",
"destination.port": 5000,
"event.category": [
"web",
"network"
],
"event.dataset": "haproxy.log",
"event.kind": "event",
"event.module": "haproxy",
"event.timezone": "-02:00",
"event.type": [
"connection"
],
"fileset.name": "log",
"haproxy.frontend_name": "main",
"haproxy.mode": "HTTP",
Expand All @@ -13,6 +21,10 @@
"log.offset": 0,
"process.name": "haproxy",
"process.pid": 24551,
"related.ip": [
"1.2.3.4",
"1.2.3.4"
],
"service.type": "haproxy",
"source.address": "1.2.3.4",
"source.geo.city_name": "Moscow",
Expand Down
8 changes: 8 additions & 0 deletions filebeat/module/haproxy/log/test/haproxy.log-expected.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
[
{
"event.category": [
"web"
],
"event.dataset": "haproxy.log",
"event.duration": 2000000,
"event.kind": "event",
"event.module": "haproxy",
"event.outcome": "success",
"event.timezone": "-02:00",
"fileset.name": "log",
"haproxy.backend_name": "docs_microservice",
Expand Down Expand Up @@ -34,6 +39,9 @@
"log.offset": 0,
"process.name": "haproxy",
"process.pid": 32450,
"related.ip": [
"1.2.3.4"
],
"service.type": "haproxy",
"source.address": "1.2.3.4",
"source.geo.city_name": "Moscow",
Expand Down
Loading

0 comments on commit 88e8fb1

Please sign in to comment.