Issue #KN-439 merge: merging from release-5.2.0-knowlg to release-5.2.0

ansible/inventory/env/group_vars/all.yml

@@ -85,8 +85,8 @@ search_es7_host: "{{ groups['es7']|join(':9200,')}}:9200"
 
 mlworkbench: "{{ groups['mlworkbench'][0]}}"
 
-azure_account: "{{ sunbird_public_storage_account_name }}"
-azure_secret: "{{ sunbird_public_storage_account_key }}"
+azure_account: "{{ cloud_public_storage_accountname }}"
+azure_secret: "{{ cloud_public_storage_secret }}"
 dedup_redis_host: "{{ dp_redis_host }}"
 kp_redis_host: "{{ groups['redisall'][0] }}"
 neo4j_route_path: "bolt://{{ groups['learning-neo4j-node1'][0] }}:7687"

ansible/roles/lp-synctool-deploy/defaults/main.yml

@@ -27,4 +27,5 @@ cloud_store: azure
 azure_public_container: 
 azure_account_name:
 
-csp_migration_batch_size: 100
\ No newline at end of file
+csp_migration_batch_size: 100
+csp_migration_topic_name: "{{ env }}.csp.migration.job.request"

ansible/roles/lp-synctool-deploy/templates/application.conf.j2

@@ -116,5 +116,5 @@ contentTypeToPrimaryCategory {
   CourseUnit: "Course Unit"
   TextBookUnit: "Textbook Unit"
 }
-csp.migration.request.topic="{{ env }}.csp.migration.job.request"
+csp.migration.request.topic="{{ csp_migration_topic_name }}"
 csp.migration.batch.size={{ csp_migration_batch_size }}
\ No newline at end of file

ansible/roles/setup-kafka/defaults/main.yml

@@ -144,7 +144,10 @@ processing_kafka_topics:
   - name: republish.job.request
     num_of_partitions: 1
     replication_factor: 1
-  - name: assessment.republish.request
+  - name: cassandra.data.migration.request
+    num_of_partitions: 1
+    replication_factor: 1
+  - name: cassandra.data.migration.job.request.failed
     num_of_partitions: 1
     replication_factor: 1
 
@@ -285,7 +288,9 @@ processing_kafka_overriden_topics:
   - name: republish.job.request
     retention_time: 1209600000
     replication_factor: 1
-  - name: assessment.republish.request
+  - name: cassandra.data.migration.request
+    retention_time: 1209600000
+    replication_factor: 1
+  - name: cassandra.data.migration.job.request.failed
     retention_time: 1209600000
     replication_factor: 1
-

kubernetes/ansible/roles/flink-jobs-deploy/defaults/main.yml

@@ -286,6 +286,13 @@ flink_job_names:
     taskmanager_memory: 1024m
     taskslots: 1
     cpu_requests: 0.3
+  cassandra-data-migration:
+    job_class_name: 'org.sunbird.job.task.CassandraDataMigrationStreamTask'
+    replica: 1
+    jobmanager_memory: 1024m
+    taskmanager_memory: 1024m
+    taskslots: 1
+    cpu_requests: 0.3
 
 ### Global vars
 middleware_course_keyspace: "sunbird_courses"
@@ -299,6 +306,11 @@ composite_search_indexer_parallelism: 1
 dialcode_external_indexer_parallelism: 1
 dialcode_metric_indexer_parallelism: 1
 schema_definition_cache_expiry_in_sec: 14400
+search_indexer_topic_name: "{{ env_name }}.learning.graph.events"
+search_indexer_failed_topic_name: "{{ env_name }}.learning.events.failed"
+search_indexer_group_name: "{{ env_name }}-search-indexer-group"
+search_indexer_es_index_name: "{{ compositesearch_index_name }}"
+dialcode_es_index_name: "dialcode"
 search_indexer_ignored_fields: ["responseDeclaration", "body", "options", "lastStatusChangedOn", "SYS_INTERNAL_LAST_UPDATED_ON", "sYS_INTERNAL_LAST_UPDATED_ON","branchingLogic"]
 search_indexer_restrict_object_types: ["EventSet", "EventSetImage", "Event", "EventImage", "Questionnaire", "Misconception", "FrameworkType", "Concept", "Misconception", "Language", "Reference", "Dimension", "Method", "Library", "Domain", "Api"]
 
@@ -376,3 +388,15 @@ csp_migrator_timer_duration: 1800
 csp_migrator_max_retries: 10
 csp_migrator_consumer_parallelism: 1
 csp_migrator_cassandra_parallelism: 1
+csp_migration_topic_name: "{{ env_name }}.csp.migration.job.request"
+csp_migrator_group_name: "{{ env_name }}-csp-migrator-group"
+csp_migrator_failed_topic_name: "{{ env_name }}.csp.migration.job.request.failed"
+question_republish_topic_name: "{{ env_name }}.assessment.republish.request"
+content_republish_topic_name: "{{ env_name }}.republish.job.request"
+video_stream_topic_name: "{{ env_name }}.live.video.stream.request"
+content_hierarchy_keyspace_name: "{{ hierarchy_keyspace_name }}"
+questionset_hierarchy_keyspace_name: "{{ hierarchy_keyspace_name }}"
+
+cloudstorage_relative_path_prefix_content: "CLOUD_STORAGE_BASE_PATH"
+cloudstorage_relative_path_prefix_dial: "DIAL_STORAGE_BASE_PATH"
+cloudstorage_metadata_list: '["appIcon", "artifactUrl", "posterImage", "previewUrl", "thumbnail", "assetsMap", "certTemplate", "itemSetPreviewUrl", "grayScaleAppIcon", "sourceURL", "variants", "downloadUrl", "streamingUrl", "toc_url", "data", "question", "solutions", "editorState", "media", "pdfUrl"]'
\ No newline at end of file

pom.xml

@@ -29,7 +29,7 @@
 				<module>platform-core</module>
 				<module>platform-modules</module>
 				<module>platform-tools/spikes/sync-tool</module>
-				<module>platform-tools/cassandra-extension</module>
+<!--				<module>platform-tools/cassandra-extension</module>-->
 				<module>platform-tools/spikes/content-tool</module>
 			</modules>
 		</profile>