From d59715e29fe2436763308e56608e4481d5d18ad8 Mon Sep 17 00:00:00 2001
From: Eduardo Silva <eduardo@calyptia.com>
Date: Tue, 21 Feb 2023 23:29:04 -0600
Subject: [PATCH] out_syslog: when using a message key, avoid prefixing raw
 messages

Signed-off-by: Eduardo Silva <eduardo@calyptia.com>
---
 plugins/out_syslog/syslog.c | 33 ++++++++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/plugins/out_syslog/syslog.c b/plugins/out_syslog/syslog.c
index a333513543f..15944f6e9b8 100644
--- a/plugins/out_syslog/syslog.c
+++ b/plugins/out_syslog/syslog.c
@@ -144,10 +144,21 @@ static char rfc5424_sp_name[256] = {
 static flb_sds_t syslog_rfc5424(flb_sds_t *s, struct flb_time *tms,
                                 struct syslog_msg *msg)
 {
+    int len;
     struct tm tm;
     flb_sds_t tmp;
     uint8_t prival;
 
+    if (msg->message && msg->message[0] == '<') {
+        len = flb_sds_len(msg->message);
+        tmp = flb_sds_cat(*s, msg->message, len);
+        if (!tmp) {
+            return NULL;
+        }
+        *s = tmp;
+        return *s;
+    }
+
     prival = (msg->facility << 3) + msg->severity;
 
     if (gmtime_r(&(tms->tm.tv_sec), &tm) == NULL) {
@@ -164,7 +175,7 @@ static flb_sds_t syslog_rfc5424(flb_sds_t *s, struct flb_time *tms,
     *s = tmp;
 
     if (msg->hostname) {
-        int len = flb_sds_len(msg->hostname);
+        len = flb_sds_len(msg->hostname);
         tmp = flb_sds_cat(*s, msg->hostname, len > 255 ? 255 : len);
         if (!tmp) {
             return NULL;
@@ -186,7 +197,7 @@ static flb_sds_t syslog_rfc5424(flb_sds_t *s, struct flb_time *tms,
     *s = tmp;
 
     if (msg->appname) {
-        int len = flb_sds_len(msg->appname);
+        len = flb_sds_len(msg->appname);
         tmp = flb_sds_cat(*s, msg->appname, len > 48 ? 48 : len);
         if (!tmp) {
             return NULL;
@@ -208,7 +219,7 @@ static flb_sds_t syslog_rfc5424(flb_sds_t *s, struct flb_time *tms,
     *s = tmp;
 
     if (msg->procid) {
-        int len = flb_sds_len(msg->procid);
+        len = flb_sds_len(msg->procid);
         tmp = flb_sds_cat(*s, msg->procid, len > 128 ? 128 : len);
         if (!tmp) {
             return NULL;
@@ -230,7 +241,7 @@ static flb_sds_t syslog_rfc5424(flb_sds_t *s, struct flb_time *tms,
     *s = tmp;
 
     if (msg->msgid) {
-        int len = flb_sds_len(msg->msgid);
+        len = flb_sds_len(msg->msgid);
         tmp = flb_sds_cat(*s, msg->msgid, len > 32 ? 32 : len);
         if (!tmp) {
             return NULL;
@@ -267,7 +278,7 @@ static flb_sds_t syslog_rfc5424(flb_sds_t *s, struct flb_time *tms,
     }
 
     if (msg->message) {
-        int len = flb_sds_len(msg->message);
+        len = flb_sds_len(msg->message);
         tmp = flb_sds_cat(*s, " \xef\xbb\xbf", 4);
         if (!tmp) {
             return NULL;
@@ -286,10 +297,21 @@ static flb_sds_t syslog_rfc5424(flb_sds_t *s, struct flb_time *tms,
 static flb_sds_t syslog_rfc3164 (flb_sds_t *s, struct flb_time *tms,
                                  struct syslog_msg *msg)
 {
+    int len;
     struct tm tm;
     flb_sds_t tmp;
     uint8_t prival;
 
+    if (msg->message && msg->message[0] == '<') {
+        len = flb_sds_len(msg->message);
+        tmp = flb_sds_cat(*s, msg->message, len);
+        if (!tmp) {
+            return NULL;
+        }
+        *s = tmp;
+        return *s;
+    }
+
     prival =  (msg->facility << 3) + msg->severity;
 
     if (gmtime_r(&(tms->tm.tv_sec), &tm) == NULL) {
@@ -797,6 +819,7 @@ static void cb_syslog_flush(struct flb_event_chunk *event_chunk,
 
     if (ctx->parsed_mode != FLB_SYSLOG_UDP) {
         u_conn = flb_upstream_conn_get(ctx->u);
+
         if (!u_conn) {
             flb_plg_error(ctx->ins, "no upstream connections available");
             FLB_OUTPUT_RETURN(FLB_RETRY);