Merge pull request #91 from varshamahuli97/cbrelease-4.8.12

Fixed acbp-report-path config issue for enrolment report

ansible/roles/data-products-deploy/defaults/main.yml

@@ -132,7 +132,7 @@ report_user_enrolment_table: "report_user_enrolments"
 zip_reports_prefix_directory_path: "standalone-reports"
 zip_reports_destination_path: "standalone-reports/merged"
 zip_reports_password: "123456"
-directories_to_select: "blended-program-report-mdo,cbp-report-mdo-summary,course-report,cba-report,cbp-report-mdo-enrolment,user-report,user-enrollment-report,kcm-report"
+directories_to_select: "blended-program-report-mdo,cbp-report-mdo-summary,course-report,cba-report,cbp-report-mdo-enrolment,user-report,user-enrollment-report"
 
 analytics_job_list: '"wfs", "dashboard-sync", "assessment-metrics", "monitor-job-summ", "user-report-job", "survey-nps"'
 analytics_jobs_count: 6

ansible/roles/data-products-deploy/templates/model-config.j2

@@ -116,7 +116,7 @@ config() {
         echo '{"search":{"type":"none"},"model":"org.ekstep.analytics.dashboard.report.user.UserReportJob","modelParams":{"debug":"false","validation":"false","reportSyncEnable":"{{ operational_report_sync_enable }}","redisHost":"{{ dashboards_redis_host }}","redisPort":"{{ dashboards_redis_port }}","redisDB":"{{ dashboards_redis_db }}","sparkCassandraConnectionHost":"{{ core_cassandra_host }}","sparkDruidRouterHost":"{{ druid_router_host }}","sparkElasticsearchConnectionHost":"{{ single_node_es_host }}","fracBackendHost":"{{ dashboards_frac_backend_host }}","cassandraUserKeyspace":"{{ user_table_keyspace }}","cassandraCourseKeyspace":"{{ course_keyspace }}","cassandraHierarchyStoreKeyspace":"{{ hierarchy_store_keyspace }}","cassandraUserTable":"{{ dashboards_cassandra_user_table }}","cassandraUserRolesTable":"{{ dashboards_cassandra_user_roles_table }}","cassandraOrgTable":"{{ dashboards_cassandra_org_table }}","cassandraUserEnrolmentsTable":"{{ dashboards_cassandra_user_enrolments_table }}","cassandraContentHierarchyTable":"{{ dashboards_cassandra_content_hierarchy_table }}","cassandraRatingSummaryTable":"{{ dashboards_cassandra_rating_summary_table }}","cassandraRatingsTable":"{{ dashboards_cassandra_ratings_table }}","cassandraUserAssessmentTable":"{{ dashboards_cassandra_user_assessment_table }}","cassandraOrgHierarchyTable":"{{ dashboards_cassandra_org_hierarchy_table }}","cassandraCourseBatchTable":"{{ dashboards_cassandra_course_batch_table }}","cassandraLearnerStatsTable":"{{ dashboards_cassandra_learner_stats_table }}","appPostgresHost":"{{ app_postgres_host }}","appPostgresSchema":"sunbird","appPostgresUsername":"sunbird","appPostgresCredential":"sunbird","appOrgHierarchyTable":"org_hierarchy_v4","dwPostgresHost":"{{ dw_postgres_host }}","dwPostgresSchema":"warehouse","dwPostgresUsername":"postgres","dwPostgresCredential":"{{ dw_postgres_credential }}","dwUserTable":"user_detail","dwCourseTable":"content","dwEnrollmentsTable":"user_enrolments","dwOrgTable":"org_hierarchy","dwAssessmentTable":"assessment_detail","dwBPEnrollmentsTable":"bp_enrolments","key":"{{ dp_storage_key_config }}","secret":"{{ dp_storage_secret_config }}","store":"{{ report_storage_type }}","container":"{{ s3_storage_container }}","mdoIDs":"'$reportMDOIDs'","cutoffTime":"60.0","userReportPath":"{{ user_report_path }}","userEnrolmentReportPath":"{{ user_enrolment_report_path }}","courseReportPath":"{{ course_report_path }}","cbaReportPath":"{{ cba_report_path }}","standaloneAssessmentReportPath":"{{ standalone_assessment_report_path }}","taggedUsersPath":"{{ tagged_users_path }}","blendedReportPath":"{{ blended_report_path }}","sideOutput":{"brokerList":"'$brokerList'","compression":"{{ dashboards_broker_compression }}","topics":{"roleUserCount":"{{ dashboards_role_count_topic }}","orgRoleUserCount":"{{ dashboards_org_role_count_topic }}","allCourses":"{{ dashboards_courses_topic }}","userCourseProgramProgress":"{{ dashboards_user_course_program_progress_topic }}","fracCompetency":"{{ dashboards_frac_competency_topic }}","courseCompetency":"{{ dashboards_course_competency_topic }}","expectedCompetency":"{{ dashboards_expected_competency_topic }}","declaredCompetency":"{{ dashboards_declared_competency_topic }}","competencyGap":"{{ dashboards_competency_gap_topic }}","userOrg":"{{ dashboards_user_org_topic }}","org":"{{ dashboards_org_topic }}","userAssessment":"{{ dashboards_user_assessment_topic }}","assessment":"{{ dashboards_assessment_topic }}"}}},"output":[],"parallelization":16,"appName":"User Report","deviceMapping":false}'
         ;;
         "user-enrolment-report")
-        echo '{"search":{"type":"none"},"model":"org.ekstep.analytics.dashboard.report.enrolment.UserEnrolmentJob","modelParams":{"debug":"false","validation":"false","reportSyncEnable":"{{ operational_report_sync_enable }}","redisHost":"{{ dashboards_redis_host }}","redisPort":"{{ dashboards_redis_port }}","redisDB":"{{ dashboards_redis_db }}","sparkCassandraConnectionHost":"{{ core_cassandra_host }}","sparkDruidRouterHost":"{{ druid_router_host }}","sparkElasticsearchConnectionHost":"{{ single_node_es_host }}","fracBackendHost":"{{ dashboards_frac_backend_host }}","cassandraUserKeyspace":"{{ user_table_keyspace }}","cassandraCourseKeyspace":"{{ course_keyspace }}","cassandraHierarchyStoreKeyspace":"{{ hierarchy_store_keyspace }}","cassandraUserTable":"{{ dashboards_cassandra_user_table }}","cassandraUserRolesTable":"{{ dashboards_cassandra_user_roles_table }}","cassandraOrgTable":"{{ dashboards_cassandra_org_table }}","cassandraUserEnrolmentsTable":"{{ dashboards_cassandra_user_enrolments_table }}","cassandraContentHierarchyTable":"{{ dashboards_cassandra_content_hierarchy_table }}","cassandraRatingSummaryTable":"{{ dashboards_cassandra_rating_summary_table }}","cassandraRatingsTable":"{{ dashboards_cassandra_ratings_table }}","cassandraUserAssessmentTable":"{{ dashboards_cassandra_user_assessment_table }}","cassandraOrgHierarchyTable":"{{ dashboards_cassandra_org_hierarchy_table }}","cassandraCourseBatchTable":"{{ dashboards_cassandra_course_batch_table }}","cassandraLearnerStatsTable":"{{ dashboards_cassandra_learner_stats_table }}","appPostgresHost":"{{ app_postgres_host }}","appPostgresSchema":"sunbird","appPostgresUsername":"sunbird","appPostgresCredential":"sunbird","appOrgHierarchyTable":"org_hierarchy_v4","dwPostgresHost":"{{ dw_postgres_host }}","dwPostgresSchema":"warehouse","dwPostgresUsername":"postgres","dwPostgresCredential":"{{ dw_postgres_credential }}","dwUserTable":"user_detail","dwCourseTable":"content","dwEnrollmentsTable":"user_enrolments","dwOrgTable":"org_hierarchy","dwAssessmentTable":"assessment_detail","dwBPEnrollmentsTable":"bp_enrolments","key":"{{ dp_storage_key_config }}","secret":"{{ dp_storage_secret_config }}","store":"{{ report_storage_type }}","container":"{{ s3_storage_container }}","mdoIDs":"'$reportMDOIDs'","cutoffTime":"60.0","userReportPath":"{{ user_report_path }}","userEnrolmentReportPath":"{{ user_enrolment_report_path }}","courseReportPath":"{{ course_report_path }}","cbaReportPath":"{{ cba_report_path }}","standaloneAssessmentReportPath":"{{ standalone_assessment_report_path }}","taggedUsersPath":"{{ tagged_users_path }}","blendedReportPath":"{{ blended_report_path }}","sideOutput":{"brokerList":"'$brokerList'","compression":"{{ dashboards_broker_compression }}","topics":{"roleUserCount":"{{ dashboards_role_count_topic }}","orgRoleUserCount":"{{ dashboards_org_role_count_topic }}","allCourses":"{{ dashboards_courses_topic }}","userCourseProgramProgress":"{{ dashboards_user_course_program_progress_topic }}","fracCompetency":"{{ dashboards_frac_competency_topic }}","courseCompetency":"{{ dashboards_course_competency_topic }}","expectedCompetency":"{{ dashboards_expected_competency_topic }}","declaredCompetency":"{{ dashboards_declared_competency_topic }}","competencyGap":"{{ dashboards_competency_gap_topic }}","userOrg":"{{ dashboards_user_org_topic }}","org":"{{ dashboards_org_topic }}","userAssessment":"{{ dashboards_user_assessment_topic }}","assessment":"{{ dashboards_assessment_topic }}"}}},"output":[],"parallelization":16,"appName":"User Enrolment Report","deviceMapping":false}'
+        echo '{"search":{"type":"none"},"model":"org.ekstep.analytics.dashboard.report.enrolment.UserEnrolmentJob","modelParams":{"debug":"false","validation":"false","reportSyncEnable":"{{ operational_report_sync_enable }}","redisHost":"{{ dashboards_redis_host }}","redisPort":"{{ dashboards_redis_port }}","redisDB":"{{ dashboards_redis_db }}","sparkCassandraConnectionHost":"{{ core_cassandra_host }}","sparkDruidRouterHost":"{{ druid_router_host }}","sparkElasticsearchConnectionHost":"{{ single_node_es_host }}","fracBackendHost":"{{ dashboards_frac_backend_host }}","cassandraUserKeyspace":"{{ user_table_keyspace }}","cassandraCourseKeyspace":"{{ course_keyspace }}","cassandraHierarchyStoreKeyspace":"{{ hierarchy_store_keyspace }}","cassandraUserTable":"{{ dashboards_cassandra_user_table }}","cassandraUserRolesTable":"{{ dashboards_cassandra_user_roles_table }}","cassandraOrgTable":"{{ dashboards_cassandra_org_table }}","cassandraUserEnrolmentsTable":"{{ dashboards_cassandra_user_enrolments_table }}","cassandraContentHierarchyTable":"{{ dashboards_cassandra_content_hierarchy_table }}","cassandraRatingSummaryTable":"{{ dashboards_cassandra_rating_summary_table }}","cassandraRatingsTable":"{{ dashboards_cassandra_ratings_table }}","cassandraUserAssessmentTable":"{{ dashboards_cassandra_user_assessment_table }}","cassandraOrgHierarchyTable":"{{ dashboards_cassandra_org_hierarchy_table }}","cassandraCourseBatchTable":"{{ dashboards_cassandra_course_batch_table }}","cassandraLearnerStatsTable":"{{ dashboards_cassandra_learner_stats_table }}","appPostgresHost":"{{ app_postgres_host }}","appPostgresSchema":"sunbird","appPostgresUsername":"sunbird","appPostgresCredential":"sunbird","appOrgHierarchyTable":"org_hierarchy_v4","dwPostgresHost":"{{ dw_postgres_host }}","dwPostgresSchema":"warehouse","dwPostgresUsername":"postgres","dwPostgresCredential":"{{ dw_postgres_credential }}","dwUserTable":"user_detail","dwCourseTable":"content","dwEnrollmentsTable":"user_enrolments","dwOrgTable":"org_hierarchy","dwAssessmentTable":"assessment_detail","dwBPEnrollmentsTable":"bp_enrolments","key":"{{ dp_storage_key_config }}","secret":"{{ dp_storage_secret_config }}","store":"{{ report_storage_type }}","container":"{{ s3_storage_container }}","mdoIDs":"'$reportMDOIDs'","cutoffTime":"60.0","userReportPath":"{{ user_report_path }}","userEnrolmentReportPath":"{{ user_enrolment_report_path }}","courseReportPath":"{{ course_report_path }}","cbaReportPath":"{{ cba_report_path }}","standaloneAssessmentReportPath":"{{ standalone_assessment_report_path }}","taggedUsersPath":"{{ tagged_users_path }}","blendedReportPath":"{{ blended_report_path }}","acbpReportPath":"{{ acbp_report_path }}","sideOutput":{"brokerList":"'$brokerList'","compression":"{{ dashboards_broker_compression }}","topics":{"roleUserCount":"{{ dashboards_role_count_topic }}","orgRoleUserCount":"{{ dashboards_org_role_count_topic }}","allCourses":"{{ dashboards_courses_topic }}","userCourseProgramProgress":"{{ dashboards_user_course_program_progress_topic }}","fracCompetency":"{{ dashboards_frac_competency_topic }}","courseCompetency":"{{ dashboards_course_competency_topic }}","expectedCompetency":"{{ dashboards_expected_competency_topic }}","declaredCompetency":"{{ dashboards_declared_competency_topic }}","competencyGap":"{{ dashboards_competency_gap_topic }}","userOrg":"{{ dashboards_user_org_topic }}","org":"{{ dashboards_org_topic }}","userAssessment":"{{ dashboards_user_assessment_topic }}","assessment":"{{ dashboards_assessment_topic }}"}}},"output":[],"parallelization":16,"appName":"User Enrolment Report","deviceMapping":false}'
         ;;
         "course-report")
         echo '{"search":{"type":"none"},"model":"org.ekstep.analytics.dashboard.report.course.CourseReportJob","modelParams":{"debug":"false","validation":"false","reportSyncEnable":"{{ operational_report_sync_enable }}","redisHost":"{{ dashboards_redis_host }}","redisPort":"{{ dashboards_redis_port }}","redisDB":"{{ dashboards_redis_db }}","sparkCassandraConnectionHost":"{{ core_cassandra_host }}","sparkDruidRouterHost":"{{ druid_router_host }}","sparkElasticsearchConnectionHost":"{{ single_node_es_host }}","fracBackendHost":"{{ dashboards_frac_backend_host }}","cassandraUserKeyspace":"{{ user_table_keyspace }}","cassandraCourseKeyspace":"{{ course_keyspace }}","cassandraHierarchyStoreKeyspace":"{{ hierarchy_store_keyspace }}","cassandraUserTable":"{{ dashboards_cassandra_user_table }}","cassandraUserRolesTable":"{{ dashboards_cassandra_user_roles_table }}","cassandraOrgTable":"{{ dashboards_cassandra_org_table }}","cassandraUserEnrolmentsTable":"{{ dashboards_cassandra_user_enrolments_table }}","cassandraContentHierarchyTable":"{{ dashboards_cassandra_content_hierarchy_table }}","cassandraRatingSummaryTable":"{{ dashboards_cassandra_rating_summary_table }}","cassandraRatingsTable":"{{ dashboards_cassandra_ratings_table }}","cassandraUserAssessmentTable":"{{ dashboards_cassandra_user_assessment_table }}","cassandraOrgHierarchyTable":"{{ dashboards_cassandra_org_hierarchy_table }}","cassandraCourseBatchTable":"{{ dashboards_cassandra_course_batch_table }}","cassandraLearnerStatsTable":"{{ dashboards_cassandra_learner_stats_table }}","appPostgresHost":"{{ app_postgres_host }}","appPostgresSchema":"sunbird","appPostgresUsername":"sunbird","appPostgresCredential":"sunbird","appOrgHierarchyTable":"org_hierarchy_v4","dwPostgresHost":"{{ dw_postgres_host }}","dwPostgresSchema":"warehouse","dwPostgresUsername":"postgres","dwPostgresCredential":"{{ dw_postgres_credential }}","dwUserTable":"user_detail","dwCourseTable":"content","dwEnrollmentsTable":"user_enrolments","dwOrgTable":"org_hierarchy","dwAssessmentTable":"assessment_detail","dwBPEnrollmentsTable":"bp_enrolments","key":"{{ dp_storage_key_config }}","secret":"{{ dp_storage_secret_config }}","store":"{{ report_storage_type }}","container":"{{ s3_storage_container }}","mdoIDs":"'$reportMDOIDs'","cutoffTime":"60.0","userReportPath":"{{ user_report_path }}","userEnrolmentReportPath":"{{ user_enrolment_report_path }}","courseReportPath":"{{ course_report_path }}","cbaReportPath":"{{ cba_report_path }}","standaloneAssessmentReportPath":"{{ standalone_assessment_report_path }}","taggedUsersPath":"{{ tagged_users_path }}","blendedReportPath":"{{ blended_report_path }}","sideOutput":{"brokerList":"'$brokerList'","compression":"{{ dashboards_broker_compression }}","topics":{"roleUserCount":"{{ dashboards_role_count_topic }}","orgRoleUserCount":"{{ dashboards_org_role_count_topic }}","allCourses":"{{ dashboards_courses_topic }}","userCourseProgramProgress":"{{ dashboards_user_course_program_progress_topic }}","fracCompetency":"{{ dashboards_frac_competency_topic }}","courseCompetency":"{{ dashboards_course_competency_topic }}","expectedCompetency":"{{ dashboards_expected_competency_topic }}","declaredCompetency":"{{ dashboards_declared_competency_topic }}","competencyGap":"{{ dashboards_competency_gap_topic }}","userOrg":"{{ dashboards_user_org_topic }}","org":"{{ dashboards_org_topic }}","userAssessment":"{{ dashboards_user_assessment_topic }}","assessment":"{{ dashboards_assessment_topic }}"}}},"output":[],"parallelization":16,"appName":"Course Report","deviceMapping":false}'