mirror of
https://codeberg.org/scip/esctl.git
synced 2026-08-24 11:54:18 +02:00
Compare commits
3 Commits
b49153bd38
...
feature/re
| Author | SHA1 | Date | |
|---|---|---|---|
| e00e5981f3 | |||
| b0b01941b8 | |||
| 58ad07bb4f |
1
TODO.md
1
TODO.md
@@ -5,3 +5,4 @@
|
|||||||
|
|
||||||
- add datastream support:
|
- add datastream support:
|
||||||
https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-get-data-stream
|
https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-get-data-stream
|
||||||
|
|
||||||
|
|||||||
3
go.mod
3
go.mod
@@ -17,7 +17,6 @@ module codeberg.org/scip/esctl
|
|||||||
go 1.26
|
go 1.26
|
||||||
|
|
||||||
require (
|
require (
|
||||||
codeberg.org/scip/mapmap v0.0.2
|
|
||||||
github.com/MichaelMure/go-term-markdown v0.1.4
|
github.com/MichaelMure/go-term-markdown v0.1.4
|
||||||
github.com/alecthomas/repr v0.5.3
|
github.com/alecthomas/repr v0.5.3
|
||||||
github.com/charmbracelet/bubbles v1.0.0
|
github.com/charmbracelet/bubbles v1.0.0
|
||||||
@@ -32,6 +31,7 @@ require (
|
|||||||
github.com/go-openapi/spec v0.22.5
|
github.com/go-openapi/spec v0.22.5
|
||||||
github.com/go-openapi/swag/loading v0.26.1
|
github.com/go-openapi/swag/loading v0.26.1
|
||||||
github.com/mattn/go-isatty v0.0.22
|
github.com/mattn/go-isatty v0.0.22
|
||||||
|
github.com/seeruk/go-wordwrap v0.0.0-20191208221741-14ec4aac9550
|
||||||
github.com/tidwall/gjson v1.19.0
|
github.com/tidwall/gjson v1.19.0
|
||||||
github.com/tlinden/yadu v0.1.3
|
github.com/tlinden/yadu v0.1.3
|
||||||
github.com/urfave/cli/v3 v3.10.1-0.20260623012112-f980ca84bf65
|
github.com/urfave/cli/v3 v3.10.1-0.20260623012112-f980ca84bf65
|
||||||
@@ -40,6 +40,7 @@ require (
|
|||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
|
codeberg.org/scip/mapmap v0.0.2 // indirect
|
||||||
github.com/MichaelMure/go-term-text v0.3.1 // indirect
|
github.com/MichaelMure/go-term-text v0.3.1 // indirect
|
||||||
github.com/alecthomas/chroma v0.7.1 // indirect
|
github.com/alecthomas/chroma v0.7.1 // indirect
|
||||||
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
|
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
|
||||||
|
|||||||
4
go.sum
4
go.sum
@@ -1,3 +1,5 @@
|
|||||||
|
codeberg.org/scip/mapmap v0.0.1 h1:L1jMBo/UNp19MXUF/ONjc1XKVGeuF1x05z0pEhjgkzA=
|
||||||
|
codeberg.org/scip/mapmap v0.0.1/go.mod h1:/ojYo2P7dMA2FWEu+jHKmsKPeq5yDcCvXeHevqZd5OI=
|
||||||
codeberg.org/scip/mapmap v0.0.2 h1:0i61jOUwFmGVwPukrMzrx0Fi4T9Qru2nlmibuaJimBo=
|
codeberg.org/scip/mapmap v0.0.2 h1:0i61jOUwFmGVwPukrMzrx0Fi4T9Qru2nlmibuaJimBo=
|
||||||
codeberg.org/scip/mapmap v0.0.2/go.mod h1:/ojYo2P7dMA2FWEu+jHKmsKPeq5yDcCvXeHevqZd5OI=
|
codeberg.org/scip/mapmap v0.0.2/go.mod h1:/ojYo2P7dMA2FWEu+jHKmsKPeq5yDcCvXeHevqZd5OI=
|
||||||
github.com/MichaelMure/go-term-markdown v0.1.4 h1:Ir3kBXDUtOX7dEv0EaQV8CNPpH+T7AfTh0eniMOtNcs=
|
github.com/MichaelMure/go-term-markdown v0.1.4 h1:Ir3kBXDUtOX7dEv0EaQV8CNPpH+T7AfTh0eniMOtNcs=
|
||||||
@@ -153,6 +155,8 @@ github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
|
|||||||
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
|
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
|
||||||
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
|
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
|
||||||
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
|
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
|
||||||
|
github.com/seeruk/go-wordwrap v0.0.0-20191208221741-14ec4aac9550 h1:C3CfUXH/qmWuQFRqnPm3Sx8PFxa+pqACjhV5CaNO8pw=
|
||||||
|
github.com/seeruk/go-wordwrap v0.0.0-20191208221741-14ec4aac9550/go.mod h1:Sl541M2Em6rRG3V9WObycR7MYFZiERVkd/TJg0Gt0U4=
|
||||||
github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
|
github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
|
||||||
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
|
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
|
||||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||||
|
|||||||
@@ -328,7 +328,7 @@ func ApiList(conf *cfg.Config, pattern string) error {
|
|||||||
|
|
||||||
filter := regexp.MustCompile(pattern)
|
filter := regexp.MustCompile(pattern)
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(4, 0)
|
table := printer.NewTable(conf, 4, 0)
|
||||||
table.Addheaders("path", "http verb", "tag", "description")
|
table.Addheaders("path", "http verb", "tag", "description")
|
||||||
|
|
||||||
for path, item := range assets.OpenAPI.Spec().Paths.Paths {
|
for path, item := range assets.OpenAPI.Spec().Paths.Paths {
|
||||||
|
|||||||
@@ -111,7 +111,7 @@ func CcrRemoteInfo(conf *cfg.Config, index string) error {
|
|||||||
mode = "leader"
|
mode = "leader"
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(2, 5)
|
table := printer.NewTable(conf, 2, 5)
|
||||||
table.Addheaders("ccr remote property", "value")
|
table.Addheaders("ccr remote property", "value")
|
||||||
|
|
||||||
table.Entries = [][]any{
|
table.Entries = [][]any{
|
||||||
|
|||||||
@@ -164,7 +164,7 @@ func CcrFollowerShow(conf *cfg.Config, index string) error {
|
|||||||
|
|
||||||
follower := res.Indices[0].Shards[0]
|
follower := res.Indices[0].Shards[0]
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(2, 9)
|
table := printer.NewTable(conf, 2, 9)
|
||||||
table.Addheaders("ccr follower property", "value")
|
table.Addheaders("ccr follower property", "value")
|
||||||
|
|
||||||
table.Entries = [][]any{
|
table.Entries = [][]any{
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ func ClusterList(conf *cfg.Config) error {
|
|||||||
|
|
||||||
wg.Wait()
|
wg.Wait()
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(5, len(conf.Clusters))
|
table := printer.NewTable(conf, 5, len(conf.Clusters))
|
||||||
table.Addheaders("cluster", "uri", "reachable", "current", "error")
|
table.Addheaders("cluster", "uri", "reachable", "current", "error")
|
||||||
|
|
||||||
idx := 0
|
idx := 0
|
||||||
@@ -212,7 +212,7 @@ func ClusterStatus(conf *cfg.Config) error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(2, 7)
|
table := printer.NewTable(conf, 2, 7)
|
||||||
table.Addheaders(conf.DefaultCluster.Name, "status")
|
table.Addheaders(conf.DefaultCluster.Name, "status")
|
||||||
|
|
||||||
table.Entries = [][]any{
|
table.Entries = [][]any{
|
||||||
@@ -291,7 +291,7 @@ func gatherClusterStats(clusterstats *clusterstats.Response, table *printer.Tabl
|
|||||||
{"indices", clusterstats.Indices.Count},
|
{"indices", clusterstats.Indices.Count},
|
||||||
{"Docs", clusterstats.Indices.Docs.Count},
|
{"Docs", clusterstats.Indices.Docs.Count},
|
||||||
{"Total Size", printer.Bytes(clusterstats.Indices.Docs.TotalSizeInBytes)},
|
{"Total Size", printer.Bytes(clusterstats.Indices.Docs.TotalSizeInBytes)},
|
||||||
{"Total Queries", querycount},
|
{"Total Queries", "%d", querycount},
|
||||||
{"Shards Primaries", clusterstats.Indices.Shards.Primaries},
|
{"Shards Primaries", clusterstats.Indices.Shards.Primaries},
|
||||||
{"Shards Total", clusterstats.Indices.Shards.Total},
|
{"Shards Total", clusterstats.Indices.Shards.Total},
|
||||||
{"Storage", fmt.Sprintf(
|
{"Storage", fmt.Sprintf(
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ func ClusterSettingsList(conf *cfg.Config) error {
|
|||||||
return fmt.Errorf("failed to get cluster settings: %w", esErrorString(err))
|
return fmt.Errorf("failed to get cluster settings: %w", esErrorString(err))
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(2, 0)
|
table := printer.NewTable(conf, 2, 0)
|
||||||
table.Addheaders("setting", "value")
|
table.Addheaders("setting", "value")
|
||||||
|
|
||||||
entries := [][]any{}
|
entries := [][]any{}
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ func checkClusterStatus(conf *cfg.Config, leader, follower string) bool {
|
|||||||
status[cluster] = clusterHealth
|
status[cluster] = clusterHealth
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(3, 6)
|
table := printer.NewTable(conf, 3, 6)
|
||||||
|
|
||||||
table.Addheaders("setting", "leader:"+leader, "follower:"+follower)
|
table.Addheaders("setting", "leader:"+leader, "follower:"+follower)
|
||||||
|
|
||||||
@@ -151,7 +151,7 @@ func findIlmErrors(conf *cfg.Config, leader, follower string) bool {
|
|||||||
|
|
||||||
if len(failed[cluster]) > 0 {
|
if len(failed[cluster]) > 0 {
|
||||||
idx := 0
|
idx := 0
|
||||||
table := printer.NewTable(conf).WithSize(2, len(failed[cluster]))
|
table := printer.NewTable(conf, 2, len(failed[cluster]))
|
||||||
table.Addheaders("ilm errors on "+which, "errors")
|
table.Addheaders("ilm errors on "+which, "errors")
|
||||||
|
|
||||||
for name, count := range failed[cluster] {
|
for name, count := range failed[cluster] {
|
||||||
@@ -225,7 +225,7 @@ func findIndicesOnlyOnLeader(conf *cfg.Config, indices ClusterIndices, leader, f
|
|||||||
}
|
}
|
||||||
|
|
||||||
idx := 0
|
idx := 0
|
||||||
table := printer.NewTable(conf).WithSize(3, len(indexOnlyOnLeader))
|
table := printer.NewTable(conf, 3, len(indexOnlyOnLeader))
|
||||||
table.Addheaders("index only on leader", "size", "docscount")
|
table.Addheaders("index only on leader", "size", "docscount")
|
||||||
|
|
||||||
for name, index := range indexOnlyOnLeader {
|
for name, index := range indexOnlyOnLeader {
|
||||||
@@ -275,7 +275,7 @@ func findOrphanedIndices(conf *cfg.Config, indices ClusterIndices, leader, follo
|
|||||||
}
|
}
|
||||||
|
|
||||||
idx := 0
|
idx := 0
|
||||||
table := printer.NewTable(conf).WithSize(3, len(orphaned))
|
table := printer.NewTable(conf, 3, len(orphaned))
|
||||||
table.Addheaders("orphaned index on follower", "size", "docscount")
|
table.Addheaders("orphaned index on follower", "size", "docscount")
|
||||||
|
|
||||||
for name, index := range orphaned {
|
for name, index := range orphaned {
|
||||||
@@ -311,7 +311,7 @@ func findFailedFollowerIndices(conf *cfg.Config, indices ClusterIndices, followe
|
|||||||
}
|
}
|
||||||
|
|
||||||
idx := 0
|
idx := 0
|
||||||
table := printer.NewTable(conf).WithSize(3, len(red))
|
table := printer.NewTable(conf, 3, len(red))
|
||||||
table.Addheaders("red index on follower", "size", "docscount")
|
table.Addheaders("red index on follower", "size", "docscount")
|
||||||
|
|
||||||
for name, index := range red {
|
for name, index := range red {
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ func DatastreamList(conf *cfg.Config) error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(7, size)
|
table := printer.NewTable(conf, 7, size)
|
||||||
table.Addheaders("name", "ilm policy", "hidden", "system", "replicated", "generation", "timestamp field")
|
table.Addheaders("name", "ilm policy", "hidden", "system", "replicated", "generation", "timestamp field")
|
||||||
|
|
||||||
for idx, datastream := range list {
|
for idx, datastream := range list {
|
||||||
@@ -146,7 +146,7 @@ func DatastreamShow(conf *cfg.Config, dsname string) error {
|
|||||||
return fmt.Errorf("failed to get data stream stats: %w", esErrorString(err))
|
return fmt.Errorf("failed to get data stream stats: %w", esErrorString(err))
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(11, 2)
|
table := printer.NewTable(conf, 11, 2)
|
||||||
table.Addheaders("data stream property", "value")
|
table.Addheaders("data stream property", "value")
|
||||||
|
|
||||||
datastream := res.DataStreams[0]
|
datastream := res.DataStreams[0]
|
||||||
@@ -176,7 +176,7 @@ func DatastreamShow(conf *cfg.Config, dsname string) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
table = printer.NewTable(conf).WithSize(5, len(datastream.Indices))
|
table = printer.NewTable(conf, 5, len(datastream.Indices))
|
||||||
table.Addheaders("backing index name", "uuid", "prefer ilm", "ilm policy", "managed by")
|
table.Addheaders("backing index name", "uuid", "prefer ilm", "ilm policy", "managed by")
|
||||||
|
|
||||||
for idx, index := range datastream.Indices {
|
for idx, index := range datastream.Indices {
|
||||||
@@ -233,7 +233,7 @@ func DatastreamRollover(conf *cfg.Config, ds string) error {
|
|||||||
return fmt.Errorf("failed to rollover data stream: %w", esErrorString(err))
|
return fmt.Errorf("failed to rollover data stream: %w", esErrorString(err))
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(2, 5)
|
table := printer.NewTable(conf, 2, 5)
|
||||||
table.Addheaders("rollover response", "value")
|
table.Addheaders("rollover response", "value")
|
||||||
table.Entries = [][]any{
|
table.Entries = [][]any{
|
||||||
{"acknowledged", res.Acknowledged},
|
{"acknowledged", res.Acknowledged},
|
||||||
|
|||||||
@@ -85,7 +85,7 @@ func IlmList(conf *cfg.Config, pattern string) error {
|
|||||||
repr.Println(res)
|
repr.Println(res)
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(5, 0)
|
table := printer.NewTable(conf, 5, 0)
|
||||||
table.Addheaders("ilm policy", "hot", "warm", "frozen", "delete")
|
table.Addheaders("ilm policy", "hot", "warm", "frozen", "delete")
|
||||||
|
|
||||||
for name, ilm := range res {
|
for name, ilm := range res {
|
||||||
@@ -123,7 +123,7 @@ func IlmShow(conf *cfg.Config, policy string) error {
|
|||||||
return IlmShowTree(conf, ilm.Policy)
|
return IlmShowTree(conf, ilm.Policy)
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(2, 5)
|
table := printer.NewTable(conf, 2, 5)
|
||||||
table.Addheaders("ilm policy setting", "value")
|
table.Addheaders("ilm policy setting", "value")
|
||||||
|
|
||||||
table.Entries = [][]any{
|
table.Entries = [][]any{
|
||||||
@@ -142,7 +142,7 @@ func IlmShow(conf *cfg.Config, policy string) error {
|
|||||||
func IlmShowTree(conf *cfg.Config, ilm types.IlmPolicy) error {
|
func IlmShowTree(conf *cfg.Config, ilm types.IlmPolicy) error {
|
||||||
indent := ""
|
indent := ""
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(4, 0)
|
table := printer.NewTable(conf, 4, 0)
|
||||||
table.Addheaders("phase", "min age", "min size", "snapshot repo")
|
table.Addheaders("phase", "min age", "min size", "snapshot repo")
|
||||||
|
|
||||||
for _, phase := range IlmPhaseOrder {
|
for _, phase := range IlmPhaseOrder {
|
||||||
@@ -280,16 +280,14 @@ func IlmExplain(conf *cfg.Config, index string) error {
|
|||||||
|
|
||||||
ilm := explain.(*types.LifecycleExplainManaged)
|
ilm := explain.(*types.LifecycleExplainManaged)
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(2, 0)
|
table := printer.NewTable(conf, 2, 0)
|
||||||
table.Addheaders("ilm status field", "value")
|
table.Addheaders("ilm status field", "value")
|
||||||
|
|
||||||
info := ""
|
info := ""
|
||||||
|
|
||||||
if len(ilm.StepInfo["reason"]) > 0 {
|
err = json.Unmarshal(ilm.StepInfo["reason"], &info)
|
||||||
err = json.Unmarshal(ilm.StepInfo["reason"], &info)
|
if err != nil {
|
||||||
if err != nil {
|
return fmt.Errorf("failed to unmarshal step info: %w", err)
|
||||||
return fmt.Errorf("failed to unmarshal step info: %w", err)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
table.Entries = [][]any{
|
table.Entries = [][]any{
|
||||||
@@ -301,11 +299,8 @@ func IlmExplain(conf *cfg.Config, index string) error {
|
|||||||
{"phase", *ilm.Phase},
|
{"phase", *ilm.Phase},
|
||||||
{"phase execution", ilmPhaseString(ilm.PhaseExecution.PhaseDefinition, false)},
|
{"phase execution", ilmPhaseString(ilm.PhaseExecution.PhaseDefinition, false)},
|
||||||
{"step", *ilm.Step},
|
{"step", *ilm.Step},
|
||||||
}
|
{"failed step", *ilm.FailedStep},
|
||||||
|
{"failed step retry count", ilm.FailedStepRetryCount},
|
||||||
if ilm.FailedStep != nil {
|
|
||||||
table.AddRow("failed step", *ilm.FailedStep)
|
|
||||||
table.AddRow("failed step retry count", ilm.FailedStepRetryCount)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := table.Print(); err != nil {
|
if err := table.Print(); err != nil {
|
||||||
|
|||||||
@@ -105,7 +105,7 @@ func IlmForecastList(conf *cfg.Config, filter string) error {
|
|||||||
headers = append(headers, "ilm policy")
|
headers = append(headers, "ilm policy")
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(len(headers), 0)
|
table := printer.NewTable(conf, len(headers), 0)
|
||||||
table.Addheaders(headers...)
|
table.Addheaders(headers...)
|
||||||
|
|
||||||
for _, phase := range phaseData {
|
for _, phase := range phaseData {
|
||||||
|
|||||||
@@ -104,7 +104,7 @@ func IndexList(conf *cfg.Config) error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(3, size)
|
table := printer.NewTable(conf, 3, size)
|
||||||
table.Addheaders("name", "size", "docscount")
|
table.Addheaders("name", "size", "docscount")
|
||||||
|
|
||||||
for idx, index := range list {
|
for idx, index := range list {
|
||||||
@@ -140,7 +140,7 @@ func IndexShow(conf *cfg.Config, indexpattern string) error {
|
|||||||
idx++
|
idx++
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(2, 7)
|
table := printer.NewTable(conf, 2, 7)
|
||||||
table.Addheaders("index property", "value")
|
table.Addheaders("index property", "value")
|
||||||
|
|
||||||
ts, err := strconv.ParseInt(index.Settings.Index.CreationDate.(string), 10, 64)
|
ts, err := strconv.ParseInt(index.Settings.Index.CreationDate.(string), 10, 64)
|
||||||
@@ -263,7 +263,7 @@ func IndexFields(conf *cfg.Config, index string) error {
|
|||||||
return fmt.Errorf("failed to retrieve field capabilties: %w", esErrorString(err))
|
return fmt.Errorf("failed to retrieve field capabilties: %w", esErrorString(err))
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(5, 0)
|
table := printer.NewTable(conf, 5, 0)
|
||||||
table.Addheaders("field", "type", "searchable", "aggretable", "metadata")
|
table.Addheaders("field", "type", "searchable", "aggretable", "metadata")
|
||||||
|
|
||||||
idx := 0
|
idx := 0
|
||||||
@@ -336,7 +336,7 @@ func IndexDiskusage(conf *cfg.Config, index string) error {
|
|||||||
return errors.New("no disk usage reported for index")
|
return errors.New("no disk usage reported for index")
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf).
|
table := printer.NewTableEmpty(conf).
|
||||||
WithHeaders("field", "bloom filter", "norms", "points", "term vectors", "knn vectors", "total")
|
WithHeaders("field", "bloom filter", "norms", "points", "term vectors", "knn vectors", "total")
|
||||||
|
|
||||||
for name, field := range diskusage.Fields {
|
for name, field := range diskusage.Fields {
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ func IndexAliasList(conf *cfg.Config) error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(2, len(aliaslist))
|
table := printer.NewTable(conf, 2, len(aliaslist))
|
||||||
table.Addheaders("index", "alias")
|
table.Addheaders("index", "alias")
|
||||||
|
|
||||||
idx := 0
|
idx := 0
|
||||||
@@ -113,7 +113,7 @@ func IndexAliasRollover(conf *cfg.Config, alias string) error {
|
|||||||
return fmt.Errorf("failed to rollover index alias: %w", esErrorString(err))
|
return fmt.Errorf("failed to rollover index alias: %w", esErrorString(err))
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(2, 5)
|
table := printer.NewTable(conf, 2, 5)
|
||||||
table.Addheaders("rollover response", "value")
|
table.Addheaders("rollover response", "value")
|
||||||
table.Entries = [][]any{
|
table.Entries = [][]any{
|
||||||
{"acknowledged", res.Acknowledged},
|
{"acknowledged", res.Acknowledged},
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ func IndexCopy(conf *cfg.Config) error {
|
|||||||
return fmt.Errorf("failed to copy indices: %w", esErrorString(err))
|
return fmt.Errorf("failed to copy indices: %w", esErrorString(err))
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(2, 0).
|
table := printer.NewTable(conf, 2, 0).
|
||||||
WithHeaders("Reindex metrtic", "value")
|
WithHeaders("Reindex metrtic", "value")
|
||||||
|
|
||||||
table.Entries = [][]any{
|
table.Entries = [][]any{
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ func IndexTemplateList(conf *cfg.Config, filter string) error {
|
|||||||
|
|
||||||
slog.Debug("res", "index templates", res)
|
slog.Debug("res", "index templates", res)
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(5, 0)
|
table := printer.NewTable(conf, 5, 0)
|
||||||
table.Addheaders("name", "description", "index patterns", "priority")
|
table.Addheaders("name", "description", "index patterns", "priority")
|
||||||
|
|
||||||
tplList := filterIndexTemplates(conf, filter, res.IndexTemplates)
|
tplList := filterIndexTemplates(conf, filter, res.IndexTemplates)
|
||||||
@@ -120,7 +120,7 @@ func IndexTemplateShow(conf *cfg.Config, tplname string) error {
|
|||||||
|
|
||||||
tpl := res.IndexTemplates[0]
|
tpl := res.IndexTemplates[0]
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(2, 6)
|
table := printer.NewTable(conf, 2, 6)
|
||||||
table.Addheaders("index template property", "value")
|
table.Addheaders("index template property", "value")
|
||||||
|
|
||||||
desc, err := json.Marshal(tpl.IndexTemplate.Meta_["description"])
|
desc, err := json.Marshal(tpl.IndexTemplate.Meta_["description"])
|
||||||
@@ -148,7 +148,7 @@ func IndexTemplateShow(conf *cfg.Config, tplname string) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
table = printer.NewTable(conf).WithSize(2, 0)
|
table = printer.NewTable(conf, 2, 0)
|
||||||
table.Addheaders("index setting property", "value")
|
table.Addheaders("index setting property", "value")
|
||||||
|
|
||||||
err = getIndexTemplateSettings(conf, tplname, table)
|
err = getIndexTemplateSettings(conf, tplname, table)
|
||||||
@@ -162,7 +162,7 @@ func IndexTemplateShow(conf *cfg.Config, tplname string) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
table = printer.NewTable(conf).WithSize(2, 0)
|
table = printer.NewTable(conf, 2, 0)
|
||||||
table.Addheaders("index field mapping", "type")
|
table.Addheaders("index field mapping", "type")
|
||||||
|
|
||||||
if tpl.IndexTemplate.Template.Mappings != nil {
|
if tpl.IndexTemplate.Template.Mappings != nil {
|
||||||
@@ -441,7 +441,7 @@ func rolloverAliasIndexTemplate(conf *cfg.Config, name string) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(4, 0)
|
table := printer.NewTable(conf, 4, 0)
|
||||||
table.Addheaders("rollover alias", "status", "ack", "new index")
|
table.Addheaders("rollover alias", "status", "ack", "new index")
|
||||||
|
|
||||||
// apply rollover to all matching aliases, if any
|
// apply rollover to all matching aliases, if any
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ func LicenseShow(conf *cfg.Config) error {
|
|||||||
|
|
||||||
slog.Debug("license show", "license", res)
|
slog.Debug("license show", "license", res)
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithHeaders("license setting", "value")
|
table := printer.NewTableEmpty(conf).WithHeaders("license setting", "value")
|
||||||
|
|
||||||
lic := res.License
|
lic := res.License
|
||||||
|
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ func NodeList(conf *cfg.Config) error {
|
|||||||
|
|
||||||
slog.Debug("ES result", "nodes", nodes)
|
slog.Debug("ES result", "nodes", nodes)
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithHeaders(
|
table := printer.NewTableEmpty(conf).WithHeaders(
|
||||||
"name", "ip", "load1m", "load5m", "load15m", "ram %", "heap %")
|
"name", "ip", "load1m", "load5m", "load15m", "ram %", "heap %")
|
||||||
|
|
||||||
for _, node := range nodes {
|
for _, node := range nodes {
|
||||||
@@ -104,7 +104,7 @@ func NodeShow(conf *cfg.Config, nodename string) error {
|
|||||||
for id, info := range res.Nodes {
|
for id, info := range res.Nodes {
|
||||||
stat := stats.Nodes[id]
|
stat := stats.Nodes[id]
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(2, 0)
|
table := printer.NewTable(conf, 2, 0)
|
||||||
table.Addheaders(nodename+" property", "value")
|
table.Addheaders(nodename+" property", "value")
|
||||||
|
|
||||||
roles := make([]string, len(info.Roles))
|
roles := make([]string, len(info.Roles))
|
||||||
@@ -197,7 +197,7 @@ func NodeClients(conf *cfg.Config, nodename string) error {
|
|||||||
|
|
||||||
slog.Debug("ES result", "stat", stats)
|
slog.Debug("ES result", "stat", stats)
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(5, 0)
|
table := printer.NewTable(conf, 5, 0)
|
||||||
table.Addheaders("agent", "id", "when", "from host", "url")
|
table.Addheaders("agent", "id", "when", "from host", "url")
|
||||||
|
|
||||||
for _, stat := range stats.Nodes {
|
for _, stat := range stats.Nodes {
|
||||||
@@ -250,7 +250,7 @@ func NodeUsage(conf *cfg.Config, nodeid string) error {
|
|||||||
|
|
||||||
slog.Debug("ES result", "usage", stats)
|
slog.Debug("ES result", "usage", stats)
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithHeaders(
|
table := printer.NewTableEmpty(conf).WithHeaders(
|
||||||
"node",
|
"node",
|
||||||
"bulk",
|
"bulk",
|
||||||
"doc get",
|
"doc get",
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ func RoleList(conf *cfg.Config) error {
|
|||||||
|
|
||||||
slog.Debug("ES result", "roles", res)
|
slog.Debug("ES result", "roles", res)
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(3, len(res))
|
table := printer.NewTable(conf, 3, len(res))
|
||||||
table.Addheaders("role", "index roles", "cluster roles")
|
table.Addheaders("role", "index roles", "cluster roles")
|
||||||
|
|
||||||
idx := 0
|
idx := 0
|
||||||
@@ -126,7 +126,7 @@ func roleRemoteClusters(conf *cfg.Config, role types.Role) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(2, len(role.RemoteCluster))
|
table := printer.NewTable(conf, 2, len(role.RemoteCluster))
|
||||||
table.Addheaders("remote cluster", "privilege")
|
table.Addheaders("remote cluster", "privilege")
|
||||||
|
|
||||||
idx := 0
|
idx := 0
|
||||||
@@ -152,7 +152,7 @@ func roleClusters(conf *cfg.Config, role types.Role) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(1, len(role.Cluster))
|
table := printer.NewTable(conf, 1, len(role.Cluster))
|
||||||
table.Addheaders("cluster rights")
|
table.Addheaders("cluster rights")
|
||||||
|
|
||||||
idx := 0
|
idx := 0
|
||||||
@@ -171,7 +171,7 @@ func roleRemoteIndices(conf *cfg.Config, role types.Role) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(3, len(role.RemoteIndices))
|
table := printer.NewTable(conf, 3, len(role.RemoteIndices))
|
||||||
table.Addheaders("remote index names", "index permissions", "allow restricted")
|
table.Addheaders("remote index names", "index permissions", "allow restricted")
|
||||||
|
|
||||||
idx := 0
|
idx := 0
|
||||||
@@ -197,7 +197,7 @@ func roleIndices(conf *cfg.Config, role types.Role) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(3, len(role.Indices))
|
table := printer.NewTable(conf, 3, len(role.Indices))
|
||||||
table.Addheaders("index names", "index permissions", "allow restricted")
|
table.Addheaders("index names", "index permissions", "allow restricted")
|
||||||
|
|
||||||
idx := 0
|
idx := 0
|
||||||
@@ -223,7 +223,7 @@ func roleApplications(conf *cfg.Config, role types.Role) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(3, len(role.Applications))
|
table := printer.NewTable(conf, 3, len(role.Applications))
|
||||||
table.Addheaders("application", "privileges", "resources")
|
table.Addheaders("application", "privileges", "resources")
|
||||||
|
|
||||||
idx := 0
|
idx := 0
|
||||||
|
|||||||
@@ -216,7 +216,7 @@ func RoleDiff(conf *cfg.Config, csvfile, role string) error {
|
|||||||
|
|
||||||
rows := diffRoles(conf, records, res)
|
rows := diffRoles(conf, records, res)
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(3, len(rows))
|
table := printer.NewTable(conf, 3, len(rows))
|
||||||
table.Addheaders("role", "is deployed", "is defined")
|
table.Addheaders("role", "is deployed", "is defined")
|
||||||
|
|
||||||
for idx, row := range rows {
|
for idx, row := range rows {
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ func SearchQL(conf *cfg.Config, querystring string) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(len(qlResult.Columns), len(qlResult.Values))
|
table := printer.NewTable(conf, len(qlResult.Columns), len(qlResult.Values))
|
||||||
|
|
||||||
headers := make([]string, len(qlResult.Columns))
|
headers := make([]string, len(qlResult.Columns))
|
||||||
for idx, col := range qlResult.Columns {
|
for idx, col := range qlResult.Columns {
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ func printShards(conf *cfg.Config, shardlist shards.Response) error {
|
|||||||
headers = append(headers, "node", "ip")
|
headers = append(headers, "node", "ip")
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(len(headers), len(shardlist))
|
table := printer.NewTable(conf, len(headers), len(shardlist))
|
||||||
table.Addheaders(headers...)
|
table.Addheaders(headers...)
|
||||||
|
|
||||||
for idx, shard := range shardlist {
|
for idx, shard := range shardlist {
|
||||||
@@ -163,7 +163,7 @@ func ShardAllocation(conf *cfg.Config, index string) error {
|
|||||||
|
|
||||||
slog.Debug("ES result", "explain", res)
|
slog.Debug("ES result", "explain", res)
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(2, 10)
|
table := printer.NewTable(conf, 2, 10)
|
||||||
table.Addheaders("shard allocation setting", "value")
|
table.Addheaders("shard allocation setting", "value")
|
||||||
|
|
||||||
table.Entries = [][]any{
|
table.Entries = [][]any{
|
||||||
|
|||||||
@@ -84,7 +84,7 @@ func SnapshotList(conf *cfg.Config) error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(5, len(snapshots))
|
table := printer.NewTable(conf, 5, len(snapshots))
|
||||||
table.Addheaders("name", "index", "start", "orphaned", "status")
|
table.Addheaders("name", "index", "start", "orphaned", "status")
|
||||||
|
|
||||||
for idx, snap := range snapshots {
|
for idx, snap := range snapshots {
|
||||||
@@ -118,7 +118,7 @@ func SnapshotShow(conf *cfg.Config, snapshot string) error {
|
|||||||
return errors.New("no snapshot retrieved")
|
return errors.New("no snapshot retrieved")
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(2, 17)
|
table := printer.NewTable(conf, 2, 17)
|
||||||
table.Addheaders("snapshot property", "value")
|
table.Addheaders("snapshot property", "value")
|
||||||
|
|
||||||
snap := res.Snapshots[0]
|
snap := res.Snapshots[0]
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ func TaskList(conf *cfg.Config) error {
|
|||||||
|
|
||||||
slog.Debug("res", "tasks", res)
|
slog.Debug("res", "tasks", res)
|
||||||
|
|
||||||
table := printer.NewTable(conf).WithSize(6, len(res))
|
table := printer.NewTable(conf, 8, len(res))
|
||||||
table.Addheaders("task id", "action", "start time", "run time", "node", "type")
|
table.Addheaders("task id", "action", "start time", "run time", "node", "type")
|
||||||
|
|
||||||
for idx, task := range res {
|
for idx, task := range res {
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
package printer
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Copyright © 2026 Thomas von Dein
|
Copyright © 2026 Thomas von Dein
|
||||||
|
|
||||||
@@ -16,6 +14,7 @@ GNU General Public License for more details.
|
|||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
package printer
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
@@ -26,9 +25,7 @@ import (
|
|||||||
"github.com/elastic/go-elasticsearch/v9/typedapi/types"
|
"github.com/elastic/go-elasticsearch/v9/typedapi/types"
|
||||||
)
|
)
|
||||||
|
|
||||||
// stringer returns the string representation of different types of
|
func any2string(in any) string {
|
||||||
// values
|
|
||||||
func stringer(in any) string {
|
|
||||||
//nolint:gocritic
|
//nolint:gocritic
|
||||||
switch val := in.(type) {
|
switch val := in.(type) {
|
||||||
case string:
|
case string:
|
||||||
@@ -57,26 +54,52 @@ func stringer(in any) string {
|
|||||||
return string(val)
|
return string(val)
|
||||||
case nil:
|
case nil:
|
||||||
return "null"
|
return "null"
|
||||||
case *types.Float64:
|
case types.Percentage, types.DateTime:
|
||||||
// ignore err here, because types.Float64.MarshalJSON() never returns one
|
return val.(string)
|
||||||
f, _ := val.MarshalJSON()
|
|
||||||
return string(f)
|
|
||||||
default:
|
|
||||||
// Caution: this may cause a panic if the [unknown] type does
|
|
||||||
// not implement fmt.Stringer. In this case add another case
|
|
||||||
// to the type switch for it above.
|
|
||||||
return in.(fmt.Stringer).String()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// visibleLen returns the length of a string but only visible chars,
|
|
||||||
// w/o ansi color escapes
|
|
||||||
func visibleLen(word string) int {
|
|
||||||
if !strings.Contains(word, "\x1b") {
|
|
||||||
// no ansi escape in there, use faster method
|
|
||||||
return len(word)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// contains escapes, need to clean up before counting
|
return ""
|
||||||
return len(ansiCtrlSeq.ReplaceAllLiteralString(word, ""))
|
}
|
||||||
|
|
||||||
|
func (data *Table) preprocessRows() {
|
||||||
|
if data.processed {
|
||||||
|
// only do it once
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// convert entries to strings
|
||||||
|
data.rows = make([][]string, len(data.Entries))
|
||||||
|
for rowidx, entries := range data.Entries {
|
||||||
|
data.rows[rowidx] = make([]string, len(entries))
|
||||||
|
|
||||||
|
for colidx, entry := range data.Entries[rowidx] {
|
||||||
|
data.rows[rowidx][colidx] = any2string(entry)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// determine header lenght's
|
||||||
|
for idx, head := range data.Headers {
|
||||||
|
data.lenHeaders[idx] = visibleLen(head)
|
||||||
|
}
|
||||||
|
|
||||||
|
// determine max width per column
|
||||||
|
for _, entries := range data.rows {
|
||||||
|
currentWidth := 0
|
||||||
|
|
||||||
|
for idx, entry := range entries {
|
||||||
|
length := visibleLen(entry)
|
||||||
|
|
||||||
|
if data.lenHeaders[idx] < length {
|
||||||
|
if length > currentWidth+data.maxwidth {
|
||||||
|
data.lenHeaders[idx] = data.maxwidth - currentWidth
|
||||||
|
} else {
|
||||||
|
data.lenHeaders[idx] = length
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
currentWidth += data.lenHeaders[idx]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
data.processed = true
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,11 +18,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
package printer
|
package printer
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"os"
|
|
||||||
|
|
||||||
"codeberg.org/scip/esctl/pkg/cfg"
|
"codeberg.org/scip/esctl/pkg/cfg"
|
||||||
"github.com/fatih/color"
|
"github.com/fatih/color"
|
||||||
"github.com/mattn/go-isatty"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@@ -34,10 +31,6 @@ var (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func Colorize(conf *cfg.Config, col, what string) string {
|
func Colorize(conf *cfg.Config, col, what string) string {
|
||||||
if !isatty.IsTerminal(os.Stdout.Fd()) {
|
|
||||||
return what
|
|
||||||
}
|
|
||||||
|
|
||||||
switch conf.Output {
|
switch conf.Output {
|
||||||
case "json", "yaml":
|
case "json", "yaml":
|
||||||
return what
|
return what
|
||||||
@@ -56,11 +49,3 @@ func Colorize(conf *cfg.Config, col, what string) string {
|
|||||||
|
|
||||||
return what
|
return what
|
||||||
}
|
}
|
||||||
|
|
||||||
func Bold(what string) string {
|
|
||||||
if !isatty.IsTerminal(os.Stdout.Fd()) {
|
|
||||||
return what
|
|
||||||
}
|
|
||||||
|
|
||||||
return bold(what)
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"codeberg.org/scip/esctl/pkg/cfg"
|
"codeberg.org/scip/esctl/pkg/cfg"
|
||||||
|
"github.com/seeruk/go-wordwrap"
|
||||||
"gopkg.in/yaml.v3"
|
"gopkg.in/yaml.v3"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -42,28 +43,29 @@ type Table struct {
|
|||||||
debugGoRoutines bool
|
debugGoRoutines bool
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewTable(conf *cfg.Config) *Table {
|
func NewTable(conf *cfg.Config, columns, rows int) *Table {
|
||||||
return new(Table{
|
table := new(Table{
|
||||||
Mode: conf.Output,
|
Mode: conf.Output,
|
||||||
maxwidth: cfg.GetTermWidth(),
|
maxwidth: cfg.GetTermWidth(),
|
||||||
debugGoRoutines: conf.DebugGoRoutines,
|
debugGoRoutines: conf.DebugGoRoutines,
|
||||||
Headers: []string{},
|
|
||||||
RawHeaders: []string{},
|
|
||||||
lenHeaders: []int{},
|
|
||||||
alignInts: conf.AlignInts,
|
|
||||||
})
|
})
|
||||||
|
|
||||||
|
table.Headers = make([]string, columns)
|
||||||
|
table.RawHeaders = make([]string, columns)
|
||||||
|
table.Entries = make([][]any, rows)
|
||||||
|
table.lenHeaders = make([]int, columns)
|
||||||
|
table.alignInts = conf.AlignInts
|
||||||
|
|
||||||
|
return table
|
||||||
}
|
}
|
||||||
|
|
||||||
func (table *Table) WithSize(columns, rows int) *Table {
|
func NewTableEmpty(conf *cfg.Config) *Table {
|
||||||
if columns > 0 {
|
table := new(Table{
|
||||||
table.Headers = make([]string, columns)
|
Mode: conf.Output,
|
||||||
table.RawHeaders = make([]string, columns)
|
maxwidth: cfg.GetTermWidth(),
|
||||||
table.lenHeaders = make([]int, columns)
|
debugGoRoutines: conf.DebugGoRoutines,
|
||||||
}
|
})
|
||||||
|
table.alignInts = conf.AlignInts
|
||||||
if rows > 0 {
|
|
||||||
table.Entries = make([][]any, rows)
|
|
||||||
}
|
|
||||||
|
|
||||||
return table
|
return table
|
||||||
}
|
}
|
||||||
@@ -71,7 +73,12 @@ func (table *Table) WithSize(columns, rows int) *Table {
|
|||||||
func (table *Table) WithHeaders(headers ...string) *Table {
|
func (table *Table) WithHeaders(headers ...string) *Table {
|
||||||
count := len(headers)
|
count := len(headers)
|
||||||
|
|
||||||
table.WithSize(count, 0).Addheaders(headers...)
|
table.Entries = [][]any{}
|
||||||
|
table.lenHeaders = make([]int, count)
|
||||||
|
table.Headers = make([]string, count)
|
||||||
|
table.RawHeaders = make([]string, count)
|
||||||
|
|
||||||
|
table.Addheaders(headers...)
|
||||||
|
|
||||||
return table
|
return table
|
||||||
}
|
}
|
||||||
@@ -149,17 +156,25 @@ func (table *Table) PrintTSV() error {
|
|||||||
|
|
||||||
for _, entries := range table.rows {
|
for _, entries := range table.rows {
|
||||||
currentWidth := 0
|
currentWidth := 0
|
||||||
columns := len(entries)
|
|
||||||
|
|
||||||
for idx, entry := range entries {
|
for idx, entry := range entries {
|
||||||
length := visibleLen(entry)
|
length := visibleLen(entry)
|
||||||
|
|
||||||
if length+currentWidth > table.maxwidth &&
|
if length+currentWidth > table.maxwidth && table.maxwidth-currentWidth > 1 {
|
||||||
table.maxwidth-currentWidth > 1 &&
|
// text is too wide to be put into one line, wrap it
|
||||||
idx == columns-1 {
|
wrapper := wordwrap.Wrapper(table.maxwidth-currentWidth, false)
|
||||||
// text is too wide to be put into one line, and
|
wrapped := wrapper(entry)
|
||||||
// it's the last cell, so wrap it
|
|
||||||
entry = wrap(table.maxwidth-currentWidth, currentWidth+2, entry)
|
// and indent it
|
||||||
|
first := true
|
||||||
|
for line := range strings.Lines(wrapped) {
|
||||||
|
if first {
|
||||||
|
entry = line
|
||||||
|
first = false
|
||||||
|
} else {
|
||||||
|
entry += "\n " + strings.Repeat(" ", currentWidth) + line
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
currentWidth += table.lenHeaders[idx]
|
currentWidth += table.lenHeaders[idx]
|
||||||
@@ -187,48 +202,6 @@ func (table *Table) PrintTSV() error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Wrap a text into multiple lines, first line is not indented, all
|
|
||||||
// further lines will be indented. Used within Print() to print large
|
|
||||||
// cell text.
|
|
||||||
func wrap(width, indent int, text string) string {
|
|
||||||
if len(text) <= width {
|
|
||||||
return text
|
|
||||||
}
|
|
||||||
|
|
||||||
wrapped := ""
|
|
||||||
line := ""
|
|
||||||
|
|
||||||
for word := range strings.FieldsSeq(text) {
|
|
||||||
if len(line)+len(word)+1 <= width {
|
|
||||||
// appending word to current line doesn't exceed width
|
|
||||||
if line != "" {
|
|
||||||
line += " "
|
|
||||||
}
|
|
||||||
|
|
||||||
line += word
|
|
||||||
} else {
|
|
||||||
// it exceeds it, so we need to wrap
|
|
||||||
if wrapped == "" {
|
|
||||||
// beginning of output, no indenting here
|
|
||||||
wrapped = line + "\n"
|
|
||||||
} else {
|
|
||||||
// we're in the middle of the text, so add the indent
|
|
||||||
wrapped += strings.Repeat(" ", indent) + line + "\n"
|
|
||||||
}
|
|
||||||
|
|
||||||
// remember the current word for the next round
|
|
||||||
line = word
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if line != "" {
|
|
||||||
// last line, no newline needed here
|
|
||||||
wrapped += strings.Repeat(" ", indent) + line
|
|
||||||
}
|
|
||||||
|
|
||||||
return wrapped
|
|
||||||
}
|
|
||||||
|
|
||||||
func (table *Table) PrintCSV() error {
|
func (table *Table) PrintCSV() error {
|
||||||
table.preprocessRows()
|
table.preprocessRows()
|
||||||
|
|
||||||
@@ -270,7 +243,7 @@ func (table *Table) Addheaders(headers ...string) {
|
|||||||
case "json", "yaml":
|
case "json", "yaml":
|
||||||
table.Headers[idx] = strings.ReplaceAll(strings.ToLower(header), " ", "_")
|
table.Headers[idx] = strings.ReplaceAll(strings.ToLower(header), " ", "_")
|
||||||
default:
|
default:
|
||||||
table.Headers[idx] = Bold(strings.ReplaceAll(strings.ToUpper(header), " ", "-"))
|
table.Headers[idx] = bold(strings.ReplaceAll(strings.ToUpper(header), " ", "-"))
|
||||||
}
|
}
|
||||||
|
|
||||||
table.RawHeaders[idx] = header
|
table.RawHeaders[idx] = header
|
||||||
@@ -291,7 +264,7 @@ func (table *Table) AddRowLate(fields ...any) {
|
|||||||
row := make([]string, len(fields))
|
row := make([]string, len(fields))
|
||||||
|
|
||||||
for idx, field := range fields {
|
for idx, field := range fields {
|
||||||
row[idx] = stringer(field)
|
row[idx] = any2string(field)
|
||||||
}
|
}
|
||||||
|
|
||||||
table.rows = append(table.rows, row)
|
table.rows = append(table.rows, row)
|
||||||
@@ -311,47 +284,9 @@ func (table *Table) toMap() []map[string]any {
|
|||||||
return raw
|
return raw
|
||||||
}
|
}
|
||||||
|
|
||||||
func (data *Table) preprocessRows() {
|
// return the length of a string but only visible chars, w/o ansi color escapes
|
||||||
if data.processed {
|
func visibleLen(word string) int {
|
||||||
// only do it once
|
return len(ansiCtrlSeq.ReplaceAllLiteralString(word, ""))
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// convert entries to strings
|
|
||||||
data.rows = make([][]string, len(data.Entries))
|
|
||||||
for rowidx, entries := range data.Entries {
|
|
||||||
data.rows[rowidx] = make([]string, len(entries))
|
|
||||||
|
|
||||||
for colidx, entry := range data.Entries[rowidx] {
|
|
||||||
data.rows[rowidx][colidx] = stringer(entry)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// determine header lenght's
|
|
||||||
for idx, head := range data.Headers {
|
|
||||||
data.lenHeaders[idx] = visibleLen(head)
|
|
||||||
}
|
|
||||||
|
|
||||||
// determine max width per column
|
|
||||||
for _, entries := range data.rows {
|
|
||||||
currentWidth := 0
|
|
||||||
|
|
||||||
for idx, entry := range entries {
|
|
||||||
length := visibleLen(entry)
|
|
||||||
|
|
||||||
if data.lenHeaders[idx] < length {
|
|
||||||
if length > currentWidth+data.maxwidth {
|
|
||||||
data.lenHeaders[idx] = data.maxwidth - currentWidth
|
|
||||||
} else {
|
|
||||||
data.lenHeaders[idx] = length
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
currentWidth += data.lenHeaders[idx]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
data.processed = true
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func isInt(num string) bool {
|
func isInt(num string) bool {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
.PHONY: test clean cluster docs search up down delete runenv
|
.PHONY: test clean cluster docs search up down delete
|
||||||
|
|
||||||
# docker stuff
|
# docker stuff
|
||||||
up:
|
up:
|
||||||
@@ -20,8 +20,6 @@ delete:
|
|||||||
clean-docker: down delete
|
clean-docker: down delete
|
||||||
|
|
||||||
|
|
||||||
runenv: up waitup cluster docs wait
|
|
||||||
|
|
||||||
# mosscap esctl stuff
|
# mosscap esctl stuff
|
||||||
test: up waitup cluster docs wait search
|
test: up waitup cluster docs wait search
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user