Merge pull request #3988 from Vivek-M-08/release-6.0.0

ED-3534:- Adoption Changes in ML service

ansible/roles/ml-analytics-service/defaults/main.yml

@@ -138,7 +138,4 @@ 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_survey_meta_druid_topic_name : "{{ env_name }}.ml.survey.meta"
-ml_analytics_survey_completed_druid_topic_name : "{{ env_name }}.ml.survey.status.completed"
-ml_analytics_survey_started_druid_topic_name : "{{ env_name }}.ml.survey.status.started"
-ml_analytics_survey_inprogress_druid_topic_name : "{{ env_name }}.ml.survey.status.inprogress"
+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/'"

ansible/roles/ml-analytics-service/templates/config.j2

@@ -130,13 +130,6 @@ survey_raw_topic = {{ ml_analytics_kafka_survey_topic_name }}
 
 survey_druid_topic = {{ ml_analytics_kafka_survey_druid_topic_name }}
 
-survey_meta_druid_topic = {{ ml_analytics_survey_meta_druid_topic_name }}
-
-survey_completed_druid_topic = {{ ml_analytics_survey_completed_druid_topic_name }}
-
-survey_started_druid_topic = {{ ml_analytics_survey_started_druid_topic_name }}
-
-survey_inprogress_druid_topic = {{ ml_analytics_survey_inprogress_druid_topic_name }}
 
 [LOGS]
 
@@ -270,3 +263,8 @@ store = {{ ml_analytics_reports_store }}
 [ML_CORE_SERVICE_URL]
 
 url = {{ ml_analytics_core_service }}
+
+
+[SERVICES]
+
+faust_applications_list = {{ ml_analytics_faust_applications_list }}

ansible/roles/stack-sunbird/templates/ml-analytics-service.conf

@@ -71,8 +71,6 @@ survey_collection = surveys
 
 metadata_url = http://{{groups['druid'][0]}}:8081/druid/coordinator/v1/datasources/
 
-datasource_url = http://{{groups['ml-raw-broker'][0]}}:8082/druid/v2/datasources
-
 batch_url = http://{{groups['druid'][0]}}:8081/druid/indexer/v1/task
 
 metadata_rollup_url = http://{{groups['druid'][0]}}:8081/druid/coordinator/v1/datasources/
@@ -81,8 +79,16 @@ batch_rollup_url = http://{{groups['druid'][0]}}:8081/druid/indexer/v1/task
 
 urlQuery = http://{{groups['druid'][0]}}:8082/druid/v2?pretty
 
+datasource_url = http://{{groups['ml-raw-broker'][0]}}:8082/druid/v2/datasources
+
 sql_url = http://{{groups['ml-raw-broker'][0]}}:8082/druid/v2/sql/
 
+coordinator_url = http://{{groups['ml-raw-coordinator'][0]}}:8081/status/health
+
+overload_url = http://{{groups['ml-raw-overload'][0]}}:8081/status/health
+
+historical_url = http://{{groups['ml-raw-historical'][0]}}:8081/status/health
+
 observation_status_injestion_spec = '{"type":"index","spec":{"ioConfig":{"type":"index","inputSource":{"type": "CloudType","uris": ["CloudURI"]},"inputFormat":{"type":"json"}},"tuningConfig":{"type":"index","partitionsSpec":{"type":"dynamic"}},"dataSchema":{"dataSource":"sl-observation-status","granularitySpec":{"type":"uniform","queryGranularity":"DAY","rollup":false,"segmentGranularity":"DAY"},"timestampSpec":{"column":"updatedAt","format":"auto"},"dimensionsSpec":{"dimensions":["status","entity_externalId","entity_id","entity_type","solution_id","solution_externalId","submission_id","entity_name","solution_name","role_title","school_name","school_code","school_externalId","state_name","state_code","state_externalId","district_name","district_code","district_externalId","block_name","block_code","block_externalId","cluster_name","cluster_code","cluster_externalId","completedDate","channel","parent_channel","program_id","program_externalId","program_name","app_name","user_id","private_program","solution_type","organisation_name","ecm_marked_na","board_name","updatedAt","organisation_id","user_type","observed_school_name","observed_school_id","observed_school_code","observed_state_name","observed_state_id","observed_state_code","observed_district_name","observed_district_id","observed_district_code","observed_block_name","observed_block_id","observed_block_code","observed_cluster_name","observed_cluster_id","observed_cluster_code","isRubricDriven","criteriaLevelReport"]},"metricsSpec":[]}}}'
 
 project_injestion_spec = '{"type":"index","spec":{"ioConfig":{"type":"index","inputSource":{"type": "CloudType","uris": ["CloudURI"]},"inputFormat":{"type":"json"}},"tuningConfig":{"type":"index","partitionsSpec":{"type":"dynamic"}},"dataSchema":{"dataSource":"sl-project","granularitySpec":{"type":"uniform","queryGranularity":"DAY","rollup":false,"segmentGranularity":"DAY"},"timestampSpec":{"column":"project_updated_date","format":"auto"},"dimensionsSpec":{"dimensions":[]},"metricsSpec":[]}}}'
@@ -282,3 +288,7 @@ store = {{ ml_analytics_reports_store }}
 [ML_CORE_SERVICE_URL]
 
 url = http://{{private_ingressgateway_ip}}/ml-core
+
+[SERVICES]
+
+faust_applications_list = {{ faust_applications_list }}