resolve conflicts

oleksandr.volha · oleksandr.volha · commit 594c6615abcd · 2024-06-27T14:37:03.000+03:00
diff --git a/uncoder-core/app/translator/mappings/platforms/palo_alto_cortex/dns.yml b/uncoder-core/app/translator/mappings/platforms/palo_alto_cortex/dns.yml
@@ -11,4 +11,4 @@ field_mapping:
   dns_query_name: xdm.network.dns.dns_question.name
   QueryName: xdm.network.dns.dns_question.name
   query: xdm.network.dns.dns_question.name
-  dns-record-type: xdm.network.dns.dns_question.type
+  dns-record-type: xdm.network.dns.dns_question.type
diff --git a/uncoder-core/app/translator/mappings/platforms/qradar/default.yml b/uncoder-core/app/translator/mappings/platforms/qradar/default.yml
@@ -75,4 +75,4 @@ field_mapping:
   EventSeverity: EventSeverity
   Source: 
     - Source
-    - source
+    - source
diff --git a/uncoder-core/app/translator/platforms/palo_alto/renders/cortex_xsiam.py b/uncoder-core/app/translator/platforms/palo_alto/renders/cortex_xsiam.py
@@ -50,6 +50,7 @@
 }
 
 
+
 class CortexXQLFieldValueRender(BaseFieldValueRender):
     details: PlatformDetails = cortex_xql_query_details
     str_value_manager = cortex_xql_str_value_manager

-Original file line number
+Diff line change
   EventSeverity: EventSeverity
   Source:
     - Source
 -    - source
 +    - source
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@`
`50`	`50`	`}`
`51`	`51`
`52`	`52`
	`53`	`+`
`53`	`54`	`class CortexXQLFieldValueRender(BaseFieldValueRender):`
`54`	`55`	`details: PlatformDetails = cortex_xql_query_details`
`55`	`56`	`str_value_manager = cortex_xql_str_value_manager`