Fix Conflict & Add variables (#3477)

* Update merge conflict & Add variables
* Add variables

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

@@ -79,3 +79,9 @@ ml_analytics_AWS_access_key: "{{ ml_AWS_access_key | default('') }}"
 ml_analytics_AWS_secret_access_key: "{{ ml_AWS_secret_access_key | default('') }}"
 ml_analytics_AWS_region_name: "{{ ml_AWS_region_name | default('') }}"
 ml_analytics_AWS_bucket_name: "{{ ml_AWS_bucket_name | default('') }}"
+ml_analytics_druid_distinctCnt_prglevel_projects_status_injestion_spec : : '{"type":"index","spec":{"ioConfig":{"type":"index","inputSource":{"type":"azure","uris":["azure://telemetry-data-store/projects/distinctCountPrglevel/ml_projects_distinctCount_prgmlevel.json"]},"inputFormat":{"type":"json"}},"tuningConfig":{"type":"index","partitionsSpec":{"type":"dynamic"}},"dataSchema":{"dataSource":"ml-project-programLevel-status","granularitySpec":{"type":"uniform","queryGranularity":"none","rollup":false,"segmentGranularity":"DAY"},"timestampSpec":{"column":"time_stamp","format":"auto"},"dimensionsSpec":{"dimensions":[{"type":"string","name":"program_name"},{"type":"string","name":"program_id"},{"type":"string","name":"status_of_project"},{"type":"string","name":"state_name"},{"type":"string","name":"state_externalId"},{"type":"string","name":"private_program"},{"type":"string","name":"project_created_type"},{"type":"string","name":"parent_channel"},{"type":"long","name":"unique_projects"},{"type":"long","name":"unique_users"},{"type":"long","name":"no_of_imp_with_evidence"},{"type":"string","name":"time_stamp"}]},"metricsSpec":[]}}}'
+ml_analytics_projects_distinctCnt_prglevel_output_dir: "{{ WORKDIR }}/source/projects/distinctCountPrglevel/output"
+ml_analytics_projects_distinctCnt_prglevel_azure_blob_path: "projects/distinctCountPrglevel/"
+ml_analytics_survey_status_output_dir : "{{ WORKDIR }}/source/survey/status/output"
+ml_analytics_survey_azure_blob_path : "survey/status/"
+ml_analytics_druid_survey_status_injestion_spec : '{"type":"index","spec":{"ioConfig":{"type":"index","inputSource":{"type":"azure","uris":["azure://telemetry-data-store/survey/status/sl_survey_status.json"]},"inputFormat":{"type":"json"}},"tuningConfig":{"type":"index","partitionsSpec":{"type":"dynamic"}},"dataSchema":{"dataSource":"ml-survey-status","granularitySpec":{"type":"uniform","queryGranularity":"DAY","rollup":true,"segmentGranularity":"DAY"},"timestampSpec":{"column":"updatedAt","format":"iso"},"dimensionsSpec":{"dimensions":["survey_submission_id", "submission_status", "user_id", "user_sub_type", "user_type", "state_externalId", "block_externalId", "district_externalId", "cluster_externalId", "school_externalId", "state_name", "block_name", "district_name", "cluster_name", "school_name", "board_name", "organisation_id", "organisation_name", "program_externalId", "program_id", "program_name", "survey_name", "survey_id", "survey_externalId", "created_date", "submission_date", "updatedAt", "parent_channel", "solution_name", "solution_id","private_program"]},"metricsSpec":[]}}}'

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

@@ -96,6 +96,10 @@ project_rollup_injestion_spec = {{ ml_analytics_druid_project_rollup_injestion_s
 
 ml_survey_rollup_spec = {{ml_analytics_druid_survey_rollup_injestion_spec}}
 
+ml_distinctCnt_prglevel_projects_status_spec = {{ ml_analytics_druid_distinctCnt_prglevel_projects_status_injestion_spec}}
+
+survey_status_injestion_spec = {{ ml_analytics_druid_survey_status_injestion_spec }}
+
 [KAFKA]
 
 url = {{ ml_analytics_kafka_url }}
@@ -164,6 +168,10 @@ observation_rollup_blob_path = {{ ml_analytics_observation_rollup_azure_blob_pat
 
 survey_rollup_blob_path = {{ ml_analytics_survey_rollup_azure_blob_path }}
 
+projects_distinctCnt_prgmlevel_blob_path = {{ml_analytics_projects_distinctCnt_prglevel_azure_blob_path}}
+
+survey_blob_path = {{ ml_analytics_survey_azure_blob_path }}
+
 [REDIS]
 
 host = {{ ml_analytics_redis_host }}
@@ -192,7 +200,12 @@ observation_status_rollup = {{ ml_analytics_observation_status_rollup_output_dir
 
 survey_rollup = {{ ml_analytics_survey_rollup_output_dir }}
 
+projects_distinctCount_prgmlevel = {{ml_analytics_projects_distinctCnt_prglevel_output_dir}}
+
+survey_status = {{ ml_analytics_survey_status_output_dir }}
+
 [CLOUD_STORAGE]
+
 service_name = {{ ml_analytics_AWS_service_name }}
 
 access_key = {{ ml_analytics_AWS_access_key }}