Merge pull request #122 from Sunbird-cQube/staging

Merging changes from staging to v5.0.3-nvsk
Sunbird-cQube · Oct 24, 2023 · c82b764 · c82b764
2 parents 7c15940 + 0097df8
commit c82b764
Show file tree

Hide file tree

Showing 59 changed files with 255 additions and 136 deletions.
diff --git a/impl/c-qube/ingest/NVSK/config.json b/impl/c-qube/ingest/NVSK/config.json
@@ -204,8 +204,49 @@
         ],
         "blacklisted": []
       }
+    },
+    {
+      "name": "PM SHRI",
+      "namespace": "pm_shri",
+      "description": "pm_shri",
+      "shouldIngestToDB": true,
+      "input": {
+        "files": "./ingest/NVSK/programs/pm-shri"
+      },
+      "./output": {
+        "location": "./output/programs/pm-shri"
+      },
+      "dimensions": {
+        "whitelisted": [
+          "state,categorypmshri"
+        ],
+        "blacklisted": []
+      }
+    },
+    {
+      "name": "Telemetry",
+      "namespace": "telemetry",
+      "description": "Telemetry",
+      "shouldIngestToDB": true,
+      "input": {
+        "files": "./ingest/NVSK/programs/telemetry"
+      },
+      "./output": {
+        "location": "./output/programs/telemetry"
+      },
+      "dimensions": {
+        "whitelisted": [
+          "users,pagenames",
+          "users,devices",
+          "users,browsers",
+          "users,pageevents,pagenames",
+          "pagenames,pageevents"
+        ],
+        "blacklisted": []
+      }
     }
-
   ]
 }
 
+
+
diff --git a/impl/c-qube/ingest/NVSK/dimensions/browsers-dimension.grammar.csv b/impl/c-qube/ingest/NVSK/dimensions/browsers-dimension.grammar.csv
@@ -0,0 +1,3 @@
+Index
+string
+browserName
diff --git a/impl/c-qube/ingest/NVSK/dimensions/categorypmshri-dimension.grammar.csv b/impl/c-qube/ingest/NVSK/dimensions/categorypmshri-dimension.grammar.csv
@@ -0,0 +1,3 @@
+PK,Index
+string,string
+category_id,category_name
diff --git a/impl/c-qube/ingest/NVSK/dimensions/devices-dimension.grammar.csv b/impl/c-qube/ingest/NVSK/dimensions/devices-dimension.grammar.csv
@@ -0,0 +1,3 @@
+Index
+string
+deviceName
diff --git a/impl/c-qube/ingest/NVSK/dimensions/pageevents-dimension.grammar.csv b/impl/c-qube/ingest/NVSK/dimensions/pageevents-dimension.grammar.csv
@@ -0,0 +1,3 @@
+Index
+string
+pageEvent
diff --git a/impl/c-qube/ingest/NVSK/dimensions/pagenames-dimension.grammar.csv b/impl/c-qube/ingest/NVSK/dimensions/pagenames-dimension.grammar.csv
@@ -0,0 +1,3 @@
+Index
+string
+pageName
diff --git a/impl/c-qube/ingest/NVSK/dimensions/users-dimension.grammar.csv b/impl/c-qube/ingest/NVSK/dimensions/users-dimension.grammar.csv
@@ -0,0 +1,3 @@
+Index
+string
+userId
diff --git a/impl/c-qube/ingest/NVSK/programs/diksha/totalplays-event.grammar.csv b/impl/c-qube/ingest/NVSK/programs/diksha/totalplays-event.grammar.csv
@@ -1,5 +1,5 @@
-state,grade,subject,medium,
-state_id,grade,subject,medium,
-string,string,string,string,integer
-state_id,grade,subject,medium,total_no_of_plays
+state,grade,subject,medium,
+state_id,grade,subject,medium,
+string,string,string,string,integer
+state_id,grade,subject,medium,total_no_of_plays
 dimension,dimension,dimension,dimension,metric
diff --git a/impl/c-qube/ingest/NVSK/programs/pm-shri/pm_shri_category-event.grammar.csv b/impl/c-qube/ingest/NVSK/programs/pm-shri/pm_shri_category-event.grammar.csv
@@ -0,0 +1,5 @@
+state,categorypmshri,
+state_id,category_name,	
+string,string,integer
+state_id,category_name,category_value
+dimension,dimension,metric
diff --git a/impl/c-qube/ingest/NVSK/programs/pm-shri/programstarted-event.grammar.csv b/impl/c-qube/ingest/NVSK/programs/pm-shri/programstarted-event.grammar.csv
@@ -0,0 +1,5 @@
+state,
+state_id,	
+string,integer
+state_id,started
+dimension,metric
diff --git a/impl/c-qube/ingest/NVSK/programs/pm-shri/schools-event.grammar.csv b/impl/c-qube/ingest/NVSK/programs/pm-shri/schools-event.grammar.csv
@@ -0,0 +1,5 @@
+state,
+state_id,
+string,
+state_id,total_schools
+dimension,metric
diff --git a/impl/c-qube/ingest/NVSK/programs/pm-shri/totalboys-event.grammar.csv b/impl/c-qube/ingest/NVSK/programs/pm-shri/totalboys-event.grammar.csv
@@ -0,0 +1,5 @@
+state,
+state_id,
+string,
+state_id,total_boys_in_schools
+dimension,metric
diff --git a/impl/c-qube/ingest/NVSK/programs/pm-shri/totalgirls-event.grammar.csv b/impl/c-qube/ingest/NVSK/programs/pm-shri/totalgirls-event.grammar.csv
@@ -0,0 +1,5 @@
+state,
+state_id,
+string,
+state_id,total_girls_in_schools
+dimension,metric
diff --git a/impl/c-qube/ingest/NVSK/programs/telemetry/browserscount-event.grammar.csv b/impl/c-qube/ingest/NVSK/programs/telemetry/browserscount-event.grammar.csv
@@ -0,0 +1,5 @@
+,users,browsers,
+,userId,browserName,
+date,string,string,integer
+date,userId,browserName,browserCount
+timeDimension,dimension,dimension,metric
diff --git a/impl/c-qube/ingest/NVSK/programs/telemetry/devicescount-event.grammar.csv b/impl/c-qube/ingest/NVSK/programs/telemetry/devicescount-event.grammar.csv
@@ -0,0 +1,5 @@
+,users,devices,
+,userId,deviceName,
+date,string,string,integer
+date,userId,deviceName,deviceCount
+timeDimension,dimension,dimension,metric
diff --git a/impl/c-qube/ingest/NVSK/programs/telemetry/pageeventcount-event.grammar.csv b/impl/c-qube/ingest/NVSK/programs/telemetry/pageeventcount-event.grammar.csv
@@ -0,0 +1,5 @@
+,users,pagenames,pageevents,
+,userId,pageName,pageEvent,
+date,string,string,string,integer
+date,userId,pageName,pageEvent,pageEventCount
+timeDimension,dimension,dimension,dimension,metric
diff --git a/impl/c-qube/ingest/NVSK/programs/telemetry/pagenamecount-event.grammar.csv b/impl/c-qube/ingest/NVSK/programs/telemetry/pagenamecount-event.grammar.csv
@@ -0,0 +1,5 @@
+,pagenames,pageevents,
+,pageName,pageEvent,
+date,string,string,integer
+date,pageName,pageEvent,pageCount
+timeDimension,dimension,dimension,metric
diff --git a/impl/c-qube/ingest/NVSK/programs/telemetry/timespent-event.grammar.csv b/impl/c-qube/ingest/NVSK/programs/telemetry/timespent-event.grammar.csv
@@ -0,0 +1,5 @@
+,users,pagenames,
+,userId,pageName,
+date,string,string,integer
+date,userId,pageName,timespent
+timeDimension,dimension,dimension,metric
diff --git a/impl/c-qube/ingest/NVSK/programs/telemetry/usercount-event.grammar.csv b/impl/c-qube/ingest/NVSK/programs/telemetry/usercount-event.grammar.csv
@@ -0,0 +1,5 @@
+,users,
+,userId,
+date,string,integer
+date,userId,userCount
+timeDimension,dimension,metric
diff --git a/impl/c-qube/ingest/VSK/config.json b/impl/c-qube/ingest/VSK/config.json
@@ -138,18 +138,36 @@
       },
       "dimensions": {
         "whitelisted": [
-          "state,district,programnishtha",
-          "state,programnishtha,coursenishtha",
-          "state,programnishtha",
+          "district,programnishtha,programstatusnishtha",
+          "district,programnishtha,coursenishtha",
           "district,programnishtha",
-	        "coursenishtha,programnishtha"
+          "district,programnishtha,languagenishtha",
+          "programnishtha,coursenishtha"   
+        ],
+        "blacklisted": []
+      }
+    },
+    {
+      "name": "Telemetry",
+      "namespace": "telemetry",
+      "description": "Telemetry",
+      "shouldIngestToDB": true,
+      "input": {
+        "files": "./ingest/VSK/programs/telemetry"
+      },
+      "./output": {
+        "location": "./output/programs/telemetry"
+      },
+      "dimensions": {
+        "whitelisted": [
+          "users,pagenames",
+          "users,devices",
+          "users,browsers",
+          "users,pageevents,pagenames",
+          "pagenames,pageevents"
         ],
         "blacklisted": []
       }
     }
-
-
-
-
   ]
 }
diff --git a/impl/c-qube/ingest/VSK/dimensions/browsers-dimension.grammar.csv b/impl/c-qube/ingest/VSK/dimensions/browsers-dimension.grammar.csv
@@ -0,0 +1,3 @@
+Index
+string
+browserName
diff --git a/impl/c-qube/ingest/VSK/dimensions/devices-dimension.grammar.csv b/impl/c-qube/ingest/VSK/dimensions/devices-dimension.grammar.csv
@@ -0,0 +1,3 @@
+Index
+string
+deviceName
diff --git a/impl/c-qube/ingest/VSK/dimensions/languagenishtha-dimension.grammar.csv b/impl/c-qube/ingest/VSK/dimensions/languagenishtha-dimension.grammar.csv
@@ -0,0 +1,3 @@
+PK,Index
+string,string
+language_id,language
diff --git a/impl/c-qube/ingest/VSK/dimensions/pageevents-dimension.grammar.csv b/impl/c-qube/ingest/VSK/dimensions/pageevents-dimension.grammar.csv
@@ -0,0 +1,3 @@
+Index
+string
+pageEvent
diff --git a/impl/c-qube/ingest/VSK/dimensions/pagenames-dimension.grammar.csv b/impl/c-qube/ingest/VSK/dimensions/pagenames-dimension.grammar.csv
@@ -0,0 +1,3 @@
+Index
+string
+pageName
diff --git a/impl/c-qube/ingest/VSK/dimensions/programstatusnishtha-dimension.grammar.csv b/impl/c-qube/ingest/VSK/dimensions/programstatusnishtha-dimension.grammar.csv
@@ -0,0 +1,3 @@
+PK,Index
+string,string
+program_status_id,program_status
diff --git a/impl/c-qube/ingest/VSK/dimensions/users-dimension.grammar.csv b/impl/c-qube/ingest/VSK/dimensions/users-dimension.grammar.csv
@@ -0,0 +1,3 @@
+Index
+string
+userId
diff --git a/impl/c-qube/ingest/VSK/programs/nishtha/achievedcertificates-event.grammar.csv b/impl/c-qube/ingest/VSK/programs/nishtha/achievedcertificates-event.grammar.csv
diff --git a/impl/c-qube/ingest/VSK/programs/nishtha/achievedcertification-event.grammar.csv b/impl/c-qube/ingest/VSK/programs/nishtha/achievedcertification-event.grammar.csv
@@ -0,0 +1,5 @@
+state,programnishtha,
+state_id,program_name,
+string,string,integer
+state_id,program_name,total_certifications_achieved
+dimension,dimension,metric
diff --git a/impl/c-qube/ingest/VSK/programs/nishtha/achievedenrolment-event.grammar.csv b/impl/c-qube/ingest/VSK/programs/nishtha/achievedenrolment-event.grammar.csv
diff --git a/impl/c-qube/ingest/VSK/programs/nishtha/consumptioncertification-event.grammar.csv b/impl/c-qube/ingest/VSK/programs/nishtha/consumptioncertification-event.grammar.csv
diff --git a/impl/c-qube/ingest/VSK/programs/nishtha/consumptioncompletion-event.grammar.csv b/impl/c-qube/ingest/VSK/programs/nishtha/consumptioncompletion-event.grammar.csv
diff --git a/impl/c-qube/ingest/VSK/programs/nishtha/consumptionenrolment-event.grammar.csv b/impl/c-qube/ingest/VSK/programs/nishtha/consumptionenrolment-event.grammar.csv
diff --git a/impl/c-qube/ingest/VSK/programs/nishtha/consumptionperccertification-event.grammar.csv b/impl/c-qube/ingest/VSK/programs/nishtha/consumptionperccertification-event.grammar.csv
diff --git a/impl/c-qube/ingest/VSK/programs/nishtha/coursecertification-event.grammar.csv b/impl/c-qube/ingest/VSK/programs/nishtha/coursecertification-event.grammar.csv
diff --git a/impl/c-qube/ingest/VSK/programs/nishtha/coursecompletion-event.grammar.csv b/impl/c-qube/ingest/VSK/programs/nishtha/coursecompletion-event.grammar.csv
diff --git a/impl/c-qube/ingest/VSK/programs/nishtha/courseenrolment-event.grammar.csv b/impl/c-qube/ingest/VSK/programs/nishtha/courseenrolment-event.grammar.csv
diff --git a/impl/c-qube/ingest/VSK/programs/nishtha/doe-event.grammar.csv b/impl/c-qube/ingest/VSK/programs/nishtha/doe-event.grammar.csv
diff --git a/impl/c-qube/ingest/VSK/programs/nishtha/expectedcertification-event.grammar.csv b/impl/c-qube/ingest/VSK/programs/nishtha/expectedcertification-event.grammar.csv
diff --git a/impl/c-qube/ingest/VSK/programs/nishtha/expectedenrolment-event.grammar.csv b/impl/c-qube/ingest/VSK/programs/nishtha/expectedenrolment-event.grammar.csv
diff --git a/impl/c-qube/ingest/VSK/programs/nishtha/localbody-event.grammar.csv b/impl/c-qube/ingest/VSK/programs/nishtha/localbody-event.grammar.csv
diff --git a/impl/c-qube/ingest/VSK/programs/nishtha/mediumtotalcourses-event.grammar.csv b/impl/c-qube/ingest/VSK/programs/nishtha/mediumtotalcourses-event.grammar.csv
diff --git a/impl/c-qube/ingest/VSK/programs/nishtha/programstarted-event.grammar.csv b/impl/c-qube/ingest/VSK/programs/nishtha/programstarted-event.grammar.csv
@@ -1,5 +1,5 @@
-state,programnishtha,
-state_id,program_name,
-string,string,integer
-state_id,program_name,started
-dimension,dimension,metric
+state,programnishtha,programstatusnishtha,
+state_id,program_name,program_status,
+string,string,string,integer
+state_id,program_name,program_status,started
+dimension,dimension,dimension,metric
diff --git a/impl/c-qube/ingest/VSK/programs/nishtha/targetremainingcertificates-event.grammar.csv b/impl/c-qube/ingest/VSK/programs/nishtha/targetremainingcertificates-event.grammar.csv
diff --git a/impl/c-qube/ingest/VSK/programs/nishtha/targetremainingenrolment-event.grammar.csv b/impl/c-qube/ingest/VSK/programs/nishtha/targetremainingenrolment-event.grammar.csv
diff --git a/impl/c-qube/ingest/VSK/programs/nishtha/totalcertificatesissued-event.grammar.csv b/impl/c-qube/ingest/VSK/programs/nishtha/totalcertificatesissued-event.grammar.csv
diff --git a/impl/c-qube/ingest/VSK/programs/nishtha/totalcertification-event.grammar.csv b/impl/c-qube/ingest/VSK/programs/nishtha/totalcertification-event.grammar.csv
@@ -0,0 +1,5 @@
+programnishtha,coursenishtha,
+program_name,course_name,
+string,string,integer
+program_name,course_name,total_certification
+dimension,dimension,metric
diff --git a/impl/c-qube/ingest/VSK/programs/nishtha/totalcompletion-event.grammar.csv b/impl/c-qube/ingest/VSK/programs/nishtha/totalcompletion-event.grammar.csv
-Original file line number
+Diff line change
@@ -0,0 +1,3 @@
+    Index
+    string
+    userId