in_docker_events: implement config maps

Signed-off-by: Eduardo Silva <[email protected]>

Author: edsiper

plugins/in_docker_events/docker_events.c

@@ -110,9 +110,8 @@ static int in_de_collect(struct flb_input_instance *ins,
             flb_pack_time_now(&mp_pck);
             msgpack_pack_map(&mp_pck, 1);
 
-            msgpack_pack_str(&mp_pck, ctx->key_len);
-            msgpack_pack_str_body(&mp_pck, ctx->key,
-                                  ctx->key_len);
+            msgpack_pack_str(&mp_pck, flb_sds_len(ctx->key));
+            msgpack_pack_str_body(&mp_pck, ctx->key, flb_sds_len(ctx->key));
             msgpack_pack_str(&mp_pck, str_len);
             msgpack_pack_str_body(&mp_pck, ctx->buf, str_len);
             flb_input_chunk_append_raw(ins, NULL, 0, mp_sbuf.data,
@@ -198,6 +197,7 @@ static int in_de_init(struct flb_input_instance *ins,
         return -1;
     }
 
+    flb_plg_info(ctx->ins, "listening for events on %s", ctx->unix_path);
     return 0;
 }
 
@@ -214,11 +214,41 @@ static int in_de_exit(void *data, struct flb_config *config)
     (void) config;
     struct flb_in_de_config *ctx = data;
 
+    if (!ctx) {
+        return 0;
+    }
+
     de_config_destroy(ctx);
 
     return 0;
 }
 
+/* Configuration properties map */
+static struct flb_config_map config_map[] = {
+    {
+     FLB_CONFIG_MAP_STR, "unix_path", DEFAULT_UNIX_SOCKET_PATH,
+     0, FLB_TRUE, offsetof(struct flb_in_de_config, unix_path),
+     "Define Docker unix socket path to read events"
+    },
+    {
+     FLB_CONFIG_MAP_SIZE, "buffer_size", "8k",
+     0, FLB_TRUE, offsetof(struct flb_in_de_config, buf_size),
+     "Set buffer size to read events"
+    },
+    {
+     FLB_CONFIG_MAP_STR, "parser", NULL,
+      0, FLB_FALSE, 0,
+     "Optional parser for records, if not set, records are packages under 'key'"
+    },
+    {
+     FLB_CONFIG_MAP_STR, "key", DEFAULT_FIELD_NAME,
+     0, FLB_TRUE, offsetof(struct flb_in_de_config, key),
+     "Set the key name to store unparsed Docker events"
+    },
+    /* EOF */
+    {0}
+};
+
 /* Plugin reference */
 struct flb_input_plugin in_docker_events_plugin = {
     .name         = "docker_events",
@@ -228,5 +258,6 @@ struct flb_input_plugin in_docker_events_plugin = {
     .cb_collect   = in_de_collect,
     .cb_flush_buf = NULL,
     .cb_exit      = in_de_exit,
+    .config_map   = config_map,
     .flags        = FLB_INPUT_NET
 };

plugins/in_docker_events/docker_events.h

@@ -33,13 +33,13 @@
 struct flb_in_de_config
 {
     int fd;                         /* File descriptor */
-    char *unix_path;                /* Unix path for socket */
-    struct flb_parser *parser;
-    struct flb_input_instance *ins; /* Input plugin instace */
+    flb_sds_t unix_path;            /* Unix path for socket */
     char *buf;
     size_t buf_size;
-    char *key;
-    int key_len;
+    flb_sds_t key;
+    struct flb_parser *parser;
+    struct flb_input_instance *ins; /* Input plugin instace */
+
 };
 
 #endif

plugins/in_docker_events/docker_events_config.c

@@ -36,7 +36,8 @@
 struct flb_in_de_config *de_config_init(struct flb_input_instance *ins,
                                         struct flb_config *config)
 {
-    const char *p;
+    int ret;
+    const char *tmp;
     struct flb_in_de_config *ctx;
 
     ctx = flb_calloc(1, sizeof(struct flb_in_de_config));
@@ -46,41 +47,30 @@ struct flb_in_de_config *de_config_init(struct flb_input_instance *ins,
     }
     ctx->ins = ins;
 
-    p = flb_input_get_property("unix_path", ins);
-    if (p) {
-        ctx->unix_path = flb_strdup(p);
-    }
-    else {
-        ctx->unix_path = flb_strdup(DEFAULT_UNIX_SOCKET_PATH);
+    /* Load the config map */
+    ret = flb_input_config_map_set(ins, (void *) ctx);
+    if (ret == -1) {
+        flb_free(ctx);
+        return NULL;
     }
 
-    p = flb_input_get_property("buffer_size", ins);
-    if (!p) {
-        ctx->buf_size = DEFAULT_BUF_SIZE;
-    }
-    else {
-        ctx->buf_size = flb_utils_size_to_bytes(p);
-    }
+    /* Allocate buffer for events */
     ctx->buf = flb_malloc(ctx->buf_size);
+    if (!ctx->buf) {
+        flb_errno();
+        flb_free(ctx);
+        return NULL;
+    }
 
-    p = flb_input_get_property("parser", ins);
-    if (p) {
-        ctx->parser = flb_parser_get(p, config);
+    tmp = flb_input_get_property("parser", ins);
+    if (tmp) {
+        ctx->parser = flb_parser_get(tmp, config);
         if (ctx->parser == NULL) {
-            flb_error("[in_docker_events] requested parser '%s' not found", p);
+            flb_plg_error(ctx->ins, "requested parser '%s' not found", tmp);
             return NULL;
         }
     }
 
-    p = flb_input_get_property("key", ins);
-    if (p) {
-        ctx->key = flb_strdup(p);
-    }
-    else {
-        ctx->key = flb_strdup(DEFAULT_FIELD_NAME);
-    }
-    ctx->key_len = strlen(ctx->key);
-
     return ctx;
 }
 
@@ -93,15 +83,9 @@ struct flb_in_de_config *de_config_init(struct flb_input_instance *ins,
  */
 int de_config_destroy(struct flb_in_de_config *ctx)
 {
-    if (ctx->unix_path) {
-        flb_free(ctx->unix_path);
-    }
     if (ctx->buf) {
         flb_free(ctx->buf);
     }
-    if (ctx->key) {
-        flb_free(ctx->key);
-    }
 
     flb_free(ctx);
     return 0;