Added new vars (#3476)

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

@@ -10,7 +10,8 @@ ml_analytics_survey_app_name: "{{ ml_survey_app_name | default('sunbirdsurvey')
 ml_analytics_integrated_app_name: "{{ ml_integrated_app_name | default('sunbird') }}"
 ml_analytics_integrated_portal: "{{ ml_integrated_portal | default('dev.sunbird.portal') }}"
 ml_analytics_survey_service: "http://{{private_ingressgateway_ip}}/ml-survey"
-ml_analytics_evidence_base_url: "https://{{ sunbird_private_storage_account_name }}.blob.core.windows.net/telemetry-data-store/"
+ml_analytics_public_container: "{{ ml_analytics_container | default('samiksha') }}"
+ml_analytics_evidence_base_url: "https://{{ sunbird_public_storage_account_name }}.blob.core.windows.net/{{ ml_analytics_public_container }}/"
 ml_analytics_mongodb_url: "{{ml_mongodb_host | default(groups['mongo_master'][0]+':27017')}}"
 ml_analytics_mongo_db_name: "{{ml_mongodb | default('ml-survey')}}"
 ml_analytics_mongo_observation_submission_collection: "observationSubmissions"
@@ -73,3 +74,8 @@ ml_analytics_observation_status_rollup_output_dir: "/opt/sparkjobs/source/observ
 ml_analytics_druid_project_rollup_injestion_spec: '{"type":"index","spec":{"ioConfig":{"type":"index","inputSource":{"type":"azure","uris":["azure://telemetry-data-store/projects/rollup/projects_rollup.json"]},"inputFormat":{"type":"json"}},"tuningConfig":{"type":"index","partitionsSpec":{"type":"dynamic"}},"dataSchema":{"dataSource":"ml-project-status-rollup","granularitySpec":{"type":"uniform","queryGranularity":"DAY","rollup":false,"segmentGranularity":"DAY"},"timestampSpec":{"column":"project_updated_date","format":"iso"},"dimensionsSpec":{"dimensions":["project_title","project_goal","area_of_improvement","status_of_project","tasks_name","tasks_status","designation","task_evidence_status","project_id","task_id","project_created_type","parent_channel","program_id","program_name","project_updated_date","createdBy","program_externalId","private_program","task_deleted_flag","project_terms_and_condition","state_externalId","block_externalId","district_externalId","cluster_externalId","school_externalId","state_name","block_name","district_name","cluster_name","school_name","board_name","organisation_name","solution_id","organisation_id",{"name":"status_code","type":"long"}]},"metricsSpec":[{"name":"count","type":"count"},{"name":"sum___v","type":"longSum","fieldName":"__v"},{"name":"sum_status_code","type":"longMax","fieldName":"status_code"},{"type":"HLLSketchBuild","name":"count_of_createBy","fieldName":"createdBy"},{"type":"HLLSketchBuild","name":"count_of_project_id","fieldName":"project_id"},{"type":"HLLSketchBuild","name":"count_of_solution_id","fieldName":"solution_id"},{"type":"HLLSketchBuild","name":"count_of_program_id","fieldName":"program_id"}]}}}'
 ml_analytics_druid_observation_status_rollup_injestion_spec: '{"type":"index","spec":{"ioConfig":{"type":"index","inputSource":{"type":"azure","uris":["azure://telemetry-data-store/observation/rollup/observation_status_rollup.json"]},"inputFormat":{"type":"json"}},"tuningConfig":{"type":"index","partitionsSpec":{"type":"dynamic"}},"dataSchema":{"dataSource":"ml-observation-status-rollup","granularitySpec":{"type":"uniform","queryGranularity":"DAY","rollup":false,"segmentGranularity":"DAY"},"timestampSpec":{"column":"updatedAt","format":"iso"},"dimensionsSpec":{"dimensions":["status","user_id","solution_id","submission_id","entity_name","completedDate","program_id","private_program","solution_type","updatedAt","role_title","solution_name","program_name","channel","parent_channel","block_name","district_name","school_name","cluster_name","state_name","organisation_name","board_name","district_externalId","state_externalId","block_externalId","cluster_externalId","school_externalId","organisation_id",{"type":"long","name":"status_code"}]},"metricsSpec":[{"type":"count","name":"count"},{"type":"longSum","name":"sum___v","fieldName":"__v","expression":null},{"type":"HLLSketchBuild","name":"count_distinct_solution","fieldName":"solution_id","lgK":12,"tgtHllType":"HLL_4","round":false},{"type":"HLLSketchBuild","name":"count_distinct_submission_id","fieldName":"submission_id","lgK":12,"tgtHllType":"HLL_4","round":false},{"type":"HLLSketchBuild","name":"count_distinct_user_id","fieldName":"user_id","lgK":12,"tgtHllType":"HLL_4","round":false}]}}}'
 ml_analytics_druid_rollup_url: "{{groups['druid'][0]}}:8081"
+ml_analytics_AWS_service_name: "{{ ml_AWS_service_name | default('') }}"
+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('') }}"

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

@@ -191,3 +191,14 @@ project_rollup = {{ ml_analytics_project_rollup_output_dir }}
 observation_status_rollup = {{ ml_analytics_observation_status_rollup_output_dir }}
 
 survey_rollup = {{ ml_analytics_survey_rollup_output_dir }}
+
+[CLOUD_STORAGE]
+service_name = {{ ml_analytics_AWS_service_name }}
+
+access_key = {{ ml_analytics_AWS_access_key }}
+
+secret_access_key = {{ ml_analytics_AWS_secret_access_key }}
+
+region_name = {{ ml_analytics_AWS_region_name }}
+
+bucket_name = {{ ml_analytics_AWS_bucket_name }}