From 6638279c01835101536ec3ffb1fa23c9ba1d9a5b Mon Sep 17 00:00:00 2001 From: ankitshahu Date: Fri, 17 Nov 2023 14:31:05 +0530 Subject: [PATCH 1/5] added env variable for user delete flow --- .../roles/stack-sunbird/templates/ml-core-service.env | 11 ++++++++++- .../stack-sunbird/templates/ml-projects-service.env | 9 +++++++++ .../stack-sunbird/templates/ml-survey-service.env | 9 +++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/ansible/roles/stack-sunbird/templates/ml-core-service.env b/ansible/roles/stack-sunbird/templates/ml-core-service.env index 9f08caa028..25965e8fb4 100755 --- a/ansible/roles/stack-sunbird/templates/ml-core-service.env +++ b/ansible/roles/stack-sunbird/templates/ml-core-service.env @@ -69,4 +69,13 @@ KAFKA_GROUP_ID={{ml_core_kafka_group_id | default("ml-core-service")}} PROGRAM_USERS_JOINED_TOPIC={{ml_core_program_users_joined_topic | default (env_name+".programuser.info")}} #TimeOffset with respect to UTC -TIMEZONE_DIFFRENECE_BETWEEN_LOCAL_TIME_AND_UTC={{ml_core_timezone_diffrenece_between_local_time_and_utc | default ("+05:30")}} \ No newline at end of file +TIMEZONE_DIFFRENECE_BETWEEN_LOCAL_TIME_AND_UTC={{ml_core_timezone_diffrenece_between_local_time_and_utc | default ("+05:30")}} + +#Topic name for user delete event consumer Topic Name +USER_DELETE_TOPIC={{user_delete_topic_name | default(env_name+".delete.user")}} + +#ml core service id +ID={{ml_core_service_id | default(env_name+"sunbird.ml.core.service")}} + +#Topic name for telemetry +TELEMETRY_TOPIC={{telemetry_raw_topic_name | default(env_name+".telemetry.raw")}} \ No newline at end of file diff --git a/ansible/roles/stack-sunbird/templates/ml-projects-service.env b/ansible/roles/stack-sunbird/templates/ml-projects-service.env index 5cb7856ba5..5e73af87f1 100644 --- a/ansible/roles/stack-sunbird/templates/ml-projects-service.env +++ b/ansible/roles/stack-sunbird/templates/ml-projects-service.env @@ -42,3 +42,12 @@ USER_SERVICE_URL={{ml_project_user_service_URL | default("http://userorg-service # certificate issuer KID value CERTIFICATE_ISSUER_KID={{certificate_issuer_kid | default("")}} + +#Topic name for user delete event consumer Topic Name +USER_DELETE_TOPIC={{user_delete_topic_name | default(env_name+".delete.user")}} + +#ml core service id +ID={{ml_project_service_id | default(env_name+"sunbird.ml.project.service")}} + +#Topic name for telemetry +TELEMETRY_TOPIC={{telemetry_raw_topic_name | default(env_name+".telemetry.raw")}} \ No newline at end of file diff --git a/ansible/roles/stack-sunbird/templates/ml-survey-service.env b/ansible/roles/stack-sunbird/templates/ml-survey-service.env index 187a5b1120..131bd21311 100644 --- a/ansible/roles/stack-sunbird/templates/ml-survey-service.env +++ b/ansible/roles/stack-sunbird/templates/ml-survey-service.env @@ -65,3 +65,12 @@ KEYCLOAK_PUBLIC_KEY_PATH={{ml_survey_keycloak_public_key_path|default("keycloak- ## portal url of env APP_PORTAL_BASE_URL={{ proto }}://{{ domain_name }} + +#Topic name for user delete event consumer Topic Name +USER_DELETE_TOPIC={{user_delete_topic_name | default(env_name+".delete.user")}} + +#ml core service id +ID={{ml_survey_service_id | default(env_name+"sunbird.ml.survey.service")}} + +#Topic name for telemetry +TELEMETRY_TOPIC={{telemetry_raw_topic_name | default(env_name+".telemetry.raw")}} From 2a665779ac23bbcb38dce4dec7be858ea18d5428 Mon Sep 17 00:00:00 2001 From: ankitshahu Date: Tue, 28 Nov 2023 09:39:07 +0530 Subject: [PATCH 2/5] Updating PR --- ansible/roles/stack-sunbird/templates/ml-core-service.env | 8 +++++++- .../roles/stack-sunbird/templates/ml-projects-service.env | 8 +++++++- .../roles/stack-sunbird/templates/ml-survey-service.env | 8 +++++++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/ansible/roles/stack-sunbird/templates/ml-core-service.env b/ansible/roles/stack-sunbird/templates/ml-core-service.env index 25965e8fb4..d7a6562d95 100755 --- a/ansible/roles/stack-sunbird/templates/ml-core-service.env +++ b/ansible/roles/stack-sunbird/templates/ml-core-service.env @@ -71,11 +71,17 @@ PROGRAM_USERS_JOINED_TOPIC={{ml_core_program_users_joined_topic | default (env_n #TimeOffset with respect to UTC TIMEZONE_DIFFRENECE_BETWEEN_LOCAL_TIME_AND_UTC={{ml_core_timezone_diffrenece_between_local_time_and_utc | default ("+05:30")}} +#User Delete on and off flow +USER_DELETE_ON_OFF={{user_delete_on_off | default("ON")}} + #Topic name for user delete event consumer Topic Name USER_DELETE_TOPIC={{user_delete_topic_name | default(env_name+".delete.user")}} #ml core service id -ID={{ml_core_service_id | default(env_name+"sunbird.ml.core.service")}} +ID={{ml_core_service_id | default(env_name+"."+sunbird_instance+".ml.core.service")}} + +#Telemetry enable/disbale service +TELEMETRY_ON_OFF={{telemetry_on_off | default("ON")}} #Topic name for telemetry TELEMETRY_TOPIC={{telemetry_raw_topic_name | default(env_name+".telemetry.raw")}} \ No newline at end of file diff --git a/ansible/roles/stack-sunbird/templates/ml-projects-service.env b/ansible/roles/stack-sunbird/templates/ml-projects-service.env index 5e73af87f1..ed3977f691 100644 --- a/ansible/roles/stack-sunbird/templates/ml-projects-service.env +++ b/ansible/roles/stack-sunbird/templates/ml-projects-service.env @@ -43,11 +43,17 @@ USER_SERVICE_URL={{ml_project_user_service_URL | default("http://userorg-service # certificate issuer KID value CERTIFICATE_ISSUER_KID={{certificate_issuer_kid | default("")}} +#User Delete on and off flow +USER_DELETE_ON_OFF={{user_delete_on_off | default("ON")}} + #Topic name for user delete event consumer Topic Name USER_DELETE_TOPIC={{user_delete_topic_name | default(env_name+".delete.user")}} #ml core service id -ID={{ml_project_service_id | default(env_name+"sunbird.ml.project.service")}} +ID={{ml_core_service_id | default(env_name+"."+sunbird_instance+".ml.project.service")}} + +#Telemetry enable/disbale service +TELEMETRY_ON_OFF={{telemetry_on_off | default("ON")}} #Topic name for telemetry TELEMETRY_TOPIC={{telemetry_raw_topic_name | default(env_name+".telemetry.raw")}} \ No newline at end of file diff --git a/ansible/roles/stack-sunbird/templates/ml-survey-service.env b/ansible/roles/stack-sunbird/templates/ml-survey-service.env index 131bd21311..22280680e1 100644 --- a/ansible/roles/stack-sunbird/templates/ml-survey-service.env +++ b/ansible/roles/stack-sunbird/templates/ml-survey-service.env @@ -66,11 +66,17 @@ KEYCLOAK_PUBLIC_KEY_PATH={{ml_survey_keycloak_public_key_path|default("keycloak- ## portal url of env APP_PORTAL_BASE_URL={{ proto }}://{{ domain_name }} +#User Delete on and off flow +USER_DELETE_ON_OFF={{user_delete_on_off | default("ON")}} + #Topic name for user delete event consumer Topic Name USER_DELETE_TOPIC={{user_delete_topic_name | default(env_name+".delete.user")}} #ml core service id -ID={{ml_survey_service_id | default(env_name+"sunbird.ml.survey.service")}} +ID={{ml_core_service_id | default(env_name+"."+sunbird_instance+".ml.survey.service")}} + +#Telemetry enable/disbale service +TELEMETRY_ON_OFF={{telemetry_on_off | default("ON")}} #Topic name for telemetry TELEMETRY_TOPIC={{telemetry_raw_topic_name | default(env_name+".telemetry.raw")}} From 1d893ded50e28b0cfbc4660628b0394bc8aac1dd Mon Sep 17 00:00:00 2001 From: ankitshahu Date: Tue, 28 Nov 2023 15:19:55 +0530 Subject: [PATCH 3/5] Added Manage learn in on and off --- ansible/roles/stack-sunbird/templates/ml-core-service.env | 4 ++-- ansible/roles/stack-sunbird/templates/ml-projects-service.env | 4 ++-- ansible/roles/stack-sunbird/templates/ml-survey-service.env | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ansible/roles/stack-sunbird/templates/ml-core-service.env b/ansible/roles/stack-sunbird/templates/ml-core-service.env index d7a6562d95..fad182d7da 100755 --- a/ansible/roles/stack-sunbird/templates/ml-core-service.env +++ b/ansible/roles/stack-sunbird/templates/ml-core-service.env @@ -72,7 +72,7 @@ PROGRAM_USERS_JOINED_TOPIC={{ml_core_program_users_joined_topic | default (env_n TIMEZONE_DIFFRENECE_BETWEEN_LOCAL_TIME_AND_UTC={{ml_core_timezone_diffrenece_between_local_time_and_utc | default ("+05:30")}} #User Delete on and off flow -USER_DELETE_ON_OFF={{user_delete_on_off | default("ON")}} +USER_DELETE_ON_OFF={{manage_learn_ user_delete_on_off | default("ON")}} #Topic name for user delete event consumer Topic Name USER_DELETE_TOPIC={{user_delete_topic_name | default(env_name+".delete.user")}} @@ -81,7 +81,7 @@ USER_DELETE_TOPIC={{user_delete_topic_name | default(env_name+".delete.user")}} ID={{ml_core_service_id | default(env_name+"."+sunbird_instance+".ml.core.service")}} #Telemetry enable/disbale service -TELEMETRY_ON_OFF={{telemetry_on_off | default("ON")}} +TELEMETRY_ON_OFF={{manage_learn_telemetry_on_off | default("ON")}} #Topic name for telemetry TELEMETRY_TOPIC={{telemetry_raw_topic_name | default(env_name+".telemetry.raw")}} \ No newline at end of file diff --git a/ansible/roles/stack-sunbird/templates/ml-projects-service.env b/ansible/roles/stack-sunbird/templates/ml-projects-service.env index ed3977f691..d26226da9c 100644 --- a/ansible/roles/stack-sunbird/templates/ml-projects-service.env +++ b/ansible/roles/stack-sunbird/templates/ml-projects-service.env @@ -44,7 +44,7 @@ USER_SERVICE_URL={{ml_project_user_service_URL | default("http://userorg-service CERTIFICATE_ISSUER_KID={{certificate_issuer_kid | default("")}} #User Delete on and off flow -USER_DELETE_ON_OFF={{user_delete_on_off | default("ON")}} +USER_DELETE_ON_OFF={{manage_learn_ user_delete_on_off | default("ON")}} #Topic name for user delete event consumer Topic Name USER_DELETE_TOPIC={{user_delete_topic_name | default(env_name+".delete.user")}} @@ -53,7 +53,7 @@ USER_DELETE_TOPIC={{user_delete_topic_name | default(env_name+".delete.user")}} ID={{ml_core_service_id | default(env_name+"."+sunbird_instance+".ml.project.service")}} #Telemetry enable/disbale service -TELEMETRY_ON_OFF={{telemetry_on_off | default("ON")}} +TELEMETRY_ON_OFF={{manage_learn_telemetry_on_off | default("ON")}} #Topic name for telemetry TELEMETRY_TOPIC={{telemetry_raw_topic_name | default(env_name+".telemetry.raw")}} \ No newline at end of file diff --git a/ansible/roles/stack-sunbird/templates/ml-survey-service.env b/ansible/roles/stack-sunbird/templates/ml-survey-service.env index 22280680e1..85ac5d57dc 100644 --- a/ansible/roles/stack-sunbird/templates/ml-survey-service.env +++ b/ansible/roles/stack-sunbird/templates/ml-survey-service.env @@ -67,7 +67,7 @@ KEYCLOAK_PUBLIC_KEY_PATH={{ml_survey_keycloak_public_key_path|default("keycloak- APP_PORTAL_BASE_URL={{ proto }}://{{ domain_name }} #User Delete on and off flow -USER_DELETE_ON_OFF={{user_delete_on_off | default("ON")}} +USER_DELETE_ON_OFF={{manage_learn_ user_delete_on_off | default("ON")}} #Topic name for user delete event consumer Topic Name USER_DELETE_TOPIC={{user_delete_topic_name | default(env_name+".delete.user")}} @@ -76,7 +76,7 @@ USER_DELETE_TOPIC={{user_delete_topic_name | default(env_name+".delete.user")}} ID={{ml_core_service_id | default(env_name+"."+sunbird_instance+".ml.survey.service")}} #Telemetry enable/disbale service -TELEMETRY_ON_OFF={{telemetry_on_off | default("ON")}} +TELEMETRY_ON_OFF={{manage_learn_telemetry_on_off | default("ON")}} #Topic name for telemetry TELEMETRY_TOPIC={{telemetry_raw_topic_name | default(env_name+".telemetry.raw")}} From 76e1dcc8debdd61056ed2f1445bdb10d868f8898 Mon Sep 17 00:00:00 2001 From: ankitshahu Date: Fri, 8 Dec 2023 14:13:11 +0530 Subject: [PATCH 4/5] added entities and program join enable and disable env keys --- ansible/roles/stack-sunbird/templates/ml-core-service.env | 3 +++ ansible/roles/stack-sunbird/templates/ml-survey-service.env | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/ansible/roles/stack-sunbird/templates/ml-core-service.env b/ansible/roles/stack-sunbird/templates/ml-core-service.env index fad182d7da..b2fe3e78ea 100755 --- a/ansible/roles/stack-sunbird/templates/ml-core-service.env +++ b/ansible/roles/stack-sunbird/templates/ml-core-service.env @@ -71,6 +71,9 @@ PROGRAM_USERS_JOINED_TOPIC={{ml_core_program_users_joined_topic | default (env_n #TimeOffset with respect to UTC TIMEZONE_DIFFRENECE_BETWEEN_LOCAL_TIME_AND_UTC={{ml_core_timezone_diffrenece_between_local_time_and_utc | default ("+05:30")}} +#Validate Entities enable/Disable +VALIDATE_ENTITIES={{ml_service_validate_entities | default ("ON")}} + #User Delete on and off flow USER_DELETE_ON_OFF={{manage_learn_ user_delete_on_off | default("ON")}} diff --git a/ansible/roles/stack-sunbird/templates/ml-survey-service.env b/ansible/roles/stack-sunbird/templates/ml-survey-service.env index 85ac5d57dc..05736d398c 100644 --- a/ansible/roles/stack-sunbird/templates/ml-survey-service.env +++ b/ansible/roles/stack-sunbird/templates/ml-survey-service.env @@ -66,6 +66,12 @@ KEYCLOAK_PUBLIC_KEY_PATH={{ml_survey_keycloak_public_key_path|default("keycloak- ## portal url of env APP_PORTAL_BASE_URL={{ proto }}://{{ domain_name }} +#Program join enable/disable +PROGRAM_JOIN_ON_OFF={{ml_program_join_on_off | default ("ON")}} + +#validate entities enable/disable +VALIDATE_ENTITIES={{ml_service_validate_entities | default ("ON")}} + #User Delete on and off flow USER_DELETE_ON_OFF={{manage_learn_ user_delete_on_off | default("ON")}} From 6eaea5c886c8774befcfb5c607234bb3f23c0cfc Mon Sep 17 00:00:00 2001 From: ankitshahu Date: Fri, 8 Dec 2023 16:27:41 +0530 Subject: [PATCH 5/5] Changed Config --- ansible/roles/stack-sunbird/templates/ml-core-service.env | 2 +- ansible/roles/stack-sunbird/templates/ml-projects-service.env | 2 +- ansible/roles/stack-sunbird/templates/ml-survey-service.env | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/roles/stack-sunbird/templates/ml-core-service.env b/ansible/roles/stack-sunbird/templates/ml-core-service.env index b2fe3e78ea..7a8b3cbf55 100755 --- a/ansible/roles/stack-sunbird/templates/ml-core-service.env +++ b/ansible/roles/stack-sunbird/templates/ml-core-service.env @@ -75,7 +75,7 @@ TIMEZONE_DIFFRENECE_BETWEEN_LOCAL_TIME_AND_UTC={{ml_core_timezone_diffrenece_bet VALIDATE_ENTITIES={{ml_service_validate_entities | default ("ON")}} #User Delete on and off flow -USER_DELETE_ON_OFF={{manage_learn_ user_delete_on_off | default("ON")}} +USER_DELETE_ON_OFF={{manage_learn_user_delete_on_off | default("ON")}} #Topic name for user delete event consumer Topic Name USER_DELETE_TOPIC={{user_delete_topic_name | default(env_name+".delete.user")}} diff --git a/ansible/roles/stack-sunbird/templates/ml-projects-service.env b/ansible/roles/stack-sunbird/templates/ml-projects-service.env index d26226da9c..47ecd3471b 100644 --- a/ansible/roles/stack-sunbird/templates/ml-projects-service.env +++ b/ansible/roles/stack-sunbird/templates/ml-projects-service.env @@ -44,7 +44,7 @@ USER_SERVICE_URL={{ml_project_user_service_URL | default("http://userorg-service CERTIFICATE_ISSUER_KID={{certificate_issuer_kid | default("")}} #User Delete on and off flow -USER_DELETE_ON_OFF={{manage_learn_ user_delete_on_off | default("ON")}} +USER_DELETE_ON_OFF={{manage_learn_user_delete_on_off | default("ON")}} #Topic name for user delete event consumer Topic Name USER_DELETE_TOPIC={{user_delete_topic_name | default(env_name+".delete.user")}} diff --git a/ansible/roles/stack-sunbird/templates/ml-survey-service.env b/ansible/roles/stack-sunbird/templates/ml-survey-service.env index 05736d398c..277da9b836 100644 --- a/ansible/roles/stack-sunbird/templates/ml-survey-service.env +++ b/ansible/roles/stack-sunbird/templates/ml-survey-service.env @@ -73,7 +73,7 @@ PROGRAM_JOIN_ON_OFF={{ml_program_join_on_off | default ("ON")}} VALIDATE_ENTITIES={{ml_service_validate_entities | default ("ON")}} #User Delete on and off flow -USER_DELETE_ON_OFF={{manage_learn_ user_delete_on_off | default("ON")}} +USER_DELETE_ON_OFF={{manage_learn_user_delete_on_off | default("ON")}} #Topic name for user delete event consumer Topic Name USER_DELETE_TOPIC={{user_delete_topic_name | default(env_name+".delete.user")}}