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.

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

filterx: add format_json() #4871

Merged
merged 11 commits into from
Apr 9, 2024
Merged

filterx: add format_json() #4871

merged 11 commits into from
Apr 9, 2024

Conversation

alltilla
Copy link
Collaborator

@alltilla alltilla commented Mar 25, 2024 •
edited

No description provided.

@alltilla alltilla changed the title filterx: add format_json() [6/6] filterx: add format_json() Mar 25, 2024
@alltilla alltilla force-pushed the filterx-format-json branch 3 times, most recently from e31761c to 375f6b2 Compare March 26, 2024 08:04
@alltilla
filterx: store leading NULL in message-value new without len
5821d9d 
Some function calls on the stored value benefit of having the
NULL character at the end of the string, like type cast to int
or double.

Signed-off-by: Attila Szakacs <attila.szakacs@axoflow.com>
@alltilla
filterx: add get_type() and get_value() for message_value
3b51477 
Signed-off-by: Attila Szakacs <attila.szakacs@axoflow.com>
@alltilla
filterx: add unwrap for double and bool
f42ae5f 
Signed-off-by: Attila Szakacs <attila.szakacs@axoflow.com>
@alltilla
filterx: do not truncate in json marshal
5304f65 
Signed-off-by: Attila Szakacs <attila.szakacs@axoflow.com>
@alltilla
filterx: add marshal_append() function
e571bdd 
Signed-off-by: Attila Szakacs <attila.szakacs@axoflow.com>
@alltilla
filterx: add iter() function to dict interface
59dd2b4 
Signed-off-by: Attila Szakacs <attila.szakacs@axoflow.com>
@alltilla
otel: implement iter() for kvlist
9d23a9a 
Signed-off-by: Attila Szakacs <attila.szakacs@axoflow.com>
@alltilla
filterx: implement iter() for json_object
339d858 
Signed-off-by: Attila Szakacs <attila.szakacs@axoflow.com>
@alltilla
json: add format_json() filterx function
999831c 
Signed-off-by: Attila Szakacs <attila.szakacs@axoflow.com>
@kira-syslogng
Copy link
Contributor

Build FAILURE

@alltilla
libtest: add filterx test dict, list and unknown object
1a32315 
Signed-off-by: Attila Szakacs <attila.szakacs@axoflow.com>
@alltilla
json: add unit test for filterx format_json
2c16742 
Signed-off-by: Attila Szakacs <attila.szakacs@axoflow.com>
@alltilla alltilla marked this pull request as ready for review April 3, 2024 13:40
@alltilla alltilla changed the title [6/6] filterx: add format_json() filterx: add format_json() Apr 3, 2024
@alltilla alltilla requested review from bazsi and bshifter April 9, 2024 08:21
@MrAnno MrAnno requested review from MrAnno and removed request for bazsi April 9, 2024 08:45
@alltilla alltilla removed the request for review from bshifter April 9, 2024 08:51
MrAnno
MrAnno approved these changes Apr 9, 2024
View reviewed changes
lib/filterx/object-json-array.c Show resolved Hide resolved
@MrAnno
Copy link
Collaborator

MrAnno commented Apr 9, 2024 •
edited

Note that "this kind of format_json()" does not produce an object or array when passing scalar parameters.
This is valid according to RFC 7159/RFC8259.

@MrAnno MrAnno merged commit dc0258b into syslog-ng:master Apr 9, 2024
22 of 23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MrAnno MrAnno MrAnno approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@alltilla @kira-syslogng @MrAnno