From 7528c026676162c2b1bdd339e653d325fb5b45f2 Mon Sep 17 00:00:00 2001 From: Kevin Hannon Date: Fri, 8 Nov 2024 12:59:11 -0500 Subject: [PATCH] add swap column to crictl stats --- cmd/crictl/container_stats.go | 5 +++-- cmd/crictl/display.go | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cmd/crictl/container_stats.go b/cmd/crictl/container_stats.go index 059dbef104..aa2eb9676b 100644 --- a/cmd/crictl/container_stats.go +++ b/cmd/crictl/container_stats.go @@ -182,7 +182,7 @@ func (d containerStatsDisplayer) displayStats(ctx context.Context, client intern return err } - d.display.AddRow([]string{columnContainer, columnName, columnCPU, columnMemory, columnDisk, columnInodes}) + d.display.AddRow([]string{columnContainer, columnName, columnCPU, columnMemory, columnDisk, columnInodes, columnSwap}) for _, s := range r.GetStats() { if ctx.Err() != nil { return ctx.Err() @@ -193,6 +193,7 @@ func (d containerStatsDisplayer) displayStats(ctx context.Context, client intern mem := s.GetMemory().GetWorkingSetBytes().GetValue() disk := s.GetWritableLayer().GetUsedBytes().GetValue() inodes := s.GetWritableLayer().GetInodesUsed().GetValue() + swap := s.GetSwap().GetSwapUsageBytes().GetValue() if !d.opts.all && cpu == 0 && mem == 0 { // Skip non-running container continue @@ -213,7 +214,7 @@ func (d containerStatsDisplayer) displayStats(ctx context.Context, client intern } d.display.AddRow([]string{ id, name, fmt.Sprintf("%.2f", cpuPerc), units.HumanSize(float64(mem)), - units.HumanSize(float64(disk)), strconv.FormatUint(inodes, 10), + units.HumanSize(float64(disk)), strconv.FormatUint(inodes, 10), units.HumanSize(float64(swap)), }) } d.display.ClearScreen() diff --git a/cmd/crictl/display.go b/cmd/crictl/display.go index 3b441f008f..18e3019783 100644 --- a/cmd/crictl/display.go +++ b/cmd/crictl/display.go @@ -41,6 +41,7 @@ const ( columnDigest = "DIGEST" columnMemory = "MEM" columnInodes = "INODES" + columnSwap = "SWAP" columnDisk = "DISK" columnCPU = "CPU %" columnKey = "KEY"