diff --git a/thorlog/v3/eventlog.go b/thorlog/v3/eventlog.go index 68fc651..f846d7d 100644 --- a/thorlog/v3/eventlog.go +++ b/thorlog/v3/eventlog.go @@ -9,11 +9,11 @@ import ( type WindowsEventlogEntry struct { jsonlog.ObjectHeader - EventId uint16 `json:"-" textlog:"event_id"` - EventLevel int `json:"-" textlog:"event_level"` - EventTime time.Time `json:"-" textlog:"event_time"` - EventChannel string `json:"-" textlog:"event_channel,omitempty"` - EventComputer string `json:"-" textlog:"event_computer,omitempty"` + EventId uint16 `json:"event_id" textlog:"event_id"` + EventLevel int `json:"level" textlog:"event_level"` + EventTime time.Time `json:"time" textlog:"event_time"` + EventChannel string `json:"channel" textlog:"event_channel,omitempty"` + EventComputer string `json:"computer" textlog:"event_computer,omitempty"` Entry KeyValueList `json:"entry" textlog:"entry"` } @@ -36,7 +36,7 @@ type EventlogProcessStart struct { jsonlog.ObjectHeader Process string `json:"process" textlog:"process"` StartTimes []time.Time `json:"start_times" textlog:"-"` - Count int `json:"-" textlog:"count"` + Count int `json:"count" textlog:"count"` } func (EventlogProcessStart) observed() {} diff --git a/thorlog/v3/file.go b/thorlog/v3/file.go index eb0c422..b70bdd3 100644 --- a/thorlog/v3/file.go +++ b/thorlog/v3/file.go @@ -21,7 +21,7 @@ type File struct { Extension string `json:"extension" textlog:"extension,omitempty"` // FileMode is the type of the file (e.g. file, directory, symlink, etc.) - FileMode FileModeType `json:"-" textlog:"-"` + FileMode FileModeType `json:"mode" textlog:"-"` // MagicHeader is the magic header of the file (e.g. PE, ZIP, etc.) MagicHeader string `json:"magic_header,omitempty" textlog:"type,omitempty"` @@ -98,7 +98,7 @@ type FileHashes struct { } type RecycleBinIndexFile struct { - Version uint64 `json:"-" textlog:"-"` + Version uint64 `json:"version" textlog:"-"` OriginalFilename string `json:"original_file_name" textlog:"original_filename"` DeletionTime time.Time `json:"deletion_time" textlog:"deletion_time"` OriginalFilesize uint64 `json:"original_file_size" textlog:"-"` diff --git a/thorlog/v3/process.go b/thorlog/v3/process.go index d710df0..c607a0e 100644 --- a/thorlog/v3/process.go +++ b/thorlog/v3/process.go @@ -102,7 +102,7 @@ func (s *Sections) RelativeTextPointer(pointee any) (string, bool, bool) { type ProcessConnections struct { ListenPorts ProcessListenPorts `json:"listen_ports" textlog:"listen_ports,omitempty" jsonschema:"nullable"` Connections []ProcessConnection `json:"connections" textlog:"-" jsonschema:"nullable"` - ConnectionCount int `json:"-" textlog:"connection_count"` + ConnectionCount int `json:"count" textlog:"connection_count"` } type ProcessHandle struct { @@ -127,7 +127,7 @@ func (p ProcessListenPorts) String() string { } type ProcessConnection struct { - Fd uint32 `json:"-" textlog:"-"` + Fd uint32 `json:"fd" textlog:"-"` // Status is the connection status, e.g. ESTABLISHED, LISTEN, etc. Status string `json:"status" textlog:"-"` Ip string `json:"ip" textlog:"ip"`