Skip to content

NETOBSERV-234 remove slashes in debug json flows #172

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Apr 6, 2022
Merged

NETOBSERV-234 remove slashes in debug json flows #172

merged 1 commit into from
Apr 6, 2022

Conversation

@jotak
Copy link
Member

@jotak jotak commented Apr 6, 2022

Also fix doc-gen for podman+selinux

@jotak jotak requested review from KalmanMeth and eranra April 6, 2022 08:46
@jotak
Copy link
Member Author

jotak commented Apr 6, 2022

the main goal is to remove the string escaping, when logLevel is set to debug, from this kind of line:

time="2022-03-16T19:04:34Z" level=debug msg="decodeJson: line = {\"BiFlowDirection\":0,\"Bytes\":10400,\"CustomBytes1\":null,\"CustomBytes2\":null,\"CustomInteger1\":0,\"CustomInteger2\":0,\"DstAS\":0,\"DstAddr\":\"10.128.0.38\",\"DstMac\":\"0a:58:0a:80:00:26\",\"DstNet\":0,\"DstPort\":9154,\"DstVlan\":0,\"EgressVrfID\":0,\"Etype\":2048,\"FlowDirection\":1,\"ForwardingStatus\":0,\"FragmentId\":0,\"FragmentOffset\":0,\"HasMPLS\":false,\"IPTTL\":0,\"IPTos\":0,\"IPv6FlowLabel\":0,\"IcmpCode\":0,\"IcmpType\":0,\"InIf\":18,\"IngressVrfID\":0,\"MPLS1Label\":0,\"MPLS1TTL\":0,\"MPLS2Label\":0,\"MPLS2TTL\":0,\"MPLS3Label\":0,\"MPLS3TTL\":0,\"MPLSCount\":0,\"MPLSLastLabel\":0,\"MPLSLastTTL\":0,\"NextHop\":null,\"NextHopAS\":0,\"OutIf\":9,\"Packets\":200,\"Proto\":6,\"SamplerAddress\":\"ZEAABw==\",\"SamplingRate\":0,\"SequenceNum\":6221,\"SrcAS\":0,\"SrcAddr\":\"10.129.2.11\",\"SrcMac\":\"0a:58:0a:80:00:01\",\"SrcNet\":0,\"SrcPort\":37054,\"SrcVlan\":0,\"TCPFlags\":0,\"TimeFlowEnd\":1647457429,\"TimeFlowStart\":1647457414,\"TimeReceived\":1647457473,\"Type\":4,\"VlanId\":0}"

@jotak jotak removed the do-not-merge label Apr 6, 2022
ronensc
ronensc approved these changes Apr 6, 2022
View reviewed changes
Copy link
Collaborator

@ronensc ronensc left a comment

Choose a reason for hiding this comment

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

LGTM

hack/update-docs.sh
IMAGES_PATH=$PWD/docs/images
docker run -v "$IMAGES_PATH":/docs/images dpokidov/imagemagick -loop 0 -delay 500 -resize 800x800 /docs/images/animated-gif-images/*.png /docs/images/animation.gif
if [[ $(type -P "podman") ]]; then
podman run -v "$IMAGES_PATH":/docs/images:Z docker.io/dpokidov/imagemagick -loop 0 -delay 500 -resize 800x800 /docs/images/animated-gif-images/*.png /docs/images/animation.gif
Copy link
Collaborator

@ronensc ronensc Apr 6, 2022

Choose a reason for hiding this comment

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

@jotak Is it worth adding a comment regarding the :Z option?

Copy link
Member Author

@jotak jotak Apr 6, 2022

Choose a reason for hiding this comment

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

done

@jotak
NETOBSERV-234 remove slashes in debug json flows
2630ffc 
Also fix doc-gen for podman+selinux
@jotak jotak merged commit 3cefd94 into netobserv:main Apr 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@eranra eranra eranra approved these changes

@ronensc ronensc ronensc approved these changes

@KalmanMeth KalmanMeth Awaiting requested review from KalmanMeth

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@jotak @eranra @ronensc