Commit7e8169e

committed

resolve conflicts

1 parent0b092b4 commit7e8169eCopy full SHA for 7e8169e

File tree

-1

lines changed

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

-1

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -126,3 +126,4 @@ field_mapping:`
`126`	`126`	`DestinationOS:xdm.target.host.os`
`127`	`127`	`url_category:xdm.network.http.url_category`
`128`	`128`	`EventSeverity:xdm.alert.severity`
	`129`	`+duration:xdm.event.duration`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -77,4 +77,5 @@ field_mapping:`
`77`	`77`	`EventSeverity:EventSeverity`
`78`	`78`	`Source:`
`79`	`79`	`-Source`
`80`		`- -source`
	`80`	`+ -source`
	`81`	`+duration:duration`

Comments

(0)