Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update regex to handle {} brackets before http request info #342

Merged
merged 3 commits into from
Sep 28, 2021

Conversation

jsirianni
Copy link
Member

Somehow our testing missed some brackets in the http default log format. This PR handles the brackets without deriving a new field from them. I have some concerns:

  • The haproxy http log format doc suggest that we should see two fields near the end surrounded by curly braces, however our example logs only contain one set of braces
Sep 28 11:57:54 oiq-int-haproxy haproxy[302161]: 10.66.8.2:53471 [28/Sep/2021:11:57:54.672] http-json apache/apache 0/0/0/0/0 200 11173 - - ---- 1/1/0/0/0 0/0 {10.33.104.161:8082|} "GET / HTTP/1.1"
  • our braces seem to contain a host:port combination while the doc suggest we should see some headers here.

I think for now, we should handle the braces without adding the contents as a new field.

config:

pipeline:
- type: haproxy
  file_log_path:
  - ./in
  start_at: beginning
- type: stdout

new test input: (containers: {oiq-int-haproxy:8082|}

Sep 28 11:38:26 oiq-int-haproxy haproxy[302161]: 10.66.8.2:53241 [28/Sep/2021:11:38:26.670] http-json apache/apache 0/0/0/0/0 200 11161 - - ---- 1/1/0/0/0 0/0 {oiq-int-haproxy:8082|} "GET / HTTP/1.1"

previous test input: (no curly braces before GET)

Sep 19 15:49:00 oiq-int-haproxy haproxy[15165]: 127.0.0.1:40140 [16/Sep/2021:16:32:49.352] http http/<NOSRV> -1/-1/-1/-1/0 503 213 - - SC-- 1/1/0/0/0 0/0 "GET / HTTP/1.1"

output:

{
  "timestamp": "2021-09-28T11:38:26-04:00",
  "severity": 30,
  "severity_text": "200",
  "labels": {
    "file_name": "in",
    "log_type": "haproxy",
    "method": "GET",
    "plugin_id": "haproxy",
    "protocol": "HTTP",
    "protocol_version": "1.1"
  },
  "resource": {
    "backend_name": "apache",
    "frontend_ip": "10.66.8.2",
    "frontend_port": "53241",
    "frontend_type": "http",
    "host": "oiq-int-haproxy",
    "server_name": "apache"
  },
  "record": {
    "accept_date": "28/Sep/2021:11:38:26.670",
    "backend_concurrent_connections": "0",
    "backend_queue": "0",
    "bytes_read": "11161",
    "captured_request_cookie": "-",
    "captured_response_cookie": "-",
    "client_request_active_time": "0",
    "client_request_send_time": "0",
    "frontend_concurrent_connections": "1",
    "frontend_name_transport": "http-json",
    "path": "/",
    "pid": "302161",
    "process_concurrent_connections": "1",
    "process_name": "haproxy",
    "queue_wait_time": "0",
    "response_send_time": "0",
    "response_time": "0",
    "retries": "0",
    "server_concurrent_connections": "0",
    "server_queue": "0",
    "status": "200",
    "termination_state": "----"
  }
}

https://regex101.com/r/ChyY26/1

@jsirianni jsirianni requested a review from Dylan-M September 28, 2021 16:06
Copy link
Contributor

@Dylan-M Dylan-M left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change inline, it isn't a named group, so shouldn't add anything to the output if I understand correctly.

plugins/haproxy.yaml Outdated Show resolved Hide resolved
@jsirianni jsirianni requested a review from Dylan-M September 28, 2021 16:40
@jsirianni jsirianni merged commit e9df978 into master Sep 28, 2021
@jsirianni jsirianni deleted the haproxy-handle-http-braces branch September 28, 2021 17:36
schmikei added a commit that referenced this pull request Sep 28, 2021
* Update regex to parse IPv6 (#334)

Update default listener log path

* Add HAProxy Plugin (#335)

* Add haproxy plugin

* Add supported platforms and min stanza version

* PR Feedback fixes

* Rename frontend_name to frontend_name_transport in regex

* for all move operations, check if field is nil before moving. "set log type to haproxy and haproxy.error (not .http / .tcp)"

* typoe: nill --> nil

* typo, log_format: http --> default

Co-authored-by: jsirianni <[email protected]>

* Allow DBID to be empty & Correct case matching (#331)

* Allow DBID to be empty & Correct case matching

The DBID field is able to be empty on some versions of Oracle DB
The multiline regex was looking for `Audit File`, but logs have `Audit file`

* Switch to line end for multiline with double newline pattern

* Fix plugin failure when using inline truncate check

* Switch back to a regex parse for record splitting

Co-authored-by: jsirianni <[email protected]>

* Release 0.0.79 (#336)

* 0.0.79 changelog

* dbid oracle pr

* fix release date

* move frontend port to resources (#338)

* Add more checks to reduce errors (#337)

* Add more checks to reduce errors

* Add ac_lite_ap_parser change to changelog for ubiquiti

* 0.0.80 changelog

Co-authored-by: jsirianni <[email protected]>

* rebase the stanza-plugins changes

* fix haproxy

* fix ubiquiti

* fix labels rather than attributes on operator field

* oracledb attributes

* fix haproxy

* update regex to handle {} brackets before http request info (#342)

* update regex to handle {} brackets before http request info

* haproxy http default log format fix

* make change backwards compatible

* Adjust parsing further based on more detailed oracle db audit logs (#343)

* release 0.0.82

Co-authored-by: Dylan Myers <[email protected]>
Co-authored-by: EricWHolt <[email protected]>
Co-authored-by: jsirianni <[email protected]>
Co-authored-by: jsirianni <[email protected]>
jsirianni pushed a commit that referenced this pull request Oct 5, 2021
* Update regex to parse IPv6 (#334)

Update default listener log path

* Add HAProxy Plugin (#335)

* Add haproxy plugin

* Add supported platforms and min stanza version

* PR Feedback fixes

* Rename frontend_name to frontend_name_transport in regex

* for all move operations, check if field is nil before moving. "set log type to haproxy and haproxy.error (not .http / .tcp)"

* typoe: nill --> nil

* typo, log_format: http --> default

Co-authored-by: jsirianni <[email protected]>

* Allow DBID to be empty & Correct case matching (#331)

* Allow DBID to be empty & Correct case matching

The DBID field is able to be empty on some versions of Oracle DB
The multiline regex was looking for `Audit File`, but logs have `Audit file`

* Switch to line end for multiline with double newline pattern

* Fix plugin failure when using inline truncate check

* Switch back to a regex parse for record splitting

Co-authored-by: jsirianni <[email protected]>

* Release 0.0.79 (#336)

* 0.0.79 changelog

* dbid oracle pr

* fix release date

* move frontend port to resources (#338)

* Add more checks to reduce errors (#337)

* Add more checks to reduce errors

* Add ac_lite_ap_parser change to changelog for ubiquiti

* 0.0.80 changelog

Co-authored-by: jsirianni <[email protected]>

* update regex to handle {} brackets before http request info (#342)

* update regex to handle {} brackets before http request info

* haproxy http default log format fix

* make change backwards compatible

* Adjust parsing further based on more detailed oracle db audit logs (#343)

* release 0.0.82

* CI Testing: End to End Tests (#345)

* end to end nginx testing

* fix format

* fix format

* use sudo to compare against files from container mount

* sleep so stanza can parse, kill stanza when done

* try cloning log library

* use token to clone lob lib

* fix repo name

* fix expect and output paths

* handle both nginx formats

* add apache_http workflow

* dump container log

* dump container log

* 10 second sleep

* use jq with diff to prevent formatting issues

* sudo

* cannot use sudo with redirection to diff, so just format with jq before using diff

* Switch back to diff, something else is going on..

* pause and cat raw output before comparing

* sudo

* fix paths

* sort before compare

* redirect output

* sort and cat

* use jtool for comparing json files

* use jtool for comparing json files

* chmod it

* haproxy workflow

* add oracledb workflow

* single test case for oracledb

* mount plugins dir

* stop and then get stanza logs

* sleep 20 seconds instead of 10, sometimes 10 is not enough

* fix log dirg

* install jtool in its own step

* fix mount

* split oracle up. start with alert logs

* oracle audit log

* upgrade jtool and use skip timestamp for haproxy and oracle

* upgrade jtoo

* upgrade jtool

* pause, stop, logs

* listener log, oracle

* Handle second {} in http log entry if present (#346)

Co-authored-by: jsirianni <[email protected]>

* Add tcpudp plugin (#341)

* Add tcpudp plugin

* Add tcpudp schema and tests

* Split into two plugins udp and tcp

* Add schema files for tests

* Update plugins/tcp.yaml

* Update plugins/tcp.yaml

* Update plugins/udp.yaml

* Update plugins/udp.yaml

* Update test/configs/tcp/invalid/invalid_listen_port.yaml

* Update plugins/udp.yaml

Co-authored-by: jsirianni <[email protected]>
Co-authored-by: Joseph Sirianni <[email protected]>

* tcp / udp: move  to message field (#347)

* move  to message field

* \n

* Add common event format plugin (#328)

* Add common event format plugin

* use key value parser for parsing extensions field

* Promote fields to labels and resources

* Promote fields to labels and resources

* Update changelog

* Remove key value parser

* Add promote device_vendor and device_version to resources

Co-authored-by: jsirianni <[email protected]>
Co-authored-by: jsirianni <[email protected]>

* release 0.0.83

* Add http plugin (#352)

* Add http plugin

* Update log_type label to http

* remove duplicate param

* tcp --> http

* typo

* token_header --> auth_header

* small refactor

* upgrade stanza 1.2.9

Co-authored-by: jsirianni <[email protected]>

* Update Titles and uwsgi field name (#350)

Co-authored-by: Joseph Sirianni <[email protected]>

* Update cisco_meraki plugin to use key_value_parser (#349)

* Update cisco_meraki plugin to use key_value_parser instead of custom regex

* use stanza 1.2.9

Co-authored-by: jsirianni <[email protected]>

* Create Sonicwall log parser plugin (#340)

* Create Sonicwall log parser plugin

* Add pri field severity_parser

* Rename msg field to message

* Add parameter location to support setting timezone

* Update to use udp_input and add extra tests

* Use stanza 1.2.7 for tests

* update stanza and get go.sum

* Update plugins/sonicwall.yaml

Co-authored-by: Joseph Sirianni <[email protected]>

* Fix using wrong parameter if you defined listen_port

Co-authored-by: jsirianni <[email protected]>
Co-authored-by: Joseph Sirianni <[email protected]>

* release-0.0.84

* fix ci link

* remove start_at reference

* remove start_at test for sonicwall, not needed

* enable new operators

* fix start_at for w3c tests due to delete_at_end being added

* Add cisco_catalyst plugin (#351)

* Add cisco_catalyst plugin

* Add severity field group to regex. Update parse from field for severity and regex.

* Remove parse_to message in udp_input and parse_from message in regex_parser

* fix ci link

* remove start_at reference

* remove start_at test for sonicwall, not needed

* enable new operators

* fix start_at for w3c tests due to delete_at_end being added

Co-authored-by: Joseph Sirianni <[email protected]>

* remove tests for now, not compatable with otel branch

* remove tests for now, not compatable with otel branch

* port cisco catalyst to otel

* fix cef

* fix haproxy

* port http

* port sonicwall

* fix haproxy

* Update plugins/cisco_catalyst.yaml

Co-authored-by: Keith Schmitt <[email protected]>

* rebase oracledb

* try and fix severities that were missed

Co-authored-by: Dylan Myers <[email protected]>
Co-authored-by: EricWHolt <[email protected]>
Co-authored-by: Keith Schmitt <[email protected]>
Co-authored-by: schmikei <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants