out_custom_calyptia: enable machine_id config property.

if machine_id is set, that string value will be used
when registering the agent, if not given, a locally
generated one will be used.

Signed-off-by: Jorge Niedbalski <j@calyptia.com>

Author: niedbalski

plugins/custom_calyptia/calyptia.c

@@ -35,6 +35,8 @@ struct calyptia {
     flb_sds_t store_path;
     flb_sds_t cloud_host;
     flb_sds_t cloud_port;
+    flb_sds_t machine_id;
+
     int cloud_tls;
     int cloud_tls_verify;
 
@@ -258,7 +260,6 @@ static int cb_calyptia_init(struct flb_custom_instance *ins,
         flb_config_map_foreach(head, mv, ctx->add_labels) {
             k = mk_list_entry_first(mv->val.list, struct flb_slist_entry, _head);
             v = mk_list_entry_last(mv->val.list, struct flb_slist_entry, _head);
-
             kv = flb_sds_create_size(strlen(k->str) + strlen(v->str) + 1);
             if(!kv) {
                 flb_free(ctx);
@@ -277,6 +278,10 @@ static int cb_calyptia_init(struct flb_custom_instance *ins,
         flb_output_set_property(ctx->o, "store_path", ctx->store_path);
     }
 
+    if (ctx->machine_id) {
+        flb_output_set_property(ctx->o, "machine_id", ctx->machine_id);
+    }
+
     /* Override network details: development purposes only */
     if (ctx->cloud_host) {
         flb_output_set_property(ctx->o, "cloud_host", ctx->cloud_host);
@@ -359,6 +364,11 @@ static struct flb_config_map config_map[] = {
      FLB_CONFIG_MAP_MULT, FLB_TRUE, offsetof(struct calyptia, add_labels),
      "Label to append to the generated metric."
     },
+    {
+     FLB_CONFIG_MAP_STR, "machine_id", NULL,
+     0, FLB_TRUE, offsetof(struct calyptia, machine_id),
+     "Custom machine_id to be used when registering agent"
+    },
 
     /* EOF */
     {0}

plugins/out_calyptia/calyptia.c

@@ -657,12 +657,16 @@ static struct flb_calyptia *config_init(struct flb_output_instance *ins,
         }
     }
 
-    /* machine id */
-    ret = get_machine_id(ctx, &machine_id, &size);
-    if (ret == -1) {
-        return NULL;
+    /* If no machine_id has been provided via a configuration option get it from the local machine-id. */
+    if (!ctx->machine_id) {
+        /* machine id */
+        ret = get_machine_id(ctx, &machine_id, &size);
+        if (ret == -1) {
+            return NULL;
+        }
+        ctx->machine_id = (flb_sds_t) machine_id;
     }
-    ctx->machine_id = (flb_sds_t) machine_id;
+
     flb_plg_debug(ctx->ins, "machine_id=%s", ctx->machine_id);
 
     /* Upstream */
@@ -872,6 +876,11 @@ static struct flb_config_map config_map[] = {
      0, FLB_TRUE, offsetof(struct flb_calyptia, api_key),
      "Calyptia Cloud API Key."
     },
+    {
+     FLB_CONFIG_MAP_STR, "machine_id", NULL,
+     0, FLB_TRUE, offsetof(struct flb_calyptia, machine_id),
+     "Custom machine_id to be used when registering agent"
+    },
 
     {
      FLB_CONFIG_MAP_STR, "store_path", NULL,