Add 'MemUsageBytes' format option

Although storage is more human-readable when expressed in SI units,
IEC/JEDEC (Bytes) units are more pertinent for memory-related values
(and match the format of the --memory* command-line options).

(To prevent possible compatibility issues, the default SI display is
left unchanged)

See https://github.com/containers/podman/issues/8945

Signed-off-by: Stuart Shelton <stuart@shelton.me>

cmd/podman/containers/stats.go

@@ -150,6 +150,7 @@ func outputStats(reports []define.ContainerStats) error {
 		"ID":            "ID",
 		"CPUPerc":       "CPU %",
 		"MemUsage":      "MEM USAGE / LIMIT",
+		"MemUsageBytes": "MEM USAGE / LIMIT",
 		"MemPerc":       "MEM %",
 		"NetIO":         "NET IO",
 		"BlockIO":       "BLOCK IO",
@@ -222,10 +223,15 @@ func (s *containerStats) PIDS() string {
 	}
 	return fmt.Sprintf("%d", s.PIDs)
 }
+
 func (s *containerStats) MemUsage() string {
 	return combineHumanValues(s.ContainerStats.MemUsage, s.ContainerStats.MemLimit)
 }
 
+func (s *containerStats) MemUsageBytes() string {
+	return combineBytesValues(s.ContainerStats.MemUsage, s.ContainerStats.MemLimit)
+}
+
 func floatToPercentString(f float64) string {
 	strippedFloat, err := utils.RemoveScientificNotationFromFloat(f)
 	if err != nil || strippedFloat == 0 {
@@ -242,6 +248,13 @@ func combineHumanValues(a, b uint64) string {
 	return fmt.Sprintf("%s / %s", units.HumanSize(float64(a)), units.HumanSize(float64(b)))
 }
 
+func combineBytesValues(a, b uint64) string {
+	if a == 0 && b == 0 {
+		return "-- / --"
+	}
+	return fmt.Sprintf("%s / %s", units.BytesSize(float64(a)), units.BytesSize(float64(b)))
+}
+
 func outputJSON(stats []containerStats) error {
 	type jstat struct {
 		Id         string `json:"id"` // nolint

cmd/podman/pods/stats.go

@@ -77,6 +77,7 @@ func stats(cmd *cobra.Command, args []string) error {
 	headers := report.Headers(entities.PodStatsReport{}, map[string]string{
 		"CPU":           "CPU %",
 		"MemUsage":      "MEM USAGE/ LIMIT",
+		"MemUsageBytes": "MEM USAGE/ LIMIT",
 		"MEM":           "MEM %",
 		"NET IO":        "NET IO",
 		"BlockIO":       "BLOCK IO",

docs/source/markdown/podman-pod-stats.1.md

@@ -36,12 +36,13 @@ Pretty-print container statistics to JSON or using a Go template
 Valid placeholders for the Go template are listed below:
 
 | **Placeholder** | **Description**    |
-| --------------- | ---------------   |
+| --------------- | ------------------ |
 | .Pod            | Pod ID             |
 | .CID            | Container ID       |
 | .Name           | Container Name     |
 | .CPU            | CPU percentage     |
 | .MemUsage       | Memory usage       |
+| .MemUsageBytes  | Memory usage (IEC) |
 | .Mem            | Memory percentage  |
 | .NetIO          | Network IO         |
 | .BlockIO        | Block IO           |

docs/source/markdown/podman-stats.1.md

@@ -46,11 +46,12 @@ Pretty-print container statistics to JSON or using a Go template
 Valid placeholders for the Go template are listed below:
 
 | **Placeholder** | **Description**    |
-| --------------- | ---------------   |
+| --------------- | ------------------ |
 | .ID             | Container ID       |
 | .Name           | Container Name     |
 | .CPUPerc        | CPU percentage     |
 | .MemUsage       | Memory usage       |
+| .MemUsageBytes  | Memory usage (IEC) |
 | .MemPerc        | Memory percentage  |
 | .NetIO          | Network IO         |
 | .BlockIO        | Block IO           |

pkg/domain/entities/pods.go

@@ -214,6 +214,7 @@ type PodStatsOptions struct {
 type PodStatsReport struct {
 	CPU           string
 	MemUsage      string
+	MemUsageBytes string
 	Mem           string
 	NetIO         string
 	BlockIO       string

pkg/domain/infra/abi/pods_stats.go

@@ -46,6 +46,7 @@ func (ic *ContainerEngine) podsToStatsReport(pods []*libpod.Pod) ([]*entities.Po
 			r := entities.PodStatsReport{
 				CPU:           floatToPercentString(podStats[j].CPU),
 				MemUsage:      combineHumanValues(podStats[j].MemUsage, podStats[j].MemLimit),
+				MemUsageBytes: combineBytesValues(podStats[j].MemUsage, podStats[j].MemLimit),
 				Mem:           floatToPercentString(podStats[j].MemPerc),
 				NetIO:         combineHumanValues(podStats[j].NetInput, podStats[j].NetOutput),
 				BlockIO:       combineHumanValues(podStats[j].BlockInput, podStats[j].BlockOutput),
@@ -68,6 +69,13 @@ func combineHumanValues(a, b uint64) string {
 	return fmt.Sprintf("%s / %s", units.HumanSize(float64(a)), units.HumanSize(float64(b)))
 }
 
+func combineBytesValues(a, b uint64) string {
+	if a == 0 && b == 0 {
+		return "-- / --"
+	}
+	return fmt.Sprintf("%s / %s", units.BytesSize(float64(a)), units.BytesSize(float64(b)))
+}
+
 func floatToPercentString(f float64) string {
 	strippedFloat, err := utils.RemoveScientificNotationFromFloat(f)
 	if err != nil || strippedFloat == 0 {