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

in_gelf: New input plugin for ingest GELF messages - rebased #4156 #7082

Closed
wants to merge 8 commits into from
Closed

in_gelf: New input plugin for ingest GELF messages - rebased #4156 #7082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
664986f
gzip: allow to decompress zero padding gzip data
manuelluis Oct 3, 2021
b069785
gzip: new zlib uncompress interface
manuelluis Oct 3, 2021
2bf8562
pack_gelf: new interface to convert gelf message to msgpack
manuelluis Oct 3, 2021
798df9f
in_gelf: new input plugin for ingest GELF messages
manuelluis Oct 3, 2021
1ef7c28
gzip: fix windows compile error "error C2036: 'void *': unknown size"
manuelluis Oct 3, 2021
7049ffd
pack_gelf: show error if json parsing fails
manuelluis Oct 3, 2021
0e804fe
gzip: replace free with flb_free
manuelluis Oct 4, 2021
78fbd4f
Empty commit
manuelluis Aug 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ option(FLB_IN_EVENT_TEST "Enable Events test plugin"
option(FLB_IN_EVENT_TYPE "Enable event type plugin" Yes)
option(FLB_IN_FLUENTBIT_METRICS "Enable Fluent Bit metrics plugin" Yes)
option(FLB_IN_FORWARD "Enable Forward input plugin" Yes)
option(FLB_IN_GELF "Enable GELF input plugin" Yes)
Copy link
Contributor

Choose a reason for hiding this comment

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

One thing: does this build on Mac and Windows targets? If not it needs to be disabled for those in the custom cmake config they have.

option(FLB_IN_HEALTH "Enable Health input plugin" Yes)
option(FLB_IN_HTTP "Enable HTTP input plugin" Yes)
option(FLB_IN_MEM "Enable Memory input plugin" Yes)
Expand Down
3 changes: 3 additions & 0 deletions include/fluent-bit/flb_gzip.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,7 @@ int flb_gzip_compress(void *in_data, size_t in_len,
int flb_gzip_uncompress(void *in_data, size_t in_len,
void **out_data, size_t *out_size);

int flb_zlib_uncompress(void *in_data, size_t in_len,
void **out_data, size_t *out_len);

#endif
3 changes: 3 additions & 0 deletions include/fluent-bit/flb_pack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,4 +121,7 @@ flb_sds_t flb_msgpack_raw_to_gelf(char *buf, size_t buf_size,
struct flb_time *tm,
struct flb_gelf_fields *fields);

int flb_gelf_to_msgpack(const char *js, size_t len, struct flb_time *tm,
char **buffer, size_t *size, bool strict);

#endif
1 change: 1 addition & 0 deletions plugins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ REGISTER_IN_PLUGIN("in_kafka")
REGISTER_IN_PLUGIN("in_fluentbit_metrics")
REGISTER_IN_PLUGIN("in_prometheus_scrape")
REGISTER_IN_PLUGIN("in_emitter")
REGISTER_IN_PLUGIN("in_gelf")
REGISTER_IN_PLUGIN("in_tail")
REGISTER_IN_PLUGIN("in_dummy")
REGISTER_IN_PLUGIN("in_head")
Expand Down
4 changes: 4 additions & 0 deletions plugins/in_gelf/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
set(src
gelf.c)

FLB_PLUGIN(in_gelf "${src}" "")
Loading