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

Base64 format fix #1033

Merged
merged 1 commit into from
Feb 4, 2020
Merged

Base64 format fix #1033

merged 1 commit into from
Feb 4, 2020

Conversation

leodido
Copy link
Member

@leodido leodido commented Feb 4, 2020

What type of PR is this?

/kind bug

Any specific area of the project related to this PR?

/area engine

What this PR does / why we need it:

This PR deprecates PR #988 fixing the issue with base64 format (with/without json enabled).

Which issue(s) this PR fixes:

Fixes #987

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

fix: the base64 output format (-b) now works with both json and normal output.

Signed-off-by: Lorenzo Fontana <lo@linux.com>
Co-Authored-By: Leonardo Di Donato <leodidonato@gmail.com>
@poiana poiana requested review from fntlnz and Kaizhe February 4, 2020 14:06
@leodido leodido changed the title ase64 format fix base64 format fix Feb 4, 2020
@fntlnz fntlnz changed the title base64 format fix Base64 format fix Feb 4, 2020
@poiana poiana added the size/XS label Feb 4, 2020
@leodido
Copy link
Member Author

leodido commented Feb 4, 2020

/hold

@fntlnz
Copy link
Contributor

fntlnz commented Feb 4, 2020

Continuation of the comments in #988 - This is the expected output with json enabled

{
  "output": "15:11:12.275341197: Notice Yo (err=G1swbRtbMDE7MzRtLhtbMG0K)",
  "priority": "Notice",
  "rule": "Test",
  "time": "2020-02-04T14:11:12.275341197Z",
  "output_fields": {
    "evt.buffer": "G1swbRtbMDE7MzRtLhtbMG0K",
    "evt.time": 1580825472275341300
  }
}

And this is with json disabled:

15:10:50.593977278: Notice Yo (err=IBtbMG0bWzAxOzM0bURlc2t0b3AbWzBtICAgG1swMTszNG1Eb2N1bWVudHMbWzBtICAgG1swMTszNG1Eb3dubG9hZHMbWzBtICAgG1swMTszNG1nbxtbMG0gICAbWzAxOzM0bVBpY3R1cmVzG1swbSAgIBtbMDE7MzRtUHJvamVjdHMbWzBtICAgG1swMTszNG1WaWRlb3MbWzBtICAbWzAxOzM0bSdWaXJ0dWFsQm94IFZNcycbWzBtCg==) 

@leodido
Copy link
Member Author

leodido commented Feb 4, 2020

/hold cancel

@leodido leodido mentioned this pull request Feb 4, 2020
@fntlnz
Copy link
Contributor

fntlnz commented Feb 4, 2020

This was broken since 0.13.0

@poiana
Copy link

poiana commented Feb 4, 2020

LGTM label has been added.

Git tree hash: 05aa49ffaab83b1085c57223ace9d4d70106c95a

Copy link
Contributor

@mstemm mstemm left a comment

Choose a reason for hiding this comment

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

lgtm!

@poiana
Copy link

poiana commented Feb 4, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fntlnz, mstemm

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@poiana poiana merged commit 240f7e2 into master Feb 4, 2020
@poiana poiana deleted the fix/base64-format branch February 4, 2020 20:00
@fntlnz fntlnz added this to the 0.19.1 milestone Feb 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Falco Base64 doesn't work
4 participants