Added supprot for network rx/tx

connector/collector/kubernetes.go

@@ -64,6 +64,7 @@ func (k *Kubernetes) Start() {
 			k.ReadMem()
 			k.ReadNetRx()
 			k.ReadNetTx()
+			k.ReadUptime()
 			k.stream <- k.Metrics
 			time.Sleep(k.interval)
 		}
@@ -151,6 +152,16 @@ func (k *Kubernetes) ReadNetTx() {
 	k.NetTx = tx
 }
 
+func (k *Kubernetes) ReadUptime() {
+	uptime, err := k.read("/uptime")
+	if err != nil {
+		log.Errorf("collecte network uptime metric has error %s here %s", k.name, err.Error())
+		time.Sleep(1 * time.Second)
+		return
+	}
+	k.Uptime = uptime
+}
+
 func (k *Kubernetes) read(name string) (int64, error) {
 	m := &Response{}
 	url := buildURL(config.GetVal("namespace"), k.name) + "/metrics" + name

cwidgets/compact/header.go

@@ -12,7 +12,7 @@ type CompactHeader struct {
 }
 
 func NewCompactHeader() *CompactHeader {
-	fields := []string{"", "NAME", "CID", "CPU", "MEM", "NET RX/TX", "IO R/W", "PIDS"}
+	fields := []string{"", "NAME", "CID", "CPU", "MEM", "NET RX/TX", "IO R/W", "PIDS", "UPTIME"}
 	ch := &CompactHeader{}
 	ch.Height = 2
 	for _, f := range fields {

cwidgets/compact/main.go

@@ -18,6 +18,7 @@ type Compact struct {
 	Net    *TextCol
 	IO     *TextCol
 	Pids   *TextCol
+	Uptime *TextCol
 	Bg     *RowBg
 	X, Y   int
 	Width  int
@@ -38,6 +39,7 @@ func NewCompact(id string) *Compact {
 		Net:    NewTextCol("-"),
 		IO:     NewTextCol("-"),
 		Pids:   NewTextCol("-"),
+		Uptime: NewTextCol("-"),
 		Bg:     NewRowBg(),
 		X:      1,
 		Height: 1,
@@ -70,6 +72,7 @@ func (row *Compact) SetMetrics(m models.Metrics) {
 	row.SetMem(m.MemUsage, m.MemLimit, m.MemPercent)
 	row.SetIO(m.IOBytesRead, m.IOBytesWrite)
 	row.SetPids(m.Pids)
+	row.SetUptime(m.Uptime)
 }
 
 // Set gauges, counters to default unread values
@@ -79,6 +82,7 @@ func (row *Compact) Reset() {
 	row.Net.Reset()
 	row.IO.Reset()
 	row.Pids.Reset()
+	row.Uptime.Reset()
 }
 
 func (row *Compact) GetHeight() int {
@@ -137,6 +141,7 @@ func (row *Compact) Buffer() ui.Buffer {
 	buf.Merge(row.Net.Buffer())
 	buf.Merge(row.IO.Buffer())
 	buf.Merge(row.Pids.Buffer())
+	buf.Merge(row.Uptime.Buffer())
 	return buf
 }
 
@@ -150,6 +155,7 @@ func (row *Compact) all() []ui.GridBufferer {
 		row.Net,
 		row.IO,
 		row.Pids,
+		row.Uptime,
 	}
 }
 
@@ -163,6 +169,7 @@ func (row *Compact) Highlight() {
 		row.Net.Highlight()
 		row.IO.Highlight()
 		row.Pids.Highlight()
+		row.Uptime.Highlight()
 	}
 }
 
@@ -176,6 +183,7 @@ func (row *Compact) UnHighlight() {
 		row.Net.UnHighlight()
 		row.IO.UnHighlight()
 		row.Pids.UnHighlight()
+		row.Uptime.UnHighlight()
 	}
 }
 

cwidgets/compact/setters.go

@@ -3,6 +3,7 @@ package compact
 import (
 	"fmt"
 	"strconv"
+	"time"
 
 	"github.com/bcicen/ctop/cwidgets"
 	ui "github.com/gizak/termui"
@@ -23,6 +24,19 @@ func (row *Compact) SetPids(val int) {
 	row.Pids.Set(label)
 }
 
+func (row *Compact) SetUptime(val int64) {
+	d := time.Duration(val) * time.Millisecond
+	label := "- h"
+	if d.Hours() < 1.0 {
+		label = fmt.Sprintf("%.0fm", d.Minutes())
+	} else if d.Hours() < 24.0 {
+		label = fmt.Sprintf("%.0fh", d.Hours())
+	} else {
+		label = fmt.Sprintf("%dd", int(d.Hours())%24)
+	}
+	row.Uptime.Set(label)
+}
+
 func (row *Compact) SetCPU(val int) {
 	row.Cpu.BarColor = colorScale(val)
 	row.Cpu.Label = fmt.Sprintf("%s%%", strconv.Itoa(val))

cwidgets/compact/util.go

@@ -19,7 +19,8 @@ var colWidths = []int{
 	0, // memory
 	0, // net
 	0, // io
-	4, // pids
+	0, // pids
+	6, // uptime
 }
 
 // Calculate per-column width, given total width

models/main.go

@@ -17,6 +17,7 @@ type Metrics struct {
 	IOBytesRead  int64
 	IOBytesWrite int64
 	Pids         int
+	Uptime       int64
 }
 
 func NewMetrics() Metrics {
@@ -29,5 +30,6 @@ func NewMetrics() Metrics {
 		IOBytesRead:  -1,
 		IOBytesWrite: -1,
 		Pids:         -1,
+		Uptime:       -1,
 	}
 }