OrgGo/expvarmon
1
0
Fork 0
mirror of https://github.com/divan/expvarmon.git synced 2025-05-02 22:17:05 +08:00
Code Issues Projects Releases Wiki Activity

Added second sparkline

Browse Source
This commit is contained in:
Ivan Daniluk 2015-05-02 22:39:39 +03:00
parent 19b35b2a39
commit bba48dcff8
2 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
ui.go
View File

@ -16,11 +16,12 @@ type UI interface {
// TermUI is a termUI implementation of UI interface. // TermUI is a termUI implementation of UI interface.
type TermUI struct { type TermUI struct {
Title *termui.Par Title *termui.Par
Status *termui.Par Status *termui.Par
Services *termui.List Services *termui.List
Lists map[VarName]*termui.List Lists map[VarName]*termui.List
MemSparkline *termui.Sparklines Sparkline1 *termui.Sparklines
Sparkline2 *termui.Sparklines
} }
// Init creates widgets, sets sizes and labels. // Init creates widgets, sets sizes and labels.
@ -69,7 +70,7 @@ func (t *TermUI) Init(data UIData) error {
} }
} }
t.MemSparkline = func() *termui.Sparklines { makeSparkline := func(name VarName) *termui.Sparklines {
var sparklines []termui.Sparkline var sparklines []termui.Sparkline
for _, service := range data.Services { for _, service := range data.Services {
spl := termui.NewSparkline() spl := termui.NewSparkline()
@ -82,9 +83,13 @@ func (t *TermUI) Init(data UIData) error {
s := termui.NewSparklines(sparklines...) s := termui.NewSparklines(sparklines...)
s.Height = 2*len(data.Services) + 2 s.Height = 2*len(data.Services) + 2
s.HasBorder = true s.HasBorder = true
s.Border.Label = fmt.Sprintf("Monitoring %s", data.Vars[0].Long()) s.Border.Label = fmt.Sprintf("Monitoring %s", name.Long())
return s return s
}() }
t.Sparkline1 = makeSparkline(data.Vars[0])
if len(data.Vars) > 1 {
t.Sparkline2 = makeSparkline(data.Vars[1])
}
cellW, firstW := calculateCellWidth(len(data.Vars) + 1) cellW, firstW := calculateCellWidth(len(data.Vars) + 1)
col := termui.NewCol(firstW, 0, t.Services) col := termui.NewCol(firstW, 0, t.Services)
@ -99,7 +104,9 @@ func (t *TermUI) Init(data UIData) error {
termui.NewCol(6, 0, t.Title), termui.NewCol(6, 0, t.Title),
termui.NewCol(6, 0, t.Status)), termui.NewCol(6, 0, t.Status)),
listsRow, listsRow,
termui.NewRow(termui.NewCol(12, 0, t.MemSparkline)), termui.NewRow(
termui.NewCol(6, 0, t.Sparkline1),
termui.NewCol(6, 0, t.Sparkline2)),
) )
termui.Body.Align() termui.Body.Align()
@ -129,10 +136,16 @@ func (t *TermUI) Update(data UIData) {
} }
// Sparklines // Sparklines
topVar := data.Vars[0]
for i, service := range data.Services { for i, service := range data.Services {
t.MemSparkline.Lines[i].Title = fmt.Sprintf("%s (max: %v)", service.Name, service.Max(topVar)) max := formatMax(service.Max(data.Vars[0]))
t.MemSparkline.Lines[i].Data = service.Values(topVar) t.Sparkline1.Lines[i].Title = fmt.Sprintf("%s%s", service.Name, max)
t.Sparkline1.Lines[i].Data = service.Values(data.Vars[0])
if len(data.Vars) > 1 {
max = formatMax(service.Max(data.Vars[1]))
t.Sparkline2.Lines[i].Title = fmt.Sprintf("%s%s", service.Name, max)
t.Sparkline2.Lines[i].Data = service.Values(data.Vars[1])
}
} }
termui.Body.Width = termui.TermWidth() termui.Body.Width = termui.TermWidth()

16
ui_single.go
View File

@ -87,12 +87,8 @@ func (t *TermUISingle) Update(data UIData) {
} }
spl := &t.Sparkline.Lines[i] spl := &t.Sparkline.Lines[i]
var maxStr string max := formatMax(service.Max(name))
max := service.Max(name) spl.Title = fmt.Sprintf("%s: %v%s", name.Long(), service.Value(name), max)
if max != nil {
maxStr = fmt.Sprintf(" (max: %v)", max)
}
spl.Title = fmt.Sprintf("%s: %v%s", name.Long(), service.Value(name), maxStr)
spl.TitleColor = colorByKind(name.Kind()) spl.TitleColor = colorByKind(name.Kind())
spl.LineColor = colorByKind(name.Kind()) spl.LineColor = colorByKind(name.Kind())
spl.Data = service.Values(name) spl.Data = service.Values(name)
@ -107,3 +103,11 @@ func (t *TermUISingle) Update(data UIData) {
func (t *TermUISingle) Close() { func (t *TermUISingle) Close() {
termui.Close() termui.Close()
} }
func formatMax(max interface{}) string {
var str string
if max != nil {
str = fmt.Sprintf(" (max: %v)", max)
}
return str
}