Merge branch 'main' into lporoli/ticket-770-docs-2

kurtosis-tech · Oct 9, 2023 · 0d80f33 · 0d80f33
2 parents 441455d + e6d1f5e
commit 0d80f33
Show file tree

Hide file tree

Showing 15 changed files with 448 additions and 303 deletions.
diff --git a/cli/cli/commands/clean/clean.go b/cli/cli/commands/clean/clean.go
@@ -195,6 +195,6 @@ func formattedUuidAndName(enclaveUuidWithName *kurtosis_engine_rpc_api_bindings.
 }
 
 func cleanUnusedImages(ctx context.Context, kurtosisBackend backend_interface.KurtosisBackend, shouldCleanAll bool) ([]string, []error, error) {
-	cleanedImages, cleanError := kurtosisBackend.PruneUnusedImages(ctx)
-	return cleanedImages, nil, cleanError
+	cleanedImages, cleanErr := kurtosisBackend.PruneUnusedImages(ctx)
+	return cleanedImages, nil, cleanErr
 }
diff --git a/...ne-lib/lib/backend_impls/docker/docker_kurtosis_backend/engine_functions/create_engine.go b/...ne-lib/lib/backend_impls/docker/docker_kurtosis_backend/engine_functions/create_engine.go
@@ -15,10 +15,6 @@ import (
 	"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/backend_interface/objects/port_spec"
 	"github.com/kurtosis-tech/kurtosis/container-engine-lib/lib/uuid_generator"
 	"github.com/kurtosis-tech/kurtosis/engine/launcher/args"
-	"github.com/kurtosis-tech/kurtosis/engine/server/engine/centralized_logs/client_implementations/persistent_volume/log_remover"
-	"github.com/kurtosis-tech/kurtosis/engine/server/engine/centralized_logs/client_implementations/persistent_volume/logs_clock"
-	"github.com/kurtosis-tech/kurtosis/engine/server/engine/centralized_logs/client_implementations/persistent_volume/volume_consts"
-	"github.com/kurtosis-tech/kurtosis/engine/server/engine/centralized_logs/client_implementations/persistent_volume/volume_filesystem"
 	"github.com/kurtosis-tech/stacktrace"
 	"github.com/sirupsen/logrus"
 	"time"
@@ -111,20 +107,6 @@ func CreateEngine(
 			removeLogsAggregatorFunc()
 		}
 	}()
-
-	// schedule log removal for log retention
-	go func() {
-		osFs := volume_filesystem.NewOsVolumeFilesystem()
-		realTime := logs_clock.NewRealClock()
-		logRemover := log_remover.NewLogRemover(osFs, realTime)
-		// do a first removal
-		logRemover.Run()
-
-		logRemovalTicker := time.NewTicker(volume_consts.RemoveLogsWaitHours)
-		for range logRemovalTicker.C {
-			logRemover.Run()
-		}
-	}()
 	logrus.Infof("Centralized logs components started.")
 
 	enclaveManagerUIPortSpec, err := port_spec.NewPortSpec(uint16(enclaveManagerUIPort), consts.EngineTransportProtocol, consts.HttpApplicationProtocol, defaultWait)

diff --git a/...docker/docker_kurtosis_backend/logs_aggregator_functions/implementations/vector/consts.go b/...docker/docker_kurtosis_backend/logs_aggregator_functions/implementations/vector/consts.go
@@ -24,7 +24,7 @@ const (
 	// We instruct vector to store log files per-year, per-week (00-53), per-enclave, per-service
 	// To construct the filepath, we utilize vectors template syntax that allows us to reference fields in log events
 	// https://vector.dev/docs/reference/configuration/template-syntax/
-	baseLogsFilepath = "\"" + logsStorageDirpath + "%%Y/%%U/"
+	baseLogsFilepath = "\"" + logsStorageDirpath + "%%Y/%%V/"
 
 	uuidLogsFilepath = baseLogsFilepath + "{{ enclave_uuid }}/{{ service_uuid }}.json\""
 

diff --git a/container-engine-lib/lib/backend_interface/mock_kurtosis_backend.go b/container-engine-lib/lib/backend_interface/mock_kurtosis_backend.go
diff --git a/...alized_logs/client_implementations/persistent_volume/log_file_creator/log_file_creator.go b/...alized_logs/client_implementations/persistent_volume/log_file_creator/log_file_creator.go