in_syslog: Encoding parameter for input plugin for conversion to UTF8

Signed-off-by: Nigel Stewart <[email protected]>

Author: nigels-com

plugins/in_syslog/syslog.h

@@ -23,6 +23,7 @@
 
 #include <fluent-bit/flb_info.h>
 #include <fluent-bit/flb_input.h>
+#include <fluent-bit/flb_encode.h>
 
 /* Syslog modes */
 #define FLB_SYSLOG_UNIX_TCP  1
@@ -56,6 +57,9 @@ struct flb_syslog {
     size_t buffer_max_size;
     size_t buffer_chunk_size;
 
+    /* text encoding, NULL for UTF8 */
+    flb_encoder encoding;
+
     /* Configuration */
     struct flb_parser *parser;
 

plugins/in_syslog/syslog_conf.c

@@ -114,6 +114,15 @@ struct flb_syslog *syslog_conf_create(struct flb_input_instance *ins,
         ctx->buffer_max_size  = flb_utils_size_to_bytes(tmp);
     }
 
+    /* Config: Text encoding other than UTF-8 */
+    tmp = flb_input_get_property("encoding", i_ins);
+    if (tmp) {
+        ctx->encoding = flb_get_encoder(tmp);
+        if (!ctx->encoding) {
+            flb_error("[in_syslog] encoding '%s' is not supported", tmp);
+        }
+    }
+
     /* Parser */
     tmp = flb_input_get_property("parser", ins);
     if (tmp) {

plugins/in_syslog/syslog_prot.c

@@ -21,6 +21,7 @@
 #include <fluent-bit/flb_input_plugin.h>
 #include <fluent-bit/flb_parser.h>
 #include <fluent-bit/flb_time.h>
+#include <fluent-bit/flb_encode.h>
 
 #include "syslog.h"
 #include "syslog_conn.h"
@@ -44,7 +45,7 @@ static inline int pack_line(struct flb_syslog *ctx,
 
     msgpack_pack_array(&mp_pck, 2);
     flb_time_append_to_msgpack(time, &mp_pck, 0);
-    msgpack_sbuffer_write(&mp_sbuf, data, data_size);
+    flb_msgpack_encode_utf8(ctx->encoding, &mp_pck, data, data_size);
 
     flb_input_chunk_append_raw(ctx->ins, NULL, 0, mp_sbuf.data, mp_sbuf.size);
     msgpack_sbuffer_destroy(&mp_sbuf);