config: add list for input routes

Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>

Author: edsiper

include/fluent-bit/flb_config.h

@@ -27,6 +27,7 @@
 #include <fluent-bit/flb_log.h>
 #include <fluent-bit/flb_sds.h>
 #include <fluent-bit/flb_task_map.h>
+#include <cfl/cfl.h>
 
 #include <monkey/mk_core.h>
 
@@ -325,6 +326,9 @@ struct flb_config {
     int json_escape_unicode;
 
     int dry_run;
+
+    /* New Router Configuration */
+    struct cfl_list input_routes;
 };
 
 #define FLB_CONFIG_LOG_LEVEL(c) (c->log->level)

src/flb_config.c

@@ -44,6 +44,7 @@
 #include <fluent-bit/flb_config_format.h>
 #include <fluent-bit/multiline/flb_ml.h>
 #include <fluent-bit/flb_bucket_queue.h>
+#include <fluent-bit/flb_router.h>
 
 const char *FLB_CONF_ENV_LOGLEVEL = "FLB_LOG_LEVEL";
 
@@ -367,6 +368,7 @@ struct flb_config *flb_config_init()
     mk_list_init(&config->filters);
     mk_list_init(&config->outputs);
     mk_list_init(&config->proxies);
+    cfl_list_init(&config->input_routes);
     mk_list_init(&config->workers);
     mk_list_init(&config->upstreams);
     mk_list_init(&config->downstreams);
@@ -613,6 +615,9 @@ void flb_config_exit(struct flb_config *config)
     flb_config_task_map_resize(config, 0);
     flb_routes_empty_mask_destroy(config);
 
+    /* Clean up router input routes */
+    flb_router_routes_destroy(&config->input_routes);
+
     flb_free(config);
 }
 
@@ -856,6 +861,9 @@ static int configure_plugins_type(struct flb_config *config, struct flb_cf *cf,
             if (strcasecmp(kv->key, "name") == 0) {
                 continue;
             }
+            if (strcasecmp(kv->key, "routes") == 0) {
+                continue;
+            }
 
             /* set ret to -1 to ensure that we treat any unhandled plugin or
              * value types as errors.
@@ -960,6 +968,7 @@ static int configure_plugins_type(struct flb_config *config, struct flb_cf *cf,
 int flb_config_load_config_format(struct flb_config *config, struct flb_cf *cf)
 {
     int ret;
+    flb_debug("[config] starting configuration loading");
     struct flb_kv *kv;
     struct mk_list *head;
     struct cfl_kvpair *ckv;
@@ -1061,6 +1070,13 @@ int flb_config_load_config_format(struct flb_config *config, struct flb_cf *cf)
         return -1;
     }
 
+    /* Parse new router configuration */
+    ret = flb_router_config_parse(cf, &config->input_routes, config);
+    if (ret == -1) {
+        flb_debug("[router] router configuration parsing failed");
+        return -1;
+    }
+
     return 0;
 }