From e12a8b5f15cd3eada83a18a57975ab6171e4ad33 Mon Sep 17 00:00:00 2001 From: Vivek M <125434153+Vivek-M-08@users.noreply.github.com> Date: Mon, 29 Jul 2024 11:21:17 +0530 Subject: [PATCH 01/14] Update main.yml --- ansible/roles/stack-sunbird/defaults/main.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ansible/roles/stack-sunbird/defaults/main.yml b/ansible/roles/stack-sunbird/defaults/main.yml index 0c0a678be5..abd341570f 100644 --- a/ansible/roles/stack-sunbird/defaults/main.yml +++ b/ansible/roles/stack-sunbird/defaults/main.yml @@ -1075,3 +1075,7 @@ cloud_store_base_path_placeholder: "CLOUD_BASE_PATH" youtube_app_name: fetch-youtube-license youtube_api_key: "{{ lp_vault_youtube_api_key }}" pgssl: "false" + +# ML changes +capture_user_profile : "False" +capture_organisation_name : "False" From ddeb22c0a44296ff9eee250c92d3eba80a5b28cc Mon Sep 17 00:00:00 2001 From: Vivek M <125434153+Vivek-M-08@users.noreply.github.com> Date: Mon, 29 Jul 2024 11:26:40 +0530 Subject: [PATCH 02/14] Update main.yml --- ansible/roles/stack-sunbird/defaults/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/stack-sunbird/defaults/main.yml b/ansible/roles/stack-sunbird/defaults/main.yml index abd341570f..611cf78048 100644 --- a/ansible/roles/stack-sunbird/defaults/main.yml +++ b/ansible/roles/stack-sunbird/defaults/main.yml @@ -1077,5 +1077,5 @@ youtube_api_key: "{{ lp_vault_youtube_api_key }}" pgssl: "false" # ML changes -capture_user_profile : "False" -capture_organisation_name : "False" +ml_capture_user_profile : "{{ ml_capture_user_profile }}" +ml_capture_organisation_name : "{{ ml_capture_organisation_name }}" From 64d7ada93fc2c3a3893f3a1c36a82fe8bcbc27cf Mon Sep 17 00:00:00 2001 From: Vivek M <125434153+Vivek-M-08@users.noreply.github.com> Date: Mon, 29 Jul 2024 11:27:32 +0530 Subject: [PATCH 03/14] Update ml-analytics-service.conf --- .../roles/stack-sunbird/templates/ml-analytics-service.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ansible/roles/stack-sunbird/templates/ml-analytics-service.conf b/ansible/roles/stack-sunbird/templates/ml-analytics-service.conf index 707dc83e6f..26c9bb9b01 100644 --- a/ansible/roles/stack-sunbird/templates/ml-analytics-service.conf +++ b/ansible/roles/stack-sunbird/templates/ml-analytics-service.conf @@ -213,6 +213,10 @@ survey_druid_data = /opt/sparkjobs/source/survey/ program_text_file = /opt/sparkjobs/ml-analytics-service/projects/program_ids.txt +CAPTURE_USER_PROFILE = {{ ml_capture_user_profile | default('False') }} + +CAPTURE_ORGANISATION_NAME = {{ ml_capture_organisation_name | default('False') }} + [SLACK] token = {{ ml_analytics_slack_token | default('') }} From 9ae7c6ddf48cbad3e127e5d1d5fda79615e909ed Mon Sep 17 00:00:00 2001 From: Vivek M <125434153+Vivek-M-08@users.noreply.github.com> Date: Mon, 29 Jul 2024 11:51:36 +0530 Subject: [PATCH 04/14] Update ml-analytics-service.conf --- .../roles/stack-sunbird/templates/ml-analytics-service.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/stack-sunbird/templates/ml-analytics-service.conf b/ansible/roles/stack-sunbird/templates/ml-analytics-service.conf index 26c9bb9b01..20339ef861 100644 --- a/ansible/roles/stack-sunbird/templates/ml-analytics-service.conf +++ b/ansible/roles/stack-sunbird/templates/ml-analytics-service.conf @@ -213,9 +213,9 @@ survey_druid_data = /opt/sparkjobs/source/survey/ program_text_file = /opt/sparkjobs/ml-analytics-service/projects/program_ids.txt -CAPTURE_USER_PROFILE = {{ ml_capture_user_profile | default('False') }} +CAPTURE_USER_PROFILE = {{ ml_capture_user_profile }} -CAPTURE_ORGANISATION_NAME = {{ ml_capture_organisation_name | default('False') }} +CAPTURE_ORGANISATION_NAME = {{ ml_capture_organisation_name }} [SLACK] From f9c15f4d5bcf613abf24e7c35ba4a21747ca5dd8 Mon Sep 17 00:00:00 2001 From: Vivek M <125434153+Vivek-M-08@users.noreply.github.com> Date: Mon, 29 Jul 2024 11:51:56 +0530 Subject: [PATCH 05/14] Update main.yml --- ansible/roles/stack-sunbird/defaults/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/stack-sunbird/defaults/main.yml b/ansible/roles/stack-sunbird/defaults/main.yml index 611cf78048..9e6971bacf 100644 --- a/ansible/roles/stack-sunbird/defaults/main.yml +++ b/ansible/roles/stack-sunbird/defaults/main.yml @@ -1077,5 +1077,5 @@ youtube_api_key: "{{ lp_vault_youtube_api_key }}" pgssl: "false" # ML changes -ml_capture_user_profile : "{{ ml_capture_user_profile }}" -ml_capture_organisation_name : "{{ ml_capture_organisation_name }}" +ml_capture_user_profile : "{{ ml_capture_user_profile | default('False') }}" +ml_capture_organisation_name : "{{ ml_capture_organisation_name | default('False') }}" From 4268afb678145bf9f531acdaed17272203770e66 Mon Sep 17 00:00:00 2001 From: Vivek M <125434153+Vivek-M-08@users.noreply.github.com> Date: Mon, 29 Jul 2024 11:56:46 +0530 Subject: [PATCH 06/14] Update main.yml --- ansible/roles/stack-sunbird/defaults/main.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/ansible/roles/stack-sunbird/defaults/main.yml b/ansible/roles/stack-sunbird/defaults/main.yml index 9e6971bacf..53cc4351bb 100644 --- a/ansible/roles/stack-sunbird/defaults/main.yml +++ b/ansible/roles/stack-sunbird/defaults/main.yml @@ -1076,6 +1076,3 @@ youtube_app_name: fetch-youtube-license youtube_api_key: "{{ lp_vault_youtube_api_key }}" pgssl: "false" -# ML changes -ml_capture_user_profile : "{{ ml_capture_user_profile | default('False') }}" -ml_capture_organisation_name : "{{ ml_capture_organisation_name | default('False') }}" From bb4d3a0b673e6adac4f35d1fccdb543486350ba1 Mon Sep 17 00:00:00 2001 From: Vivek M <125434153+Vivek-M-08@users.noreply.github.com> Date: Mon, 29 Jul 2024 11:59:13 +0530 Subject: [PATCH 07/14] Update main.yml --- ansible/roles/ml-analytics-service/defaults/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ansible/roles/ml-analytics-service/defaults/main.yml b/ansible/roles/ml-analytics-service/defaults/main.yml index b85fe27059..5cac75ddd2 100755 --- a/ansible/roles/ml-analytics-service/defaults/main.yml +++ b/ansible/roles/ml-analytics-service/defaults/main.yml @@ -138,4 +138,6 @@ ml_analytics_batch_cron_hour: "{{ ml_batch_cron_hour | default('18') }}" ml_analytics_nvsk_cron_minute: "{{ ml_nvsk_cron_minute | default('30') }}" ml_analytics_nvsk_cron_hour: "{{ ml_nvsk_cron_hour | default('7') }}" ml_analytics_nvsk_cron_weekday: "{{ ml_nvsk_cron_weekday | default('4') }}" -ml_analytics_faust_applications_list: "'observations/py_observation_streaming observations/', 'observations/py_observation_evidence_streaming observations/', 'survey/py_survey_streaming survey/', 'survey/py_survey_evidence_streaming survey/'" \ No newline at end of file +ml_analytics_faust_applications_list: "'observations/py_observation_streaming observations/', 'observations/py_observation_evidence_streaming observations/', 'survey/py_survey_streaming survey/', 'survey/py_survey_evidence_streaming survey/'" +ml_capture_user_profile : "{{ ml_capture_user_profile | default('False') }}" +ml_capture_organisation_name : "{{ ml_capture_organisation_name | default('False') }}" From 22e3226358001b3aa9f2d9c429f3a5b0992cd3ad Mon Sep 17 00:00:00 2001 From: Vivek M <125434153+Vivek-M-08@users.noreply.github.com> Date: Mon, 29 Jul 2024 12:00:18 +0530 Subject: [PATCH 08/14] Update config.j2 --- ansible/roles/ml-analytics-service/templates/config.j2 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ansible/roles/ml-analytics-service/templates/config.j2 b/ansible/roles/ml-analytics-service/templates/config.j2 index 201e9ab8b5..396def0b10 100644 --- a/ansible/roles/ml-analytics-service/templates/config.j2 +++ b/ansible/roles/ml-analytics-service/templates/config.j2 @@ -188,6 +188,10 @@ survey_druid_data = {{ml_analytics_survey_batchupdate_output_dir}} program_text_file = {{ml_analytics_project_program}} +CAPTURE_USER_PROFILE = {{ ml_capture_user_profile }} + +CAPTURE_ORGANISATION_NAME = {{ ml_capture_organisation_name }} + [SLACK] token = {{ml_slack_token}} From f8cd25548209dcb69ddfadb1744fb261341e4777 Mon Sep 17 00:00:00 2001 From: Vivek M <125434153+Vivek-M-08@users.noreply.github.com> Date: Mon, 29 Jul 2024 12:08:03 +0530 Subject: [PATCH 09/14] Update config.j2 2nd time --- ansible/roles/ml-analytics-service/templates/config.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/roles/ml-analytics-service/templates/config.j2 b/ansible/roles/ml-analytics-service/templates/config.j2 index 396def0b10..fc29bc37cf 100644 --- a/ansible/roles/ml-analytics-service/templates/config.j2 +++ b/ansible/roles/ml-analytics-service/templates/config.j2 @@ -178,7 +178,7 @@ survey_rollup = {{ ml_analytics_survey_rollup_output_dir }} survey_status = {{ ml_analytics_survey_status_output_dir }} -observation_sub_ids = {{ ml_analytics_observation_submission_id_filepath }} +observation_sub_ids = {{ ml_analytics_observation_submission_id_filepath }} observation_druid_data = {{ ml_analytics_observation_batchupdate_output_dir }} @@ -188,9 +188,9 @@ survey_druid_data = {{ml_analytics_survey_batchupdate_output_dir}} program_text_file = {{ml_analytics_project_program}} -CAPTURE_USER_PROFILE = {{ ml_capture_user_profile }} +CAPTURE_USER_PROFILE = {{ ml_capture_user_profile | default('False') }} -CAPTURE_ORGANISATION_NAME = {{ ml_capture_organisation_name }} +CAPTURE_ORGANISATION_NAME = {{ ml_capture_organisation_name | default('False') }} [SLACK] From a3c393d740d3b25fac25dfeb45ed5f82101629ba Mon Sep 17 00:00:00 2001 From: Vivek M <125434153+Vivek-M-08@users.noreply.github.com> Date: Mon, 29 Jul 2024 14:03:37 +0530 Subject: [PATCH 10/14] Update config.j2 --- ansible/roles/ml-analytics-service/templates/config.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/ml-analytics-service/templates/config.j2 b/ansible/roles/ml-analytics-service/templates/config.j2 index fc29bc37cf..5f76393859 100644 --- a/ansible/roles/ml-analytics-service/templates/config.j2 +++ b/ansible/roles/ml-analytics-service/templates/config.j2 @@ -188,9 +188,9 @@ survey_druid_data = {{ml_analytics_survey_batchupdate_output_dir}} program_text_file = {{ml_analytics_project_program}} -CAPTURE_USER_PROFILE = {{ ml_capture_user_profile | default('False') }} +CAPTURE_USER_PROFILE = {{ ml_capture_user_profile }} -CAPTURE_ORGANISATION_NAME = {{ ml_capture_organisation_name | default('False') }} +CAPTURE_ORGANISATION_NAME = {{ ml_capture_organisation_name }} [SLACK] From 652f1b4d0e4abf2a9f96a91f892d790ba1202b9c Mon Sep 17 00:00:00 2001 From: Vivek M <125434153+Vivek-M-08@users.noreply.github.com> Date: Mon, 29 Jul 2024 14:05:20 +0530 Subject: [PATCH 11/14] Update ml-analytics-service.conf --- .../roles/stack-sunbird/templates/ml-analytics-service.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/stack-sunbird/templates/ml-analytics-service.conf b/ansible/roles/stack-sunbird/templates/ml-analytics-service.conf index 20339ef861..26c9bb9b01 100644 --- a/ansible/roles/stack-sunbird/templates/ml-analytics-service.conf +++ b/ansible/roles/stack-sunbird/templates/ml-analytics-service.conf @@ -213,9 +213,9 @@ survey_druid_data = /opt/sparkjobs/source/survey/ program_text_file = /opt/sparkjobs/ml-analytics-service/projects/program_ids.txt -CAPTURE_USER_PROFILE = {{ ml_capture_user_profile }} +CAPTURE_USER_PROFILE = {{ ml_capture_user_profile | default('False') }} -CAPTURE_ORGANISATION_NAME = {{ ml_capture_organisation_name }} +CAPTURE_ORGANISATION_NAME = {{ ml_capture_organisation_name | default('False') }} [SLACK] From e4faef4cc120c6efb65dfc71015eebc5836f2799 Mon Sep 17 00:00:00 2001 From: Vivek M <125434153+Vivek-M-08@users.noreply.github.com> Date: Mon, 29 Jul 2024 14:06:58 +0530 Subject: [PATCH 12/14] Update main.yml --- ansible/roles/stack-sunbird/defaults/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/ansible/roles/stack-sunbird/defaults/main.yml b/ansible/roles/stack-sunbird/defaults/main.yml index 53cc4351bb..0c0a678be5 100644 --- a/ansible/roles/stack-sunbird/defaults/main.yml +++ b/ansible/roles/stack-sunbird/defaults/main.yml @@ -1075,4 +1075,3 @@ cloud_store_base_path_placeholder: "CLOUD_BASE_PATH" youtube_app_name: fetch-youtube-license youtube_api_key: "{{ lp_vault_youtube_api_key }}" pgssl: "false" - From 90347e2e8d1bae4927bb2ec229413c933c61c856 Mon Sep 17 00:00:00 2001 From: Vivek M <125434153+Vivek-M-08@users.noreply.github.com> Date: Mon, 29 Jul 2024 14:08:57 +0530 Subject: [PATCH 13/14] Update main.yml --- ansible/roles/ml-analytics-service/defaults/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/ml-analytics-service/defaults/main.yml b/ansible/roles/ml-analytics-service/defaults/main.yml index 5cac75ddd2..e01e13b6e0 100755 --- a/ansible/roles/ml-analytics-service/defaults/main.yml +++ b/ansible/roles/ml-analytics-service/defaults/main.yml @@ -139,5 +139,5 @@ ml_analytics_nvsk_cron_minute: "{{ ml_nvsk_cron_minute | default('30') }}" ml_analytics_nvsk_cron_hour: "{{ ml_nvsk_cron_hour | default('7') }}" ml_analytics_nvsk_cron_weekday: "{{ ml_nvsk_cron_weekday | default('4') }}" ml_analytics_faust_applications_list: "'observations/py_observation_streaming observations/', 'observations/py_observation_evidence_streaming observations/', 'survey/py_survey_streaming survey/', 'survey/py_survey_evidence_streaming survey/'" -ml_capture_user_profile : "{{ ml_capture_user_profile | default('False') }}" -ml_capture_organisation_name : "{{ ml_capture_organisation_name | default('False') }}" +ml_capture_user_profile : "{{ ml_capture_user_profile | default('True') }}" +ml_capture_organisation_name : "{{ ml_capture_organisation_name | default('True') }}" From 82779ec68827a75411ec831b4fd36ee26ee113a2 Mon Sep 17 00:00:00 2001 From: Vivek M <125434153+Vivek-M-08@users.noreply.github.com> Date: Mon, 29 Jul 2024 14:10:18 +0530 Subject: [PATCH 14/14] Update ml-analytics-service.conf --- .../roles/stack-sunbird/templates/ml-analytics-service.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/stack-sunbird/templates/ml-analytics-service.conf b/ansible/roles/stack-sunbird/templates/ml-analytics-service.conf index 26c9bb9b01..97a35a4fa8 100644 --- a/ansible/roles/stack-sunbird/templates/ml-analytics-service.conf +++ b/ansible/roles/stack-sunbird/templates/ml-analytics-service.conf @@ -213,9 +213,9 @@ survey_druid_data = /opt/sparkjobs/source/survey/ program_text_file = /opt/sparkjobs/ml-analytics-service/projects/program_ids.txt -CAPTURE_USER_PROFILE = {{ ml_capture_user_profile | default('False') }} +CAPTURE_USER_PROFILE = {{ ml_capture_user_profile | default('True') }} -CAPTURE_ORGANISATION_NAME = {{ ml_capture_organisation_name | default('False') }} +CAPTURE_ORGANISATION_NAME = {{ ml_capture_organisation_name | default('True') }} [SLACK]