Sunbird-Obsrv
diff --git a/‎.github/workflows/build_and_deploy.yaml‎
Lines changed: 1 addition & 1 deletion b/‎.github/workflows/build_and_deploy.yaml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎api-service/package.json‎
Lines changed: 4 additions & 0 deletions b/‎api-service/package.json‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎api-service/postman-collection/Obsrv API Service.postman_collection_v2.json‎
Lines changed: 0 additions & 1882 deletions b/‎api-service/postman-collection/Obsrv API Service.postman_collection_v2.json‎
Lines changed: 0 additions & 1882 deletions
diff --git a/‎api-service/postman-collection/updated_v2_collection.json‎ renamed to ‎api-service/postman-collection/Obsrv v2 apis.postman_collection.json‎
Lines changed: 3113 additions & 514 deletions b/‎api-service/postman-collection/updated_v2_collection.json‎ renamed to ‎api-service/postman-collection/Obsrv v2 apis.postman_collection.json‎
Lines changed: 3113 additions & 514 deletions
diff --git a/‎api-service/src/app.ts‎
Lines changed: 1 addition & 1 deletion b/‎api-service/src/app.ts‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎api-service/src/configs/Config.ts‎
Lines changed: 3 additions & 1 deletion b/‎api-service/src/configs/Config.ts‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎api-service/src/configs/IngestionConfig.ts‎
Lines changed: 29 additions & 0 deletions b/‎api-service/src/configs/IngestionConfig.ts‎
Lines changed: 29 additions & 0 deletions
diff --git a/‎api-service/src/connections/commandServiceConnection.ts‎
Lines changed: 4 additions & 0 deletions b/‎api-service/src/connections/commandServiceConnection.ts‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎api-service/src/controllers/Alerts/Alerts.ts‎
Lines changed: 13 additions & 3 deletions b/‎api-service/src/controllers/Alerts/Alerts.ts‎
Lines changed: 13 additions & 3 deletions
diff --git a/‎api-service/src/controllers/Alerts/Silence.ts‎
Lines changed: 6 additions & 1 deletion b/‎api-service/src/controllers/Alerts/Silence.ts‎
Lines changed: 6 additions & 1 deletion
@@ -43,7 +43,7 @@ jobs:
           context: ./command-service
           platforms: linux/amd64  
           push: true
-          tags: ${{ vars.DOCKERHUB_USERNAME }}/flink-command-service:${{ github.ref_name }}
+          tags: ${{ vars.DOCKERHUB_USERNAME }}/obsrv-command-service:${{ github.ref_name }}
 
   aws-deploy:
     needs: [build-api-service-image, build-command-service-image]
 
@@ -28,11 +28,13 @@
     "aws-sdk": "^2.1348.0",
     "axios": "^1.6.0",
     "body-parser": "^1.20.2",
+    "busboy": "^1.6.0",
     "compression": "^1.7.4",
     "dateformat": "2.0.0",
     "express": "^5.0.0-beta.3",
     "http-errors": "^2.0.0",
     "http-status": "^1.5.3",
+    "jsonwebtoken": "^9.0.1",
     "kafka-node": "^5.0.0",
     "kafkajs": "^2.2.4",
     "kafkajs-snappy": "^1.1.0",
@@ -59,12 +61,14 @@
     "@babel/traverse": "7.23.2"
   },
   "devDependencies": {
+    "@types/busboy": "^1.5.4",
     "@types/chai": "^4.3.3",
     "@types/chai-as-promised": "^7.1.5",
     "@types/chai-spies": "^1.0.3",
     "@types/compression": "^1.7.2",
     "@types/express": "^4.17.14",
     "@types/http-errors": "^2.0.1",
+    "@types/jsonwebtoken": "^9.0.6",
     "@types/kafkajs": "^1.9.0",
     "@types/knex": "^0.16.1",
     "@types/lodash": "^4.14.190",
 
@@ -22,7 +22,7 @@ app.use("/v2/", v2Router);
 app.use("/", druidProxyRouter);
 app.use("/alerts/v1", alertsRouter);
 app.use("/", metricRouter);
-app.use("*", ResponseHandler.routeNotFound);
+app.use(/(.*)/, ResponseHandler.routeNotFound);
 app.use(obsrvErrorHandler);
 
 app.listen(config.api_port, () => {
 
@@ -112,5 +112,7 @@ export const config = {
     "dialect": process.env.dialet || "postgres",
     "url": process.env.grafana_url || "http://localhost:8000",
     "access_token": process.env.grafana_token || ""
-  }
+  },
+  "user_token_public_key": process.env.user_token_public_key || "",
+  "is_RBAC_enabled": process.env.is_rbac_enabled || "false",
 }
@@ -54,6 +54,13 @@ export const rawIngestionSpecDefaults = {
         "type": "text",
         "expr": "$.obsrv_meta.syncts"
     },
+    "hudiSynctsField": {
+        "name": "obsrv_meta_syncts",
+        "arrival_format": "text",
+        "data_type": "date",
+        "type": "text",
+        "expr": "$.obsrv_meta.syncts"
+    },
     "dimensions": [
         {
             "type": "string",
@@ -64,6 +71,16 @@ export const rawIngestionSpecDefaults = {
             "name": "obsrv.meta.source.id"
         }
     ],
+    "hudi_dimensions": [
+        {
+            "type": "string",
+            "name": "obsrv_meta_source_connector"
+        },
+        {
+            "type": "string",
+            "name": "obsrv_meta_source_id"
+        }
+    ],
     "flattenSpec": [
         {
             "type": "path",
@@ -75,5 +92,17 @@ export const rawIngestionSpecDefaults = {
             "expr": "$.obsrv_meta.source.connectorInstance",
             "name": "obsrv.meta.source.id"
         }
+    ],
+    "hudi_flattenSpec": [
+        {
+            "type": "path",
+            "expr": "$.obsrv_meta.source.connector",
+            "name": "obsrv_meta_source_connector"
+        },
+        {
+            "type": "path",
+            "expr": "$.obsrv_meta.source.connectorInstance",
+            "name": "obsrv_meta_source_id"
+        }
     ]
 }
@@ -18,4 +18,8 @@ export const executeCommand = async (id: string, command: string) => {
         }
     }
     return commandHttpService.post(commandPath, payload)
+}
+
+export const registerConnector = async (requestBody: any) => {
+    return commandHttpService.post("/connector/v1/register", requestBody)
 }
@@ -13,6 +13,9 @@ const telemetryObject = { type: "alert", ver: "1.0.0" };
 const createAlertHandler = async (req: Request, res: Response, next: NextFunction) => {
   try {
     const alertPayload = getAlertPayload(req.body);
+    const userID = (req as any)?.userID;
+    _.set(alertPayload, "created_by", userID);
+    _.set(alertPayload, "updated_by", userID);
     const response = await Alert.create(alertPayload);
     updateTelemetryAuditEvent({ request: req, object: { id: response?.dataValues?.id, ...telemetryObject } });
     ResponseHandler.successResponse(req, res, { status: httpStatus.OK, data: { id: response.dataValues.id } });
@@ -28,8 +31,11 @@ const createAlertHandler = async (req: Request, res: Response, next: NextFunctio
 const publishAlertHandler = async (req: Request, res: Response, next: NextFunction) => {
   try {
     const { alertId } = req.params;
-    const rulePayload: Record<string, any> | null = await getAlertRule(alertId);
-    if (!rulePayload) return next({ message: httpStatus[httpStatus.NOT_FOUND], statusCode: httpStatus.NOT_FOUND });
+    const ruleModel: Record<string, any> | null = await getAlertRule(alertId);
+    if (!ruleModel) return next({ message: httpStatus[httpStatus.NOT_FOUND], statusCode: httpStatus.NOT_FOUND });
+    const rulePayload = ruleModel.toJSON();
+    const userID = (req as any)?.userID;
+    _.set(rulePayload, "updated_by", userID);
     if (rulePayload.status == "live") {
       await deleteAlertRule(rulePayload, false);
     }
@@ -87,6 +93,8 @@ const deleteAlertHandler = async (req: Request, res: Response, next: NextFunctio
       return next({ message: httpStatus[httpStatus.NOT_FOUND], statusCode: httpStatus.NOT_FOUND });
     }
     const rulePayload = ruleModel.toJSON();
+    const userID = (req as any)?.userID || "SYSTEM";
+    _.set(rulePayload, "updated_by", userID);
     await deleteAlertRule(rulePayload, hardDelete === "true");
     updateTelemetryAuditEvent({ request: req, currentRecord: rulePayload, object: { id: alertId, ...telemetryObject } });
     ResponseHandler.successResponse(req, res, { status: httpStatus.OK, data: { id: alertId } });
@@ -103,12 +111,14 @@ const updateAlertHandler = async (req: Request, res: Response, next: NextFunctio
     const ruleModel = await getAlertRule(alertId);
     if (!ruleModel) { return next({ message: httpStatus[httpStatus.NOT_FOUND], statusCode: httpStatus.NOT_FOUND }) }
     const rulePayload = ruleModel.toJSON();
+    const userID = (req as any)?.userID;
     if (rulePayload.status == "live") {
+      _.set(rulePayload, "updated_by", userID);
       await deleteAlertRule(rulePayload, false);
       await retireAlertSilence(alertId);
     }
     const updatedPayload = getAlertPayload({ ...req.body, manager: rulePayload?.manager });
-    await Alert.update({ ...updatedPayload, status: "draft" }, { where: { id: alertId } });
+    await Alert.update({ ...updatedPayload, status: "draft", updated_by: userID }, { where: { id: alertId } });
     updateTelemetryAuditEvent({ request: req, currentRecord: rulePayload, object: { id: alertId, ...telemetryObject } });
     ResponseHandler.successResponse(req, res, { status: httpStatus.OK, data: { id: alertId } });
   } catch (error: any) {
 
@@ -20,12 +20,15 @@ const createHandler = async (request: Request, response: Response, next: NextFun
 
         const start_date = new Date(startDate);
         const end_date = new Date(endDate);
+        const userID = (request as any)?.userID;
         const silenceBody = {
             id: grafanaResponse.silenceId,
             manager: grafanaResponse.manager,
             alert_id: alertId,
             start_time: start_date,
             end_time: end_date,
+            created_by : userID,
+            updated_by : userID,
         }
         const sileneResponse = await Silence.create(silenceBody);
         updateTelemetryAuditEvent({ request, object: { id: sileneResponse?.dataValues?.id, ...telemetryObject } });
@@ -78,10 +81,12 @@ const updateHandler = async (request: Request, response: Response, next: NextFun
         await updateSilence(silenceObject, payload);
         const updatedStartTime = new Date(payload.startTime);
         const updatedEndTime = new Date(payload.endTime);
+        const userID = (request as any)?.userID;
         const updatedSilence = {
             ...silenceObject,
             start_time: updatedStartTime,
-            end_time: updatedEndTime
+            end_time: updatedEndTime,
+            updated_by: userID,
         }
         const silenceResponse = await Silence.update(updatedSilence, { where: { id } })
         ResponseHandler.successResponse(request, response, { status: httpStatus.OK, data: { silenceResponse } })
Original file line number	Diff line number	Diff line change
`@@ -112,5 +112,7 @@ export const config = {`
`112`	`112`	`"dialect": process.env.dialet \|\| "postgres",`
`113`	`113`	`"url": process.env.grafana_url \|\| "http://localhost:8000",`
`114`	`114`	`"access_token": process.env.grafana_token \|\| ""`
`115`		`- }`
	`115`	`+ },`
	`116`	`+ "user_token_public_key": process.env.user_token_public_key \|\| "",`
	`117`	`+ "is_RBAC_enabled": process.env.is_rbac_enabled \|\| "false",`
`116`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,4 +18,8 @@ export const executeCommand = async (id: string, command: string) => {`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`	`return commandHttpService.post(commandPath, payload)`
	`21`	`+}`
	`22`	`+`
	`23`	`+export const registerConnector = async (requestBody: any) => {`
	`24`	`+ return commandHttpService.post("/connector/v1/register", requestBody)`
`21`	`25`	`}`