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

Adding back Usable Capacity and Internal #1788

Merged
merged 1 commit into from
Oct 5, 2023
Merged

Adding back Usable Capacity and Internal #1788

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
16 changes: 12 additions & 4 deletions pkg/controller/monitoring.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,18 @@ func (c *Controller) updateHealthStatusForTenant(tenant *miniov2.Tenant) error {
return nil
}

// Add back "Usable Capacity" & "Internal" values in Tenant Status and in the UI
// How much is available: "Usable Capacity" in UI comes from "tenant.Status.Usage.Capacity"
// How much is used: "Internal" in UI comes from "tenant.Status.Usage.Usage"
UsedSpace := int64(0) // How much is used
jiuker marked this conversation as resolved.
Show resolved Hide resolved
AvailableSpace := int64(0) // How much is available
for _, disk := range storageInfo.Disks {
UsedSpace = UsedSpace + int64(disk.UsedSpace)
AvailableSpace = AvailableSpace + int64(disk.AvailableSpace)
}
tenant.Status.Usage.Usage = UsedSpace
tenant.Status.Usage.Capacity = AvailableSpace

var rawUsage uint64

var onlineDisks int32
Expand Down Expand Up @@ -237,10 +249,6 @@ func (c *Controller) updateHealthStatusForTenant(tenant *miniov2.Tenant) error {
}
}

// TODO: add usage and usableCapacity
// tenant.Status.Usage.Usage = metrics.Usage
// tenant.Status.Usage.Capacity = metrics.UsableCapacity

return nil
}

Expand Down