Merge branch 'master' of github.com:fluent/fluent-bit

fluent · Apr 20, 2021 · 9c992e4 · 9c992e4
2 parents aeb18f7 + 23aaf15
commit 9c992e4
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/plugins/out_splunk/splunk.c b/plugins/out_splunk/splunk.c
@@ -316,6 +316,13 @@ static void cb_splunk_flush(const void *data, size_t bytes,
                             ctx->auth_header, flb_sds_len(ctx->auth_header));
     }
 
+    /* Append Channel identifier header */
+    if (ctx->channel) {
+        flb_http_add_header(c, FLB_SPLUNK_CHANNEL_IDENTIFIER_HEADER,
+                            strlen(FLB_SPLUNK_CHANNEL_IDENTIFIER_HEADER),
+                            ctx->channel, ctx->channel_len);
+    }
+
     /* Content Encoding: gzip */
     if (compressed == FLB_TRUE) {
         flb_http_set_content_encoding_gzip(c);
@@ -419,6 +426,12 @@ static struct flb_config_map config_map[] = {
      "from the docs for more details to make this option work properly."
     },
 
+    {
+     FLB_CONFIG_MAP_STR, "channel", NULL,
+     0, FLB_TRUE, offsetof(struct flb_splunk, channel),
+     "Specify X-Splunk-Request-Channel Header for the HTTP Event Collector interface."
+    },
+
     /* EOF */
     {0}
 };

diff --git a/plugins/out_splunk/splunk.h b/plugins/out_splunk/splunk.h
@@ -28,6 +28,8 @@
 #define FLB_SPLUNK_DEFAULT_TIME       "time"
 #define FLB_SPLUNK_DEFAULT_EVENT      "event"
 
+#define FLB_SPLUNK_CHANNEL_IDENTIFIER_HEADER "X-Splunk-Request-Channel"
+
 #include <fluent-bit/flb_output_plugin.h>
 #include <fluent-bit/flb_sds.h>
 #include <fluent-bit/flb_record_accessor.h>
@@ -47,6 +49,10 @@ struct flb_splunk {
     /* Token Auth */
     flb_sds_t auth_header;
 
+    /* Channel identifier */
+    flb_sds_t channel;
+    size_t channel_len;
+
     /* Send fields directly or pack data into "event" object */
     int splunk_send_raw;