Merge pull request #36 from ernoaapa/humanreadable-mount-sizes

Update 'eli describe node' to print mounts in human-readable sizes
ernoaapa · Apr 28, 2018 · 5c72763 · 5c72763
2 parents db5d4a4 + 89992ba
commit 5c72763
Show file tree

Hide file tree

Showing 6 changed files with 311 additions and 2 deletions.
diff --git a/pkg/printers/humanreadable.go b/pkg/printers/humanreadable.go
@@ -18,6 +18,7 @@ import (
 	"github.com/ernoaapa/eliot/pkg/utils"
 	"github.com/pkg/errors"
 
+	"github.com/c2h5oh/datasize"
 	"github.com/hako/durafmt"
 )
 
@@ -109,6 +110,9 @@ func (p *HumanReadablePrinter) PrintNode(info *node.Info, writer io.Writer) erro
 		"Subtract": func(a, b uint64) uint64 {
 			return a - b
 		},
+		"FormatBytes": func(v uint64) string {
+			return datasize.ByteSize(v).HumanReadable()
+		},
 	})
 	t, err := t.Parse(humanreadable.NodeDetailsTemplate)
 	if err != nil {

diff --git a/pkg/printers/humanreadable/NodeDetailsTemplate.go b/pkg/printers/humanreadable/NodeDetailsTemplate.go
@@ -20,7 +20,7 @@ Filesystems:
 	Filesystem	Type	Size	Used	Available	Use%	Mounted on
 	----------	----	----	----	---------	----	----------
 {{- range .Filesystems}}
-	{{.Filesystem}}	{{.TypeName}}	{{.Total}}	{{Subtract .Total .Free}}	{{.Available}}	{{FormatPercent .Total .Free .Available}}	{{.MountDir}}
+	{{.Filesystem}}	{{.TypeName}}	{{FormatBytes .Total}}	{{Subtract .Total .Free | FormatBytes}}	{{FormatBytes .Available}}	{{FormatPercent .Total .Free .Available}}	{{.MountDir}}
 {{- end}}
 {{- end}}
 `
diff --git a/vendor.conf b/vendor.conf
@@ -41,4 +41,5 @@ k8s.io/kubernetes v1.9.0-alpha.2
 github.com/thejerf/suture v2.0.1
 github.com/ghodss/yaml v1.0.0
 github.com/syndtr/gocapability db04d3cc01c8b54962a58ec7e491717d06cfcc16
-github.com/hako/durafmt 987f93c94e473e74aadc826871e61ae6b3360ebb
+github.com/hako/durafmt 987f93c94e473e74aadc826871e61ae6b3360ebb
+github.com/c2h5oh/datasize 4eba002a5eaea69cf8d235a388fc6b65ae68d2dd
diff --git a/vendor/github.com/c2h5oh/datasize/LICENSE b/vendor/github.com/c2h5oh/datasize/LICENSE
diff --git a/vendor/github.com/c2h5oh/datasize/README.md b/vendor/github.com/c2h5oh/datasize/README.md
diff --git a/vendor/github.com/c2h5oh/datasize/datasize.go b/vendor/github.com/c2h5oh/datasize/datasize.go