redefine FLB_AZ_LI_DCE_URL_TMPLT to use stream_name

Signed-off-by: Jed Laundry <[email protected]>

Author: jlaundry

plugins/out_azure_logs_ingestion/azure_logs_ingestion.h

@@ -28,7 +28,7 @@
                                     "%s/oauth2/v2.0/token"
 /* DCE Full URL needs: dce_url, dcr_id, Log Analytics custom table name */
 #define FLB_AZ_LI_DCE_URL_TMPLT     "%s/dataCollectionRules/%s/streams/"\
-                                    "Custom-%s?"FLB_AZ_LI_API_VERSION
+                                    "%s?"FLB_AZ_LI_API_VERSION
 /* TLS Modes for upstream connection = FLB_IO_TLS or FLB_IO_OPT_TLS*/
 #define FLB_AZ_LI_TLS_MODE          FLB_IO_TLS
 /* refresh token every 60 minutes */

plugins/out_azure_logs_ingestion/azure_logs_ingestion_conf.c

@@ -91,6 +91,13 @@ struct flb_az_li* flb_az_li_ctx_create(struct flb_output_instance *ins,
         return NULL;
     }
 
+    /* config: 'stream_name' */
+    if (!ctx->stream_name) {
+        flb_plg_error(ins, "property 'stream_name' is not defined");
+        flb_az_li_ctx_destroy(ctx);
+        return NULL;
+    }
+
     /* Allocate and set auth url */
     ctx->auth_url = flb_sds_create_size(sizeof(FLB_AZ_LI_AUTH_URL_TMPLT) - 1 +
                                         flb_sds_len(ctx->tenant_id));
@@ -106,15 +113,15 @@ struct flb_az_li* flb_az_li_ctx_create(struct flb_output_instance *ins,
     ctx->dce_u_url = flb_sds_create_size(sizeof(FLB_AZ_LI_DCE_URL_TMPLT) - 1 +
                                         flb_sds_len(ctx->dce_url) +
                                         flb_sds_len(ctx->dcr_id) +
-                                        flb_sds_len(ctx->table_name));
+                                        flb_sds_len(ctx->stream_name));
     if (!ctx->dce_u_url) {
         flb_errno();
         flb_az_li_ctx_destroy(ctx);
         return NULL;
     }
     flb_sds_snprintf(&ctx->dce_u_url, flb_sds_alloc(ctx->dce_u_url),
                     FLB_AZ_LI_DCE_URL_TMPLT, ctx->dce_url, 
-                    ctx->dcr_id, ctx->table_name);
+                    ctx->dcr_id, ctx->stream_name);
 
     /* Initialize the auth mutex */
     pthread_mutex_init(&ctx->token_mutex, NULL);
@@ -138,8 +145,8 @@ struct flb_az_li* flb_az_li_ctx_create(struct flb_output_instance *ins,
     }
     flb_output_upstream_set(ctx->u_dce, ins);
 
-    flb_plg_info(ins, "dce_url='%s', dcr='%s', table='%s', stream='Custom-%s'",
-                ctx->dce_url, ctx->dcr_id, ctx->table_name, ctx->table_name);
+    flb_plg_info(ins, "dce_url='%s', dcr='%s', table='%s', stream='%s'",
+                ctx->dce_url, ctx->dcr_id, ctx->table_name, ctx->stream_name);
 
     return ctx;
 }