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

Fixes #22591: Variable from JSON file don't report in Rudder 7.2 #1816

Closed
wants to merge 1 commit into from
Closed

Fixes #22591: Variable from JSON file don't report in Rudder 7.2 #1816

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion techniques/systemSettings/misc/variableFromJsonFile/3.0/metadata.xml
View file
Open in desktop
Expand Up @@ -27,7 +27,7 @@ For example a JSON containing `{ "datacenter": "paris" }` read into the variable
</TRACKINGVARIABLE>

<SECTIONS>
<SECTION name="Base file" component="true" componentKey="VARIABLE_FROM_JSON_FILE_JSON_FILE" />
<SECTION name="Base file" component="true" componentKey="VARIABLE_FROM_JSON_FILE_BASE_FILE" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i'm dubious that it might work given that the componentKey is not related to the trackingVariable

<SECTION name="File copy" component="true" componentKey="VARIABLE_FROM_JSON_FILE_JSON_FILE" />
<SECTION name="Variable definition" component="true" componentKey="VARIABLE_FROM_JSON_FILE_JSON_FILE" >
<INPUT>
Expand Down
135 changes: 113 additions & 22 deletions techniques/systemSettings/misc/variableFromJsonFile/3.0/variableFromJsonFile.st
View file
Open in desktop
Expand Up @@ -57,8 +57,14 @@ bundle agent variable_from_json_file_&RudderUniqueID&
"pass1" expression => "any";

pass3::
"remote_base_file_ok" expression => "base_remote_source_list_${files_index}.file_copy_from_remote_source_${base_source_file_canon}_${base_destination_file_canon}_ok.variable_dict_from_file_${complete_name_canon}_${base_destination_file_canon}_ok";
"local_base_file_ok" expression => "base_local_source_list_${files_index}.file_copy_from_local_source_${base_file_canon}_${base_destination_file_canon}_ok.variable_dict_from_file_${complete_name_canon}_${base_destination_file_canon}_ok";
"remote_base_file_ok" expression => and( "base_remote_source_list_${files_index}",
"file_copy_from_remote_source_${base_source_file_canon}_${base_destination_file_canon}_ok",
"variable_dict_from_file_${complete_name_canon}_${base_destination_file_canon}_ok"
);
"local_base_file_ok" expression => and( "base_local_source_list_${files_index}",
"file_copy_from_local_source_${base_file_canon}_${base_destination_file_canon}_ok",
"variable_dict_from_file_${complete_name_canon}_${base_destination_file_canon}_ok"
);
"base_file_ok" expression => "remote_base_file_ok|local_base_file_ok";


Expand Down Expand Up @@ -120,43 +126,128 @@ bundle agent variable_from_json_file_&RudderUniqueID&
#Merging
"any" usebundle => variable_dict_merge("${variable_prefix}", "${variable_name}", "${complete_name}", "${prefix}.${json_file_canon[${files_index}]}"),
ifvarclass => "!empty_input_${files_index}.base_file_ok";
"any" usebundle => rudder_common_reports_generic("variableFromJsonFile", "variable_dict_merge_${variable_name}", "${trackingkey[${files_index}]}", "Variable definition", "${json_file[${files_index}]}", "Merging ${prefix}.${json_file_canon[${files_index}]} with ${complete_name} in ${complete_name}"),
"any" usebundle => rudder_common_reports_generic( "variableFromJsonFile",
"variable_dict_merge_${variable_name}",
"${trackingkey[${files_index}]}",
"Variable definition",
"${json_file[${files_index}]}",
"Merging ${prefix}.${json_file_canon[${files_index}]} with ${complete_name} in ${complete_name}"
),
ifvarclass => "!empty_input_${files_index}.base_file_ok";

#Reporting
# Base file
"any" usebundle => rudder_common_report_index("variableFromJsonFile", "result_success", "${trackingkey[${files_index}]}", "Base file", "${json_file[${files_index}]}", "Base variable definition from the shared file: ${base_file_list[${files_index}]} was correct", "${files_index}"),
ifvarclass => "remote_base_file_ok";

"any" usebundle => rudder_common_report_index("variableFromJsonFile", "result_success", "${trackingkey[${files_index}]}", "Base file", "${json_file[${files_index}]}", "Base variable definition from the local file: ${base_file_list[${files_index}]} was correct", "${files_index}"),
ifvarclass => "local_base_file_ok";

"any" usebundle => rudder_common_report_index("variableFromJsonFile", "result_error", "${trackingkey[${files_index}]}", "Base file", "${json_file[${files_index}]}", "Base variable definition from the shared file: ${base_file_list[${files_index}]} could not be defined", "${files_index}"),
ifvarclass => "!base_file_ok";
"any" usebundle => rudder_common_report_index(
"variableFromJsonFile",
"result_success",
"${trackingkey[${files_index}]}",
"Base file",
"${base_file}",
"Base variable definition from the shared file: ${base_file_list[${files_index}]} was correct",
"${files_index}"
),
ifvarclass => "remote_base_file_ok";

"any" usebundle => rudder_common_report_index(
"variableFromJsonFile",
"result_success",
"${trackingkey[${files_index}]}",
"Base file",
"${base_file}",
"Base variable definition from the local file: ${base_file_list[${files_index}]} was correct",
"${files_index}"
),
ifvarclass => "local_base_file_ok";

"any" usebundle => rudder_common_report_index(
"variableFromJsonFile",
"result_error", "${trackingkey[${files_index}]}",
"Base file",
"${base_file}",
"Base variable definition from the shared file: ${base_file_list[${files_index}]} could not be defined",
"${files_index}"
),
ifvarclass => "!base_file_ok";

#File copy
#Remote
"any" usebundle => rudder_common_reports_generic_index("variableFromJsonFile", "file_copy_from_remote_source_${directory_agent_canon}_${json_file_canon[${files_index}]}", "${trackingkey[${files_index}]}", "File copy", "${json_file[${files_index}]}", "Copy of ${directory_server}/${json_file[${files_index}]} from the policy server to ${directory_agent}", "${files_index}"),
ifvarclass => "!empty_input_${files_index}.remote_source_${files_index}";
"any" usebundle => rudder_common_reports_generic_index(
"variableFromJsonFile",
"file_copy_from_remote_source_${directory_agent_canon}_${json_file_canon[${files_index}]}",
"${trackingkey[${files_index}]}",
"File copy",
"${json_file[${files_index}]}",
"Copy of ${directory_server}/${json_file[${files_index}]} from the policy server to ${directory_agent}",
"${files_index}"
),
ifvarclass => "!empty_input_${files_index}.remote_source_${files_index}";

#Local
"any" usebundle => rudder_common_reports_generic_index("variableFromJsonFile", "file_copy_from_local_source_${directory_agent_canon}_${json_file_canon[${files_index}]}", "${trackingkey[${files_index}]}", "File copy", "${json_file[${files_index}]}", "Copy of ${json_file[${files_index}]} to ${directory_agent}", "${files_index}"),
ifvarclass => "!empty_input_${files_index}.local_source_${files_index}";
"any" usebundle => rudder_common_reports_generic_index(
"variableFromJsonFile",
"file_copy_from_local_source_${directory_agent_canon}_${json_file_canon[${files_index}]}",
"${trackingkey[${files_index}]}",
"File copy",
"${json_file[${files_index}]}",
"Copy of ${json_file[${files_index}]} to ${directory_agent}",
"${files_index}"
),
ifvarclass => "!empty_input_${files_index}.local_source_${files_index}";

#Variable definition
"any" usebundle => rudder_common_reports_generic_index("variableFromJsonFile", "variable_dict_from_file_${json_file_canon[${files_index}]}", "${trackingkey[${files_index}]}", "Overriding file", "${json_file[${files_index}]}", "${json_file[${files_index}]} loading", "${files_index}"),
ifvarclass => "!empty_input_${files_index}";
"any" usebundle => rudder_common_reports_generic_index(
"variableFromJsonFile",
"variable_dict_from_file_${json_file_canon[${files_index}]}",
"${trackingkey[${files_index}]}",
"Overriding file",
"${json_file[${files_index}]}",
"${json_file[${files_index}]} loading",
"${files_index}"
),
ifvarclass => "!empty_input_${files_index}";

# Error in the merging if the base variable could not be defined from the base file
"any" usebundle => rudder_common_report_index("variableFromJsonFile", "result_error", "${trackingkey[${files_index}]}", "Variable definition", "${json_file[${files_index}]}", "Merging variable could not be executed since the base variable ${complete_name} could not be defined.", "${files_index}"),
ifvarclass => "!base_file_ok";
"any" usebundle => rudder_common_report_index(
"variableFromJsonFile",
"result_error",
"${trackingkey[${files_index}]}",
"Variable definition",
"${json_file[${files_index}]}",
"Merging variable could not be executed since the base variable ${complete_name} could not be defined.",
"${files_index}"
),
ifvarclass => "!base_file_ok";

#Not applicable
"any" usebundle => rudder_common_report_index("variableFromJsonFile", "result_na", "${trackingkey[${files_index}]}", "File copy", "${json_file[${files_index}]}", "No merging files precised", "${files_index}"),
"any" usebundle => rudder_common_report_index(
"variableFromJsonFile",
"result_na",
"${trackingkey[${files_index}]}",
"File copy",
"",
"No merging files precised",
"${files_index}"
),
ifvarclass => "empty_input_${files_index}";
"any" usebundle => rudder_common_report_index("variableFromJsonFile", "result_na", "${trackingkey[${files_index}]}", "Overriding file", "${json_file[${files_index}]}", "No merging files precised", "${files_index}"),
"any" usebundle => rudder_common_report_index(
"variableFromJsonFile",
"result_na",
"${trackingkey[${files_index}]}",
"Overriding file",
"${json_file[${files_index}]}",
"No merging files precised",
"${files_index}"
),
ifvarclass => "empty_input_${files_index}";
"any" usebundle => rudder_common_report_index("variableFromJsonFile", "result_na", "${trackingkey[${files_index}]}", "Variable definition", "${json_file[${files_index}]}", "No merging files precised", "${files_index}"),
"any" usebundle => rudder_common_report_index(
"variableFromJsonFile",
"result_na",
"${trackingkey[${files_index}]}",
"Variable definition",
"${json_file[${files_index}]}",
"No merging files precised",
"${files_index}"
),
ifvarclass => "empty_input_${files_index}.base_file_ok";

}
Expand Down