Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[3.2.0 Backport] CBG-4139: 3.2.0 Cherry-pick: CBG-4138: Enable log collation by default for audit logging #7046

Merged
merged 2 commits into from
Aug 6, 2024
Merged

[3.2.0 Backport] CBG-4139: 3.2.0 Cherry-pick: CBG-4138: Enable log collation by default for audit logging #7046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
668bcfc
CBG-4139: 3.2.0 Cherry-pick: CBG-4138: Enable log collation by defaul…
bbrks Aug 6, 2024
e17eac7
Only check the events that will be produced by the test - skips event…
bbrks Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions base/logger_audit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,10 @@ func NewAuditLogger(ctx context.Context, config *AuditLoggerConfig, logFilePath
config.FileLoggerConfig.Enabled = BoolPtr(defaultAuditEnabled)
}

if config.CollationBufferSize == nil {
config.CollationBufferSize = IntPtr(defaultFileLoggerCollateBufferSize)
}

fl, err := NewFileLogger(ctx, &config.FileLoggerConfig, LevelNone, auditLogName, logFilePath, minAge, buffer)
if err != nil {
return nil, err
Expand Down
6 changes: 6 additions & 0 deletions rest/audit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,6 +762,12 @@ func TestEffectiveUserID(t *testing.T) {
events := jsonLines(t, output)

for _, event := range events {
eventID := base.AuditID(event[base.AuditFieldID].(float64))
// ignore events that don't have user info ()
if eventID != base.AuditIDPublicUserAuthenticated && eventID != base.AuditIDReadDatabase {
continue
}

effective := event[base.AuditEffectiveUserID].(map[string]any)
assert.Equal(t, cnfDomain, effective[base.AuditFieldEffectiveUserIDDomain])
assert.Equal(t, cnfUser, effective[base.AuditFieldEffectiveUserIDUser])
Expand Down
Loading