From 2fead3ac5b8ee97a29502436c4030fa9c6cb4d95 Mon Sep 17 00:00:00 2001 From: anilgupta Date: Mon, 13 May 2024 11:36:53 +0530 Subject: [PATCH] Issue #LR-781 chore: Removed lern related jobs config. --- .../collection-summary-ingestion-spec.json | 251 ----------------- .../collection-summary-ingestion-spec.j2 | 256 ------------------ .../data-products-deploy/templates/run-job.j2 | 2 - 3 files changed, 509 deletions(-) delete mode 100644 ansible/roles/data-products-deploy/files/collection-summary-ingestion-spec.json delete mode 100644 ansible/roles/data-products-deploy/templates/collection-summary-ingestion-spec.j2 diff --git a/ansible/roles/data-products-deploy/files/collection-summary-ingestion-spec.json b/ansible/roles/data-products-deploy/files/collection-summary-ingestion-spec.json deleted file mode 100644 index 69e13196e2..0000000000 --- a/ansible/roles/data-products-deploy/files/collection-summary-ingestion-spec.json +++ /dev/null @@ -1,251 +0,0 @@ -{ - "type": "index", - "spec": { - "dataSchema": { - "dataSource": "collection-summary-snapshot", - "parser": { - "type": "string", - "parseSpec": { - "format": "json", - "flattenSpec": { - "useFieldDiscovery": false, - "fields": [ - { - "type": "root", - "name": "content_org", - "expr": "contentorg" - }, - { - "type": "root", - "name": "user_org", - "expr": "orgname" - }, - { - "type": "root", - "name": "batch_start_date", - "expr": "startdate" - }, - { - "type": "root", - "name": "batch_end_date", - "expr": "enddate" - }, - { - "type": "root", - "name": "has_certificate", - "expr": "hascertified" - }, - { - "type": "root", - "name": "collection_id", - "expr": "courseid" - }, - { - "type": "root", - "name": "batch_id", - "expr": "batchid" - }, - { - "type": "root", - "name": "collection_name", - "expr": "collectionname" - }, - { - "type": "root", - "name": "batch_name", - "expr": "batchname" - }, - { - "type": "root", - "name": "total_enrolment", - "expr": "enrolleduserscount" - }, - { - "type": "root", - "name": "total_completion", - "expr": "completionuserscount" - }, - { - "type": "root", - "name": "total_certificates_issued", - "expr": "certificateissuedcount" - }, - { - "type": "root", - "name": "content_status", - "expr": "contentstatus" - }, - { - "type": "root", - "name": "user_state", - "expr": "state" - }, - { - "type": "root", - "name": "user_district", - "expr": "district" - }, - { - "type": "root", - "name": "content_channel", - "expr": "channel" - }, - { - "type": "root", - "name": "keywords", - "expr": "keywords" - }, - { - "type": "root", - "name": "timestamp", - "expr": "timestamp" - }, - { - "type": "root", - "name": "medium", - "expr": "medium" - }, - { - "type": "root", - "name": "subject", - "expr": "subject" - }, - { - "type": "root", - "name": "created_for", - "expr": "createdfor" - }, - { - "type": "root", - "name": "user_type", - "expr": "usertype" - }, - { - "type": "root", - "name": "user_subtype", - "expr": "usersubtype" - } - ] - }, - "dimensionsSpec": { - "dimensions": [ - { - "name": "content_org" - }, - { - "name": "user_org" - }, - { - "type": "string", - "name": "batch_id" - }, - { - "type": "string", - "name": "batch_start_date" - }, - { - "type": "string", - "name": "batch_end_date" - }, - { - "type": "string", - "name": "collection_id" - }, - { - "type": "string", - "name": "collection_name" - }, - { - "type": "string", - "name": "batch_name" - }, - { - "type": "long", - "name": "total_enrolment" - }, - { - "type": "long", - "name": "total_completion" - }, - { - "type": "long", - "name": "total_certificates_issued" - }, - { - "type": "string", - "name": "content_status" - }, - { - "type": "string", - "name": "user_state" - }, - { - "type": "string", - "name": "user_district" - }, - { - "name": "keywords" - }, - { - "name": "has_certificate" - }, - { - "type": "string", - "name": "content_channel" - }, - { - "name": "medium" - }, - { - "name": "subject" - }, - { - "name": "created_for" - }, - { - "type": "string", - "name": "user_type" - }, - { - "type": "string", - "name": "user_subtype" - } - ], - "dimensionsExclusions": [] - }, - "timestampSpec": { - "column": "timestamp", - "format": "auto" - } - } - }, - "metricsSpec": [], - "granularitySpec": { - "type": "uniform", - "segmentGranularity": "day", - "queryGranularity": "none", - "rollup": true - } - }, - "ioConfig": { - "type": "index", - "firehose": { - "type": "static-azure-blobstore", - "blobs": [ - { - "container": "reports", - "path": "/collection-summary-reports-v2/collection-summary-report-latest.json" - } - ], - "fetchTimeout": 300000 - } - }, - "tuningConfig": { - "type": "index", - "targetPartitionSize": 5000000, - "maxRowsInMemory": 25000, - "forceExtendableShardSpecs": false, - "logParseExceptions": true - } - } -} \ No newline at end of file diff --git a/ansible/roles/data-products-deploy/templates/collection-summary-ingestion-spec.j2 b/ansible/roles/data-products-deploy/templates/collection-summary-ingestion-spec.j2 deleted file mode 100644 index 100724ced7..0000000000 --- a/ansible/roles/data-products-deploy/templates/collection-summary-ingestion-spec.j2 +++ /dev/null @@ -1,256 +0,0 @@ -{ - "type": "index", - "spec": { - "dataSchema": { - "dataSource": "collection-summary-snapshot", - "parser": { - "type": "string", - "parseSpec": { - "format": "json", - "flattenSpec": { - "useFieldDiscovery": false, - "fields": [ - { - "type": "root", - "name": "content_org", - "expr": "contentorg" - }, - { - "type": "root", - "name": "user_org", - "expr": "orgname" - }, - { - "type": "root", - "name": "batch_start_date", - "expr": "startdate" - }, - { - "type": "root", - "name": "batch_end_date", - "expr": "enddate" - }, - { - "type": "root", - "name": "has_certificate", - "expr": "hascertified" - }, - { - "type": "root", - "name": "collection_id", - "expr": "courseid" - }, - { - "type": "root", - "name": "batch_id", - "expr": "batchid" - }, - { - "type": "root", - "name": "collection_name", - "expr": "collectionname" - }, - { - "type": "root", - "name": "batch_name", - "expr": "batchname" - }, - { - "type": "root", - "name": "total_enrolment", - "expr": "enrolleduserscount" - }, - { - "type": "root", - "name": "total_completion", - "expr": "completionuserscount" - }, - { - "type": "root", - "name": "total_certificates_issued", - "expr": "certificateissuedcount" - }, - { - "type": "root", - "name": "content_status", - "expr": "contentstatus" - }, - { - "type": "root", - "name": "user_state", - "expr": "state" - }, - { - "type": "root", - "name": "user_district", - "expr": "district" - }, - { - "type": "root", - "name": "content_channel", - "expr": "channel" - }, - { - "type": "root", - "name": "keywords", - "expr": "keywords" - }, - { - "type": "root", - "name": "timestamp", - "expr": "timestamp" - }, - { - "type": "root", - "name": "medium", - "expr": "medium" - }, - { - "type": "root", - "name": "subject", - "expr": "subject" - }, - { - "type": "root", - "name": "created_for", - "expr": "createdfor" - }, - { - "type": "root", - "name": "user_type", - "expr": "usertype" - }, - { - "type": "root", - "name": "user_subtype", - "expr": "usersubtype" - } - ] - }, - "dimensionsSpec": { - "dimensions": [ - { - "name": "content_org" - }, - { - "name": "user_org" - }, - { - "type": "string", - "name": "batch_id" - }, - { - "type": "string", - "name": "batch_start_date" - }, - { - "type": "string", - "name": "batch_end_date" - }, - { - "type": "string", - "name": "collection_id" - }, - { - "type": "string", - "name": "collection_name" - }, - { - "type": "string", - "name": "batch_name" - }, - { - "type": "long", - "name": "total_enrolment" - }, - { - "type": "long", - "name": "total_completion" - }, - { - "type": "long", - "name": "total_certificates_issued" - }, - { - "type": "string", - "name": "content_status" - }, - { - "type": "string", - "name": "user_state" - }, - { - "type": "string", - "name": "user_district" - }, - { - "name": "keywords" - }, - { - "name": "has_certificate" - }, - { - "type": "string", - "name": "content_channel" - }, - { - "name": "medium" - }, - { - "name": "subject" - }, - { - "name": "created_for" - }, - { - "type": "string", - "name": "user_type" - }, - { - "type": "string", - "name": "user_subtype" - } - ], - "dimensionsExclusions": [] - }, - "timestampSpec": { - "column": "timestamp", - "format": "auto" - } - } - }, - "metricsSpec": [], - "granularitySpec": { - "type": "uniform", - "segmentGranularity": "day", - "queryGranularity": "none", - "rollup": true - } - }, - "ioConfig": { - "type": "index", - "firehose": { -{% if cloud_service_provider == "azure" %} - "type": "static-azure-blobstore", - "blobs": [ - { - "container": "{{reports_container}}", - "path": "/collection-summary-reports-v2/collection-summary-report-latest.json" - } - ], -{% elif (cloud_service_provider == "oci") %} - "type": "static-s3", - "uris": [ "s3://{{reports_container}}/sourcing/SourcingSummaryReport.json"], -{% endif %} - "fetchTimeout": 300000 - } - }, - "tuningConfig": { - "type": "index", - "targetPartitionSize": 5000000, - "maxRowsInMemory": 25000, - "forceExtendableShardSpecs": false, - "logParseExceptions": true - } - } -} \ No newline at end of file diff --git a/ansible/roles/data-products-deploy/templates/run-job.j2 b/ansible/roles/data-products-deploy/templates/run-job.j2 index f61419e4bc..0de472f2d3 100644 --- a/ansible/roles/data-products-deploy/templates/run-job.j2 +++ b/ansible/roles/data-products-deploy/templates/run-job.j2 @@ -22,8 +22,6 @@ get_report_job_model_name(){ ;; "program-collection-summary-report") echo 'org.sunbird.analytics.job.report.CollectionSummaryJob' ;; - "collection-summary-report-v2") echo 'org.sunbird.analytics.job.report.CollectionSummaryJobV2' - ;; "assessment-score-metric-correction") echo 'org.sunbird.analytics.audit.AssessmentScoreCorrectionJob' ;; "collection-reconciliation-job") echo 'org.sunbird.analytics.audit.CollectionReconciliationJob'