diff --git a/ansible/inventory/env/group_vars/all.yml b/ansible/inventory/env/group_vars/all.yml
index 1f7bc114303ec1589ebda9e1a862eca60d0d68cc..c0aeb2bcfa10bf02ea5596708d5b03baae9d4704 100644
--- a/ansible/inventory/env/group_vars/all.yml
+++ b/ansible/inventory/env/group_vars/all.yml
@@ -133,7 +133,7 @@ cassandra_restore_dir: "/home/{{ ansible_ssh_user }}/"
cassandra_backup_azure_container_name: cassandra-backup
cassandra_backup_dir: /data/cassandra/backup
### Release 5.0.0 ###
-cassandra_isMutiDCEnabled: false
+cassandra_multi_dc_enabled: false
keycloak_realm: sunbird
sunbird_content_player_url: "http://kong:8000/"
@@ -365,7 +365,7 @@ content_service_whitelisted_mimetype: ''
content_service_blacklisted_mimetype: ''
sunbird_cloud_storage_urls: 'https://s3.ap-south-1.amazonaws.com/ekstep-public-{{ekstep_s3_env}}/,https://ekstep-public-{{ekstep_s3_env}}.s3-ap-south-1.amazonaws.com/,https://{{sunbird_public_storage_account_name}}.blob.core.windows.net/{{sunbird_content_azure_storage_container}}/'
sunbird_email_max_recipients_limit: 100
-sunbird_cassandra_consistency_level: one
+sunbird_cassandra_consistency_level: local_quorum
sunbird_cassandra_replication_strategy: '{"class":"SimpleStrategy","replication_factor":"1"}'
sunbird_lock_expiry_time: 3600
app_es_heap_size: 1500m
@@ -468,6 +468,10 @@ job_names:
api_report_mailing_list: "" ## This mailing list to send the daily api count report. if adaptor want to use they have to override in common.yml
kafka_assessment_topic: "{{env_name}}.telemetry.assess"
+### Release-5.0.0 kafka topic variables for merge user course and notification job ###
+kafka_topic_lms_user_account: "{{env_name}}.lms.user.account.merge"
+kafka_topic_lms_notification: "{{env_name}}.lms.notification"
+
# Portal vars for reports
#sunbird_portal_azure_storage_account: "{{sunbird_azure_storage_account}}"
#sunbird_portal_azure_storage_key: "{{sunbird_azure_storage_key}}"
diff --git a/ansible/roles/ml-analytics-service/defaults/main.yml b/ansible/roles/ml-analytics-service/defaults/main.yml
index 4cda4a2d7a240392105e7152c71b7ef6d8d175e7..915992714e2a5ddc6ea0eaa0e5c6ed8f25868639 100755
--- a/ansible/roles/ml-analytics-service/defaults/main.yml
+++ b/ansible/roles/ml-analytics-service/defaults/main.yml
@@ -52,10 +52,10 @@ ml_analytics_api_access_token: "{{ml_api_access_token | default('ml_core_interna
ml_analytics_druid_observation_status_injestion_spec : '{"type":"index","spec":{"ioConfig":{"type":"index","inputSource":{"type": "azure","uris": ["azure://telemetry-data-store/observation/status/sl_observation_status.json"]},"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"]},"metricsSpec":[]}}}'
ml_analytics_druid_project_injestion_spec : '{"type":"index","spec":{"ioConfig":{"type":"index","inputSource":{"type": "azure","uris": ["azure://telemetry-data-store/projects/sl_projects.json"]},"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":[]}}}'
ml_analytics_azure_sas_token: "{{ sunbird_private_storage_account_key }}"
-ml_analytics_druid_distinctCnt_obs_injestion_spec: '{"type":"index","spec":{"ioConfig":{"type":"index","inputSource":{"type":"azure","uris":["azure://telemetry-data-store/observation/distinctCount/ml_observation_distinctCount_status.json"]},"inputFormat":{"type":"json"}},"tuningConfig":{"type":"index","partitionsSpec":{"type":"dynamic"}},"dataSchema":{"dataSource":"ml-obs-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":"solution_name"},{"type":"string","name":"solution_id"},{"type":"string","name":"status"},{"type":"string","name":"state_name"},{"type":"string","name":"state_externalId"},{"type":"string","name":"district_name"},{"type":"string","name":"district_externalId"},{"type":"string","name":"organisation_name"},{"type":"string","name":"organisation_id"},{"type":"string","name":"parent_channel"},{"type":"string","name":"solution_type"},{"type":"string","name":"private_program"},{"type":"long","name":"unique_submissions"},{"type":"long","name":"unique_entities"},{"type":"long","name":"unique_users"},{"type":"string","name":"time_stamp"}]},"metricsSpec":[]}}}'
-ml_analytics_druid_distinctCnt_obs_domain_injestion_spec: '{"type":"index","spec":{"ioConfig":{"type":"index","inputSource":{"type":"azure","uris":["azure://telemetry-data-store/observation/distinctCount_domain/ml_observation_distinctCount_domain.json"]},"inputFormat":{"type":"json"}},"tuningConfig":{"type":"index","partitionsSpec":{"type":"dynamic"}},"dataSchema":{"dataSource":"ml-obs-domain","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":"solution_name"},{"type":"string","name":"solution_id"},{"type":"string","name":"state_name"},{"type":"string","name":"state_externalId"},{"type":"string","name":"district_name"},{"type":"string","name":"district_externalId"},{"type":"string","name":"organisation_name"},{"type":"string","name":"organisation_id"},{"type":"string","name":"parent_channel"},{"type":"string","name":"solution_type"},{"type":"string","name":"private_program"},{"type":"string","name":"domain_name"},{"type":"string","name":"domain_externalId"},{"type":"string","name":"domain_level"},{"type":"long","name":"unique_submissions"},{"type":"long","name":"unique_entities"},{"type":"long","name":"unique_users"},{"type":"string","name":"time_stamp"}]},"metricsSpec":[]}}}'
-ml_analytics_druid_distinctCnt_obs_domain_criteria_injestion_spec: '{"type":"index","spec":{"ioConfig":{"type":"index","inputSource":{"type":"azure","uris":["azure://telemetry-data-store/observation/distinctCount_domain_criteria/ml_observation_distinctCount_domain_criteria.json"]},"inputFormat":{"type":"json"}},"tuningConfig":{"type":"index","partitionsSpec":{"type":"dynamic"}},"dataSchema":{"dataSource":"ml-obs-domain-criteria","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":"solution_name"},{"type":"string","name":"solution_id"},{"type":"string","name":"state_name"},{"type":"string","name":"state_externalId"},{"type":"string","name":"district_name"},{"type":"string","name":"district_externalId"},{"type":"string","name":"organisation_name"},{"type":"string","name":"organisation_id"},{"type":"string","name":"parent_channel"},{"type":"string","name":"solution_type"},{"type":"string","name":"private_program"},{"type":"string","name":"domain_name"},{"type":"string","name":"domain_externalId"},{"type":"string","name":"domain_level"},{"type":"string","name":"criteria_name"},{"type":"string","name":"criteria_score"},{"type":"string","name":"criteria_id"},{"type":"long","name":"unique_submissions"},{"type":"long","name":"unique_entities"},{"type":"long","name":"unique_users"},{"type":"string","name":"time_stamp"}]},"metricsSpec":[]}}}'
-ml_analytics_druid_distinctCnt_projects_status_injestion_spec: '{"type":"index","spec":{"ioConfig":{"type":"index","inputSource":{"type":"azure","uris":["azure://telemetry-data-store/projects/distinctCount/ml_projects_distinctCount.json"]},"inputFormat":{"type":"json"}},"tuningConfig":{"type":"index","partitionsSpec":{"type":"dynamic"}},"dataSchema":{"dataSource":"ml-project-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":"project_title"},{"type":"string","name":"solution_id"},{"type":"string","name":"status_of_project"},{"type":"string","name":"state_name"},{"type":"string","name":"state_externalId"},{"type":"string","name":"district_name"},{"type":"string","name":"district_externalId"},{"type":"string","name":"organisation_name"},{"type":"string","name":"organisation_id"},{"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_druid_distinctCnt_obs_injestion_spec: '{"type":"index","spec":{"ioConfig":{"type":"index","inputSource":{"type":"azure","uris":["azure://telemetry-data-store/observation/distinctCount/ml_observation_distinctCount_status.json"]},"inputFormat":{"type":"json"}},"tuningConfig":{"type":"index","partitionsSpec":{"type":"dynamic"}},"dataSchema":{"dataSource":"ml-obs-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":"solution_name"},{"type":"string","name":"solution_id"},{"type":"string","name":"status"},{"type":"string","name":"state_name"},{"type":"string","name":"state_externalId"},{"type":"string","name":"district_name"},{"type":"string","name":"district_externalId"},{"type":"string","name":"block_name"},{"type":"string","name":"block_externalId"},{"type":"string","name":"organisation_name"},{"type":"string","name":"organisation_id"},{"type":"string","name":"parent_channel"},{"type":"string","name":"solution_type"},{"type":"string","name":"private_program"},{"type":"long","name":"unique_submissions"},{"type":"long","name":"unique_entities"},{"type":"long","name":"unique_users"},{"type":"string","name":"time_stamp"}]},"metricsSpec":[]}}}'
+ml_analytics_druid_distinctCnt_obs_domain_injestion_spec: '{"type":"index","spec":{"ioConfig":{"type":"index","inputSource":{"type":"azure","uris":["azure://telemetry-data-store/observation/distinctCount_domain/ml_observation_distinctCount_domain.json"]},"inputFormat":{"type":"json"}},"tuningConfig":{"type":"index","partitionsSpec":{"type":"dynamic"}},"dataSchema":{"dataSource":"ml-obs-domain","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":"solution_name"},{"type":"string","name":"solution_id"},{"type":"string","name":"state_name"},{"type":"string","name":"state_externalId"},{"type":"string","name":"district_name"},{"type":"string","name":"district_externalId"},{"type":"string","name":"block_name"},{"type":"string","name":"block_externalId"},{"type":"string","name":"organisation_name"},{"type":"string","name":"organisation_id"},{"type":"string","name":"parent_channel"},{"type":"string","name":"solution_type"},{"type":"string","name":"private_program"},{"type":"string","name":"domain_name"},{"type":"string","name":"domain_externalId"},{"type":"string","name":"domain_level"},{"type":"long","name":"unique_submissions"},{"type":"long","name":"unique_entities"},{"type":"long","name":"unique_users"},{"type":"string","name":"time_stamp"}]},"metricsSpec":[]}}}'
+ml_analytics_druid_distinctCnt_obs_domain_criteria_injestion_spec: '{"type":"index","spec":{"ioConfig":{"type":"index","inputSource":{"type":"azure","uris":["azure://telemetry-data-store/observation/distinctCount_domain_criteria/ml_observation_distinctCount_domain_criteria.json"]},"inputFormat":{"type":"json"}},"tuningConfig":{"type":"index","partitionsSpec":{"type":"dynamic"}},"dataSchema":{"dataSource":"ml-obs-domain-criteria","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":"solution_name"},{"type":"string","name":"solution_id"},{"type":"string","name":"state_name"},{"type":"string","name":"state_externalId"},{"type":"string","name":"district_name"},{"type":"string","name":"district_externalId"},{"type":"string","name":"block_name"},{"type":"string","name":"block_externalId"},{"type":"string","name":"organisation_name"},{"type":"string","name":"organisation_id"},{"type":"string","name":"parent_channel"},{"type":"string","name":"solution_type"},{"type":"string","name":"private_program"},{"type":"string","name":"domain_name"},{"type":"string","name":"domain_externalId"},{"type":"string","name":"domain_level"},{"type":"string","name":"criteria_name"},{"type":"string","name":"criteria_score"},{"type":"string","name":"criteria_id"},{"type":"long","name":"unique_submissions"},{"type":"long","name":"unique_entities"},{"type":"long","name":"unique_users"},{"type":"string","name":"time_stamp"}]},"metricsSpec":[]}}}'
+ml_analytics_druid_distinctCnt_projects_status_injestion_spec: '{"type":"index","spec":{"ioConfig":{"type":"index","inputSource":{"type":"azure","uris":["azure://telemetry-data-store/projects/distinctCount/ml_projects_distinctCount.json"]},"inputFormat":{"type":"json"}},"tuningConfig":{"type":"index","partitionsSpec":{"type":"dynamic"}},"dataSchema":{"dataSource":"ml-project-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":"project_title"},{"type":"string","name":"solution_id"},{"type":"string","name":"status_of_project"},{"type":"string","name":"state_name"},{"type":"string","name":"state_externalId"},{"type":"string","name":"district_name"},{"type":"string","name":"district_externalId"},{"type":"string","name":"block_name"},{"type":"string","name":"block_externalId"},{"type":"string","name":"organisation_name"},{"type":"string","name":"organisation_id"},{"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_obs_distinctCnt_azure_blob_path: "observation/distinctCount/"
ml_analytics_obs_distinctCnt_domain_azure_blob_path: "observation/distinctCount_domain/"
ml_analytics_obs_distinctCnt_domain_criteria_azure_blob_path: "observation/distinctCount_domain_criteria/"
@@ -85,3 +85,5 @@ ml_analytics_projects_distinctCnt_prglevel_azure_blob_path: "projects/distinctCo
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":[]}}}'
+ml_analytics_slack_token: "{{ ml_slack_token | default('') }}"
+ml_analytics_channel_name: "{{ ml_slack_channel | default('') }}"
diff --git a/ansible/roles/ml-analytics-service/templates/config.j2 b/ansible/roles/ml-analytics-service/templates/config.j2
index bf2da5c33dca68c4b5525af595b0858bf44f3fb0..e50509b25e4c16a5c91cead12730b5080ba91242 100644
--- a/ansible/roles/ml-analytics-service/templates/config.j2
+++ b/ansible/roles/ml-analytics-service/templates/config.j2
@@ -215,3 +215,9 @@ secret_access_key = {{ ml_analytics_AWS_secret_access_key }}
region_name = {{ ml_analytics_AWS_region_name }}
bucket_name = {{ ml_analytics_AWS_bucket_name }}
+
+[SLACK]
+
+token = {{ ml_analytics_slack_token }}
+
+channel = {{ ml_analytics_channel_name }}
diff --git a/ansible/roles/stack-sunbird/templates/dial-service_application.conf b/ansible/roles/stack-sunbird/templates/dial-service_application.conf
index 0b0955f5d59f0f759ae35a38c99c8b23c39050c1..745a8b9bfe5916e8ee0f044bd535f5ff970bded5 100644
--- a/ansible/roles/stack-sunbird/templates/dial-service_application.conf
+++ b/ansible/roles/stack-sunbird/templates/dial-service_application.conf
@@ -188,6 +188,6 @@ jsonld {
type = "sbed"
localPath = "/tmp"
ttl = 300
- sb_schema = ["https://sunbirdstagingpublic.blob.core.windows.net/sunbird-dial-staging/jsonld-schema/local/sb/schema.jsonld"]
+ sb_schema = ["http://store.knowlg.sunbird.org/dial/specs/sb/schema.jsonld"]
}
diff --git a/ansible/roles/stack-sunbird/templates/sunbird_cert-registry-service.env b/ansible/roles/stack-sunbird/templates/sunbird_cert-registry-service.env
index dcde35ae4390e75687ec5d7198cc6a4711e29892..2ea34bac0bad15ae222b19dac8b6284506d984d6 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_cert-registry-service.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_cert-registry-service.env
@@ -6,7 +6,7 @@ sunbird_es_port={{sunbird_es_port}}
sunbird_cassandra_keyspace={{sunbird_cassandra_keyspace|d('sunbird')}}
sunbird_cassandra_username={{sunbird_cassandra_username|d('cassandra')}}
sunbird_cassandra_password={{sunbird_cassandra_password|d('password')}}
-sunbird_cassandra_consistency_level=quorum
+sunbird_cassandra_consistency_level={{sunbird_cassandra_consistency_level}}
{% if (cassandra_cluster_size | int) > 1 %}
sunbird_cassandra_host={{groups['cassandra']|join(',')}}
sunbird_cassandra_port=9042
@@ -14,3 +14,5 @@ sunbird_cassandra_port=9042
sunbird_cassandra_host={{sunbird_cassandra_host}}
sunbird_cassandra_port=9042
{% endif %}
+# Release-5.0.0
+isMultiDCEnabled={{cassandra_multi_dc_enabled}}
diff --git a/ansible/roles/stack-sunbird/templates/sunbird_cert-service.env b/ansible/roles/stack-sunbird/templates/sunbird_cert-service.env
index 686df40e63afb88ad6c8b83fcb1864f50e794f88..c43c23171b687e74597513c2be139798f8fdd485 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_cert-service.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_cert-service.env
@@ -1,13 +1,13 @@
CONTAINER_NAME={{cert_service_container_name}}
-CLOUD_STORAGE_TYPE={{cert_service_cloud_storage_type}}
-AZURE_STORAGE_SECRET={{sunbird_private_storage_account_key}}
-AZURE_STORAGE_KEY={{sunbird_private_storage_account_name}}
+CLOUD_STORAGE_TYPE={{cloud_service_provider}}
+PRIVATE_CLOUD_STORAGE_SECRET={{sunbird_private_storage_account_key}}
+PRIVATE_CLOUD_STORAGE_KEY={{sunbird_private_storage_account_name}}
sunbird_cert_domain_url={{proto}}://{{proxy_server_name}}
sunbird_cert_enc_service_url=http://enc-service:8013
download_link_expiry_timeout=600
es_conn_info={{groups['es']|join(':9200,')}}:9200
ITEXT_LICENSE_ENABLED={{itext_license_enabled}}
ITEXT_LICENSE_PATH=/home/sunbird/itext_trail_license.xml
-PUBLIC_AZURE_STORAGE_KEY={{sunbird_public_storage_account_name}}
-PUBLIC_AZURE_STORAGE_SECRET={{sunbird_public_storage_account_key}}
+PUBLIC_CLOUD_STORAGE_KEY={{sunbird_public_storage_account_name}}
+PUBLIC_CLOUD_STORAGE_SECRET={{sunbird_public_storage_account_key}}
PUBLIC_CONTAINER_NAME={{sunbird_cert_qr_container_name}}
diff --git a/ansible/roles/stack-sunbird/templates/sunbird_groups-service.env b/ansible/roles/stack-sunbird/templates/sunbird_groups-service.env
index 38e1c3cf8c6ce5d325d705452f8db600b04f67fe..2c1e2fe83d8de8791b7f76da4ed3102812a3881e 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_groups-service.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_groups-service.env
@@ -1,14 +1,13 @@
{% if (cassandra_cluster_size | int) > 1 %}
sunbird_cassandra_host={{groups['cassandra']|join(',')}}
sunbird_cassandra_port=9042,9042,9042
-sunbird_cassandra_consistency_level=quorum
{% else %}
sunbird_cassandra_host={{sunbird_cassandra_host}}
sunbird_cassandra_port=9042
-sunbird_cassandra_consistency_level={{sunbird_cassandra_consistency_level}}
{% endif %}
sunbird_cassandra_password={{sunbird_cassandra_password|d('password')}}
sunbird_cassandra_username={{sunbird_cassandra_username|d('cassandra')}}
+sunbird_cassandra_consistency_level={{sunbird_cassandra_consistency_level}}
LEARNER_SERVICE_PORT=http://learner-service:9000
sunbird_redis_host={{sunbird_redis_host}}
sunbird_redis_port={{sunbird_redis_port|default(6379)}}
@@ -41,3 +40,5 @@ notification_service_api_url=/v2/notification/send
#“OFF“: To disable for all states
#To allow multiple channel . please write as comma separated : e.g : tn,cg value
enable_tenant_config={{enable_tenant_config| default('*')}}
+# Release-5.0.0
+isMultiDCEnabled={{cassandra_multi_dc_enabled}}
diff --git a/ansible/roles/stack-sunbird/templates/sunbird_learner-service.env b/ansible/roles/stack-sunbird/templates/sunbird_learner-service.env
index 27b2569ba5509bd7b6060eb6badda48ea4d59d2d..79d0bfe1e356233caff1d742df09c4355bd92b01 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_learner-service.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_learner-service.env
@@ -39,13 +39,11 @@ sunbird_installation_email={{sunbird_installation_email}}
{% if (cassandra_cluster_size | int) > 1 %}
sunbird_cassandra_host={{groups['cassandra']|join(',')}}
sunbird_cassandra_port=9042,9042,9042
-sunbird_cassandra_consistency_level=quorum
{% else %}
sunbird_cassandra_host={{sunbird_cassandra_host}}
sunbird_cassandra_port=9042
-sunbird_cassandra_consistency_level={{sunbird_cassandra_consistency_level}}
{% endif %}
-
+sunbird_cassandra_consistency_level={{sunbird_cassandra_consistency_level}}
sunbird_mw_system_host=learner-service
sunbird_mw_system_port=8088
background_actor_provider=local
@@ -98,7 +96,8 @@ sunbird_cache_enable={{sunbird_cache_enable | default(false)}}
sunbird_redis_host={{sunbird_redis_host}}
sunbird_redis_port={{sunbird_redis_port|default(6379)}}
kafka_urls={{kafka_urls}}
-sunbird_user_cert_kafka_topic={{env_name}}.lms.user.account.merge
+# Release-5.0.0
+sunbird_user_cert_kafka_topic={{kafka_topic_lms_user_account}}
# Release-2.3.0
sunbird_reset_pass_msg={{sunbird_reset_pass_msg | d('You have requested to reset password. Click on the link to set a password: {0}')}}
sunbird_fuzzy_search_threshold={{sunbird_fuzzy_search_threshold | d('0.5')}}
@@ -129,3 +128,7 @@ user_index_alias={{user_index_alias | default('user_alias')}}
org_index_alias={{org_index_alias | default('org_alias')}}
sunbird_installation_display_name_for_sms=DIKSHA
sunbird_sso_lb_ip={{keycloak_url}}
+
+# Release-5.0.0
+sunbird_cloud_service_provider={{cloud_service_provider}}
+isMultiDCEnabled={{cassandra_multi_dc_enabled}}
diff --git a/ansible/roles/stack-sunbird/templates/sunbird_lms-service.env b/ansible/roles/stack-sunbird/templates/sunbird_lms-service.env
index 112c702f37d587fb270d63cb5fbf7c602ed3407a..6b790eb7352142eb2aba441ffb7ecf414fd8f1da 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_lms-service.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_lms-service.env
@@ -39,13 +39,11 @@ sunbird_installation_email={{sunbird_installation_email}}
{% if (cassandra_cluster_size | int) > 1 %}
sunbird_cassandra_host={{groups['cassandra']|join(',')}}
sunbird_cassandra_port=9042,9042,9042
-sunbird_cassandra_consistency_level=quorum
{% else %}
sunbird_cassandra_host={{sunbird_cassandra_host}}
sunbird_cassandra_port=9042
-sunbird_cassandra_consistency_level={{sunbird_cassandra_consistency_level}}
{% endif %}
-
+sunbird_cassandra_consistency_level={{sunbird_cassandra_consistency_level}}
sunbird_mw_system_host=lms-service
sunbird_mw_system_port=8088
background_actor_provider=local
@@ -142,4 +140,8 @@ druid_proxy_api_port=8082
druid_proxy_api_endpoint=/druid/v2/
collection_summary_agg_data_source={{ summary_agg_data_source | default('audit-rollup-syncts') }}
collection_summary_agg_cache_ttl={{ summary_agg_ttl | default(21600) }}
-enrollment_list_size={{ enrollment_list_size | default(1000) }}
\ No newline at end of file
+enrollment_list_size={{ enrollment_list_size | default(1000) }}
+
+# Release-5.0.0
+sunbird_cloud_service_provider={{cloud_service_provider}}
+isMultiDCEnabled={{cassandra_multi_dc_enabled}}
\ No newline at end of file
diff --git a/ansible/roles/stack-sunbird/templates/sunbird_notification-service.env b/ansible/roles/stack-sunbird/templates/sunbird_notification-service.env
index 6189bdafa506f4845ca44050ee17180aba7437d5..19b9d2607cbc35ac3445e9fd7db9fdc55011aeea 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_notification-service.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_notification-service.env
@@ -1,17 +1,17 @@
{% if (cassandra_cluster_size | int) > 1 %}
sunbird_cassandra_host={{groups['cassandra']|join(',')}}
sunbird_cassandra_port=9042,9042,9042
-sunbird_cassandra_consistency_level=quorum
{% else %}
sunbird_cassandra_host={{ groups['cassandra'][0] }}
sunbird_cassandra_port=9042
-sunbird_cassandra_consistency_level=quorum
{% endif %}
+sunbird_cassandra_consistency_level={{sunbird_cassandra_consistency_level}}
sunbird_cassandra_notification_keyspace=sunbird_notifications
sunbird_cassandra_password={{sunbird_cassandra_password|d('password')}}
sunbird_cassandra_username={{sunbird_cassandra_username|d('cassandra')}}
sunbird_notification_kafka_servers_config={{sunbird_processing_kafka_host}}
-sunbird_notification_kafka_topic={{env_name}}.lms.notification
+# Release-5.0.0
+sunbird_notification_kafka_topic={{kafka_topic_lms_notification}}
sunbird_notification_msg_default_sender={{sunbird_msg_sender}}
sunbird_msg_91_auth={{sunbird_msg_91_auth}}
sunbird_mail_server_from_email={{sunbird_mail_server_from_email}}
@@ -35,3 +35,5 @@ LEARNER_SERVICE_PORT=http://learner-service:9000
sunbird_us_system_setting_url=/api/data/v1/system/settings/list
sunbird_us_org_read_url=/v1/org/read
notification_category_type_config=certificateUpdate
+# Release-5.0.0
+isMultiDCEnabled={{cassandra_multi_dc_enabled}}
diff --git a/kubernetes/helm_charts/core/nginx-private-ingress/templates/configmap.yaml b/kubernetes/helm_charts/core/nginx-private-ingress/templates/configmap.yaml
index f4422e608b1c0ce6ff840292624633b1fd2cc73c..0dd8167be22df47361a286176203efdaa4c1b783 100644
--- a/kubernetes/helm_charts/core/nginx-private-ingress/templates/configmap.yaml
+++ b/kubernetes/helm_charts/core/nginx-private-ingress/templates/configmap.yaml
@@ -253,6 +253,12 @@ data:
proxy_http_version 1.1;
proxy_pass $target;
}
+ location /ml-reports/ {
+ set $target http://ml-reports-service.{{ .Values.namespace }}.svc.cluster.local:3000;
+ rewrite ^/ml-reports/(.*) /$1 break;
+ proxy_http_version 1.1;
+ proxy_pass $target;
+ }
}
}
kind: ConfigMap
diff --git a/kubernetes/helm_charts/sunbird-RC/registry/schemas/TrainingCertificate.json b/kubernetes/helm_charts/sunbird-RC/registry/schemas/TrainingCertificate.json
index be84e538a37c99cbb20ca6dda6bd6023913fdf6a..2906929f2d186848ef7fd0e0ef2be85bd489ecb0 100644
--- a/kubernetes/helm_charts/sunbird-RC/registry/schemas/TrainingCertificate.json
+++ b/kubernetes/helm_charts/sunbird-RC/registry/schemas/TrainingCertificate.json
@@ -69,6 +69,6 @@
],
"systemFields": ["osCreatedAt", "osUpdatedAt", "osCreatedBy", "osUpdatedBy"],
"enableLogin": false,
- "credentialTemplate": "https://{{sunbird_public_storage_account_name}}.blob.core.windows.net/{{sunbird_content_azure_storage_container}}/schema/credential_template.json"
+ "credentialTemplate": "https://{{upstream_url}}/schema/credential_template.json"
}
}
diff --git a/utils/sunbird-RC/schema/credential_template.json b/utils/sunbird-RC/schema/credential_template.json
index 3f940546869a9bacaf771f40b5106ecfd7ecc5c9..8f467986cc4015948357a0f10b152601d9d7e406 100644
--- a/utils/sunbird-RC/schema/credential_template.json
+++ b/utils/sunbird-RC/schema/credential_template.json
@@ -1,7 +1,7 @@
{
"@context": [
- "https://{{sunbird_public_storage_account_name}}.blob.core.windows.net/{{sunbird_content_azure_storage_container}}/schema/v1_context.json",
- "https://{{sunbird_public_storage_account_name}}.blob.core.windows.net/{{sunbird_content_azure_storage_container}}/schema/sunbird_context.json"
+ "https://{{upstream_url}}/schema/v1_context.json",
+ "https://{{upstream_url}}/schema/sunbird_context.json"
],
"type": [
"VerifiableCredential"