reduce some logging
Some checks are pending
CI / Lint (push) Waiting to run
CI / Test (push) Waiting to run
CI / End-to-End (push) Waiting to run
CI / Publish Docker (push) Blocked by required conditions
continuous-integration/drone/push Build is passing

This commit is contained in:
2024-10-14 20:54:52 +11:00
parent 665750548f
commit 81271873f3
3 changed files with 21 additions and 31 deletions

View File

@@ -45,7 +45,7 @@ func (c *CronTask) RunVmCheck(ctx context.Context, logger *slog.Logger) error {
// TODO - get a list of unique vcenters, then process each event in batches
// to avoid doing unnecessary login/logout of vcenter
c.Logger.Debug("connecting to vcenter")
//c.Logger.Debug("connecting to vcenter")
vc := vcenter.New(c.Logger, c.VcCreds)
vc.Login(evt.Source)
@@ -80,10 +80,10 @@ func (c *CronTask) RunVmCheck(ctx context.Context, logger *slog.Logger) error {
if disk, ok := device.(*types.VirtualDisk); ok {
// Print the filename of the backing device
if backing, ok := disk.Backing.(*types.VirtualDiskFlatVer2BackingInfo); ok {
c.Logger.Debug("Adding disk", "size_bytes", disk.CapacityInBytes, "backing_file", backing.FileName)
if _, ok := disk.Backing.(*types.VirtualDiskFlatVer2BackingInfo); ok {
//c.Logger.Debug("Adding disk", "size_bytes", disk.CapacityInBytes, "backing_file", backing.FileName)
} else {
c.Logger.Debug("Adding disk, unknown backing type", "size_bytes", disk.CapacityInBytes)
//c.Logger.Debug("Adding disk, unknown backing type", "size_bytes", disk.CapacityInBytes)
}
totalDiskBytes += disk.CapacityInBytes
@@ -126,7 +126,7 @@ func (c *CronTask) RunVmCheck(ctx context.Context, logger *slog.Logger) error {
c.Logger.Error("Empty VM config")
}
c.Logger.Debug("VM has runtime data", "power_state", vmObject.Runtime.PowerState)
//c.Logger.Debug("VM has runtime data", "power_state", vmObject.Runtime.PowerState)
if vmObject.Runtime.PowerState == "poweredOff" {
poweredOn = "FALSE"
} else {
@@ -165,11 +165,11 @@ func (c *CronTask) RunVmCheck(ctx context.Context, logger *slog.Logger) error {
c.Logger.Debug("database params", "params", params)
// Insert the new inventory record into the database
result, err := c.Database.Queries().CreateInventory(ctx, params)
_, err := c.Database.Queries().CreateInventory(ctx, params)
if err != nil {
c.Logger.Error("unable to perform database insert", "error", err)
} else {
c.Logger.Debug("created database record", "insert_result", result)
//c.Logger.Debug("created database record", "insert_result", result)
// mark this event as processed
err = c.Database.Queries().UpdateEventsProcessed(ctx, evt.Eid)

View File

@@ -189,7 +189,7 @@ func (v *Vcenter) ConvertObjToMoVM(vmObj *object.VirtualMachine) (*mo.VirtualMac
}
// Return the found mo.VirtualMachine object
v.Logger.Debug("Found VM in datacenter", "vm_name", moVM.Name, "dc_name", datacenterName)
//v.Logger.Debug("Found VM in datacenter", "vm_name", moVM.Name, "dc_name", datacenterName)
return &moVM, nil
}
@@ -448,30 +448,10 @@ func (v *Vcenter) FindVMByIDWithDatacenter(vmID string, dcID string) (*mo.Virtua
//err := v.client.RetrieveOne(v.ctx, vmRef, []string{"config", "name"}, &vm)
err = v.client.RetrieveOne(v.ctx, vmRef, nil, &vm)
if err == nil {
v.Logger.Debug("Found VM")
/*
// Retrieve the resource pool the VM is in
if vm.ResourcePool != nil {
rp := object.NewResourcePool(v.client.Client, *vm.ResourcePool)
rpName, err := rp.ObjectName(v.ctx)
if err != nil {
v.Logger.Error("failed to get resource pool name", "error", err)
} else {
v.Logger.Debug("Found resource pool name", "rp_name", rpName)
resourcePool = rpName
}
}
*/
//v.Logger.Debug("Found VM")
return &vm, nil
/*
return &VmProperties{
//Datacenter: dcName,
Vm: vm,
ResourcePool: resourcePool,
}, nil
*/
} else if _, ok := err.(*find.NotFoundError); !ok {
// If the error is not a NotFoundError, return it
//return nil, fmt.Errorf("failed to retrieve VM with ID %s in datacenter %s: %w", vmID, dc.Name(), err)
@@ -492,7 +472,7 @@ func (v *Vcenter) GetVmResourcePool(vm mo.VirtualMachine) (string, error) {
v.Logger.Error("failed to get resource pool name", "error", err)
return resourcePool, err
} else {
v.Logger.Debug("Found resource pool name", "rp_name", rpName)
//v.Logger.Debug("Found resource pool name", "rp_name", rpName)
resourcePool = rpName
}
}

View File

@@ -112,6 +112,8 @@ func (h *Handler) VmModifyEvent(w http.ResponseWriter, r *http.Request) {
params.PlaceholderChange = sql.NullString{String: "placeholderVm", Valid: true}
} else if change["newValue"] == "<unset>" {
params.PlaceholderChange = sql.NullString{String: "Vm", Valid: true}
} else if change["newValue"] == "testVm" {
params.PlaceholderChange = sql.NullString{String: "testVm", Valid: true}
} else {
h.Logger.Error("Unexpected value for managedBy configuration", "new_value", change["newValue"])
}
@@ -121,7 +123,15 @@ func (h *Handler) VmModifyEvent(w http.ResponseWriter, r *http.Request) {
// [map[newValue:\"placeholderVm\" type:config.managedBy.type]
// map[newValue:<unset> type:config.managedBy]
// config.managedBy.type: "testVm" -> "placeholderVm"
// TODO - track when this happens, maybe need a new database column?
case "config.managedBy.type":
h.Logger.Debug("config.managedBy.type")
if change["newValue"] == "testVm" {
h.Logger.Debug("testVm")
params.PlaceholderChange = sql.NullString{String: "testVm", Valid: true}
}
}
// Check if a disk was added (or maybe removed?)