Skip to content

koordlet: add more cli flags for audit log and ensure the audit log directory exist #912

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

Merged
koordinator-bot merged 1 commit into from
Jan 5, 2023
Merged

koordlet: add more cli flags for audit log and ensure the audit log directory exist #912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions pkg/koordlet/audit/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,6 @@ func (c *Config) InitFlags(fs *flag.FlagSet) {
fs.StringVar(&c.LogDir, "audit-log-dir", c.LogDir, "The dir of audit log")
fs.IntVar(&c.Verbose, "audit-verbose", c.Verbose, "The verbose of the audit log")
fs.IntVar(&c.MaxDiskSpaceMB, "audit-max-disk-space-mb", c.MaxDiskSpaceMB, "Max disk space occupied of audit log")
fs.IntVar(&c.MaxConcurrentReaders, "audit-max-concurrent-readers", c.MaxConcurrentReaders, "Max concurrent readers of the audit log")
fs.IntVar(&c.MaxEventsLimit, "audit-max-events-limit", c.MaxEventsLimit, "Max events limit in one request of the audit log")
}
25 changes: 22 additions & 3 deletions pkg/koordlet/audit/event_logger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"encoding/json"
"fmt"
"io"
"io/fs"
"os"
"path/filepath"
"sync"
Expand All @@ -29,7 +30,8 @@ import (
)

const (
MaxFileSize = 1 << 21 // 2MB
MaxFileSize = 1 << 21 // 2MB
DefaultLogDirMode fs.FileMode = 0755
)

// NewEventLogger create an EventWriter, it won't open the underly file until do a log call.
Expand All @@ -38,6 +40,19 @@ func NewEventLogger(dir string, sizeMB int, verbose int) EventWriter {
if sizeMB <= 0 {
klog.Fatalf("sizeMB [%d] should be larger than 0", sizeMB)
}

// we should ensure the log directory exist and have write to permission
if _, err := os.Stat(dir); err != nil && !os.IsNotExist(err) {
klog.Fatalf("failed to get log directory [%s] fileInfo: %v", dir, err)
} else if err != nil {
if err := os.MkdirAll(dir, DefaultLogDirMode); err != nil && !os.IsExist(err) {
klog.Fatalf("failed to create log directory [%s]: %v", dir, err)
}
}
if err := os.Chmod(dir, DefaultLogDirMode); err != nil {
klog.Fatalf("failed to chmod log directory [%s]: %v", dir, err)
}

return &eventWriter{
dir: dir,
maxFileSize: MaxFileSize,
Expand Down Expand Up @@ -120,6 +135,8 @@ func (e *eventWriter) openNewLogWriter() error {
err = os.Rename(oldFile, newFile)
if err != nil {
klog.Errorf("failed to rename %s to %s", oldFile, newFile)
// if rename failed, return error
return err
}

// remove the old files
Expand All @@ -135,8 +152,6 @@ func (e *eventWriter) openNewLogWriter() error {
}
}
}

return nil
}

newLogWriter, err := OpenLogWriter(e.dir + "/audit.log")
Expand Down Expand Up @@ -212,6 +227,10 @@ func listAuditfiles(dir string) ([]string, error) {
pattern := fmt.Sprintf("%s/audit-*.log", dir)
files, err := filepath.Glob(pattern)
if err == nil {
// reverse files
for i, j := 0, len(files)-1; i < j; i, j = i+1, j-1 {
files[i], files[j] = files[j], files[i]
}
auditFiles = append(auditFiles, files...)
}
return auditFiles, nil
Expand Down