Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

custom_calyptia: correctly set fleet_id for out_calyptia when fleet_name is set. #8089

Merged
merged 1 commit into from
Oct 29, 2023
Merged

custom_calyptia: correctly set fleet_id for out_calyptia when fleet_name is set. #8089

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions plugins/custom_calyptia/calyptia.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,6 @@ static struct flb_output_instance *setup_cloud_output(struct flb_config *config,
}

if (ctx->fleet_id) {
flb_output_set_property(cloud, "fleet_id", ctx->fleet_id);
label = flb_sds_create_size(strlen("fleet_id") + strlen(ctx->fleet_id) + 1);

if (!label) {
Expand Down Expand Up @@ -469,11 +468,10 @@ static int cb_calyptia_init(struct flb_custom_instance *ins,
}

if (ctx->fleet_name) {
// TODO: set this once the fleet_id has been retrieved...
// flb_output_set_property(ctx->o, "fleet_id", ctx->fleet_id);
flb_input_set_property(ctx->fleet, "fleet_name", ctx->fleet_name);
}
else {

if (ctx->fleet_id) {
flb_output_set_property(ctx->o, "fleet_id", ctx->fleet_id);
flb_input_set_property(ctx->fleet, "fleet_id", ctx->fleet_id);
}
Expand Down
Loading