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

fix: triple logs bug #1752

Merged
merged 2 commits into from
Nov 10, 2023
Merged

fix: triple logs bug #1752

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
c8fdd15
prevent vector from writing to symlinked log files
tedim52 Nov 10, 2023
3125179
Merge branch 'main' into tedi/symbug
tedim52 Nov 10, 2023
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
7 changes: 0 additions & 7 deletions ...docker/docker_kurtosis_backend/logs_aggregator_functions/implementations/vector/consts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,6 @@ const (

uuidLogsFilepath = baseLogsFilepath + "{{ enclave_uuid }}/{{ service_uuid }}.json\""

// Right now, we store duplicate logs files by service name and service's shortened uuid
// This is to enable retrieving logs by name and short uuid after enclaves have been stopped
// As right now, when an enclave is stopped all identifier info is lost
// TODO: Find a better way to capture or persist identifier info without storing duplicate log files
nameLogsFilepath = baseLogsFilepath + "{{ enclave_uuid }}/{{ service_name }}.json\""
shortUUIDLogsFilepath = baseLogsFilepath + "{{ enclave_uuid }}/{{ service_short_uuid }}.json\""

sourceConfigFileTemplateName = "srcVectorConfigFileTemplate"
sinkConfigFileTemplateName = "sinkVectorConfigFileTemplate"

Expand Down
12 changes: 0 additions & 12 deletions ...docker_kurtosis_backend/logs_aggregator_functions/implementations/vector/vector_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,6 @@ func newDefaultVectorConfig(listeningPortNumber uint16) *VectorConfig {
Inputs: []string{fluentBitSourceId},
Filepath: uuidLogsFilepath,
},
{
Id: "name_" + fileSinkIdSuffix,
Type: fileTypeId,
Inputs: []string{fluentBitSourceId},
Filepath: nameLogsFilepath,
},
{
Id: "short_uuid_" + fileSinkIdSuffix,
Type: fileTypeId,
Inputs: []string{fluentBitSourceId},
Filepath: shortUUIDLogsFilepath,
},
},
}
}
Expand Down
2 changes: 1 addition & 1 deletion .../engine/centralized_logs/client_implementations/persistent_volume/volume_consts/consts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const (

RemoveLogsWaitHours = 6 * time.Hour

CreateLogsWaitMinutes = 3 * time.Minute
CreateLogsWaitMinutes = 1 * time.Minute

// basepath/enclave uuid/service uuid <filetype>
PerFileFmtStr = "%s%s/%s%s"
Expand Down