Merge branch 'main' into table-metrics

Sanketika-Obsrv · Jan 15, 2025 · ee1cd5c · ee1cd5c
2 parents 4391985 + edff55d
commit ee1cd5c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/api-service/src/configs/IngestionConfig.ts b/api-service/src/configs/IngestionConfig.ts
@@ -84,12 +84,12 @@ export const rawIngestionSpecDefaults = {
     "flattenSpec": [
         {
             "type": "path",
-            "expr": "$.obsrv_meta.source.connector",
+            "expr": "$.obsrv_meta.source.entry_source",
             "name": "obsrv.meta.source.connector"
         },
         {
             "type": "path",
-            "expr": "$.obsrv_meta.source.connectorInstance",
+            "expr": "$.obsrv_meta.source.id",
             "name": "obsrv.meta.source.id"
         }
     ],

diff --git a/api-service/src/middlewares/userPermissions.json b/api-service/src/middlewares/userPermissions.json
@@ -4,6 +4,7 @@
             "api.datasets.list",
             "api.datasets.read",
             "api.datasets.export",
+            "api.dataset.health",
             "api.data.out",
             "api.data.exhaust",
             "api.alert.list",
@@ -47,7 +48,6 @@
             "api.datasets.update",
             "api.datasets.import",
             "api.datasets.copy",
-            "api.dataset.health",
             "api.datasets.dataschema"
         ],
         "data": [
@@ -117,7 +117,11 @@
             "file",
             "connector",
             "sqlQuery",
-            "restricted_dataset_api"
+            "restricted_dataset_api",
+            "alert",
+            "metric",
+            "silence",
+            "notificationChannel"
         ],
         "operations_admin": [
             "alert",

diff --git a/api-service/src/services/TableGenerator.ts b/api-service/src/services/TableGenerator.ts
@@ -66,7 +66,7 @@ class BaseTableGenerator {
         }
         if (!_.isEmpty(transformations_config)) {
             const transformationFields = _.map(transformations_config, (tf) => ({
-                expr: "$." + `['${tf.field_key}']`,
+                expr: "$." + tf.field_key.split('.').map((fieldpart: string) => `['${fieldpart}']`).join('.'),
                 name: tf.field_key,
                 data_type: tf.transformation_function.datatype,
                 arrival_format: tf.transformation_function.datatype,

diff --git a/command-service/src/command/alert_manager_command.py b/command-service/src/command/alert_manager_command.py
@@ -5,7 +5,7 @@
 from model.data_models import Action, ActionResponse, CommandPayload
 from service.db_service import DatabaseService
 from service.http_service import HttpService
-
+from copy import deepcopy
 
 class AlertManagerService(ICommand):
 
@@ -95,17 +95,18 @@ def get_dataset_source_config(self, dataset_id: str) -> str:
     def get_modified_metric(
         self, service: str, metric: dict, payload: CommandPayload
     ) -> dict:
+        metric_data = deepcopy(metric)
         if service == "flink":
             substring = f"{payload.dataset_id}"
             modified_substring = substring.replace("-", "_")
-            modified_metric = metric["metric"].replace("dataset_id", modified_substring)
-            metric["metric"] = modified_metric
-            return metric
+            modified_metric = metric_data["metric"].replace("dataset_id", modified_substring)
+            metric_data["metric"] = modified_metric
+            return metric_data
         else:
-            metric["metric"] = metric["metric"].replace(
+            metric_data["metric"] = metric_data["metric"].replace(
                 "dataset_id", payload.dataset_id
             )
-            return metric
+            return metric_data
 
     def create_alert_metric(
         self, payload: CommandPayload, service: str, metric: dict, dataset_name: str