ensure we logout, fix aggregations

server/handler/vmModifyEvent.go

@@ -404,10 +404,7 @@ func (h *Handler) calculateNewDiskSize(event models.CloudEventReceived) float64
 		}
 	}
 
-	err = vc.Logout()
-	if err != nil {
-		h.Logger.Error("unable to logout of vcenter", "error", err)
-	}
+	_ = vc.Logout(context.Background())
 
 	h.Logger.Debug("Calculated new disk size", "value", diskSize)
 
@@ -446,9 +443,7 @@ func (h *Handler) AddVmToInventory(evt models.CloudEventReceived, ctx context.Co
 
 	if strings.HasPrefix(vmObject.Name, "vCLS-") {
 		h.Logger.Info("Skipping internal vCLS VM", "vm_name", vmObject.Name)
-		if err := vc.Logout(); err != nil {
-			h.Logger.Error("unable to logout of vcenter", "error", err)
-		}
+		_ = vc.Logout(ctx)
 		return 0, nil
 	}
 
@@ -522,10 +517,7 @@ func (h *Handler) AddVmToInventory(evt models.CloudEventReceived, ctx context.Co
 		poweredOn = "TRUE"
 	}
 
-	err = vc.Logout()
-	if err != nil {
-		h.Logger.Error("unable to logout of vcenter", "error", err)
-	}
+	_ = vc.Logout(ctx)
 
 	if foundVm {
 		e := evt.CloudEvent

server/handler/vmTrace.go

@@ -35,6 +35,7 @@ func (h *Handler) VmTrace(w http.ResponseWriter, r *http.Request) {
 	}
 	creationLabel := ""
 	deletionLabel := ""
+	creationApprox := false
 
 	// Only fetch data when a query is provided; otherwise render empty page with form.
 	if vmID != "" || vmUUID != "" || name != "" {
@@ -79,9 +80,16 @@ func (h *Handler) VmTrace(w http.ResponseWriter, r *http.Request) {
 
 		if len(entries) > 0 {
 			if lifecycle.CreationTime > 0 {
-				creationLabel = time.Unix(lifecycle.CreationTime, 0).Local().Format("2006-01-02 15:04:05")
+				ts := time.Unix(lifecycle.CreationTime, 0).Local().Format("2006-01-02 15:04:05")
+				if lifecycle.CreationApprox {
+					creationLabel = fmt.Sprintf("%s (approx. earliest snapshot)", ts)
+					creationApprox = true
+				} else {
+					creationLabel = ts
+				}
 			} else {
 				creationLabel = time.Unix(entries[0].RawTime, 0).Local().Format("2006-01-02 15:04:05")
+				creationApprox = true
 			}
 			if lifecycle.DeletionTime > 0 {
 				deletionLabel = time.Unix(lifecycle.DeletionTime, 0).Local().Format("2006-01-02 15:04:05")
@@ -90,7 +98,7 @@ func (h *Handler) VmTrace(w http.ResponseWriter, r *http.Request) {
 	}
 
 	w.Header().Set("Content-Type", "text/html; charset=utf-8")
-	if err := views.VmTracePage(queryLabel, displayQuery, vmID, vmUUID, name, creationLabel, deletionLabel, entries, chart).Render(ctx, w); err != nil {
+	if err := views.VmTracePage(queryLabel, displayQuery, vmID, vmUUID, name, creationLabel, deletionLabel, creationApprox, entries, chart).Render(ctx, w); err != nil {
 		http.Error(w, "Failed to render template", http.StatusInternalServerError)
 	}
 }