remove tview usage, move to simple table

go.mod

@@ -5,14 +5,11 @@ go 1.21
 require (
  github.com/dustin/go-humanize v1.0.1
  github.com/fatih/color v1.17.0
- github.com/gdamore/tcell/v2 v2.7.4
  github.com/gorilla/mux v1.8.1
  github.com/minio/cli v1.24.2
  github.com/minio/dnscache v0.1.1
- github.com/minio/pkg v1.7.5
  github.com/minio/pkg/v3 v3.0.1
  github.com/prometheus/client_golang v1.19.1
- github.com/rivo/tview v0.0.0-20231126123532-b11bfc7683c7
  github.com/sirupsen/logrus v1.9.3
  go.uber.org/atomic v1.11.0
  golang.org/x/net v0.26.0
@@ -28,7 +25,6 @@ require (
  github.com/beorn7/perks v1.0.1 // indirect
  github.com/cespare/xxhash/v2 v2.3.0 // indirect
  github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
- github.com/gdamore/encoding v1.0.1 // indirect
  github.com/go-ole/go-ole v1.3.0 // indirect
  github.com/goccy/go-json v0.10.3 // indirect
  github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
@@ -40,11 +36,9 @@ require (
  github.com/lestrrat-go/iter v1.0.2 // indirect
  github.com/lestrrat-go/jwx v1.2.29 // indirect
  github.com/lestrrat-go/option v1.0.1 // indirect
- github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
  github.com/lufia/plan9stats v0.0.0-20240513124658-fba389f38bae // indirect
  github.com/mattn/go-colorable v0.1.13 // indirect
  github.com/mattn/go-isatty v0.0.20 // indirect
- github.com/mattn/go-runewidth v0.0.15 // indirect
  github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
  github.com/minio/madmin-go/v3 v3.0.56 // indirect
  github.com/minio/md5-simd v1.1.2 // indirect
@@ -57,7 +51,6 @@ require (
  github.com/prometheus/common v0.54.0 // indirect
  github.com/prometheus/procfs v0.15.1 // indirect
  github.com/prometheus/prom2json v1.3.3 // indirect
- github.com/rivo/uniseg v0.4.7 // indirect
  github.com/rjeczalik/notify v0.9.3 // indirect
  github.com/rs/xid v1.5.0 // indirect
  github.com/safchain/ethtool v0.4.0 // indirect

go.sum

@@ -14,11 +14,6 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4=
 github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI=
-github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
-github.com/gdamore/encoding v1.0.1 h1:YzKZckdBL6jVt2Gc+5p82qhrGiqMdG/eNs6Wy0u3Uhw=
-github.com/gdamore/encoding v1.0.1/go.mod h1:0Z0cMFinngz9kS1QfMjCP8TY7em3bZYeeklsSDPivEo=
-github.com/gdamore/tcell/v2 v2.7.4 h1:sg6/UnTM9jGpZU+oFYAsDahfchWAFW8Xx2yFinNSAYU=
-github.com/gdamore/tcell/v2 v2.7.4/go.mod h1:dSXtXTSK0VsW1biw65DZLZ2NKr7j0qP/0J7ONmsraWg=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
 github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
@@ -50,17 +45,13 @@ github.com/lestrrat-go/jwx v1.2.29/go.mod h1:hU8k2l6WF0ncx20uQdOmik/Gjg6E3/wIRtX
 github.com/lestrrat-go/option v1.0.0/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I=
 github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNBEYU=
 github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I=
-github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
-github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/lufia/plan9stats v0.0.0-20240513124658-fba389f38bae h1:dIZY4ULFcto4tAFlj1FYZl8ztUZ13bdq+PLY+NOfbyI=
 github.com/lufia/plan9stats v0.0.0-20240513124658-fba389f38bae/go.mod h1:ilwx/Dta8jXAgpFYFvSWEMwxmbWXyiUHkd5FwyKhb5k=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
-github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
 github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/minio/cli v1.24.2 h1:J+fCUh9mhPLjN3Lj/YhklXvxj8mnyE/D6FpFduXJ2jg=
@@ -75,8 +66,6 @@ github.com/minio/minio-go/v7 v7.0.71 h1:No9XfOKTYi6i0GnBj+WZwD8WP5GZfL7n7GOjRqCd
 github.com/minio/minio-go/v7 v7.0.71/go.mod h1:4yBA8v80xGA30cfM3fz0DKYMXunWl/AV/6tWEs9ryzo=
 github.com/minio/mux v1.8.2 h1:r9oVDFM09y+u8CF4HPLanguAG41niXgYwZAFkVHce9M=
 github.com/minio/mux v1.8.2/go.mod h1:1pAare17ZRL5GpmNL+9YmqHoWnLmMZF9C/ioUCfy0BQ=
-github.com/minio/pkg v1.7.5 h1:UOUJjewE5zoaDPlCMJtNx/swc1jT1ZR+IajT7hrLd44=
-github.com/minio/pkg v1.7.5/go.mod h1:mEfGMTm5Z0b5EGxKNuPwyb5A2d+CC/VlUyRj6RJtIwo=
 github.com/minio/pkg/v3 v3.0.1 h1:qts6g9rYjAdeomRdwjnMc1IaQ6KbaJs3dwqBntXziaw=
 github.com/minio/pkg/v3 v3.0.1/go.mod h1:53gkSUVHcfYoskOs5YAJ3D99nsd2SKru90rdE9whlXU=
 github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8eaE=
@@ -100,12 +89,6 @@ github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0leargg
 github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
 github.com/prometheus/prom2json v1.3.3 h1:IYfSMiZ7sSOfliBoo89PcufjWO4eAR0gznGcETyaUgo=
 github.com/prometheus/prom2json v1.3.3/go.mod h1:Pv4yIPktEkK7btWsrUTWDDDrnpUrAELaOCj+oFwlgmc=
-github.com/rivo/tview v0.0.0-20231126123532-b11bfc7683c7 h1:COzHU5BcNtpJhQijeK34VQdITkvcPwLA+eYyySH+dXY=
-github.com/rivo/tview v0.0.0-20231126123532-b11bfc7683c7/go.mod h1:nVwGv4MP47T0jvlk7KuTTjjuSmrGO4JF0iaiNt4bufE=
-github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
-github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
-github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/rjeczalik/notify v0.9.3 h1:6rJAzHTGKXGj76sbRgDiDcYj/HniypXmSJo1SWakZeY=
 github.com/rjeczalik/notify v0.9.3/go.mod h1:gF3zSOrafR9DQEWSE8TjfI9NkooDxbyT4UgRGKZA0lc=
 github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc=

main.go

@@ -38,6 +38,8 @@ import (
  "sync/atomic"
  "time"
 
+ "github.com/dustin/go-humanize"
+ "github.com/fatih/color"
  "github.com/gorilla/mux"
  "github.com/sirupsen/logrus"
  "golang.org/x/term"
@@ -411,8 +413,32 @@ type multisite struct {
  sites []*site
 }
 
+func (m *multisite) populate(cellText [][]string) {
+ for i, site := range m.sites {
+ for j, b := range site.backends {
+ minLatency := "0s"
+ maxLatency := "0s"
+ if b.Stats.MaxLatency > 0 {
+ minLatency = fmt.Sprintf("%2s", b.Stats.MinLatency.Round(time.Microsecond))
+ maxLatency = fmt.Sprintf("%2s", b.Stats.MaxLatency.Round(time.Microsecond))
+ }
+ cellText[i*len(site.backends)+j][0] = humanize.Ordinal(b.siteNumber)
+ cellText[i*len(site.backends)+j][1] = b.endpoint
+ cellText[i*len(site.backends)+j][2] = b.getServerStatus()
+ cellText[i*len(site.backends)+j][3] = strconv.FormatInt(b.Stats.TotCalls, 10)
+ cellText[i*len(site.backends)+j][4] = strconv.FormatInt(b.Stats.TotCallFailures, 10)
+ cellText[i*len(site.backends)+j][5] = humanize.IBytes(uint64(b.Stats.Rx))
+ cellText[i*len(site.backends)+j][6] = humanize.IBytes(uint64(b.Stats.Tx))
+ cellText[i*len(site.backends)+j][7] = b.Stats.CumDowntime.Round(time.Microsecond).String()
+ cellText[i*len(site.backends)+j][8] = b.Stats.LastDowntime.Round(time.Microsecond).String()
+ cellText[i*len(site.backends)+j][9] = minLatency
+ cellText[i*len(site.backends)+j][10] = maxLatency
+ }
+ }
+}
+
 func (m *multisite) ServeHTTP(w http.ResponseWriter, r *http.Request) {
- w.Header().Set("Server", "SideKick") // indicate sidekick is serving the request
+ w.Header().Set("Server", "SideKick") // indicate sidekick is serving
  for _, s := range m.sites {
  if s.Online() {
  if r.URL.Path == healthPath {
@@ -828,6 +854,20 @@ func configureSite(ctx *cli.Context, siteNum int, siteStrs []string, healthCheck
  }
 }
 
+var headers = []string{
+ "SITE",
+ "HOST",
+ "STATUS",
+ "CALLS",
+ "FAILURES",
+ "Rx",
+ "Tx",
+ "TOTAL DOWNTIME",
+ "LAST DOWNTIME",
+ "MIN LATENCY",
+ "MAX LATENCY",
+}
+
 func sidekickMain(ctx *cli.Context) {
  checkMain(ctx)
 
@@ -892,10 +932,18 @@ func sidekickMain(ctx *cli.Context) {
  sites = append(sites, site)
  }
 
- m := &multisite{sites}
- initUI(m)
-
  if globalConsoleDisplay {
+ console.SetColor("LogMsgType", color.New(color.FgHiMagenta))
+ console.SetColor("TraceMsgType", color.New(color.FgYellow))
+ console.SetColor("Stat", color.New(color.FgYellow))
+ console.SetColor("Request", color.New(color.FgCyan))
+ console.SetColor("Method", color.New(color.Bold, color.FgWhite))
+ console.SetColor("Host", color.New(color.Bold, color.FgGreen))
+ console.SetColor("ReqHeaderKey", color.New(color.Bold, color.FgWhite))
+ console.SetColor("RespHeaderKey", color.New(color.Bold, color.FgCyan))
+ console.SetColor("RespStatus", color.New(color.Bold, color.FgYellow))
+ console.SetColor("ErrStatus", color.New(color.Bold, color.FgRed))
+ console.SetColor("Response", color.New(color.FgGreen))
  console.Infof("listening on '%s'\n", addr)
  }
 
@@ -912,6 +960,43 @@ func sidekickMain(ctx *cli.Context) {
  console.Fatalln(err)
  }
 
+ m := &multisite{sites}
+ if !globalConsoleDisplay {
+ dspOrder := []col{colGreen} // Header
+ for i := 0; i < len(sites); i++ {
+ for range sites[i].backends {
+ dspOrder = append(dspOrder, colGrey)
+ }
+ }
+ var printColors []*color.Color
+ for _, c := range dspOrder {
+ printColors = append(printColors, getPrintCol(c))
+ }
+
+ tbl := console.NewTable(printColors, []bool{
+ false, false, false, false, false, false,
+ false, false, false, false, false,
+ }, 0)
+
+ cellText := make([][]string, len(dspOrder))
+ for i := range dspOrder {
+ cellText[i] = make([]string, len(headers))
+ }
+ cellText[0] = headers
+
+ go func() {
+ // Clear screen before we start the table UI
+ clearScreen()
+
+ ticker := time.NewTicker(500 * time.Millisecond)
+ for range ticker.C {
+ m.populate(cellText[1:])
+ console.RewindLines(len(cellText) + 2)
+ tbl.DisplayTable(cellText)
+ }
+ }()
+ }
+
  router.PathPrefix(slashSeparator).Handler(m)
  server := &http.Server{
  Addr: addr,
@@ -931,18 +1016,9 @@ func sidekickMain(ctx *cli.Context) {
  ClientSessionCache: tls.NewLRUClientSessionCache(tlsClientSessionCacheSize),
  }
  server.TLSConfig = tlsConfig
- listener, err := tls.Listen("tcp", addr, tlsConfig)
- if err != nil {
- console.Fatalln(err)
- }
- err = server.Serve(listener)
- if err != nil {
- console.Fatalln(err)
- }
- } else {
- if err := server.ListenAndServe(); err != nil {
- console.Fatalln(err)
- }
+ }
+ if err := server.ListenAndServe(); err != nil {
+ console.Fatalln(err)
  }
 }
 

table-ui.go

@@ -0,0 +1,51 @@
+// Copyright (c) 2021-2024 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+package main
+
+import (
+ "fmt"
+
+ "github.com/fatih/color"
+)
+
+// An alias of string to represent the health color code of an object
+type col string
+
+const (
+ colGrey col = "Grey"
+ colRed col = "Red"
+ colYellow col = "Yellow"
+ colGreen col = "Green"
+)
+
+func clearScreen() {
+ fmt.Print("\033[H\033[2J")
+}
+
+// getPrintCol - map color code to color for printing
+func getPrintCol(c col) *color.Color {
+ switch c {
+ case colGrey:
+ return color.New(color.FgWhite, color.Bold)
+ case colRed:
+ return color.New(color.FgRed, color.Bold)
+ case colYellow:
+ return color.New(color.FgYellow, color.Bold)
+ case colGreen:
+ return color.New(color.FgGreen, color.Bold)
+ }
+ return nil
+}