Merge pull request #1674 from kannon92/add-swap-summary

add swap column to crictl stats
kubernetes-sigs · Nov 20, 2024 · b0fe9c5 · b0fe9c5
2 parents 4ffcbb1 + 7528c02
commit b0fe9c5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -41,6 +41,7 @@ const (
 	columnDigest     = "DIGEST"
 	columnMemory     = "MEM"
 	columnInodes     = "INODES"
+	columnSwap       = "SWAP"
 	columnDisk       = "DISK"
 	columnCPU        = "CPU %"
 	columnKey        = "KEY"