Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit716329e

Browse files
committed
Merge branch 'refs/heads/prod' into gis-8085
# Conflicts:#app/translator/core/exceptions/core.py
1 parent8f1d145 commit716329e

File tree

5 files changed

+15
-6
lines changed

5 files changed

+15
-6
lines changed

‎uncoder-core/app/translator/core/exceptions/core.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
fromtypingimportOptional
22

33

4-
classNotImplementedException(BaseException): ...
4+
classNotImplementedException(BaseException):
5+
...
56

67

7-
classBasePlatformException(BaseException): ...
8+
classBasePlatformException(BaseException):
9+
...
810

911

1012
classStrictPlatformException(BasePlatformException):

‎uncoder-core/app/translator/core/render.py‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ class PlatformQueryRender(QueryRender):
197197
not_token="not"
198198

199199
group_token="(%s)"
200+
query_parts_delimiter=" "
200201

201202
field_value_map=BaseQueryFieldValue(or_token=or_token)
202203

@@ -292,6 +293,10 @@ def wrap_query_with_meta_info(self, meta_info: MetaInfoContainer, query: str) ->
292293
def_finalize_search_query(query:str)->str:
293294
returnquery
294295

296+
def_join_query_parts(self,prefix:str,query:str,functions:str)->str:
297+
parts=filter(lambdas:bool(s),map(str.strip, [prefix,self._finalize_search_query(query),functions]))
298+
returnself.query_parts_delimiter.join(parts)
299+
295300
deffinalize_query(
296301
self,
297302
prefix:str,
@@ -303,8 +308,7 @@ def finalize_query(
303308
*args,# noqa: ARG002
304309
**kwargs,# noqa: ARG002
305310
)->str:
306-
parts=filter(lambdas:bool(s),map(str.strip, [prefix,self._finalize_search_query(query),functions]))
307-
query=" ".join(parts)
311+
query=self._join_query_parts(prefix,query,functions)
308312
query=self.wrap_query_with_meta_info(meta_info=meta_info,query=query)
309313
ifnot_supported_functions:
310314
rendered_not_supported=self.render_not_supported_functions(not_supported_functions)
@@ -391,7 +395,7 @@ def _generate_from_tokenized_query_container(self, query_container: TokenizedQue
391395
defined_raw_log_fields=self.generate_raw_log_fields(
392396
fields=query_container.meta_info.query_fields,source_mapping=source_mapping
393397
)
394-
prefix+=f"\n{defined_raw_log_fields}\n"
398+
prefix+=f"\n{defined_raw_log_fields}"
395399
result=self.generate_query(tokens=query_container.tokens,source_mapping=source_mapping)
396400
exceptStrictPlatformExceptionaserr:
397401
errors.append(err)

‎uncoder-core/app/translator/mappings/platforms/palo_alto_cortex/default.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,3 +125,4 @@ field_mapping:
125125
SourceOS:xdm.source.host.os
126126
DestinationOS:xdm.target.host.os
127127
url_category:xdm.network.http.url_category
128+
EventSeverity:xdm.alert.severity

‎uncoder-core/app/translator/mappings/platforms/qradar/default.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,5 @@ field_mapping:
6464
DestinationOS:DestinationOS
6565
TargetUserName:DestinationUserName
6666
SourceUserName:SourceUserName
67-
url_category:XForceCategoryByURL
67+
url_category:XForceCategoryByURL
68+
EventSeverity:EventSeverity

‎uncoder-core/app/translator/platforms/palo_alto/renders/cortex_xsiam.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ class CortexXQLQueryRender(PlatformQueryRender):
147147
or_token="or"
148148
and_token="and"
149149
not_token="not"
150+
query_parts_delimiter="\n"
150151

151152
field_value_map=CortexXQLFieldValue(or_token=or_token)
152153
comment_symbol="//"

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp