[ED-4185] merge Release 6.0.0 to 7.0.1

ansible/artifacts/sunbird/login/resources/js/telemetry_service.js

@@ -3159,6 +3159,7 @@ var handleGoogleAuthEvent = () => {
         redirectToLib();
     }
 };
+
 var redirectToPortal = (redirectUrlPath) => { // redirectUrlPath for sso and self signUp
     const curUrlObj = window.location;
     var redirect_uri = getValueFromSession('redirect_uri');
@@ -3171,9 +3172,7 @@ var redirectToPortal = (redirectUrlPath) => { // redirectUrlPath for sso and sel
             const redirect_uriLocation = new URL(redirect_uri);
             if (client_id === 'android' || client_id === 'desktop') {
                 window.location.href = sessionUrlObj.protocol + '//' + sessionUrlObj.host + redirectUrlPath + updatedQuery;
-            } else if(client_id === 'portal' && 
-            redirectUrlPath === '/sign-in/sso/select-org' && 
-            (redirect_uri.includes('dock.sunbirded.org') || redirect_uri.includes('dockstaging.sunbirded.org'))) {
+            } else if(client_id === 'portal' && redirectUrlPath === '/sign-in/sso/select-org' && (sessionUrlObj.host !== redirect_uriLocation.host)) {
                 window.location.href = sessionUrlObj.protocol + '//' + sessionUrlObj.host + redirectUrlPath + updatedQuery;
             } else {
                 window.location.href = redirect_uriLocation.protocol + '//' + redirect_uriLocation.host +

ansible/roles/cassandra/defaults/main.yml

@@ -1,5 +1,5 @@
 user_home: "/home/{{ ansible_ssh_user }}/"
-cassandra_repo: 'deb http://www.apache.org/dist/cassandra/debian 311x main'
-cassandra_repo_key: 'https://www.apache.org/dist/cassandra/KEYS'
+cassandra_repo: 'deb https://debian.cassandra.apache.org 311x main'
+cassandra_repo_key: 'https://downloads.apache.org/cassandra/KEYS'
 resource_crunch: "yes" # make this value yes if heap size should be quarter of the Server Memory when you are deploying multiple databases, else make this value no to have 50% of the value as per the best practice of cassandra
 cassandra_home_directory: "/var/lib/cassandra"

ansible/roles/kong-api/defaults/main.yml

@@ -8237,6 +8237,27 @@ kong_apis:
     config.required: false
     config.enabled: false
 
+- name: uploadFileToCloud
+  uris: "{{ cloud_service_prefix }}/mlcore/v1/files/upload"
+  upstream_url: "{{ ml_core_service_url }}/v1/cloud-services/files/upload"
+  strip_uri: true
+  plugins:
+  - name: jwt
+  - name: cors
+  - "{{ statsd_pulgin }}"
+  - name: acl
+    config.whitelist:
+    - cloudUrlsCreate
+  - name: rate-limiting
+    config.policy: local
+    config.hour: "{{ medium_rate_limit_per_hour }}"
+    config.limit_by: credential
+  - name: request-size-limiting
+    config.allowed_payload_size: "{{ small_request_size_limit }}"
+  - name: opa-checks
+    config.required: false
+    config.enabled: false
+
 - name: listPlatformPrograms
   uris: "{{ user_extension_prefix }}/mlcore/v1/programsByPlatformRoles"
   upstream_url: "{{ ml_core_service_url }}/v1/user-extension/programsByPlatformRoles"

ansible/roles/log-es6/tasks/plugins/repository-oci.yml

@@ -4,33 +4,33 @@
   shell: echo "{{ cloud_management_storage_accountname }}" | {{ es_home }}/bin/elasticsearch-keystore add -f s3.client.default.access_key
   no_log: True
   environment:
-    ES_PATH_CONF: "{{ conf_dir }}"
+    ES_PATH_CONF: "{{ es_conf_dir }}"
 
 - name: Add default oci account key for backups
   become: yes
   shell: echo "{{ cloud_management_storage_secret }}" | {{ es_home }}/bin/elasticsearch-keystore add -f s3.client.default.secret_key
   no_log: True
   environment:
-    ES_PATH_CONF: "{{ conf_dir }}"
+    ES_PATH_CONF: "{{ es_conf_dir }}"
 
 
 - name: Add default oci endpoint for backups
   become: yes
   shell: echo "{{ cloud_management_storage_endpoint }}" | {{ es_home }}/bin/elasticsearch-keystore add -f s3.client.default.endpoint
   no_log: True
   environment:
-    ES_PATH_CONF: "{{ conf_dir }}"
+    ES_PATH_CONF: "{{ es_conf_dir }}"
 
 - name: Add default oci region for backups
   become: yes
   shell: echo "{{ cloud_management_storage_region }}" | {{ es_home }}/bin/elasticsearch-keystore add -f s3.client.default.region
   no_log: True
   environment:
-    ES_PATH_CONF: "{{ conf_dir }}"
+    ES_PATH_CONF: "{{ es_conf_dir }}"
 
 - name: Add default path-style access for backups
   become: yes
   shell: echo "{{ cloud_management_storage_path_style_access }}" | {{ es_home }}/bin/elasticsearch-keystore add -f s3.client.default.path_style_access
   no_log: True
   environment:
-    ES_PATH_CONF: "{{ conf_dir }}"   
+    ES_PATH_CONF: "{{ es_conf_dir }}"   

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

@@ -133,3 +133,9 @@ ml_analytics_reports_store: "{{ cloud_service_provider }}"
 ml_analytics_reports_container: "{{ cloud_storage_privatereports_bucketname }}"
 ml_analytics_driver_memory: "{{ ml_analytics_default_driver_memory | default('5g') }}"
 ml_analytics_executor_memory: "{{ ml_analytics_default_executor_memory | default('5g') }}"
+ml_analytics_batch_cron_minute: "{{ ml_batch_cron_minute | default('30') }}"
+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/'"

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

@@ -26,6 +26,7 @@
       - python3-virtualenv
       - zip
       - unzip
+      - acl
     state: present
 
 - name: CHANGE THE OWNERSHIP FOR THIS {{ BASEPATH }} DIRECTORY
@@ -135,15 +136,15 @@
   cron:
     name: "Run Batch Ingestion Job"
     user: "{{ USER }}"
-    minute: "30"
-    hour: "18"
+    minute: "{{ ml_analytics_batch_cron_minute }}"
+    hour: "{{ ml_analytics_batch_cron_hour }}"
     job: "{{ BASEPATH }}/ml-analytics-service/run.sh > {{ BASEPATH }}/ml-analytics-service/crontab_job.log"
 
 - name: CREATE THE CRON NVSK Data Upload
   cron:
     name: "NVSK Data Upload JOB"
     user: "{{ USER }}"
-    minute: "30"
-    hour: "7"
-    weekday: "4"
+    minute: "{{ ml_analytics_nvsk_cron_minute }}"
+    hour: "{{ ml_analytics_nvsk_cron_hour }}"
+    weekday: "{{ ml_analytics_nvsk_cron_weekday }}"
     job: "{{ BASEPATH }}/ml-analytics-service/run_weekly.sh > {{ BASEPATH }}/ml-analytics-service/nvsk_data_weekly.logs"

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

@@ -263,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/mongodb-cluster/templates/mongod.conf.j2

@@ -106,7 +106,7 @@ operationProfiling:
   {% endfor %}
   {% endif %}
 
-{% if mongodb_major_version is version("4.0", ">=") -%}
+{# {% if mongodb_major_version is version("4.0", ">=") -%}
 cloud:
   monitoring:
     free:
@@ -116,7 +116,7 @@ cloud:
   {{ item }}
   {% endfor %}
   {% endif %}
-{% endif %}
+{% endif %} #}
 
 {% if mongodb_set_parameters -%}
 setParameter:

ansible/roles/stack-sunbird/defaults/main.yml

@@ -268,6 +268,7 @@ service_env:
   ml-reports-service: ../../../../ansible/roles/stack-sunbird/templates/ml-reports-service.env
   ml-core-service: ../../../../ansible/roles/stack-sunbird/templates/ml-core-service.env
   ml-projects-service: ../../../../ansible/roles/stack-sunbird/templates/ml-projects-service.env
+  ml-analytics-service: ../../../../ansible/roles/stack-sunbird/templates/ml-analytics-service.conf
   inbound: ../../../../ansible/roles/stack-sunbird/templates/inbound.env
   outbound:
     - ../../../../ansible/roles/stack-sunbird/templates/outbound.env

ansible/roles/stack-sunbird/templates/analytics_api_service.conf

@@ -201,10 +201,10 @@ public {
   }
 }
 cloud_storage_type="{{cloud_service_provider}}"
-storage.key.config="{{cloud_public_storage_accountname}}"
-storage.secret.config="{{cloud_public_storage_secret}}"
-public.storage.key.config="{{cloud_public_storage_accountname}}"
-public.storage.secret.config="{{cloud_public_storage_secret}}"
+storage.key.config="cloud_storage_key"
+storage.secret.config="cloud_storage_secret"
+public.storage.key.config="public_cloud_storage_key"
+public.storage.secret.config="public_cloud_storage_secret"
 cloud_storage_endpoint_with_protocol="{{cloud_storage_url}}"
 metrics.time.interval.min=30
 cache.refresh.time.interval.min=1440