v0.7.5

Readme : fix link

.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
     steps:
       - checkout
       - setup_remote_docker:
-          version: 17.05.0-ce
+          version: 19.03.13
       - run: make image
       - deploy: 
           command: |

Dockerfile

@@ -1,4 +1,4 @@
-FROM quay.io/vektorcloud/go:1.12
+FROM quay.io/vektorcloud/go:1.13
 
 RUN apk add --no-cache make
 

Makefile

@@ -1,8 +1,7 @@
 NAME=ctop
 VERSION=$(shell cat VERSION)
 BUILD=$(shell git rev-parse --short HEAD)
-EXT_LD_FLAGS="-Wl,--allow-multiple-definition"
-LD_FLAGS="-w -X main.version=$(VERSION) -X main.build=$(BUILD) -extldflags=$(EXT_LD_FLAGS)"
+LD_FLAGS="-w -X main.version=$(VERSION) -X main.build=$(BUILD)"
 
 clean:
 	rm -rf _build/ release/
@@ -11,27 +10,27 @@ build:
 	go mod download
 	CGO_ENABLED=0 go build -tags release -ldflags $(LD_FLAGS) -o ctop
 
-build-dev:
-	go build -ldflags "-w -X main.version=$(VERSION)-dev -X main.build=$(BUILD) -extldflags=$(EXT_LD_FLAGS)"
-
 build-all:
 	mkdir -p _build
-	GOOS=darwin  GOARCH=amd64 go build -tags release -ldflags $(LD_FLAGS) -o _build/ctop-$(VERSION)-darwin-amd64
-	GOOS=linux   GOARCH=amd64 go build -tags release -ldflags $(LD_FLAGS) -o _build/ctop-$(VERSION)-linux-amd64
-	GOOS=linux   GOARCH=arm   go build -tags release -ldflags $(LD_FLAGS) -o _build/ctop-$(VERSION)-linux-arm
-	GOOS=linux   GOARCH=arm64 go build -tags release -ldflags $(LD_FLAGS) -o _build/ctop-$(VERSION)-linux-arm64
-	GOOS=windows GOARCH=amd64 go build -tags release -ldflags $(LD_FLAGS) -o _build/ctop-$(VERSION)-windows-amd64
+	GOOS=darwin  GOARCH=amd64 CGO_ENABLED=0 go build -tags release -ldflags $(LD_FLAGS) -o _build/ctop-$(VERSION)-darwin-amd64
+	GOOS=linux   GOARCH=amd64 CGO_ENABLED=0 go build -tags release -ldflags $(LD_FLAGS) -o _build/ctop-$(VERSION)-linux-amd64
+	GOOS=linux   GOARCH=arm   CGO_ENABLED=0 go build -tags release -ldflags $(LD_FLAGS) -o _build/ctop-$(VERSION)-linux-arm
+	GOOS=linux   GOARCH=arm64 CGO_ENABLED=0 go build -tags release -ldflags $(LD_FLAGS) -o _build/ctop-$(VERSION)-linux-arm64
+	GOOS=windows GOARCH=amd64 CGO_ENABLED=0 go build -tags release -ldflags $(LD_FLAGS) -o _build/ctop-$(VERSION)-windows-amd64
 	cd _build; sha256sum * > sha256sums.txt
 
+run-dev:
+	rm -f ctop.sock ctop
+	go build -ldflags $(LD_FLAGS) -o ctop
+	CTOP_DEBUG=1 ./ctop
+
 image:
 	docker build -t ctop -f Dockerfile .
 
 release:
 	mkdir release
-	go get github.com/progrium/gh-release/...
 	cp _build/* release
 	cd release; sha256sum --quiet --check sha256sums.txt
-	gh-release create bcicen/$(NAME) $(VERSION) \
-		$(shell git rev-parse --abbrev-ref HEAD) $(VERSION)
+	gh release create $(VERSION) -d -t $(VERSION) *
 
 .PHONY: build

README.md

@@ -9,7 +9,7 @@ Top-like interface for container metrics
 `ctop` provides a concise and condensed overview of real-time metrics for multiple containers:
 <p align="center"><img src="_docs/img/grid.gif" alt="ctop"/></p>
 
-as well as an [single container view][single_view] for inspecting a specific container.
+as well as a [single container view][single_view] for inspecting a specific container.
 
 `ctop` comes with built-in support for Docker and runC; connectors for other container and cluster systems are planned for future releases.
 
@@ -17,10 +17,24 @@ as well as an [single container view][single_view] for inspecting a specific con
 
 Fetch the [latest release](https://github.com/bcicen/ctop/releases) for your platform:
 
-#### Linux
+#### Debian/Ubuntu
+
+Maintained by a [third party](https://packages.azlux.fr/)
+```bash
+echo "deb http://packages.azlux.fr/debian/ buster main" | sudo tee /etc/apt/sources.list.d/azlux.list
+wget -qO - https://azlux.fr/repo.gpg.key | sudo apt-key add -
+sudo apt update
+sudo apt install docker-ctop
+```
+
+#### Arch
+
+`ctop` is available for Arch in the [AUR](https://aur.archlinux.org/packages/ctop-bin/)
+
+#### Linux (Generic)
 
 ```bash
-sudo wget https://github.com/bcicen/ctop/releases/download/v0.7.3/ctop-0.7.3-linux-amd64 -O /usr/local/bin/ctop
+sudo wget https://github.com/bcicen/ctop/releases/download/v0.7.5/ctop-0.7.5-linux-amd64 -O /usr/local/bin/ctop
 sudo chmod +x /usr/local/bin/ctop
 ```
 
@@ -31,7 +45,7 @@ brew install ctop
 ```
 or
 ```bash
-sudo curl -Lo /usr/local/bin/ctop https://github.com/bcicen/ctop/releases/download/v0.7.3/ctop-0.7.3-darwin-amd64
+sudo curl -Lo /usr/local/bin/ctop https://github.com/bcicen/ctop/releases/download/v0.7.5/ctop-0.7.5-darwin-amd64
 sudo chmod +x /usr/local/bin/ctop
 ```
 
@@ -44,8 +58,6 @@ docker run --rm -ti \
   quay.io/vektorlab/ctop:latest
 ```
 
-`ctop` is also available for Arch in the [AUR](https://aur.archlinux.org/packages/ctop-bin/)
-
 ## Building
 
 Build steps can be found [here][build].
@@ -56,7 +68,9 @@ Build steps can be found [here][build].
 
 ### Config file
 
-While running, use `S` to save the current filters, sort field, and other options to a default config path. These settings will be loaded and applied the next time `ctop` is started.
+While running, use `S` to save the current filters, sort field, and other options to a default config path (`~/.config/ctop/config` on XDG systems, else `~/.ctop`).
+
+Config file values will be loaded and applied the next time `ctop` is started.
 
 ### Options
 
@@ -70,24 +84,25 @@ Option | Description
 `-s`  | select initial container sort field
 `-scale-cpu`	| show cpu as % of system total
 `-v`	| output version information and exit
-`-shell` | specify shell (default: sh)
+`-shell` | exec shell to use (default: sh)
 
 ### Keybindings
 
-Key | Action
---- | ---
-`<enter>` | Open container menu
-`a` | Toggle display of all (running and non-running) containers
-`f` | Filter displayed containers (`esc` to clear when open)
-`H` | Toggle ctop header
-`h` | Open help dialog
-`s` | Select container sort field
-`r` | Reverse container sort order
-`o` | Open single view
-`l` | View container logs (`t` to toggle timestamp when open)
-`e` | Exec Shell
-`S` | Save current configuration to file
-`q` | Quit ctop
+|           Key            | Action                                                     |
+| :----------------------: | ---------------------------------------------------------- |
+| <kbd>&lt;ENTER&gt;</kbd> | Open container menu                                        |
+|       <kbd>a</kbd>       | Toggle display of all (running and non-running) containers |
+|       <kbd>f</kbd>       | Filter displayed containers (`esc` to clear when open)     |
+|       <kbd>H</kbd>       | Toggle ctop header                                         |
+|       <kbd>h</kbd>       | Open help dialog                                           |
+|       <kbd>s</kbd>       | Select container sort field                                |
+|       <kbd>r</kbd>       | Reverse container sort order                               |
+|       <kbd>o</kbd>       | Open single view                                           |
+|       <kbd>l</kbd>       | View container logs (`t` to toggle timestamp when open)    |
+|       <kbd>e</kbd>       | Exec Shell                                                 |
+|       <kbd>c</kbd>       | Configure columns                                          |
+|       <kbd>S</kbd>       | Save current configuration to file                         |
+|       <kbd>q</kbd>       | Quit ctop                                                  |
 
 [build]: _docs/build.md
 [connectors]: _docs/connectors.md

VERSION

@@ -1 +1 @@
-0.7.3
+0.7.5

_docs/build.md

@@ -1,10 +1,8 @@
 # Build
 
-To build `ctop` from source, ensure you have [dep](https://github.com/golang/dep) installed and run:
+To build `ctop` from source, simply clone the repo and run:
 
 ```bash
-go get github.com/bcicen/ctop && \
-cd $GOPATH/src/github.com/bcicen/ctop && \
 make build
 ```
 
@@ -16,5 +14,8 @@ make image
 Now you can run your local image:
 
 ```bash
-docker run -ti --name ctop --rm -v /var/run/docker.sock:/var/run/docker.sock ctop
+docker run --rm -ti \
+  --name ctop \
+  -v /var/run/docker.sock:/var/run/docker.sock \
+  ctop:latest
 ```

config/columns.go

@@ -0,0 +1,145 @@
+package config
+
+import (
+	"strings"
+)
+
+// defaults
+var defaultColumns = []Column{
+	Column{
+		Name:    "status",
+		Label:   "Status Indicator",
+		Enabled: true,
+	},
+	Column{
+		Name:    "name",
+		Label:   "Container Name",
+		Enabled: true,
+	},
+	Column{
+		Name:    "id",
+		Label:   "Container ID",
+		Enabled: true,
+	},
+	Column{
+		Name:    "cpu",
+		Label:   "CPU Usage",
+		Enabled: true,
+	},
+	Column{
+		Name:    "mem",
+		Label:   "Memory Usage",
+		Enabled: true,
+	},
+	Column{
+		Name:    "net",
+		Label:   "Network RX/TX",
+		Enabled: true,
+	},
+	Column{
+		Name:    "io",
+		Label:   "Disk IO Read/Write",
+		Enabled: true,
+	},
+	Column{
+		Name:    "pids",
+		Label:   "Container PID Count",
+		Enabled: true,
+	},
+}
+
+type Column struct {
+	Name    string
+	Label   string
+	Enabled bool
+}
+
+// ColumnsString returns an ordered and comma-delimited string of currently enabled Columns
+func ColumnsString() string { return strings.Join(EnabledColumns(), ",") }
+
+// EnabledColumns returns an ordered array of enabled column names
+func EnabledColumns() (a []string) {
+	lock.RLock()
+	defer lock.RUnlock()
+	for _, col := range GlobalColumns {
+		if col.Enabled {
+			a = append(a, col.Name)
+		}
+	}
+	return a
+}
+
+// ColumnToggle toggles the enabled status of a given column name
+func ColumnToggle(name string) {
+	col := GlobalColumns[colIndex(name)]
+	col.Enabled = !col.Enabled
+	log.Noticef("config change [column-%s]: %t -> %t", col.Name, !col.Enabled, col.Enabled)
+}
+
+// ColumnLeft moves the column with given name up one position, if possible
+func ColumnLeft(name string) {
+	idx := colIndex(name)
+	if idx > 0 {
+		swapCols(idx, idx-1)
+	}
+}
+
+// ColumnRight moves the column with given name up one position, if possible
+func ColumnRight(name string) {
+	idx := colIndex(name)
+	if idx < len(GlobalColumns)-1 {
+		swapCols(idx, idx+1)
+	}
+}
+
+// Set Column order and enabled status from one or more provided Column names
+func SetColumns(names []string) {
+	var (
+		n          int
+		curColStr  = ColumnsString()
+		newColumns = make([]*Column, len(GlobalColumns))
+	)
+
+	lock.Lock()
+
+	// add enabled columns by name
+	for _, name := range names {
+		newColumns[n] = popColumn(name)
+		newColumns[n].Enabled = true
+		n++
+	}
+
+	// extend with omitted columns as disabled
+	for _, col := range GlobalColumns {
+		newColumns[n] = col
+		newColumns[n].Enabled = false
+		n++
+	}
+
+	GlobalColumns = newColumns
+	lock.Unlock()
+
+	log.Noticef("config change [columns]: %s -> %s", curColStr, ColumnsString())
+}
+
+func swapCols(i, j int) { GlobalColumns[i], GlobalColumns[j] = GlobalColumns[j], GlobalColumns[i] }
+
+func popColumn(name string) *Column {
+	idx := colIndex(name)
+	if idx < 0 {
+		panic("no such column name: " + name)
+	}
+	col := GlobalColumns[idx]
+	GlobalColumns = append(GlobalColumns[:idx], GlobalColumns[idx+1:]...)
+	return col
+}
+
+// return index of column with given name, if any
+func colIndex(name string) int {
+	for n, c := range GlobalColumns {
+		if c.Name == name {
+			return n
+		}
+	}
+	return -1
+}

config/file.go

@@ -19,19 +19,28 @@ type File struct {
 }
 
 func exportConfig() File {
+	// update columns param from working config
+	Update("columns", ColumnsString())
+
+	lock.RLock()
+	defer lock.RUnlock()
+
 	c := File{
 		Options: make(map[string]string),
 		Toggles: make(map[string]bool),
 	}
+
 	for _, p := range GlobalParams {
 		c.Options[p.Key] = p.Val
 	}
 	for _, sw := range GlobalSwitches {
 		c.Toggles[sw.Key] = sw.Val
 	}
+
 	return c
 }
 
+//
 func Read() error {
 	var config File
 
@@ -43,13 +52,26 @@ func Read() error {
 	if _, err := toml.DecodeFile(path, &config); err != nil {
 		return err
 	}
-
 	for k, v := range config.Options {
 		Update(k, v)
 	}
 	for k, v := range config.Toggles {
 		UpdateSwitch(k, v)
 	}
+
+	// set working column config, if provided
+	colStr := GetVal("columns")
+	if len(colStr) > 0 {
+		var colNames []string
+		for _, s := range strings.Split(colStr, ",") {
+			s = strings.TrimSpace(s)
+			if s != "" {
+				colNames = append(colNames, strings.TrimSpace(s))
+			}
+		}
+		SetColumns(colNames)
+	}
+
 	return nil
 }
 
@@ -68,6 +90,13 @@ func Write() (path string, err error) {
 		}
 	}
 
+	// remove prior to writing new file
+	if err := os.Remove(path); err != nil {
+		if !os.IsNotExist(err) {
+			return path, err
+		}
+	}
+
 	file, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE, 0644)
 	if err != nil {
 		return path, fmt.Errorf("failed to open config for writing: %s", err)

config/main.go

@@ -3,6 +3,7 @@ package config
 import (
 	"fmt"
 	"os"
+	"sync"
 
 	"github.com/bcicen/ctop/logging"
 )
@@ -10,17 +11,24 @@ import (
 var (
 	GlobalParams   []*Param
 	GlobalSwitches []*Switch
+	GlobalColumns  []*Column
+	lock           sync.RWMutex
 	log            = logging.Init()
 )
 
 func Init() {
-	for _, p := range params {
+	for _, p := range defaultParams {
 		GlobalParams = append(GlobalParams, p)
-		log.Infof("loaded config param: %s: %s", quote(p.Key), quote(p.Val))
+		log.Infof("loaded default config param [%s]: %s", quote(p.Key), quote(p.Val))
 	}
-	for _, s := range switches {
+	for _, s := range defaultSwitches {
 		GlobalSwitches = append(GlobalSwitches, s)
-		log.Infof("loaded config switch: %s: %t", quote(s.Key), s.Val)
+		log.Infof("loaded default config switch [%s]: %t", quote(s.Key), s.Val)
+	}
+	for _, c := range defaultColumns {
+		x := c
+		GlobalColumns = append(GlobalColumns, &x)
+		log.Infof("loaded default widget config [%s]: %t", quote(x.Name), x.Enabled)
 	}
 }
 

config/param.go

@@ -1,7 +1,7 @@
 package config
 
 // defaults
-var params = []*Param{
+var defaultParams = []*Param{
 	&Param{
 		Key:   "filterStr",
 		Val:   "",
@@ -17,6 +17,11 @@ var params = []*Param{
 		Val:   "sh",
 		Label: "Shell",
 	},
+	&Param{
+		Key:   "columns",
+		Val:   "status,name,id,cpu,mem,net,io,pids",
+		Label: "Enabled Columns",
+	},
 }
 
 type Param struct {
@@ -27,6 +32,9 @@ type Param struct {
 
 // Get Param by key
 func Get(k string) *Param {
+	lock.RLock()
+	defer lock.RUnlock()
+
 	for _, p := range GlobalParams {
 		if p.Key == k {
 			return p
@@ -43,7 +51,10 @@ func GetVal(k string) string {
 // Set param value
 func Update(k, v string) {
 	p := Get(k)
-	log.Noticef("config change: %s: %s -> %s", k, quote(p.Val), quote(v))
+	log.Noticef("config change [%s]: %s -> %s", k, quote(p.Val), quote(v))
+
+	lock.Lock()
+	defer lock.Unlock()
 	p.Val = v
 	// log.Errorf("ignoring update for non-existant parameter: %s", k)
 }

config/switch.go

@@ -1,7 +1,7 @@
 package config
 
 // defaults
-var switches = []*Switch{
+var defaultSwitches = []*Switch{
 	&Switch{
 		Key:   "sortReversed",
 		Val:   false,
@@ -37,6 +37,9 @@ type Switch struct {
 
 // GetSwitch returns Switch by key
 func GetSwitch(k string) *Switch {
+	lock.RLock()
+	defer lock.RUnlock()
+
 	for _, sw := range GlobalSwitches {
 		if sw.Key == k {
 			return sw
@@ -52,8 +55,12 @@ func GetSwitchVal(k string) bool {
 
 func UpdateSwitch(k string, val bool) {
 	sw := GetSwitch(k)
+
+	lock.Lock()
+	defer lock.Unlock()
+
 	if sw.Val != val {
-		log.Noticef("config change: %s: %t -> %t", k, sw.Val, val)
+		log.Noticef("config change [%s]: %t -> %t", k, sw.Val, val)
 		sw.Val = val
 	}
 }
@@ -61,8 +68,11 @@ func UpdateSwitch(k string, val bool) {
 // Toggle a boolean switch
 func Toggle(k string) {
 	sw := GetSwitch(k)
-	newVal := !sw.Val
-	log.Noticef("config change: %s: %t -> %t", k, sw.Val, newVal)
-	sw.Val = newVal
+
+	lock.Lock()
+	defer lock.Unlock()
+
+	sw.Val = !sw.Val
+	log.Noticef("config change [%s]: %t -> %t", k, !sw.Val, sw.Val)
 	//log.Errorf("ignoring toggle for non-existant switch: %s", k)
 }

connector/collector/docker.go

@@ -114,10 +114,10 @@ func (c *Docker) ReadIO(stats *api.Stats) {
 	var read, write int64
 	for _, blk := range stats.BlkioStats.IOServiceBytesRecursive {
 		if blk.Op == "Read" {
-			read = int64(blk.Value)
+			read += int64(blk.Value)
 		}
 		if blk.Op == "Write" {
-			write = int64(blk.Value)
+			write += int64(blk.Value)
 		}
 	}
 	c.IOBytesRead, c.IOBytesWrite = read, write

connector/collector/proc.go

@@ -4,13 +4,14 @@ package collector
 
 import (
 	linuxproc "github.com/c9s/goprocinfo/linux"
-	"github.com/opencontainers/runc/libcontainer/system"
 )
 
 var sysMemTotal = getSysMemTotal()
-var clockTicksPerSecond = uint64(system.GetClockTicks())
 
-const nanoSecondsPerSecond = 1e9
+const (
+	clockTicksPerSecond  uint64 = 100
+	nanoSecondsPerSecond        = 1e9
+)
 
 func getSysMemTotal() int64 {
 	stat, err := linuxproc.ReadMemInfo("/proc/meminfo")

connector/collector/runc.go

@@ -5,10 +5,12 @@ package collector
 import (
 	"time"
 
-	"github.com/bcicen/ctop/config"
-	"github.com/bcicen/ctop/models"
 	"github.com/opencontainers/runc/libcontainer"
 	"github.com/opencontainers/runc/libcontainer/cgroups"
+	"github.com/opencontainers/runc/types"
+
+	"github.com/bcicen/ctop/config"
+	"github.com/bcicen/ctop/models"
 )
 
 // Runc collector
@@ -112,7 +114,7 @@ func (c *Runc) ReadMem(stats *cgroups.Stats) {
 	c.MemPercent = percent(float64(c.MemUsage), float64(c.MemLimit))
 }
 
-func (c *Runc) ReadNet(interfaces []*libcontainer.NetworkInterface) {
+func (c *Runc) ReadNet(interfaces []*types.NetworkInterface) {
 	var rx, tx int64
 	for _, network := range interfaces {
 		rx += int64(network.RxBytes)

connector/main.go

@@ -22,7 +22,7 @@ type Connector interface {
 	All() container.Containers
 	// Get returns a single container.Container by ID
 	Get(string) (*container.Container, bool)
-	// Wait waits for the underlying connection to be lost before returning
+	// Wait blocks until the underlying connection is lost
 	Wait() struct{}
 }
 

connector/manager/main.go

@@ -1,5 +1,9 @@
 package manager
 
+import "errors"
+
+var ActionNotImplErr = errors.New("action not implemented")
+
 type Manager interface {
 	Start() error
 	Stop() error

connector/manager/mock.go

@@ -7,29 +7,29 @@ func NewMock() *Mock {
 }
 
 func (m *Mock) Start() error {
-	return nil
+	return ActionNotImplErr
 }
 
 func (m *Mock) Stop() error {
-	return nil
+	return ActionNotImplErr
 }
 
 func (m *Mock) Remove() error {
-	return nil
+	return ActionNotImplErr
 }
 
 func (m *Mock) Pause() error {
-	return nil
+	return ActionNotImplErr
 }
 
 func (m *Mock) Unpause() error {
-	return nil
+	return ActionNotImplErr
 }
 
 func (m *Mock) Restart() error {
-	return nil
+	return ActionNotImplErr
 }
 
 func (m *Mock) Exec(cmd []string) error {
-	return nil
+	return ActionNotImplErr
 }

connector/manager/runc.go

@@ -7,29 +7,29 @@ func NewRunc() *Runc {
 }
 
 func (rc *Runc) Start() error {
-	return nil
+	return ActionNotImplErr
 }
 
 func (rc *Runc) Stop() error {
-	return nil
+	return ActionNotImplErr
 }
 
 func (rc *Runc) Remove() error {
-	return nil
+	return ActionNotImplErr
 }
 
 func (rc *Runc) Pause() error {
-	return nil
+	return ActionNotImplErr
 }
 
 func (rc *Runc) Unpause() error {
-	return nil
+	return ActionNotImplErr
 }
 
 func (rc *Runc) Restart() error {
-	return nil
+	return ActionNotImplErr
 }
 
 func (rc *Runc) Exec(cmd []string) error {
-	return nil
+	return ActionNotImplErr
 }

connector/mock.go

@@ -32,11 +32,11 @@ func (cs *Mock) Init() {
 	rand.Seed(int64(time.Now().Nanosecond()))
 
 	for i := 0; i < 4; i++ {
-		cs.makeContainer(3)
+		cs.makeContainer(3, true)
 	}
 
 	for i := 0; i < 16; i++ {
-		cs.makeContainer(1)
+		cs.makeContainer(1, false)
 	}
 
 }
@@ -50,12 +50,28 @@ func (cs *Mock) Wait() struct{} {
 	return <-ch
 }
 
-func (cs *Mock) makeContainer(aggression int64) {
+var healthStates = []string{"starting", "healthy", "unhealthy"}
+
+func (cs *Mock) makeContainer(aggression int64, health bool) {
 	collector := collector.NewMock(aggression)
 	manager := manager.NewMock()
 	c := container.New(makeID(), collector, manager)
 	c.SetMeta("name", makeName())
 	c.SetState(makeState())
+	if health {
+		var i int
+		c.SetMeta("health", healthStates[i])
+		go func() {
+			for {
+				i++
+				if i >= len(healthStates) {
+					i = 0
+				}
+				c.SetMeta("health", healthStates[i])
+				time.Sleep(12 * time.Second)
+			}
+		}()
+	}
 	cs.containers = append(cs.containers, c)
 }
 

connector/runc.go

@@ -247,7 +247,7 @@ func (cm *Runc) All() (containers container.Containers) {
 func getFactory(opts RuncOpts) (libcontainer.Factory, error) {
 	cgroupManager := libcontainer.Cgroupfs
 	if opts.systemdCgroups {
-		if systemd.UseSystemd() {
+		if systemd.IsRunningSystemd() {
 			cgroupManager = libcontainer.SystemdCgroups
 		} else {
 			return nil, fmt.Errorf("systemd cgroup enabled, but systemd support for managing cgroups is not available")

container/main.go

@@ -21,8 +21,8 @@ const (
 type Container struct {
 	models.Metrics
 	Id        string
-	Meta      map[string]string
-	Widgets   *compact.Compact
+	Meta      models.Meta
+	Widgets   *compact.CompactRow
 	Display   bool // display this container in compact view
 	updater   cwidgets.WidgetUpdater
 	collector collector.Collector
@@ -30,11 +30,11 @@ type Container struct {
 }
 
 func New(id string, collector collector.Collector, manager manager.Manager) *Container {
-	widgets := compact.NewCompact(id)
+	widgets := compact.NewCompactRow()
 	return &Container{
 		Metrics:   models.NewMetrics(),
 		Id:        id,
-		Meta:      make(map[string]string),
+		Meta:      models.NewMeta("id", id[:12]),
 		Widgets:   widgets,
 		updater:   widgets,
 		collector: collector,
@@ -42,23 +42,24 @@ func New(id string, collector collector.Collector, manager manager.Manager) *Con
 	}
 }
 
+func (c *Container) RecreateWidgets() {
+	c.SetUpdater(cwidgets.NullWidgetUpdater{})
+	c.Widgets = compact.NewCompactRow()
+	c.SetUpdater(c.Widgets)
+}
+
 func (c *Container) SetUpdater(u cwidgets.WidgetUpdater) {
 	c.updater = u
-	for k, v := range c.Meta {
-		c.updater.SetMeta(k, v)
-	}
+	c.updater.SetMeta(c.Meta)
 }
 
 func (c *Container) SetMeta(k, v string) {
 	c.Meta[k] = v
-	c.updater.SetMeta(k, v)
+	c.updater.SetMeta(c.Meta)
 }
 
 func (c *Container) GetMeta(k string) string {
-	if v, ok := c.Meta[k]; ok {
-		return v
-	}
-	return ""
+	return c.Meta.Get(k)
 }
 
 func (c *Container) SetState(s string) {

cwidgets/compact/column.go

@@ -0,0 +1,49 @@
+package compact
+
+import (
+	"github.com/bcicen/ctop/config"
+	"github.com/bcicen/ctop/models"
+
+	ui "github.com/gizak/termui"
+)
+
+var (
+	allCols = map[string]NewCompactColFn{
+		"status": NewStatus,
+		"name":   NewNameCol,
+		"id":     NewCIDCol,
+		"cpu":    NewCPUCol,
+		"mem":    NewMemCol,
+		"net":    NewNetCol,
+		"io":     NewIOCol,
+		"pids":   NewPIDCol,
+	}
+)
+
+type NewCompactColFn func() CompactCol
+
+func newRowWidgets() []CompactCol {
+	enabled := config.EnabledColumns()
+	cols := make([]CompactCol, len(enabled))
+
+	for n, name := range enabled {
+		wFn, ok := allCols[name]
+		if !ok {
+			panic("no such widget name: %s" + name)
+		}
+		cols[n] = wFn()
+	}
+
+	return cols
+}
+
+type CompactCol interface {
+	ui.GridBufferer
+	Reset()
+	Header() string  // header text to display for column
+	FixedWidth() int // fixed width size. if == 0, width is automatically calculated
+	Highlight()
+	UnHighlight()
+	SetMeta(models.Meta)
+	SetMetrics(models.Metrics)
+}

cwidgets/compact/gauge.go

@@ -1,21 +1,60 @@
 package compact
 
 import (
+	"fmt"
+
+	"github.com/bcicen/ctop/cwidgets"
+	"github.com/bcicen/ctop/models"
+
 	ui "github.com/gizak/termui"
 )
 
-type GaugeCol struct {
-	*ui.Gauge
+type CPUCol struct {
+	*GaugeCol
 }
 
-func NewGaugeCol() *GaugeCol {
-	g := ui.NewGauge()
+func NewCPUCol() CompactCol {
+	return &CPUCol{NewGaugeCol("CPU")}
+}
+
+func (w *CPUCol) SetMetrics(m models.Metrics) {
+	val := m.CPUUtil
+	w.BarColor = colorScale(val)
+	w.Label = fmt.Sprintf("%d%%", val)
+
+	if val > 100 {
+		val = 100
+	}
+	w.Percent = val
+}
+
+type MemCol struct {
+	*GaugeCol
+}
+
+func NewMemCol() CompactCol {
+	return &MemCol{NewGaugeCol("MEM")}
+}
+
+func (w *MemCol) SetMetrics(m models.Metrics) {
+	w.BarColor = ui.ThemeAttr("gauge.bar.bg")
+	w.Label = fmt.Sprintf("%s / %s", cwidgets.ByteFormat64Short(m.MemUsage), cwidgets.ByteFormat64Short(m.MemLimit))
+	w.Percent = m.MemPercent
+}
+
+type GaugeCol struct {
+	*ui.Gauge
+	header string
+	fWidth int
+}
+
+func NewGaugeCol(header string) *GaugeCol {
+	g := &GaugeCol{ui.NewGauge(), header, 0}
 	g.Height = 1
 	g.Border = false
-	g.Percent = 0
 	g.PaddingBottom = 0
-	g.Label = "-"
-	return &GaugeCol{g}
+	g.Reset()
+	return g
 }
 
 func (w *GaugeCol) Reset() {
@@ -23,11 +62,30 @@ func (w *GaugeCol) Reset() {
 	w.Percent = 0
 }
 
+func (w *GaugeCol) Buffer() ui.Buffer {
+	// if bar would not otherwise be visible, set a minimum
+	// percentage value and low-contrast color for structure
+	if w.Percent < 5 {
+		w.Percent = 5
+		w.BarColor = ui.ColorBlack
+	}
+
+	return w.Gauge.Buffer()
+}
+
+// GaugeCol implements CompactCol
+func (w *GaugeCol) SetMeta(models.Meta)       {}
+func (w *GaugeCol) SetMetrics(models.Metrics) {}
+func (w *GaugeCol) Header() string            { return w.header }
+func (w *GaugeCol) FixedWidth() int           { return w.fWidth }
+
+// GaugeCol implements CompactCol
 func (w *GaugeCol) Highlight() {
 	w.Bg = ui.ThemeAttr("par.text.fg")
 	w.PercentColor = ui.ThemeAttr("par.text.hi")
 }
 
+// GaugeCol implements CompactCol
 func (w *GaugeCol) UnHighlight() {
 	w.Bg = ui.ThemeAttr("par.text.bg")
 	w.PercentColor = ui.ThemeAttr("par.text.bg")

cwidgets/compact/grid.go

@@ -4,11 +4,11 @@ import (
 	ui "github.com/gizak/termui"
 )
 
-var header *CompactHeader
-
 type CompactGrid struct {
 	ui.GridBufferer
-	Rows   []ui.GridBufferer
+	header *CompactHeader
+	cols   []CompactCol // reference columns
+	Rows   []RowBufferer
 	X, Y   int
 	Width  int
 	Height int
@@ -16,8 +16,9 @@ type CompactGrid struct {
 }
 
 func NewCompactGrid() *CompactGrid {
-	header = NewCompactHeader() // init column header
-	return &CompactGrid{}
+	cg := &CompactGrid{header: NewCompactHeader()}
+	cg.rebuildHeader()
+	return cg
 }
 
 func (cg *CompactGrid) Align() {
@@ -28,22 +29,51 @@ func (cg *CompactGrid) Align() {
 	}
 
 	// update row ypos, width recursively
+	colWidths := cg.calcWidths()
 	for _, r := range cg.pageRows() {
 		r.SetY(y)
 		y += r.GetHeight()
-		r.SetWidth(cg.Width)
+		r.SetWidths(cg.Width, colWidths)
 	}
 }
 
-func (cg *CompactGrid) Clear()         { cg.Rows = []ui.GridBufferer{} }
-func (cg *CompactGrid) GetHeight() int { return len(cg.Rows) + header.Height }
+func (cg *CompactGrid) Clear() {
+	cg.Rows = []RowBufferer{}
+	cg.rebuildHeader()
+}
+
+func (cg *CompactGrid) GetHeight() int { return len(cg.Rows) + cg.header.Height }
 func (cg *CompactGrid) SetX(x int)     { cg.X = x }
 func (cg *CompactGrid) SetY(y int)     { cg.Y = y }
 func (cg *CompactGrid) SetWidth(w int) { cg.Width = w }
-func (cg *CompactGrid) MaxRows() int   { return ui.TermHeight() - header.Height - cg.Y }
+func (cg *CompactGrid) MaxRows() int   { return ui.TermHeight() - cg.header.Height - cg.Y }
 
-func (cg *CompactGrid) pageRows() (rows []ui.GridBufferer) {
-	rows = append(rows, header)
+// calculate and return per-column width
+func (cg *CompactGrid) calcWidths() []int {
+	var autoCols int
+	width := cg.Width
+	colWidths := make([]int, len(cg.cols))
+
+	for n, w := range cg.cols {
+		colWidths[n] = w.FixedWidth()
+		width -= w.FixedWidth()
+		if w.FixedWidth() == 0 {
+			autoCols++
+		}
+	}
+
+	spacing := colSpacing * len(cg.cols)
+	autoWidth := (width - spacing) / autoCols
+	for n, val := range colWidths {
+		if val == 0 {
+			colWidths[n] = autoWidth
+		}
+	}
+	return colWidths
+}
+
+func (cg *CompactGrid) pageRows() (rows []RowBufferer) {
+	rows = append(rows, cg.header)
 	rows = append(rows, cg.Rows[cg.Offset:]...)
 	return rows
 }
@@ -56,6 +86,14 @@ func (cg *CompactGrid) Buffer() ui.Buffer {
 	return buf
 }
 
-func (cg *CompactGrid) AddRows(rows ...ui.GridBufferer) {
+func (cg *CompactGrid) AddRows(rows ...RowBufferer) {
 	cg.Rows = append(cg.Rows, rows...)
 }
+
+func (cg *CompactGrid) rebuildHeader() {
+	cg.cols = newRowWidgets()
+	cg.header.clearFieldPars()
+	for _, col := range cg.cols {
+		cg.header.addFieldPar(col.Header())
+	}
+}

cwidgets/compact/header.go

@@ -8,63 +8,59 @@ type CompactHeader struct {
 	X, Y   int
 	Width  int
 	Height int
+	cols   []CompactCol
+	widths []int
 	pars   []*ui.Par
 }
 
 func NewCompactHeader() *CompactHeader {
-	fields := []string{"", "NAME", "CID", "CPU", "MEM", "NET RX/TX", "IO R/W", "PIDS"}
-	ch := &CompactHeader{}
-	ch.Height = 2
-	for _, f := range fields {
-		ch.addFieldPar(f)
+	return &CompactHeader{
+		X:      rowPadding,
+		Height: 2,
 	}
-	return ch
 }
 
-func (ch *CompactHeader) GetHeight() int {
-	return ch.Height
+func (row *CompactHeader) GetHeight() int {
+	return row.Height
 }
 
-func (ch *CompactHeader) SetWidth(w int) {
-	x := ch.X
-	autoWidth := calcWidth(w)
-	for n, col := range ch.pars {
-		// set column to static width
-		if colWidths[n] != 0 {
-			col.SetX(x)
-			col.SetWidth(colWidths[n])
-			x += colWidths[n]
-			continue
+func (row *CompactHeader) SetWidths(totalWidth int, widths []int) {
+	x := row.X
+
+	for n, w := range row.pars {
+		w.SetX(x)
+		w.SetWidth(widths[n])
+		x += widths[n] + colSpacing
 	}
-		col.SetX(x)
-		col.SetWidth(autoWidth)
-		x += autoWidth + colSpacing
-	}
-	ch.Width = w
+	row.Width = totalWidth
 }
 
-func (ch *CompactHeader) SetX(x int) {
-	ch.X = x
+func (row *CompactHeader) SetX(x int) {
+	row.X = x
 }
 
-func (ch *CompactHeader) SetY(y int) {
-	for _, p := range ch.pars {
+func (row *CompactHeader) SetY(y int) {
+	for _, p := range row.pars {
 		p.SetY(y)
 	}
-	ch.Y = y
+	row.Y = y
 }
 
-func (ch *CompactHeader) Buffer() ui.Buffer {
+func (row *CompactHeader) Buffer() ui.Buffer {
 	buf := ui.NewBuffer()
-	for _, p := range ch.pars {
+	for _, p := range row.pars {
 		buf.Merge(p.Buffer())
 	}
 	return buf
 }
 
-func (ch *CompactHeader) addFieldPar(s string) {
-	p := ui.NewPar(s)
-	p.Height = ch.Height
-	p.Border = false
-	ch.pars = append(ch.pars, p)
+func (row *CompactHeader) clearFieldPars() {
+	row.pars = []*ui.Par{}
+}
+
+func (row *CompactHeader) addFieldPar(s string) {
+	p := ui.NewPar(s)
+	p.Height = row.Height
+	p.Border = false
+	row.pars = append(row.pars, p)
 }

cwidgets/compact/main.go

@@ -1,195 +0,0 @@
-package compact
-
-import (
-	"github.com/bcicen/ctop/config"
-	"github.com/bcicen/ctop/logging"
-	"github.com/bcicen/ctop/models"
-	ui "github.com/gizak/termui"
-)
-
-var log = logging.Init()
-
-type Compact struct {
-	Status *Status
-	Name   *TextCol
-	Cid    *TextCol
-	Cpu    *GaugeCol
-	Mem    *GaugeCol
-	Net    *TextCol
-	IO     *TextCol
-	Pids   *TextCol
-	Bg     *RowBg
-	X, Y   int
-	Width  int
-	Height int
-}
-
-func NewCompact(id string) *Compact {
-	// truncate container id
-	if len(id) > 12 {
-		id = id[:12]
-	}
-	row := &Compact{
-		Status: NewStatus(),
-		Name:   NewTextCol("-"),
-		Cid:    NewTextCol(id),
-		Cpu:    NewGaugeCol(),
-		Mem:    NewGaugeCol(),
-		Net:    NewTextCol("-"),
-		IO:     NewTextCol("-"),
-		Pids:   NewTextCol("-"),
-		Bg:     NewRowBg(),
-		X:      1,
-		Height: 1,
-	}
-	return row
-}
-
-//func (row *Compact) ToggleExpand() {
-//if row.Height == 1 {
-//row.Height = 4
-//} else {
-//row.Height = 1
-//}
-//}
-
-func (row *Compact) SetMeta(k, v string) {
-	switch k {
-	case "name":
-		row.Name.Set(v)
-	case "state":
-		row.Status.Set(v)
-	case "health":
-		row.Status.SetHealth(v)
-	}
-}
-
-func (row *Compact) SetMetrics(m models.Metrics) {
-	row.SetCPU(m.CPUUtil)
-	row.SetNet(m.NetRx, m.NetTx)
-	row.SetMem(m.MemUsage, m.MemLimit, m.MemPercent)
-	row.SetIO(m.IOBytesRead, m.IOBytesWrite)
-	row.SetPids(m.Pids)
-}
-
-// Set gauges, counters to default unread values
-func (row *Compact) Reset() {
-	row.Cpu.Reset()
-	row.Mem.Reset()
-	row.Net.Reset()
-	row.IO.Reset()
-	row.Pids.Reset()
-}
-
-func (row *Compact) GetHeight() int {
-	return row.Height
-}
-
-func (row *Compact) SetX(x int) {
-	row.X = x
-}
-
-func (row *Compact) SetY(y int) {
-	if y == row.Y {
-		return
-	}
-
-	row.Bg.Y = y
-	for _, col := range row.all() {
-		col.SetY(y)
-	}
-	row.Y = y
-}
-
-func (row *Compact) SetWidth(width int) {
-	if width == row.Width {
-		return
-	}
-	x := row.X
-
-	row.Bg.SetX(x + colWidths[0] + 1)
-	row.Bg.SetWidth(width)
-
-	autoWidth := calcWidth(width)
-	for n, col := range row.all() {
-		if colWidths[n] != 0 {
-			col.SetX(x)
-			col.SetWidth(colWidths[n])
-			x += colWidths[n]
-			continue
-		}
-		col.SetX(x)
-		col.SetWidth(autoWidth)
-		x += autoWidth + colSpacing
-	}
-	row.Width = width
-}
-
-func (row *Compact) Buffer() ui.Buffer {
-	buf := ui.NewBuffer()
-
-	buf.Merge(row.Bg.Buffer())
-	buf.Merge(row.Status.Buffer())
-	buf.Merge(row.Name.Buffer())
-	buf.Merge(row.Cid.Buffer())
-	buf.Merge(row.Cpu.Buffer())
-	buf.Merge(row.Mem.Buffer())
-	buf.Merge(row.Net.Buffer())
-	buf.Merge(row.IO.Buffer())
-	buf.Merge(row.Pids.Buffer())
-	return buf
-}
-
-func (row *Compact) all() []ui.GridBufferer {
-	return []ui.GridBufferer{
-		row.Status,
-		row.Name,
-		row.Cid,
-		row.Cpu,
-		row.Mem,
-		row.Net,
-		row.IO,
-		row.Pids,
-	}
-}
-
-func (row *Compact) Highlight() {
-	row.Name.Highlight()
-	if config.GetSwitchVal("fullRowCursor") {
-		row.Bg.Highlight()
-		row.Cid.Highlight()
-		row.Cpu.Highlight()
-		row.Mem.Highlight()
-		row.Net.Highlight()
-		row.IO.Highlight()
-		row.Pids.Highlight()
-	}
-}
-
-func (row *Compact) UnHighlight() {
-	row.Name.UnHighlight()
-	if config.GetSwitchVal("fullRowCursor") {
-		row.Bg.UnHighlight()
-		row.Cid.UnHighlight()
-		row.Cpu.UnHighlight()
-		row.Mem.UnHighlight()
-		row.Net.UnHighlight()
-		row.IO.UnHighlight()
-		row.Pids.UnHighlight()
-	}
-}
-
-type RowBg struct {
-	*ui.Par
-}
-
-func NewRowBg() *RowBg {
-	bg := ui.NewPar("")
-	bg.Height = 1
-	bg.Border = false
-	bg.Bg = ui.ThemeAttr("par.text.bg")
-	return &RowBg{bg}
-}
-
-func (w *RowBg) Highlight()   { w.Bg = ui.ThemeAttr("par.text.fg") }
-func (w *RowBg) UnHighlight() { w.Bg = ui.ThemeAttr("par.text.bg") }

cwidgets/compact/row.go

@@ -0,0 +1,129 @@
+package compact
+
+import (
+	"github.com/bcicen/ctop/config"
+	"github.com/bcicen/ctop/logging"
+	"github.com/bcicen/ctop/models"
+
+	ui "github.com/gizak/termui"
+)
+
+const rowPadding = 1
+
+var log = logging.Init()
+
+type RowBufferer interface {
+	SetY(int)
+	SetWidths(int, []int)
+	GetHeight() int
+	Buffer() ui.Buffer
+}
+
+type CompactRow struct {
+	Bg     *RowBg
+	Cols   []CompactCol
+	X, Y   int
+	Height int
+	widths []int // column widths
+}
+
+func NewCompactRow() *CompactRow {
+	row := &CompactRow{
+		Bg:     NewRowBg(),
+		Cols:   newRowWidgets(),
+		X:      rowPadding,
+		Height: 1,
+	}
+
+	return row
+}
+
+func (row *CompactRow) SetMeta(m models.Meta) {
+	for _, w := range row.Cols {
+		w.SetMeta(m)
+	}
+}
+
+func (row *CompactRow) SetMetrics(m models.Metrics) {
+	for _, w := range row.Cols {
+		w.SetMetrics(m)
+	}
+}
+
+// Set gauges, counters, etc. to default unread values
+func (row *CompactRow) Reset() {
+	for _, w := range row.Cols {
+		w.Reset()
+	}
+}
+
+func (row *CompactRow) GetHeight() int { return row.Height }
+
+//func (row *CompactRow) SetX(x int)     { row.X = x }
+
+func (row *CompactRow) SetY(y int) {
+	if y == row.Y {
+		return
+	}
+
+	row.Bg.Y = y
+	for _, w := range row.Cols {
+		w.SetY(y)
+	}
+	row.Y = y
+}
+
+func (row *CompactRow) SetWidths(totalWidth int, widths []int) {
+	x := row.X
+
+	row.Bg.SetX(x)
+	row.Bg.SetWidth(totalWidth)
+
+	for n, w := range row.Cols {
+		w.SetX(x)
+		w.SetWidth(widths[n])
+		x += widths[n] + colSpacing
+	}
+}
+
+func (row *CompactRow) Buffer() ui.Buffer {
+	buf := ui.NewBuffer()
+	buf.Merge(row.Bg.Buffer())
+	for _, w := range row.Cols {
+		buf.Merge(w.Buffer())
+	}
+	return buf
+}
+
+func (row *CompactRow) Highlight() {
+	row.Cols[1].Highlight()
+	if config.GetSwitchVal("fullRowCursor") {
+		for _, w := range row.Cols {
+			w.Highlight()
+		}
+	}
+}
+
+func (row *CompactRow) UnHighlight() {
+	row.Cols[1].UnHighlight()
+	if config.GetSwitchVal("fullRowCursor") {
+		for _, w := range row.Cols {
+			w.UnHighlight()
+		}
+	}
+}
+
+type RowBg struct {
+	*ui.Par
+}
+
+func NewRowBg() *RowBg {
+	bg := ui.NewPar("")
+	bg.Height = 1
+	bg.Border = false
+	bg.Bg = ui.ThemeAttr("par.text.bg")
+	return &RowBg{bg}
+}
+
+func (w *RowBg) Highlight()   { w.Bg = ui.ThemeAttr("par.text.fg") }
+func (w *RowBg) UnHighlight() { w.Bg = ui.ThemeAttr("par.text.bg") }

cwidgets/compact/setters.go

@@ -1,48 +0,0 @@
-package compact
-
-import (
-	"fmt"
-	"strconv"
-
-	"github.com/bcicen/ctop/cwidgets"
-	ui "github.com/gizak/termui"
-)
-
-func (row *Compact) SetNet(rx int64, tx int64) {
-	label := fmt.Sprintf("%s / %s", cwidgets.ByteFormat(rx), cwidgets.ByteFormat(tx))
-	row.Net.Set(label)
-}
-
-func (row *Compact) SetIO(read int64, write int64) {
-	label := fmt.Sprintf("%s / %s", cwidgets.ByteFormat(read), cwidgets.ByteFormat(write))
-	row.IO.Set(label)
-}
-
-func (row *Compact) SetPids(val int) {
-	label := strconv.Itoa(val)
-	row.Pids.Set(label)
-}
-
-func (row *Compact) SetCPU(val int) {
-	row.Cpu.BarColor = colorScale(val)
-	row.Cpu.Label = fmt.Sprintf("%s%%", strconv.Itoa(val))
-	if val < 5 {
-		val = 5
-		row.Cpu.BarColor = ui.ThemeAttr("gauge.bar.bg")
-	}
-	if val > 100 {
-		val = 100
-	}
-	row.Cpu.Percent = val
-}
-
-func (row *Compact) SetMem(val int64, limit int64, percent int) {
-	row.Mem.Label = fmt.Sprintf("%s / %s", cwidgets.ByteFormat(val), cwidgets.ByteFormat(limit))
-	if percent < 5 {
-		percent = 5
-		row.Mem.BarColor = ui.ColorBlack
-	} else {
-		row.Mem.BarColor = ui.ThemeAttr("gauge.bar.bg")
-	}
-	row.Mem.Percent = percent
-}

cwidgets/compact/status.go

@@ -1,6 +1,8 @@
 package compact
 
 import (
+	"github.com/bcicen/ctop/models"
+
 	ui "github.com/gizak/termui"
 )
 
@@ -17,14 +19,14 @@ type Status struct {
 	health []ui.Cell
 }
 
-func NewStatus() *Status {
+func NewStatus() CompactCol {
 	s := &Status{
 		Block:  ui.NewBlock(),
 		health: []ui.Cell{{Ch: ' '}},
 	}
 	s.Height = 1
 	s.Border = false
-	s.Set("")
+	s.setState("")
 	return s
 }
 
@@ -43,7 +45,20 @@ func (s *Status) Buffer() ui.Buffer {
 	return buf
 }
 
-func (s *Status) Set(val string) {
+func (s *Status) SetMeta(m models.Meta) {
+	s.setState(m.Get("state"))
+	s.setHealth(m.Get("health"))
+}
+
+// Status implements CompactCol
+func (s *Status) Reset()                    {}
+func (s *Status) SetMetrics(models.Metrics) {}
+func (s *Status) Highlight()                {}
+func (s *Status) UnHighlight()              {}
+func (s *Status) Header() string            { return "" }
+func (s *Status) FixedWidth() int           { return 3 }
+
+func (s *Status) setState(val string) {
 	// defaults
 	text := mark
 	color := ui.ColorDefault
@@ -60,21 +75,21 @@ func (s *Status) Set(val string) {
 	s.status = ui.TextCells(text, color, ui.ColorDefault)
 }
 
-func (s *Status) SetHealth(val string) {
-	if val == "" {
-		return
-	}
-
+func (s *Status) setHealth(val string) {
 	color := ui.ColorDefault
 	mark := healthMark
 
 	switch val {
+	case "":
+		return
 	case "healthy":
 		color = ui.ThemeAttr("status.ok")
 	case "unhealthy":
 		color = ui.ThemeAttr("status.danger")
 	case "starting":
 		color = ui.ThemeAttr("status.warn")
+	default:
+		log.Warningf("unknown health state string: \"%v\"", val)
 	}
 
 	s.health = ui.TextCells(mark, color, ui.ColorDefault)

cwidgets/compact/text.go

@@ -1,19 +1,97 @@
 package compact
 
 import (
+	"fmt"
+
+	"github.com/bcicen/ctop/cwidgets"
+	"github.com/bcicen/ctop/models"
+
 	ui "github.com/gizak/termui"
 )
 
-type TextCol struct {
-	*ui.Par
+type NameCol struct {
+	*TextCol
 }
 
-func NewTextCol(s string) *TextCol {
-	p := ui.NewPar(s)
+func NewNameCol() CompactCol {
+	return &NameCol{NewTextCol("NAME")}
+}
+
+func (w *NameCol) SetMeta(m models.Meta) {
+	w.setText(m.Get("name"))
+}
+
+type CIDCol struct {
+	*TextCol
+}
+
+func NewCIDCol() CompactCol {
+	c := &CIDCol{NewTextCol("CID")}
+	c.fWidth = 12
+	return c
+}
+
+func (w *CIDCol) SetMeta(m models.Meta) {
+	w.setText(m.Get("id"))
+}
+
+type NetCol struct {
+	*TextCol
+}
+
+func NewNetCol() CompactCol {
+	return &NetCol{NewTextCol("NET RX/TX")}
+}
+
+func (w *NetCol) SetMetrics(m models.Metrics) {
+	label := fmt.Sprintf("%s / %s", cwidgets.ByteFormat64Short(m.NetRx), cwidgets.ByteFormat64Short(m.NetTx))
+	w.setText(label)
+}
+
+type IOCol struct {
+	*TextCol
+}
+
+func NewIOCol() CompactCol {
+	return &IOCol{NewTextCol("IO R/W")}
+}
+
+func (w *IOCol) SetMetrics(m models.Metrics) {
+	label := fmt.Sprintf("%s / %s", cwidgets.ByteFormat64Short(m.IOBytesRead), cwidgets.ByteFormat64Short(m.IOBytesWrite))
+	w.setText(label)
+}
+
+type PIDCol struct {
+	*TextCol
+}
+
+func NewPIDCol() CompactCol {
+	w := &PIDCol{NewTextCol("PIDS")}
+	w.fWidth = 4
+	return w
+}
+
+func (w *PIDCol) SetMetrics(m models.Metrics) {
+	w.setText(fmt.Sprintf("%d", m.Pids))
+}
+
+type TextCol struct {
+	*ui.Par
+	header string
+	fWidth int
+}
+
+func NewTextCol(header string) *TextCol {
+	p := ui.NewPar("-")
 	p.Border = false
 	p.Height = 1
 	p.Width = 20
-	return &TextCol{p}
+
+	return &TextCol{
+		Par:    p,
+		header: header,
+		fWidth: 0,
+	}
 }
 
 func (w *TextCol) Highlight() {
@@ -28,10 +106,16 @@ func (w *TextCol) UnHighlight() {
 	w.TextBgColor = ui.ThemeAttr("par.text.bg")
 }
 
-func (w *TextCol) Reset() {
-	w.Text = "-"
-}
+// TextCol implements CompactCol
+func (w *TextCol) Reset()                    { w.setText("-") }
+func (w *TextCol) SetMeta(models.Meta)       {}
+func (w *TextCol) SetMetrics(models.Metrics) {}
+func (w *TextCol) Header() string            { return w.header }
+func (w *TextCol) FixedWidth() int           { return w.fWidth }
 
-func (w *TextCol) Set(s string) {
+func (w *TextCol) setText(s string) {
+	if w.fWidth > 0 && len(s) > w.fWidth {
+		s = s[0:w.fWidth]
+	}
 	w.Text = s
 }

cwidgets/compact/util.go

@@ -10,31 +10,6 @@ import (
 
 const colSpacing = 1
 
-// per-column width. 0 == auto width
-var colWidths = []int{
-	5, // status
-	0, // name
-	0, // cid
-	0, // cpu
-	0, // memory
-	0, // net
-	0, // io
-	4, // pids
-}
-
-// Calculate per-column width, given total width
-func calcWidth(width int) int {
-	spacing := colSpacing * len(colWidths)
-	var staticCols int
-	for _, w := range colWidths {
-		width -= w
-		if w == 0 {
-			staticCols++
-		}
-	}
-	return (width - spacing) / staticCols
-}
-
 func centerParText(p *ui.Par) {
 	var text string
 	var padding string

cwidgets/main.go

@@ -8,6 +8,14 @@ import (
 var log = logging.Init()
 
 type WidgetUpdater interface {
-	SetMeta(string, string)
+	SetMeta(models.Meta)
 	SetMetrics(models.Metrics)
 }
+
+type NullWidgetUpdater struct{}
+
+// NullWidgetUpdater implements WidgetUpdater
+func (wu NullWidgetUpdater) SetMeta(models.Meta) {}
+
+// NullWidgetUpdater implements WidgetUpdater
+func (wu NullWidgetUpdater) SetMetrics(models.Metrics) {}

cwidgets/single/info.go

@@ -13,14 +13,13 @@ type Info struct {
 	data map[string]string
 }
 
-func NewInfo(id string) *Info {
+func NewInfo() *Info {
 	p := ui.NewTable()
 	p.Height = 4
 	p.Width = colWidth[0]
 	p.FgColor = ui.ThemeAttr("par.text.fg")
 	p.Separator = false
 	i := &Info{p, make(map[string]string)}
-	i.Set("id", id)
 	return i
 }
 

cwidgets/single/io.go

@@ -42,10 +42,10 @@ func (w *IO) Update(read int64, write int64) {
 	var rate string
 
 	w.readHist.Append(int(read))
-	rate = strings.ToLower(cwidgets.ByteFormatInt(w.readHist.Val))
+	rate = strings.ToLower(cwidgets.ByteFormatShort(w.readHist.Val))
 	w.Lines[0].Title = fmt.Sprintf("read [%s/s]", rate)
 
 	w.writeHist.Append(int(write))
-	rate = strings.ToLower(cwidgets.ByteFormatInt(w.writeHist.Val))
+	rate = strings.ToLower(cwidgets.ByteFormatShort(w.writeHist.Val))
 	w.Lines[1].Title = fmt.Sprintf("write [%s/s]", rate)
 }

cwidgets/single/main.go

@@ -23,12 +23,9 @@ type Single struct {
 	Width int
 }
 
-func NewSingle(id string) *Single {
-	if len(id) > 12 {
-		id = id[:12]
-	}
+func NewSingle() *Single {
 	return &Single{
-		Info:  NewInfo(id),
+		Info:  NewInfo(),
 		Net:   NewNet(),
 		Cpu:   NewCpu(),
 		Mem:   NewMem(),
@@ -55,13 +52,15 @@ func (e *Single) Down() {
 }
 
 func (e *Single) SetWidth(w int) { e.Width = w }
-func (e *Single) SetMeta(k, v string) {
+func (e *Single) SetMeta(m models.Meta) {
+	for k, v := range m {
 		if k == "[ENV-VAR]" {
 			e.Env.Set(k, v)
 		} else {
 			e.Info.Set(k, v)
 		}
 	}
+}
 
 func (e *Single) SetMetrics(m models.Metrics) {
 	e.Cpu.Update(m.CPUUtil)

cwidgets/single/mem.go

@@ -70,7 +70,7 @@ func newMemChart() *ui.MBarChart {
 	mbar.BarColor[1] = ui.ColorBlack
 	mbar.NumColor[1] = ui.ColorBlack
 
-	mbar.NumFmt = cwidgets.ByteFormatInt
+	mbar.NumFmt = cwidgets.ByteFormatShort
 	//mbar.ShowScale = true
 	return mbar
 }
@@ -78,6 +78,6 @@ func newMemChart() *ui.MBarChart {
 func (w *Mem) Update(val int, limit int) {
 	w.valHist.Append(val)
 	w.limitHist.Append(limit - val)
-	w.InnerLabel.Text = fmt.Sprintf("%v / %v", cwidgets.ByteFormatInt(val), cwidgets.ByteFormatInt(limit))
+	w.InnerLabel.Text = fmt.Sprintf("%v / %v", cwidgets.ByteFormatShort(val), cwidgets.ByteFormatShort(limit))
 	//w.Data[0] = w.hist.data
 }

cwidgets/single/net.go

@@ -42,10 +42,10 @@ func (w *Net) Update(rx int64, tx int64) {
 	var rate string
 
 	w.rxHist.Append(int(rx))
-	rate = strings.ToLower(cwidgets.ByteFormatInt(w.rxHist.Val))
+	rate = strings.ToLower(cwidgets.ByteFormat(w.rxHist.Val))
 	w.Lines[0].Title = fmt.Sprintf("RX [%s/s]", rate)
 
 	w.txHist.Append(int(tx))
-	rate = strings.ToLower(cwidgets.ByteFormatInt(w.txHist.Val))
+	rate = strings.ToLower(cwidgets.ByteFormat(w.txHist.Val))
 	w.Lines[1].Title = fmt.Sprintf("TX [%s/s]", rate)
 }

cwidgets/util.go

@@ -1,53 +1,74 @@
 package cwidgets
 
 import (
-	"fmt"
 	"strconv"
 )
 
 const (
-	kb = 1024
-	mb = kb * 1024
-	gb = mb * 1024
-	tb = gb * 1024
+	// byte ratio constants
+	_           = iota
+	kib float64 = 1 << (10 * iota)
+	mib
+	gib
+	tib
+	pib
 )
 
-// convenience method
-func ByteFormatInt(n int) string {
-	return ByteFormat(int64(n))
+var (
+	units = []float64{
+		1,
+		kib,
+		mib,
+		gib,
+		tib,
+		pib,
 	}
 
-func ByteFormat(n int64) string {
-	if n < kb {
-		return fmt.Sprintf("%sB", strconv.FormatInt(n, 10))
+	// short, full unit labels
+	labels = [][2]string{
+		[2]string{"B", "B"},
+		[2]string{"K", "KiB"},
+		[2]string{"M", "MiB"},
+		[2]string{"G", "GiB"},
+		[2]string{"T", "TiB"},
+		[2]string{"P", "PiB"},
 	}
-	if n < mb {
-		n = n / kb
-		return fmt.Sprintf("%sK", strconv.FormatInt(n, 10))
+)
+
+// convenience methods
+func ByteFormat(n int) string          { return byteFormat(float64(n), false) }
+func ByteFormatShort(n int) string     { return byteFormat(float64(n), true) }
+func ByteFormat64(n int64) string      { return byteFormat(float64(n), false) }
+func ByteFormat64Short(n int64) string { return byteFormat(float64(n), true) }
+
+func byteFormat(n float64, short bool) string {
+	i := len(units) - 1
+
+	for i > 0 {
+		if n >= units[i] {
+			n /= units[i]
+			break
 		}
-	if n < gb {
-		n = n / mb
-		return fmt.Sprintf("%sM", strconv.FormatInt(n, 10))
-	}
-	if n < tb {
-		nf := float64(n) / gb
-		return fmt.Sprintf("%sG", unpadFloat(nf))
-	}
-	nf := float64(n) / tb
-	return fmt.Sprintf("%sT", unpadFloat(nf))
+		i--
 	}
 
-func unpadFloat(f float64) string {
-	return strconv.FormatFloat(f, 'f', getPrecision(f), 64)
+	if short {
+		return unpadFloat(n, 0) + labels[i][0]
+	}
+	return unpadFloat(n, 2) + labels[i][1]
 }
 
-func getPrecision(f float64) int {
+func unpadFloat(f float64, maxp int) string {
+	return strconv.FormatFloat(f, 'f', getPrecision(f, maxp), 64)
+}
+
+func getPrecision(f float64, maxp int) int {
 	frac := int((f - float64(int(f))) * 100)
-	if frac == 0 {
+	if frac == 0 || maxp == 0 {
 		return 0
 	}
-	if frac%10 == 0 {
+	if frac%10 == 0 || maxp < 2 {
 		return 1
 	}
-	return 2 // default precision
+	return maxp
 }

go.mod

@@ -1,32 +1,21 @@
 module github.com/bcicen/ctop
 
 require (
-	github.com/BurntSushi/toml v0.3.0
+	github.com/BurntSushi/toml v0.3.1
 	github.com/c9s/goprocinfo v0.0.0-20170609001544-b34328d6e0cd
-	github.com/checkpoint-restore/go-criu v0.0.0-20190109184317-bdb7599cd87b // indirect
-	github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50 // indirect
-	github.com/coreos/go-systemd v0.0.0-20151104194251-b4a58d95188d // indirect
-	github.com/cyphar/filepath-securejoin v0.2.2 // indirect
-	github.com/fsouza/go-dockerclient v1.4.1
+	github.com/fsouza/go-dockerclient v1.6.6
 	github.com/gizak/termui v2.3.0+incompatible
-	github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55 // indirect
 	github.com/jgautheron/codename-generator v0.0.0-20150829203204-16d037c7cc3c
 	github.com/mattn/go-runewidth v0.0.0-20170201023540-14207d285c6c // indirect
 	github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 // indirect
-	github.com/mrunalp/fileutils v0.0.0-20171103030105-7d4729fb3618 // indirect
 	github.com/nsf/termbox-go v0.0.0-20180303152453-e2050e41c884
 	github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d
 	github.com/op/go-logging v0.0.0-20160211212156-b2cb9fa56473
-	github.com/opencontainers/runc v1.0.0-rc8
-	github.com/opencontainers/runtime-spec v1.0.1 // indirect
-	github.com/opencontainers/selinux v1.2.2 // indirect
-	github.com/pkg/errors v0.8.1
-	github.com/seccomp/libseccomp-golang v0.0.0-20150813023252-1b506fc7c24e // indirect
-	github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2 // indirect
-	github.com/vishvananda/netlink v0.0.0-20150820014904-1e2e08e8a2dc // indirect
-	github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc // indirect
+	github.com/opencontainers/runc v1.0.0-rc92
+	github.com/pkg/errors v0.9.1
+	github.com/stretchr/testify v1.4.0
 )
 
 replace github.com/gizak/termui => github.com/bcicen/termui v0.0.0-20180326052246-4eb80249d3f5
 
-go 1.13
+go 1.15

go.sum

@@ -1,103 +1,280 @@
+bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8=
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
-github.com/BurntSushi/toml v0.3.0 h1:e1/Ivsx3Z0FVTV0NSOv/aVgbUWyQuzj7DDnFblkRvsY=
-github.com/BurntSushi/toml v0.3.0/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/Microsoft/go-winio v0.4.12 h1:xAfWHN1IrQ0NJ9TBC0KBZoqLjzDTr1ML+4MywiUOryc=
-github.com/Microsoft/go-winio v0.4.12/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
+github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw=
+github.com/Microsoft/go-winio v0.4.15-0.20200113171025-3fe6c5262873 h1:93nQ7k53GjoMQ07HVP8g6Zj1fQZDDj7Xy2VkNNtvX8o=
+github.com/Microsoft/go-winio v0.4.15-0.20200113171025-3fe6c5262873/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw=
+github.com/Microsoft/hcsshim v0.8.9 h1:VrfodqvztU8YSOvygU+DN1BGaSGxmrNfqOv5oOuX2Bk=
+github.com/Microsoft/hcsshim v0.8.9/go.mod h1:5692vkUqntj1idxauYlpoINNKeqCiG6Sg38RRsjT5y8=
 github.com/bcicen/termui v0.0.0-20180326052246-4eb80249d3f5 h1:2pI3ZsoefWIi++8EqmANoC7Px/v2lRwnleVUcCuFgLg=
 github.com/bcicen/termui v0.0.0-20180326052246-4eb80249d3f5/go.mod h1:yIA9ITWZD1p4/DvCQ44xvhyVb9XEUlVnY1rzGSHwbiM=
 github.com/c9s/goprocinfo v0.0.0-20170609001544-b34328d6e0cd h1:xqaBnULC8wEnQpRDXAsDgXkU/STqoluz1REOoegSfNU=
 github.com/c9s/goprocinfo v0.0.0-20170609001544-b34328d6e0cd/go.mod h1:uEyr4WpAH4hio6LFriaPkL938XnrvLpNPmQHBdrmbIE=
-github.com/checkpoint-restore/go-criu v0.0.0-20190109184317-bdb7599cd87b h1:T4nWG1TXIxeor8mAu5bFguPJgSIGhZqv/f0z55KCrJM=
-github.com/checkpoint-restore/go-criu v0.0.0-20190109184317-bdb7599cd87b/go.mod h1:TrMrLQfeENAPYPRsJuq3jsqdlRh3lvi6trTZJG8+tho=
-github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50 h1:WMpHmC6AxwWb9hMqhudkqG7A/p14KiMnl6d3r1iUMjU=
-github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw=
-github.com/containerd/continuity v0.0.0-20181203112020-004b46473808 h1:4BX8f882bXEDKfWIf0wa8HRvpnBoPszJJXL+TVbBw4M=
-github.com/containerd/continuity v0.0.0-20181203112020-004b46473808/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
-github.com/coreos/go-systemd v0.0.0-20151104194251-b4a58d95188d h1:MJ4ge3i0lehw+gE3JcGUUp8TmWjsLAlQlhmdASs/9wk=
-github.com/coreos/go-systemd v0.0.0-20151104194251-b4a58d95188d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/checkpoint-restore/go-criu/v4 v4.1.0 h1:WW2B2uxx9KWF6bGlHqhm8Okiafwwx7Y2kcpn8lCpjgo=
+github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw=
+github.com/cilium/ebpf v0.0.0-20200702112145-1c8d4c9ef775 h1:cHzBGGVew0ezFsq2grfy2RsB8hO/eNyBgOLHBCqfR1U=
+github.com/cilium/ebpf v0.0.0-20200702112145-1c8d4c9ef775/go.mod h1:7cR51M8ViRLIdUjrmSXlK9pkrsDlLHbO8jiB8X8JnOc=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod h1:OApqhQ4XNSNC13gXIwDjhOQxjWa/NxkwZXJ1EvqT0ko=
+github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw=
+github.com/containerd/console v1.0.0 h1:fU3UuQapBs+zLJu82NhR11Rif1ny2zfMMAyPJzSN5tQ=
+github.com/containerd/console v1.0.0/go.mod h1:8Pf4gM6VEbTNRIT26AyyU7hxdQU3MvAvxVI0sc00XBE=
+github.com/containerd/containerd v1.3.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
+github.com/containerd/containerd v1.3.4 h1:3o0smo5SKY7H6AJCmJhsnCjR2/V2T8VmiHt7seN2/kI=
+github.com/containerd/containerd v1.3.4/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
+github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
+github.com/containerd/continuity v0.0.0-20200413184840-d3ef23f19fbb h1:nXPkFq8X1a9ycY3GYQpFNxHh3j2JgY7zDZfq2EXMIzk=
+github.com/containerd/continuity v0.0.0-20200413184840-d3ef23f19fbb/go.mod h1:Dq467ZllaHgAtVp4p1xUQWBrFXR9s/wyoTpG8zOJGkY=
+github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI=
+github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0=
+github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o=
+github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc=
+github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e h1:Wf6HqHfScWJN9/ZjdUKyjop4mf3Qdd+1TvvltAvM3m8=
+github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/coreos/go-systemd/v22 v22.1.0 h1:kq/SbG2BCKLkDKkjQf5OWwKWUKj1lgs3lFI4PxnR5lg=
+github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/creack/pty v1.1.9 h1:uDmaGzcdjhF4i/plgjmEsriH11Y0o7RKapEf/LDaM3w=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg=
 github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/docker/docker v0.7.3-0.20190309235953-33c3200e0d16 h1:dmUn0SuGx7unKFwxyeQ/oLUHhEfZosEDrpmYM+6MTuc=
-github.com/docker/docker v0.7.3-0.20190309235953-33c3200e0d16/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug=
+github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
+github.com/docker/docker v17.12.0-ce-rc1.0.20200505174321-1655290016ac+incompatible h1:ZxJX4ZSNg1LORBsStUojbrLfkrE3Ut122XhzyZnN110=
+github.com/docker/docker v17.12.0-ce-rc1.0.20200505174321-1655290016ac+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
 github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
 github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/fsouza/go-dockerclient v1.4.1 h1:W7wuJ3IB48WYZv/UBk9dCTIb9oX805+L9KIm65HcUYs=
-github.com/fsouza/go-dockerclient v1.4.1/go.mod h1:PUNHxbowDqRXfRgZqMz1OeGtbWC6VKyZvJ99hDjB0qs=
-github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55 h1:oIgNYSrSUbNH5DJh6DMhU1PiOKOYIHNxrV3djLsLpEI=
-github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
+github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/fsouza/go-dockerclient v1.6.6 h1:9e3xkBrVkPb81gzYq23i7iDUEd6sx2ooeJA/gnYU6R4=
+github.com/fsouza/go-dockerclient v1.6.6/go.mod h1:3/oRIWoe7uT6bwtAayj/EmJmepBjeL4pYvt7ZxC7Rnk=
+github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e h1:BWhy2j3IXJhjCbC68FptL43tDKIq8FladmaTs3Xs7Z8=
+github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4=
+github.com/godbus/dbus/v5 v5.0.3 h1:ZqHaoEF7TBzh4jzPmqVhE/5A1z9of6orkAe5uHoAeME=
+github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
-github.com/golang/protobuf v1.3.0 h1:kbxbvI4Un1LUWKxufD+BiE6AEExYYgkQLQmLFqA1LFk=
-github.com/golang/protobuf v1.3.0/go.mod h1:Qd/q+1AKNOZr9uGQzbzCmRO6sUih6GTPZv6a1/R87v0=
-github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
+github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
+github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/gorilla/mux v1.7.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
-github.com/ijc/Gotty v0.0.0-20170406111628-a8b993ba6abd h1:anPrsicrIi2ColgWTVPk+TrN42hJIWlfPHSBP9S0ZkM=
-github.com/ijc/Gotty v0.0.0-20170406111628-a8b993ba6abd/go.mod h1:3LVOLeyx9XVvwPgrt2be44XgSqndprz1G18rSk8KD84=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
+github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jgautheron/codename-generator v0.0.0-20150829203204-16d037c7cc3c h1:/hc+TxW4Q1v6aqNPHE5jiaNF2xEK0CzWTgo25RQhQ+U=
 github.com/jgautheron/codename-generator v0.0.0-20150829203204-16d037c7cc3c/go.mod h1:FJRkXmPrkHw0WDjB/LXMUhjWJ112Y6JUYnIVBOy8oH8=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
+github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=
+github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/mattn/go-runewidth v0.0.0-20170201023540-14207d285c6c h1:eFzthqtg3W6Pihj3DMTXLAF4f+ge5r5Ie5g6HLIZAF0=
 github.com/mattn/go-runewidth v0.0.0-20170201023540-14207d285c6c/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 h1:DpOJ2HYzCv8LZP15IdmG+YdwD2luVPHITV96TkirNBM=
 github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
-github.com/mrunalp/fileutils v0.0.0-20171103030105-7d4729fb3618 h1:7InQ7/zrOh6SlFjaXFubv0xX0HsuC9qJsdqm7bNQpYM=
-github.com/mrunalp/fileutils v0.0.0-20171103030105-7d4729fb3618/go.mod h1:x8F1gnqOkIEiO4rqoeEEEqQbo7HjGMTvyoq3gej4iT0=
+github.com/moby/sys/mount v0.1.0 h1:Ytx78EatgFKtrqZ0BvJ0UtJE472ZvawVmil6pIfuCCU=
+github.com/moby/sys/mount v0.1.0/go.mod h1:FVQFLDRWwyBjDTBNQXDlWnSFREqOo3OKX9aqhmeoo74=
+github.com/moby/sys/mountinfo v0.1.0/go.mod h1:w2t2Avltqx8vE7gX5l+QiBKxODu2TX0+Syr3h52Tw4o=
+github.com/moby/sys/mountinfo v0.1.3 h1:KIrhRO14+AkwKvG/g2yIpNMOUVZ02xNhOw8KY1WsLOI=
+github.com/moby/sys/mountinfo v0.1.3/go.mod h1:w2t2Avltqx8vE7gX5l+QiBKxODu2TX0+Syr3h52Tw4o=
+github.com/moby/term v0.0.0-20200429084858-129dac9f73f6 h1:3Y9aosU6S5Bo8GYH0s+t1ej4m30GuUKvQ3c9ZLqdL28=
+github.com/moby/term v0.0.0-20200429084858-129dac9f73f6/go.mod h1:or9wGItza1sRcM4Wd3dIv8DsFHYQuFsMHEdxUIlUxms=
+github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
+github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
+github.com/mrunalp/fileutils v0.0.0-20200520151820-abd8a0e76976 h1:aZQToFSLH8ejFeSkTc3r3L4dPImcj7Ib/KgmkQqbGGg=
+github.com/mrunalp/fileutils v0.0.0-20200520151820-abd8a0e76976/go.mod h1:x8F1gnqOkIEiO4rqoeEEEqQbo7HjGMTvyoq3gej4iT0=
 github.com/nsf/termbox-go v0.0.0-20180303152453-e2050e41c884 h1:fcs71SMqqDhUD+PbpIv9xf3EH9F9s6HfiLwr6jKm1VA=
 github.com/nsf/termbox-go v0.0.0-20180303152453-e2050e41c884/go.mod h1:IuKpRQcYE1Tfu+oAQqaLisqDeXgjyyltCfsaoYN18NQ=
 github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d h1:VhgPp6v9qf9Agr/56bj7Y/xa04UccTW04VP0Qed4vnQ=
 github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/op/go-logging v0.0.0-20160211212156-b2cb9fa56473 h1:J1QZwDXgZ4dJD2s19iqR9+U00OWM2kDzbf1O/fmvCWg=
 github.com/op/go-logging v0.0.0-20160211212156-b2cb9fa56473/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
+github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
 github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ=
 github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
 github.com/opencontainers/image-spec v1.0.1 h1:JMemWkRwHx4Zj+fVxWoMCFm/8sYGGrUVojFA6h/TRcI=
 github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
-github.com/opencontainers/runc v0.1.1 h1:GlxAyO6x8rfZYN9Tt0Kti5a/cP41iuiO2yYT0IJGY8Y=
+github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
 github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
-github.com/opencontainers/runc v1.0.0-rc8 h1:dDCFes8Hj1r/i5qnypONo5jdOme/8HWZC/aNDyhECt0=
-github.com/opencontainers/runc v1.0.0-rc8/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
-github.com/opencontainers/runtime-spec v1.0.1 h1:wY4pOY8fBdSIvs9+IDHC55thBuEulhzfSgKeC1yFvzQ=
-github.com/opencontainers/runtime-spec v1.0.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
-github.com/opencontainers/selinux v1.2.2 h1:Kx9J6eDG5/24A6DtUquGSpJQ+m2MUTahn4FtGEe8bFg=
-github.com/opencontainers/selinux v1.2.2/go.mod h1:+BLncwf63G4dgOzykXAxcmnFlUaOlkDdmw/CqsW6pjs=
-github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
+github.com/opencontainers/runc v1.0.0-rc92 h1:+IczUKCRzDzFDnw99O/PAqrcBBCoRp9xN3cB1SYSNS4=
+github.com/opencontainers/runc v1.0.0-rc92/go.mod h1:X1zlU4p7wOlX4+WRCz+hvlRv8phdL7UqbYD+vQwNMmE=
+github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
+github.com/opencontainers/runtime-spec v1.0.3-0.20200728170252-4d89ac9fbff6 h1:NhsM2gc769rVWDqJvapK37r+7+CBXI8xHhnfnt8uQsg=
+github.com/opencontainers/runtime-spec v1.0.3-0.20200728170252-4d89ac9fbff6/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
+github.com/opencontainers/selinux v1.6.0 h1:+bIAS/Za3q5FTwWym4fTB0vObnfCf3G/NC7K6Jx62mY=
+github.com/opencontainers/selinux v1.6.0/go.mod h1:VVGKuOLlE7v4PJyT6h7mNWvq1rzqiriPsEqVhc+svHE=
+github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/seccomp/libseccomp-golang v0.0.0-20150813023252-1b506fc7c24e h1:HJbgNpzYMeTLPpkMwbPNTPlhNd9r4xQtqcZG6qoIGgs=
-github.com/seccomp/libseccomp-golang v0.0.0-20150813023252-1b506fc7c24e/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo=
-github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME=
-github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/seccomp/libseccomp-golang v0.9.1 h1:NJjM5DNFOs0s3kYE1WUOr6G8V97sdt46rlXTMfXGWBo=
+github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo=
+github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
+github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
+github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
+github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
+github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2 h1:b6uOv7YOFK0TYG7HtkIgExQo+2RdLuwRft63jn2HWj8=
 github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
-github.com/vishvananda/netlink v0.0.0-20150820014904-1e2e08e8a2dc h1:0HAHLwEY4k1VqaO1SzBi4XxT0KA06Cv+QW2LXknBk9g=
-github.com/vishvananda/netlink v0.0.0-20150820014904-1e2e08e8a2dc/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk=
-github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc h1:R83G5ikgLMxrBvLh22JhdfI8K6YXEPHx5P03Uu3DRs4=
-github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI=
-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
+github.com/urfave/cli v1.22.1 h1:+mkCCcOFKPnCmVYVcURKps1Xe+3zP90gSYGNfRkjoIY=
+github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
+github.com/vishvananda/netlink v1.1.0 h1:1iyaYNBLmP6L0220aDnYQpo1QEV4t4hJ+xEEhhJH8j0=
+github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
+github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df h1:OviZH7qLw/7ZovXvuNyL3XQl8UFofeikI1NW1Gypu7k=
+github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=
+github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243 h1:R43TdZy32XXSXjJn7M/HhALJ9imq6ztLnChfYJpVDnM=
+github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
+go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
+golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79 h1:IaQbIIB2X/Mp/DKctl6ROxz1KyMlKp4uyvL6+kQ7C88=
+golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 h1:rjwSpXsdiK0dV8/Naq3kAw9ymfAeJIyd0upUIElB+lI=
+golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker1l1vDZRCRefw=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190310054646-10058d7d4faa h1:lqti/xP+yD/6zH5TqEwx2MilNIJY5Vbc6Qr8J3qyPIQ=
-golang.org/x/sys v0.0.0-20190310054646-10058d7d4faa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1 h1:sIky/MyNRSHTrdxfsiUSS4WIAMvInbeXljJz+jDjeYE=
+golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+google.golang.org/grpc v1.29.1 h1:EC2SB8S04d2r73uptxphDSUG+kTKVgjRPF+N3xpxRB4=
+google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
+gotest.tools/v3 v3.0.2 h1:kG1BFyqVHuQoVQiR1bWGnfz/fmHvvuiSPIV7rvl360E=
+gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

grid.go

@@ -83,7 +83,7 @@ func SingleView() MenuFn {
 	ui.DefaultEvtStream.ResetHandlers()
 	defer ui.DefaultEvtStream.ResetHandlers()
 
-	ex := single.NewSingle(c.Id)
+	ex := single.NewSingle()
 	c.SetUpdater(ex)
 
 	ex.Align()
@@ -191,6 +191,10 @@ func Display() bool {
 		menu = SortMenu
 		ui.StopLoop()
 	})
+	ui.Handle("/sys/kbd/c", func(ui.Event) {
+		menu = ColumnsMenu
+		ui.StopLoop()
+	})
 	ui.Handle("/sys/kbd/S", func(ui.Event) {
 		path, err := config.Write()
 		if err == nil {

main.go

@@ -46,7 +46,7 @@ func main() {
 		invertFlag      = flag.Bool("i", false, "invert default colors")
 		scaleCpu        = flag.Bool("scale-cpu", false, "show cpu as % of system total")
 		connectorFlag   = flag.String("connector", "docker", "container connector to use")
-		defaultShell    = flag.String("shell", "", "default shell")
+		defaultShell    = flag.String("shell", "sh", "exec shell to use")
 	)
 	flag.Parse()
 
@@ -65,7 +65,9 @@ func main() {
 
 	// init global config and read config file if exists
 	config.Init()
-	config.Read()
+	if err := config.Read(); err != nil {
+		log.Warningf("reading config: %s", err)
+	}
 
 	// override default config values with command line flags
 	if *filterFlag != "" {

menus.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/bcicen/ctop/config"
@@ -26,6 +27,7 @@ var helpDialog = []menu.Item{
 	{"[o] - open single view", ""},
 	{"[l] - view container logs ([t] to toggle timestamp when open)", ""},
 	{"[e] - exec shell", ""},
+	{"[c] - configure columns", ""},
 	{"[S] - save current configuration to file", ""},
 	{"[q] - exit ctop", ""},
 }
@@ -104,7 +106,90 @@ func SortMenu() MenuFn {
 	HandleKeys("exit", ui.StopLoop)
 
 	ui.Handle("/sys/kbd/<enter>", func(ui.Event) {
-		config.Update("sortField", m.SelectedItem().Val)
+		config.Update("sortField", m.SelectedValue())
+		ui.StopLoop()
+	})
+
+	ui.Render(m)
+	ui.Loop()
+	return nil
+}
+
+func ColumnsMenu() MenuFn {
+	const (
+		enabledStr  = "[X]"
+		disabledStr = "[ ]"
+		padding     = 2
+	)
+
+	ui.Clear()
+	ui.DefaultEvtStream.ResetHandlers()
+	defer ui.DefaultEvtStream.ResetHandlers()
+
+	m := menu.NewMenu()
+	m.Selectable = true
+	m.SortItems = false
+	m.BorderLabel = "Columns"
+	//m.SubText = "Enabled Columns"
+
+	rebuild := func() {
+		// get padding for right alignment of enabled status
+		var maxLen int
+		for _, col := range config.GlobalColumns {
+			if len(col.Label) > maxLen {
+				maxLen = len(col.Label)
+			}
+		}
+		maxLen += padding
+
+		// rebuild menu items
+		m.ClearItems()
+		for _, col := range config.GlobalColumns {
+			txt := col.Label + strings.Repeat(" ", maxLen-len(col.Label))
+			if col.Enabled {
+				txt += enabledStr
+			} else {
+				txt += disabledStr
+			}
+			m.AddItems(menu.Item{col.Name, txt})
+		}
+	}
+
+	upFn := func() {
+		config.ColumnLeft(m.SelectedValue())
+		m.Up()
+		rebuild()
+	}
+
+	downFn := func() {
+		config.ColumnRight(m.SelectedValue())
+		m.Down()
+		rebuild()
+	}
+
+	toggleFn := func() {
+		config.ColumnToggle(m.SelectedValue())
+		rebuild()
+	}
+
+	rebuild()
+
+	HandleKeys("up", m.Up)
+	HandleKeys("down", m.Down)
+	HandleKeys("enter", toggleFn)
+	HandleKeys("pgup", upFn)
+	HandleKeys("pgdown", downFn)
+
+	ui.Handle("/sys/kbd/x", func(ui.Event) { toggleFn() })
+	ui.Handle("/sys/kbd/<enter>", func(ui.Event) { toggleFn() })
+
+	HandleKeys("exit", func() {
+		cSource, err := cursor.cSuper.Get()
+		if err == nil {
+			for _, c := range cSource.All() {
+				c.RecreateWidgets()
+			}
+		}
 		ui.StopLoop()
 	})
 
@@ -202,7 +287,7 @@ func ContainerMenu() MenuFn {
 	})
 
 	ui.Handle("/sys/kbd/<enter>", func(ui.Event) {
-		selected = m.SelectedItem().Val
+		selected = m.SelectedValue()
 		ui.StopLoop()
 	})
 	ui.Handle("/sys/kbd/", func(ui.Event) {
@@ -321,7 +406,7 @@ func Confirm(txt string, fn func()) MenuFn {
 		ui.Handle("/sys/kbd/y", func(ui.Event) { yes() })
 
 		ui.Handle("/sys/kbd/<enter>", func(ui.Event) {
-			switch m.SelectedItem().Val {
+			switch m.SelectedValue() {
 			case "cancel":
 				no()
 			case "yes":

models/main.go

@@ -7,6 +7,29 @@ type Log struct {
 	Message   string
 }
 
+type Meta map[string]string
+
+// NewMeta returns an initialized Meta map.
+// An optional series of key, values may be provided to populate the map prior to returning
+func NewMeta(kvs ...string) Meta {
+	m := make(Meta)
+
+	var i int
+	for i < len(kvs)-1 {
+		m[kvs[i]] = kvs[i+1]
+		i += 2
+	}
+
+	return m
+}
+
+func (m Meta) Get(k string) string {
+	if s, ok := m[k]; ok {
+		return s
+	}
+	return ""
+}
+
 type Metrics struct {
 	CPUUtil      int
 	NetTx        int64

widgets/menu/main.go

@@ -11,13 +11,14 @@ type Padding [2]int // x,y padding
 type Menu struct {
 	ui.Block
 	SortItems   bool   // enable automatic sorting of menu items
+	Selectable  bool   // whether menu is navigable
 	SubText     string // optional text to display before items
 	TextFgColor ui.Attribute
 	TextBgColor ui.Attribute
-	Selectable  bool
 	cursorPos   int
 	items       Items
 	padding     Padding
+	toolTip     *ToolTip
 }
 
 func NewMenu() *Menu {
@@ -55,6 +56,11 @@ func (m *Menu) DelItem(s string) (success bool) {
 	return success
 }
 
+// ClearItems removes all current menu items
+func (m *Menu) ClearItems() {
+	m.items = m.items[:0]
+}
+
 // Move cursor to an position by Item value or label
 func (m *Menu) SetCursor(s string) (success bool) {
 	for n, i := range m.items {
@@ -66,19 +72,19 @@ func (m *Menu) SetCursor(s string) (success bool) {
 	return false
 }
 
-// Sort menu items(if enabled) and re-calculate window size
-func (m *Menu) refresh() {
-	if m.SortItems {
-		sort.Sort(m.items)
-	}
-	m.calcSize()
-	ui.Render(m)
+// SetToolTip sets an optional tooltip string to show at bottom of screen
+func (m *Menu) SetToolTip(lines ...string) {
+	m.toolTip = NewToolTip(lines...)
 }
 
 func (m *Menu) SelectedItem() Item {
 	return m.items[m.cursorPos]
 }
 
+func (m *Menu) SelectedValue() string {
+	return m.items[m.cursorPos].Val
+}
+
 func (m *Menu) Buffer() ui.Buffer {
 	var cell ui.Cell
 	buf := m.Block.Buffer()
@@ -108,6 +114,10 @@ func (m *Menu) Buffer() ui.Buffer {
 		}
 	}
 
+	if m.toolTip != nil {
+		buf.Merge(m.toolTip.Buffer())
+	}
+
 	return buf
 }
 
@@ -125,6 +135,15 @@ func (m *Menu) Down() {
 	}
 }
 
+// Sort menu items(if enabled) and re-calculate window size
+func (m *Menu) refresh() {
+	if m.SortItems {
+		sort.Sort(m.items)
+	}
+	m.calcSize()
+	ui.Render(m)
+}
+
 // Set width and height based on menu items
 func (m *Menu) calcSize() {
 	m.Width = 7 // minimum width

widgets/menu/tooltip.go

@@ -0,0 +1,55 @@
+package menu
+
+import (
+	ui "github.com/gizak/termui"
+)
+
+type ToolTip struct {
+	ui.Block
+	Lines       []string
+	TextFgColor ui.Attribute
+	TextBgColor ui.Attribute
+	padding     Padding
+}
+
+func NewToolTip(lines ...string) *ToolTip {
+	t := &ToolTip{
+		Block:       *ui.NewBlock(),
+		Lines:       lines,
+		TextFgColor: ui.ThemeAttr("menu.text.fg"),
+		TextBgColor: ui.ThemeAttr("menu.text.bg"),
+		padding:     Padding{2, 1},
+	}
+	t.BorderFg = ui.ThemeAttr("menu.border.fg")
+	t.BorderLabelFg = ui.ThemeAttr("menu.label.fg")
+	t.X = 1
+	t.Align()
+	return t
+}
+
+func (t *ToolTip) Buffer() ui.Buffer {
+	var cell ui.Cell
+	buf := t.Block.Buffer()
+
+	y := t.Y + t.padding[1]
+
+	for n, line := range t.Lines {
+		x := t.X + t.padding[0]
+		for _, ch := range line {
+			cell = ui.Cell{Ch: ch, Fg: t.TextFgColor, Bg: t.TextBgColor}
+			buf.Set(x, y+n, cell)
+			x++
+		}
+	}
+
+	return buf
+}
+
+// Set width and height based on screen size
+func (t *ToolTip) Align() {
+	t.Width = ui.TermWidth() - (t.padding[0] * 2)
+	t.Height = len(t.Lines) + (t.padding[1] * 2)
+	t.Y = ui.TermHeight() - t.Height
+
+	t.Block.Align()
+}