mirror of
https://codeberg.org/scip/esctl.git
synced 2026-08-24 14:54:24 +02:00
Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 2841a94fe5 | |||
| b49153bd38 | |||
| a052c70baa | |||
| 35bd685cfe | |||
| ce5d7f51c6 |
@@ -328,8 +328,8 @@ func ApiList(conf *cfg.Config, pattern string) error {
|
|||||||
|
|
||||||
filter := regexp.MustCompile(pattern)
|
filter := regexp.MustCompile(pattern)
|
||||||
|
|
||||||
table := printer.NewTable(conf, 4, 0)
|
table := printer.NewTable(conf).WithSize(4, 0).
|
||||||
table.Addheaders("path", "http verb", "tag", "description")
|
WithHeaders("path", "http verb", "tag", "description")
|
||||||
|
|
||||||
for path, item := range assets.OpenAPI.Spec().Paths.Paths {
|
for path, item := range assets.OpenAPI.Spec().Paths.Paths {
|
||||||
if pattern != "" {
|
if pattern != "" {
|
||||||
|
|||||||
@@ -111,8 +111,8 @@ func CcrRemoteInfo(conf *cfg.Config, index string) error {
|
|||||||
mode = "leader"
|
mode = "leader"
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf, 2, 5)
|
table := printer.NewTable(conf).WithSize(2, 5).
|
||||||
table.Addheaders("ccr remote property", "value")
|
WithHeaders("ccr remote property", "value")
|
||||||
|
|
||||||
table.Entries = [][]any{
|
table.Entries = [][]any{
|
||||||
{"Remote Cluster", remote},
|
{"Remote Cluster", remote},
|
||||||
|
|||||||
@@ -164,8 +164,8 @@ func CcrFollowerShow(conf *cfg.Config, index string) error {
|
|||||||
|
|
||||||
follower := res.Indices[0].Shards[0]
|
follower := res.Indices[0].Shards[0]
|
||||||
|
|
||||||
table := printer.NewTable(conf, 2, 9)
|
table := printer.NewTable(conf).WithSize(2, 9).
|
||||||
table.Addheaders("ccr follower property", "value")
|
WithHeaders("ccr follower property", "value")
|
||||||
|
|
||||||
table.Entries = [][]any{
|
table.Entries = [][]any{
|
||||||
{"name", index},
|
{"name", index},
|
||||||
|
|||||||
@@ -58,8 +58,8 @@ func ClusterList(conf *cfg.Config) error {
|
|||||||
|
|
||||||
wg.Wait()
|
wg.Wait()
|
||||||
|
|
||||||
table := printer.NewTable(conf, 5, len(conf.Clusters))
|
table := printer.NewTable(conf).WithSize(5, len(conf.Clusters)).
|
||||||
table.Addheaders("cluster", "uri", "reachable", "current", "error")
|
WithHeaders("cluster", "uri", "reachable", "current", "error")
|
||||||
|
|
||||||
idx := 0
|
idx := 0
|
||||||
|
|
||||||
@@ -212,8 +212,8 @@ func ClusterStatus(conf *cfg.Config) error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf, 2, 7)
|
table := printer.NewTable(conf).WithSize(2, 7).
|
||||||
table.Addheaders(conf.DefaultCluster.Name, "status")
|
WithHeaders(conf.DefaultCluster.Name, "status")
|
||||||
|
|
||||||
table.Entries = [][]any{
|
table.Entries = [][]any{
|
||||||
{"Cluster Name", res.health.ClusterName},
|
{"Cluster Name", res.health.ClusterName},
|
||||||
@@ -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", "%d", querycount},
|
{"Total Queries", 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,8 +38,8 @@ 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, 2, 0)
|
table := printer.NewTable(conf).WithSize(2, 0).
|
||||||
table.Addheaders("setting", "value")
|
WithHeaders("setting", "value")
|
||||||
|
|
||||||
entries := [][]any{}
|
entries := [][]any{}
|
||||||
|
|
||||||
|
|||||||
@@ -71,9 +71,9 @@ func checkClusterStatus(conf *cfg.Config, leader, follower string) bool {
|
|||||||
status[cluster] = clusterHealth
|
status[cluster] = clusterHealth
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf, 3, 6)
|
table := printer.NewTable(conf).WithSize(3, 6).
|
||||||
|
|
||||||
table.Addheaders("setting", "leader:"+leader, "follower:"+follower)
|
WithHeaders("setting", "leader:"+leader, "follower:"+follower)
|
||||||
|
|
||||||
table.Entries = [][]any{
|
table.Entries = [][]any{
|
||||||
{"Cluster Name", status[leader].ClusterName, status[follower].ClusterName},
|
{"Cluster Name", status[leader].ClusterName, status[follower].ClusterName},
|
||||||
@@ -151,8 +151,8 @@ 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, 2, len(failed[cluster]))
|
table := printer.NewTable(conf).WithSize(2, len(failed[cluster])).
|
||||||
table.Addheaders("ilm errors on "+which, "errors")
|
WithHeaders("ilm errors on "+which, "errors")
|
||||||
|
|
||||||
for name, count := range failed[cluster] {
|
for name, count := range failed[cluster] {
|
||||||
table.Entries[idx] = []any{name, count}
|
table.Entries[idx] = []any{name, count}
|
||||||
@@ -225,8 +225,8 @@ func findIndicesOnlyOnLeader(conf *cfg.Config, indices ClusterIndices, leader, f
|
|||||||
}
|
}
|
||||||
|
|
||||||
idx := 0
|
idx := 0
|
||||||
table := printer.NewTable(conf, 3, len(indexOnlyOnLeader))
|
table := printer.NewTable(conf).WithSize(3, len(indexOnlyOnLeader)).
|
||||||
table.Addheaders("index only on leader", "size", "docscount")
|
WithHeaders("index only on leader", "size", "docscount")
|
||||||
|
|
||||||
for name, index := range indexOnlyOnLeader {
|
for name, index := range indexOnlyOnLeader {
|
||||||
name := printer.Colorize(conf, "red", name)
|
name := printer.Colorize(conf, "red", name)
|
||||||
@@ -275,8 +275,8 @@ func findOrphanedIndices(conf *cfg.Config, indices ClusterIndices, leader, follo
|
|||||||
}
|
}
|
||||||
|
|
||||||
idx := 0
|
idx := 0
|
||||||
table := printer.NewTable(conf, 3, len(orphaned))
|
table := printer.NewTable(conf).WithSize(3, len(orphaned)).
|
||||||
table.Addheaders("orphaned index on follower", "size", "docscount")
|
WithHeaders("orphaned index on follower", "size", "docscount")
|
||||||
|
|
||||||
for name, index := range orphaned {
|
for name, index := range orphaned {
|
||||||
name := printer.Colorize(conf, "red", name)
|
name := printer.Colorize(conf, "red", name)
|
||||||
@@ -311,8 +311,8 @@ func findFailedFollowerIndices(conf *cfg.Config, indices ClusterIndices, followe
|
|||||||
}
|
}
|
||||||
|
|
||||||
idx := 0
|
idx := 0
|
||||||
table := printer.NewTable(conf, 3, len(red))
|
table := printer.NewTable(conf).WithSize(3, len(red)).
|
||||||
table.Addheaders("red index on follower", "size", "docscount")
|
WithHeaders("red index on follower", "size", "docscount")
|
||||||
|
|
||||||
for name, index := range red {
|
for name, index := range red {
|
||||||
name := printer.Colorize(conf, "red", name)
|
name := printer.Colorize(conf, "red", name)
|
||||||
|
|||||||
@@ -62,8 +62,8 @@ func DatastreamList(conf *cfg.Config) error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf, 7, size)
|
table := printer.NewTable(conf).WithSize(7, size).
|
||||||
table.Addheaders("name", "ilm policy", "hidden", "system", "replicated", "generation", "timestamp field")
|
WithHeaders("name", "ilm policy", "hidden", "system", "replicated", "generation", "timestamp field")
|
||||||
|
|
||||||
for idx, datastream := range list {
|
for idx, datastream := range list {
|
||||||
name := printer.Colorize(conf, datastream.Status.String(), datastream.Name)
|
name := printer.Colorize(conf, datastream.Status.String(), datastream.Name)
|
||||||
@@ -146,8 +146,8 @@ 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, 11, 2)
|
table := printer.NewTable(conf).WithSize(11, 2).
|
||||||
table.Addheaders("data stream property", "value")
|
WithHeaders("data stream property", "value")
|
||||||
|
|
||||||
datastream := res.DataStreams[0]
|
datastream := res.DataStreams[0]
|
||||||
|
|
||||||
@@ -176,8 +176,8 @@ func DatastreamShow(conf *cfg.Config, dsname string) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
table = printer.NewTable(conf, 5, len(datastream.Indices))
|
table = printer.NewTable(conf).WithSize(5, len(datastream.Indices)).
|
||||||
table.Addheaders("backing index name", "uuid", "prefer ilm", "ilm policy", "managed by")
|
WithHeaders("backing index name", "uuid", "prefer ilm", "ilm policy", "managed by")
|
||||||
|
|
||||||
for idx, index := range datastream.Indices {
|
for idx, index := range datastream.Indices {
|
||||||
policy := ""
|
policy := ""
|
||||||
@@ -233,8 +233,8 @@ 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, 2, 5)
|
table := printer.NewTable(conf).WithSize(2, 5).
|
||||||
table.Addheaders("rollover response", "value")
|
WithHeaders("rollover response", "value")
|
||||||
table.Entries = [][]any{
|
table.Entries = [][]any{
|
||||||
{"acknowledged", res.Acknowledged},
|
{"acknowledged", res.Acknowledged},
|
||||||
{"rolled over", res.RolledOver},
|
{"rolled over", res.RolledOver},
|
||||||
|
|||||||
@@ -85,8 +85,8 @@ func IlmList(conf *cfg.Config, pattern string) error {
|
|||||||
repr.Println(res)
|
repr.Println(res)
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf, 5, 0)
|
table := printer.NewTable(conf).WithSize(5, 0).
|
||||||
table.Addheaders("ilm policy", "hot", "warm", "frozen", "delete")
|
WithHeaders("ilm policy", "hot", "warm", "frozen", "delete")
|
||||||
|
|
||||||
for name, ilm := range res {
|
for name, ilm := range res {
|
||||||
table.AddRow(name,
|
table.AddRow(name,
|
||||||
@@ -123,8 +123,8 @@ func IlmShow(conf *cfg.Config, policy string) error {
|
|||||||
return IlmShowTree(conf, ilm.Policy)
|
return IlmShowTree(conf, ilm.Policy)
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf, 2, 5)
|
table := printer.NewTable(conf).WithSize(2, 5).
|
||||||
table.Addheaders("ilm policy setting", "value")
|
WithHeaders("ilm policy setting", "value")
|
||||||
|
|
||||||
table.Entries = [][]any{
|
table.Entries = [][]any{
|
||||||
{"policy", policy},
|
{"policy", policy},
|
||||||
@@ -142,9 +142,6 @@ 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, 4, 0)
|
|
||||||
table.Addheaders("phase", "min age", "min size", "snapshot repo")
|
|
||||||
|
|
||||||
for _, phase := range IlmPhaseOrder {
|
for _, phase := range IlmPhaseOrder {
|
||||||
if phase == "hot" {
|
if phase == "hot" {
|
||||||
fmt.Printf("%s%s phase:\n%s rollover after %s\n",
|
fmt.Printf("%s%s phase:\n%s rollover after %s\n",
|
||||||
@@ -280,8 +277,8 @@ func IlmExplain(conf *cfg.Config, index string) error {
|
|||||||
|
|
||||||
ilm := explain.(*types.LifecycleExplainManaged)
|
ilm := explain.(*types.LifecycleExplainManaged)
|
||||||
|
|
||||||
table := printer.NewTable(conf, 2, 0)
|
table := printer.NewTable(conf).WithSize(2, 0).
|
||||||
table.Addheaders("ilm status field", "value")
|
WithHeaders("ilm status field", "value")
|
||||||
|
|
||||||
info := ""
|
info := ""
|
||||||
|
|
||||||
|
|||||||
@@ -105,8 +105,8 @@ func IlmForecastList(conf *cfg.Config, filter string) error {
|
|||||||
headers = append(headers, "ilm policy")
|
headers = append(headers, "ilm policy")
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf, len(headers), 0)
|
table := printer.NewTable(conf).WithSize(len(headers), 0).
|
||||||
table.Addheaders(headers...)
|
WithHeaders(headers...)
|
||||||
|
|
||||||
for _, phase := range phaseData {
|
for _, phase := range phaseData {
|
||||||
if filter != "" && !flt.MatchString(phase.index) {
|
if filter != "" && !flt.MatchString(phase.index) {
|
||||||
|
|||||||
@@ -104,8 +104,8 @@ func IndexList(conf *cfg.Config) error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf, 3, size)
|
table := printer.NewTable(conf).WithSize(3, size).
|
||||||
table.Addheaders("name", "size", "docscount")
|
WithHeaders("name", "size", "docscount")
|
||||||
|
|
||||||
for idx, index := range list {
|
for idx, index := range list {
|
||||||
name := printer.Colorize(conf, *index.Health, *index.Index)
|
name := printer.Colorize(conf, *index.Health, *index.Index)
|
||||||
@@ -140,8 +140,8 @@ func IndexShow(conf *cfg.Config, indexpattern string) error {
|
|||||||
idx++
|
idx++
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf, 2, 7)
|
table := printer.NewTable(conf).WithSize(2, 7).
|
||||||
table.Addheaders("index property", "value")
|
WithHeaders("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)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -263,8 +263,8 @@ 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, 5, 0)
|
table := printer.NewTable(conf).WithSize(5, 0).
|
||||||
table.Addheaders("field", "type", "searchable", "aggretable", "metadata")
|
WithHeaders("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.NewTableEmpty(conf).
|
table := printer.NewTable(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,8 +72,8 @@ func IndexAliasList(conf *cfg.Config) error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf, 2, len(aliaslist))
|
table := printer.NewTable(conf).WithSize(2, len(aliaslist)).
|
||||||
table.Addheaders("index", "alias")
|
WithHeaders("index", "alias")
|
||||||
|
|
||||||
idx := 0
|
idx := 0
|
||||||
for index, aliases := range aliaslist {
|
for index, aliases := range aliaslist {
|
||||||
@@ -113,8 +113,8 @@ 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, 2, 5)
|
table := printer.NewTable(conf).WithSize(2, 5).
|
||||||
table.Addheaders("rollover response", "value")
|
WithHeaders("rollover response", "value")
|
||||||
table.Entries = [][]any{
|
table.Entries = [][]any{
|
||||||
{"acknowledged", res.Acknowledged},
|
{"acknowledged", res.Acknowledged},
|
||||||
{"rolled over", res.RolledOver},
|
{"rolled over", res.RolledOver},
|
||||||
|
|||||||
@@ -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, 2, 0).
|
table := printer.NewTable(conf).WithSize(2, 0).
|
||||||
WithHeaders("Reindex metrtic", "value")
|
WithHeaders("Reindex metrtic", "value")
|
||||||
|
|
||||||
table.Entries = [][]any{
|
table.Entries = [][]any{
|
||||||
|
|||||||
@@ -59,8 +59,8 @@ func IndexTemplateList(conf *cfg.Config, filter string) error {
|
|||||||
|
|
||||||
slog.Debug("res", "index templates", res)
|
slog.Debug("res", "index templates", res)
|
||||||
|
|
||||||
table := printer.NewTable(conf, 5, 0)
|
table := printer.NewTable(conf).WithSize(5, 0).
|
||||||
table.Addheaders("name", "description", "index patterns", "priority")
|
WithHeaders("name", "description", "index patterns", "priority")
|
||||||
|
|
||||||
tplList := filterIndexTemplates(conf, filter, res.IndexTemplates)
|
tplList := filterIndexTemplates(conf, filter, res.IndexTemplates)
|
||||||
|
|
||||||
@@ -120,8 +120,8 @@ func IndexTemplateShow(conf *cfg.Config, tplname string) error {
|
|||||||
|
|
||||||
tpl := res.IndexTemplates[0]
|
tpl := res.IndexTemplates[0]
|
||||||
|
|
||||||
table := printer.NewTable(conf, 2, 6)
|
table := printer.NewTable(conf).WithSize(2, 6).
|
||||||
table.Addheaders("index template property", "value")
|
WithHeaders("index template property", "value")
|
||||||
|
|
||||||
desc, err := json.Marshal(tpl.IndexTemplate.Meta_["description"])
|
desc, err := json.Marshal(tpl.IndexTemplate.Meta_["description"])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -148,8 +148,8 @@ func IndexTemplateShow(conf *cfg.Config, tplname string) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
table = printer.NewTable(conf, 2, 0)
|
table = printer.NewTable(conf).WithSize(2, 0).
|
||||||
table.Addheaders("index setting property", "value")
|
WithHeaders("index setting property", "value")
|
||||||
|
|
||||||
err = getIndexTemplateSettings(conf, tplname, table)
|
err = getIndexTemplateSettings(conf, tplname, table)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -162,8 +162,8 @@ func IndexTemplateShow(conf *cfg.Config, tplname string) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
table = printer.NewTable(conf, 2, 0)
|
table = printer.NewTable(conf).WithSize(2, 0).
|
||||||
table.Addheaders("index field mapping", "type")
|
WithHeaders("index field mapping", "type")
|
||||||
|
|
||||||
if tpl.IndexTemplate.Template.Mappings != nil {
|
if tpl.IndexTemplate.Template.Mappings != nil {
|
||||||
for name, field := range tpl.IndexTemplate.Template.Mappings.Properties {
|
for name, field := range tpl.IndexTemplate.Template.Mappings.Properties {
|
||||||
@@ -441,8 +441,8 @@ func rolloverAliasIndexTemplate(conf *cfg.Config, name string) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf, 4, 0)
|
table := printer.NewTable(conf).WithSize(4, 0).
|
||||||
table.Addheaders("rollover alias", "status", "ack", "new index")
|
WithHeaders("rollover alias", "status", "ack", "new index")
|
||||||
|
|
||||||
// apply rollover to all matching aliases, if any
|
// apply rollover to all matching aliases, if any
|
||||||
for alias := range aliases {
|
for alias := range aliases {
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ func LicenseShow(conf *cfg.Config) error {
|
|||||||
|
|
||||||
slog.Debug("license show", "license", res)
|
slog.Debug("license show", "license", res)
|
||||||
|
|
||||||
table := printer.NewTableEmpty(conf).WithHeaders("license setting", "value")
|
table := printer.NewTable(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.NewTableEmpty(conf).WithHeaders(
|
table := printer.NewTable(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,8 +104,8 @@ 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, 2, 0)
|
table := printer.NewTable(conf).WithSize(2, 0).
|
||||||
table.Addheaders(nodename+" property", "value")
|
WithHeaders(nodename+" property", "value")
|
||||||
|
|
||||||
roles := make([]string, len(info.Roles))
|
roles := make([]string, len(info.Roles))
|
||||||
for idx, role := range info.Roles {
|
for idx, role := range info.Roles {
|
||||||
@@ -197,8 +197,8 @@ func NodeClients(conf *cfg.Config, nodename string) error {
|
|||||||
|
|
||||||
slog.Debug("ES result", "stat", stats)
|
slog.Debug("ES result", "stat", stats)
|
||||||
|
|
||||||
table := printer.NewTable(conf, 5, 0)
|
table := printer.NewTable(conf).WithSize(5, 0).
|
||||||
table.Addheaders("agent", "id", "when", "from host", "url")
|
WithHeaders("agent", "id", "when", "from host", "url")
|
||||||
|
|
||||||
for _, stat := range stats.Nodes {
|
for _, stat := range stats.Nodes {
|
||||||
for _, client := range stat.Http.Clients {
|
for _, client := range stat.Http.Clients {
|
||||||
@@ -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.NewTableEmpty(conf).WithHeaders(
|
table := printer.NewTable(conf).WithHeaders(
|
||||||
"node",
|
"node",
|
||||||
"bulk",
|
"bulk",
|
||||||
"doc get",
|
"doc get",
|
||||||
|
|||||||
@@ -47,8 +47,8 @@ func RoleList(conf *cfg.Config) error {
|
|||||||
|
|
||||||
slog.Debug("ES result", "roles", res)
|
slog.Debug("ES result", "roles", res)
|
||||||
|
|
||||||
table := printer.NewTable(conf, 3, len(res))
|
table := printer.NewTable(conf).WithSize(3, len(res)).
|
||||||
table.Addheaders("role", "index roles", "cluster roles")
|
WithHeaders("role", "index roles", "cluster roles")
|
||||||
|
|
||||||
idx := 0
|
idx := 0
|
||||||
for name, role := range res {
|
for name, role := range res {
|
||||||
@@ -126,8 +126,8 @@ func roleRemoteClusters(conf *cfg.Config, role types.Role) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf, 2, len(role.RemoteCluster))
|
table := printer.NewTable(conf).WithSize(2, len(role.RemoteCluster)).
|
||||||
table.Addheaders("remote cluster", "privilege")
|
WithHeaders("remote cluster", "privilege")
|
||||||
|
|
||||||
idx := 0
|
idx := 0
|
||||||
|
|
||||||
@@ -152,8 +152,8 @@ func roleClusters(conf *cfg.Config, role types.Role) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf, 1, len(role.Cluster))
|
table := printer.NewTable(conf).WithSize(1, len(role.Cluster)).
|
||||||
table.Addheaders("cluster rights")
|
WithHeaders("cluster rights")
|
||||||
|
|
||||||
idx := 0
|
idx := 0
|
||||||
for _, cluster := range role.Cluster {
|
for _, cluster := range role.Cluster {
|
||||||
@@ -171,8 +171,8 @@ func roleRemoteIndices(conf *cfg.Config, role types.Role) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf, 3, len(role.RemoteIndices))
|
table := printer.NewTable(conf).WithSize(3, len(role.RemoteIndices)).
|
||||||
table.Addheaders("remote index names", "index permissions", "allow restricted")
|
WithHeaders("remote index names", "index permissions", "allow restricted")
|
||||||
|
|
||||||
idx := 0
|
idx := 0
|
||||||
|
|
||||||
@@ -197,8 +197,8 @@ func roleIndices(conf *cfg.Config, role types.Role) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf, 3, len(role.Indices))
|
table := printer.NewTable(conf).WithSize(3, len(role.Indices)).
|
||||||
table.Addheaders("index names", "index permissions", "allow restricted")
|
WithHeaders("index names", "index permissions", "allow restricted")
|
||||||
|
|
||||||
idx := 0
|
idx := 0
|
||||||
|
|
||||||
@@ -223,8 +223,8 @@ func roleApplications(conf *cfg.Config, role types.Role) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf, 3, len(role.Applications))
|
table := printer.NewTable(conf).WithSize(3, len(role.Applications)).
|
||||||
table.Addheaders("application", "privileges", "resources")
|
WithHeaders("application", "privileges", "resources")
|
||||||
|
|
||||||
idx := 0
|
idx := 0
|
||||||
for _, priv := range role.Applications {
|
for _, priv := range role.Applications {
|
||||||
|
|||||||
@@ -216,8 +216,8 @@ func RoleDiff(conf *cfg.Config, csvfile, role string) error {
|
|||||||
|
|
||||||
rows := diffRoles(conf, records, res)
|
rows := diffRoles(conf, records, res)
|
||||||
|
|
||||||
table := printer.NewTable(conf, 3, len(rows))
|
table := printer.NewTable(conf).WithSize(3, len(rows)).
|
||||||
table.Addheaders("role", "is deployed", "is defined")
|
WithHeaders("role", "is deployed", "is defined")
|
||||||
|
|
||||||
for idx, row := range rows {
|
for idx, row := range rows {
|
||||||
deployed := printer.Colorize(conf, "green", "deployed")
|
deployed := printer.Colorize(conf, "green", "deployed")
|
||||||
|
|||||||
@@ -64,14 +64,13 @@ func SearchQL(conf *cfg.Config, querystring string) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
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 {
|
||||||
headers[idx] = col.Name
|
headers[idx] = col.Name
|
||||||
}
|
}
|
||||||
|
|
||||||
table.Addheaders(headers...)
|
table := printer.NewTable(conf).WithSize(len(qlResult.Columns), len(qlResult.Values)).
|
||||||
|
WithHeaders(headers...)
|
||||||
|
|
||||||
table.Entries = qlResult.Values
|
table.Entries = qlResult.Values
|
||||||
|
|
||||||
|
|||||||
@@ -100,8 +100,8 @@ func printShards(conf *cfg.Config, shardlist shards.Response) error {
|
|||||||
headers = append(headers, "node", "ip")
|
headers = append(headers, "node", "ip")
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf, len(headers), len(shardlist))
|
table := printer.NewTable(conf).WithSize(len(headers), len(shardlist)).
|
||||||
table.Addheaders(headers...)
|
WithHeaders(headers...)
|
||||||
|
|
||||||
for idx, shard := range shardlist {
|
for idx, shard := range shardlist {
|
||||||
name := colorzizeShard(conf, *shard.State, *shard.Index)
|
name := colorzizeShard(conf, *shard.State, *shard.Index)
|
||||||
@@ -163,8 +163,8 @@ func ShardAllocation(conf *cfg.Config, index string) error {
|
|||||||
|
|
||||||
slog.Debug("ES result", "explain", res)
|
slog.Debug("ES result", "explain", res)
|
||||||
|
|
||||||
table := printer.NewTable(conf, 2, 10)
|
table := printer.NewTable(conf).WithSize(2, 10).
|
||||||
table.Addheaders("shard allocation setting", "value")
|
WithHeaders("shard allocation setting", "value")
|
||||||
|
|
||||||
table.Entries = [][]any{
|
table.Entries = [][]any{
|
||||||
{"Index", index},
|
{"Index", index},
|
||||||
|
|||||||
@@ -84,8 +84,8 @@ func SnapshotList(conf *cfg.Config) error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf, 5, len(snapshots))
|
table := printer.NewTable(conf).WithSize(5, len(snapshots)).
|
||||||
table.Addheaders("name", "index", "start", "orphaned", "status")
|
WithHeaders("name", "index", "start", "orphaned", "status")
|
||||||
|
|
||||||
for idx, snap := range snapshots {
|
for idx, snap := range snapshots {
|
||||||
table.Entries[idx] = []any{
|
table.Entries[idx] = []any{
|
||||||
@@ -118,8 +118,8 @@ func SnapshotShow(conf *cfg.Config, snapshot string) error {
|
|||||||
return errors.New("no snapshot retrieved")
|
return errors.New("no snapshot retrieved")
|
||||||
}
|
}
|
||||||
|
|
||||||
table := printer.NewTable(conf, 2, 17)
|
table := printer.NewTable(conf).WithSize(2, 17).
|
||||||
table.Addheaders("snapshot property", "value")
|
WithHeaders("snapshot property", "value")
|
||||||
|
|
||||||
snap := res.Snapshots[0]
|
snap := res.Snapshots[0]
|
||||||
|
|
||||||
|
|||||||
@@ -36,8 +36,8 @@ func TaskList(conf *cfg.Config) error {
|
|||||||
|
|
||||||
slog.Debug("res", "tasks", res)
|
slog.Debug("res", "tasks", res)
|
||||||
|
|
||||||
table := printer.NewTable(conf, 6, len(res))
|
table := printer.NewTable(conf).WithSize(6, len(res)).
|
||||||
table.Addheaders("task id", "action", "start time", "run time", "node", "type")
|
WithHeaders("task id", "action", "start time", "run time", "node", "type")
|
||||||
|
|
||||||
for idx, task := range res {
|
for idx, task := range res {
|
||||||
var ts time.Time
|
var ts time.Time
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
package printer
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Copyright © 2026 Thomas von Dein
|
Copyright © 2026 Thomas von Dein
|
||||||
|
|
||||||
@@ -14,15 +16,15 @@ 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 "strings"
|
import "strings"
|
||||||
|
|
||||||
// a wrapper around strings.Builder for convenience
|
// Builder is a wrapper around strings.Builder for convenience
|
||||||
type Builder struct {
|
type Builder struct {
|
||||||
strings.Builder
|
strings.Builder
|
||||||
}
|
}
|
||||||
|
|
||||||
func (builder *Builder) WriteStringLine(in string) {
|
func (builder *Builder) WriteStringLine(in string) {
|
||||||
builder.WriteString(in + "\n")
|
builder.WriteString(in)
|
||||||
|
builder.WriteString("\n")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
package printer
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Copyright © 2026 Thomas von Dein
|
Copyright © 2026 Thomas von Dein
|
||||||
|
|
||||||
@@ -14,10 +16,11 @@ 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 "github.com/dustin/go-humanize"
|
import "github.com/dustin/go-humanize"
|
||||||
|
|
||||||
|
// ByteSize converts uint64 bytes into human readable size
|
||||||
|
// e.g. 1500 => 1.5kb
|
||||||
type ByteSize struct {
|
type ByteSize struct {
|
||||||
size uint64
|
size uint64
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
package printer
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Copyright © 2026 Thomas von Dein
|
Copyright © 2026 Thomas von Dein
|
||||||
|
|
||||||
@@ -14,7 +16,6 @@ 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"
|
||||||
@@ -25,9 +26,11 @@ import (
|
|||||||
"github.com/elastic/go-elasticsearch/v9/typedapi/types"
|
"github.com/elastic/go-elasticsearch/v9/typedapi/types"
|
||||||
)
|
)
|
||||||
|
|
||||||
func any2string(in any) string {
|
// stringer returns the string representation of different types of
|
||||||
|
// values
|
||||||
|
func stringer(cell any) string {
|
||||||
//nolint:gocritic
|
//nolint:gocritic
|
||||||
switch val := in.(type) {
|
switch val := cell.(type) {
|
||||||
case string:
|
case string:
|
||||||
return val
|
return val
|
||||||
case bool:
|
case bool:
|
||||||
@@ -54,52 +57,27 @@ func any2string(in any) string {
|
|||||||
return string(val)
|
return string(val)
|
||||||
case nil:
|
case nil:
|
||||||
return "null"
|
return "null"
|
||||||
case types.Percentage, types.DateTime:
|
case *types.Float64:
|
||||||
return val.(string)
|
// ignore err here, because types.Float64.MarshalJSON() never returns one
|
||||||
}
|
f, _ := val.MarshalJSON()
|
||||||
|
|
||||||
return ""
|
return string(f)
|
||||||
}
|
default:
|
||||||
|
// Caution: this may cause a panic if the [unknown] type does
|
||||||
func (data *Table) preprocessRows() {
|
// not implement fmt.Stringer. In this case add another case
|
||||||
if data.processed {
|
// to the type switch for it above.
|
||||||
// only do it once
|
return cell.(fmt.Stringer).String()
|
||||||
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
|
// visibleLen returns the length of a string but only visible chars,
|
||||||
for idx, head := range data.Headers {
|
// w/o ansi color escapes
|
||||||
data.lenHeaders[idx] = visibleLen(head)
|
func visibleLen(word string) int {
|
||||||
|
if !strings.Contains(word, "\x1b") {
|
||||||
|
// no ansi escape in there, use faster method
|
||||||
|
return len(word)
|
||||||
}
|
}
|
||||||
|
|
||||||
// determine max width per column
|
// contains escapes, need to clean up before counting
|
||||||
for _, entries := range data.rows {
|
return len(ansiCtrlSeq.ReplaceAllLiteralString(word, ""))
|
||||||
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
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
package printer
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Copyright © 2026 Thomas von Dein
|
Copyright © 2026 Thomas von Dein
|
||||||
|
|
||||||
@@ -15,8 +17,6 @@ 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 (
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
package printer
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Copyright © 2026 Thomas von Dein
|
Copyright © 2026 Thomas von Dein
|
||||||
|
|
||||||
@@ -14,7 +16,6 @@ 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"
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
package printer
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Copyright © 2026 Thomas von Dein
|
Copyright © 2026 Thomas von Dein
|
||||||
|
|
||||||
@@ -14,7 +16,6 @@ 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"
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
package printer
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Copyright © 2026 Thomas von Dein
|
Copyright © 2026 Thomas von Dein
|
||||||
|
|
||||||
@@ -14,7 +16,6 @@ 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
|
|
||||||
|
|
||||||
// pager setup using bubbletea
|
// pager setup using bubbletea
|
||||||
// file shamlelessly copied from:
|
// file shamlelessly copied from:
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
package printer
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Copyright © 2026 Thomas von Dein
|
Copyright © 2026 Thomas von Dein
|
||||||
|
|
||||||
@@ -14,7 +16,6 @@ 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 (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
@@ -28,13 +29,20 @@ import (
|
|||||||
"gopkg.in/yaml.v3"
|
"gopkg.in/yaml.v3"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
// ansiCtrlSeq is being used to remove ANSI control sequences so
|
||||||
|
// that we can properly determine string lenght's
|
||||||
|
ansiCtrlSeq = regexp.MustCompile(`\033.[0-9;]+m`)
|
||||||
|
)
|
||||||
|
|
||||||
|
// Table stores tabular data for printing
|
||||||
type Table struct {
|
type Table struct {
|
||||||
Mode string // tsv, json, yaml
|
Mode string // tsv, json, yaml
|
||||||
Headers []string
|
Headers []string // colored headers
|
||||||
RawHeaders []string
|
RawHeaders []string // plain string headers
|
||||||
Entries [][]any
|
Entries [][]any // rows of cells as fed in by pkg/es
|
||||||
|
|
||||||
rows [][]string // representation used for printing
|
rows [][]string // representation used for printing, cells are stringified
|
||||||
processed bool
|
processed bool
|
||||||
lenHeaders []int
|
lenHeaders []int
|
||||||
alignInts bool
|
alignInts bool
|
||||||
@@ -42,73 +50,65 @@ type Table struct {
|
|||||||
debugGoRoutines bool
|
debugGoRoutines bool
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewTable(conf *cfg.Config, columns, rows int) *Table {
|
// NewTable returns a new empty table object with unaligned storage
|
||||||
table := new(Table{
|
func NewTable(conf *cfg.Config) *Table {
|
||||||
|
return 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 NewTableEmpty(conf *cfg.Config) *Table {
|
// WithSize configures the dimensions of the table, allocs aligned storage
|
||||||
table := new(Table{
|
func (t *Table) WithSize(columns, rows int) *Table {
|
||||||
Mode: conf.Output,
|
if columns > 0 {
|
||||||
maxwidth: cfg.GetTermWidth(),
|
t.Headers = make([]string, columns)
|
||||||
debugGoRoutines: conf.DebugGoRoutines,
|
t.RawHeaders = make([]string, columns)
|
||||||
})
|
t.lenHeaders = make([]int, columns)
|
||||||
table.alignInts = conf.AlignInts
|
|
||||||
|
|
||||||
return table
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (table *Table) WithHeaders(headers ...string) *Table {
|
if rows > 0 {
|
||||||
|
t.Entries = make([][]any, rows)
|
||||||
|
}
|
||||||
|
|
||||||
|
return t
|
||||||
|
}
|
||||||
|
|
||||||
|
// WithHeaders sets table headers
|
||||||
|
func (t *Table) WithHeaders(headers ...string) *Table {
|
||||||
count := len(headers)
|
count := len(headers)
|
||||||
|
|
||||||
table.Entries = [][]any{}
|
return t.WithSize(count, 0).formatHeaders(headers...)
|
||||||
table.lenHeaders = make([]int, count)
|
|
||||||
table.Headers = make([]string, count)
|
|
||||||
table.RawHeaders = make([]string, count)
|
|
||||||
|
|
||||||
table.Addheaders(headers...)
|
|
||||||
|
|
||||||
return table
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (table *Table) Print() error {
|
// Print outputs the tabular data according to Table.Mode
|
||||||
|
func (t *Table) Print() error {
|
||||||
var err error
|
var err error
|
||||||
|
|
||||||
switch table.Mode {
|
switch t.Mode {
|
||||||
case "json":
|
case "json":
|
||||||
err = table.PrintJSON()
|
err = t.PrintJSON()
|
||||||
case "yaml":
|
case "yaml":
|
||||||
err = table.PrintYAML()
|
err = t.PrintYAML()
|
||||||
case "csv":
|
case "csv":
|
||||||
err = table.PrintCSV()
|
err = t.PrintCSV()
|
||||||
default:
|
default:
|
||||||
err = table.PrintTSV()
|
err = t.PrintTSV()
|
||||||
}
|
}
|
||||||
|
|
||||||
if table.debugGoRoutines {
|
if t.debugGoRoutines {
|
||||||
printGoRoutineMetrics()
|
printGoRoutineMetrics()
|
||||||
}
|
}
|
||||||
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
func (t *Table) PrintYAML() error {
|
||||||
ansiCtrlSeq = regexp.MustCompile(`\033.[0-9;]+m`)
|
raw := t.toMap()
|
||||||
)
|
|
||||||
|
|
||||||
func (table *Table) PrintYAML() error {
|
|
||||||
raw := table.toMap()
|
|
||||||
|
|
||||||
body, err := yaml.Marshal(raw)
|
body, err := yaml.Marshal(raw)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -120,8 +120,8 @@ func (table *Table) PrintYAML() error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (table *Table) PrintJSON() error {
|
func (t *Table) PrintJSON() error {
|
||||||
raw := table.toMap()
|
raw := t.toMap()
|
||||||
|
|
||||||
body, err := json.MarshalIndent(raw, "", " ")
|
body, err := json.MarshalIndent(raw, "", " ")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -133,56 +133,101 @@ func (table *Table) PrintJSON() error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (table *Table) PrintTSV() error {
|
func (t *Table) PrintCSV() error {
|
||||||
// length's, convert cell types
|
t.preprocessRows()
|
||||||
table.preprocessRows()
|
|
||||||
|
|
||||||
// output headers
|
fmt.Println(strings.Join(t.RawHeaders, ","))
|
||||||
for idx, header := range table.Headers {
|
|
||||||
if idx+1 != len(table.Headers) {
|
for _, entries := range t.rows {
|
||||||
fmt.Print(header, strings.Repeat(" ", table.lenHeaders[idx]-visibleLen(header)))
|
row := make([]string, len(entries))
|
||||||
|
|
||||||
|
for idx, entry := range entries {
|
||||||
|
if strings.Contains(entry, " ") || strings.Contains(entry, ",") {
|
||||||
|
row[idx] = `"` + entry + `"`
|
||||||
} else {
|
} else {
|
||||||
// no padding for last header
|
row[idx] = entry
|
||||||
fmt.Print(header)
|
|
||||||
}
|
|
||||||
|
|
||||||
if idx < len(table.Headers)-1 {
|
|
||||||
fmt.Print(" ")
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fmt.Println()
|
fmt.Println(strings.Join(row, ","))
|
||||||
|
}
|
||||||
|
|
||||||
for _, entries := range table.rows {
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sort tabular data by first column
|
||||||
|
func (t *Table) Sort() {
|
||||||
|
// sanity checks
|
||||||
|
if len(t.Entries) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
t.preprocessRows()
|
||||||
|
|
||||||
|
sort.Slice(t.rows, func(i, j int) bool {
|
||||||
|
return t.rows[i][0] < t.rows[j][0]
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t *Table) AddRow(fields ...any) {
|
||||||
|
t.Entries = append(t.Entries, fields)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t *Table) AddRowLate(fields ...any) {
|
||||||
|
t.AddRow(fields)
|
||||||
|
|
||||||
|
if !t.processed {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
row := make([]string, len(fields))
|
||||||
|
|
||||||
|
for idx, field := range fields {
|
||||||
|
row[idx] = stringer(field)
|
||||||
|
}
|
||||||
|
|
||||||
|
t.rows = append(t.rows, row)
|
||||||
|
}
|
||||||
|
|
||||||
|
// PrintTSV is the default printer, it outputs in tab-separated-value format
|
||||||
|
func (t *Table) PrintTSV() error {
|
||||||
|
t.preprocessRows()
|
||||||
|
t.printTsvHeaders()
|
||||||
|
|
||||||
|
return t.printTsvRows()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t *Table) printTsvRows() error {
|
||||||
|
for _, entries := range t.rows {
|
||||||
currentWidth := 0
|
currentWidth := 0
|
||||||
columns := len(entries)
|
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 > t.maxwidth &&
|
||||||
table.maxwidth-currentWidth > 1 &&
|
t.maxwidth-currentWidth > 1 &&
|
||||||
idx == columns-1 {
|
idx == columns-1 {
|
||||||
// text is too wide to be put into one line, and
|
// text is too wide to be put into one line, and
|
||||||
// it's the last cell, so wrap it
|
// it's the last cell, so wrap it
|
||||||
entry = wrap(table.maxwidth-currentWidth, currentWidth+2, entry)
|
entry = wrap(t.maxwidth-currentWidth, currentWidth+2, entry)
|
||||||
}
|
}
|
||||||
|
|
||||||
currentWidth += table.lenHeaders[idx]
|
currentWidth += t.lenHeaders[idx]
|
||||||
|
|
||||||
switch {
|
switch {
|
||||||
case isInt(entry) && table.alignInts:
|
case isInt(entry) && t.alignInts:
|
||||||
// align right
|
// align right
|
||||||
fmt.Print(strings.Repeat(" ", table.lenHeaders[idx]-length), entry)
|
fmt.Print(strings.Repeat(" ", t.lenHeaders[idx]-length), entry)
|
||||||
case length < table.lenHeaders[idx] && idx+1 != len(entries):
|
case length < t.lenHeaders[idx] && idx+1 != len(entries):
|
||||||
// pad right, if required
|
// pad right, if required
|
||||||
fmt.Print(entry, strings.Repeat(" ", table.lenHeaders[idx]-length))
|
fmt.Print(entry, strings.Repeat(" ", t.lenHeaders[idx]-length))
|
||||||
default:
|
default:
|
||||||
// no padding for last entry
|
// no padding for last entry
|
||||||
fmt.Print(entry)
|
fmt.Print(entry)
|
||||||
}
|
}
|
||||||
|
|
||||||
if idx < len(table.Headers)-1 {
|
if idx < len(t.Headers)-1 {
|
||||||
fmt.Print(" ")
|
fmt.Print(" ")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -193,6 +238,40 @@ func (table *Table) PrintTSV() error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// printTsvHeaders outputs TSV headers
|
||||||
|
func (t *Table) printTsvHeaders() {
|
||||||
|
for idx, header := range t.Headers {
|
||||||
|
if idx+1 != len(t.Headers) {
|
||||||
|
fmt.Print(header, strings.Repeat(" ", t.lenHeaders[idx]-visibleLen(header)))
|
||||||
|
} else {
|
||||||
|
// no padding for last header
|
||||||
|
fmt.Print(header)
|
||||||
|
}
|
||||||
|
|
||||||
|
if idx < len(t.Headers)-1 {
|
||||||
|
fmt.Print(" ")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt.Println()
|
||||||
|
}
|
||||||
|
|
||||||
|
// formatHeaders formats header fields according to output mode
|
||||||
|
func (t *Table) formatHeaders(headers ...string) *Table {
|
||||||
|
for idx, header := range headers {
|
||||||
|
switch t.Mode {
|
||||||
|
case "json", "yaml":
|
||||||
|
t.Headers[idx] = strings.ReplaceAll(strings.ToLower(header), " ", "_")
|
||||||
|
default:
|
||||||
|
t.Headers[idx] = Bold(strings.ReplaceAll(strings.ToUpper(header), " ", "-"))
|
||||||
|
}
|
||||||
|
|
||||||
|
t.RawHeaders[idx] = header
|
||||||
|
}
|
||||||
|
|
||||||
|
return t
|
||||||
|
}
|
||||||
|
|
||||||
// Wrap a text into multiple lines, first line is not indented, all
|
// Wrap a text into multiple lines, first line is not indented, all
|
||||||
// further lines will be indented. Used within Print() to print large
|
// further lines will be indented. Used within Print() to print large
|
||||||
// cell text.
|
// cell text.
|
||||||
@@ -235,91 +314,61 @@ func wrap(width, indent int, text string) string {
|
|||||||
return wrapped
|
return wrapped
|
||||||
}
|
}
|
||||||
|
|
||||||
func (table *Table) PrintCSV() error {
|
|
||||||
table.preprocessRows()
|
|
||||||
|
|
||||||
fmt.Println(strings.Join(table.RawHeaders, ","))
|
|
||||||
|
|
||||||
for _, entries := range table.rows {
|
|
||||||
row := make([]string, len(entries))
|
|
||||||
|
|
||||||
for idx, entry := range entries {
|
|
||||||
if strings.Contains(entry, " ") || strings.Contains(entry, ",") {
|
|
||||||
row[idx] = `"` + entry + `"`
|
|
||||||
} else {
|
|
||||||
row[idx] = entry
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fmt.Println(strings.Join(row, ","))
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (table *Table) Sort() {
|
|
||||||
// sanity checks
|
|
||||||
if len(table.Entries) == 0 {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
table.preprocessRows()
|
|
||||||
|
|
||||||
sort.Slice(table.rows, func(i, j int) bool {
|
|
||||||
return table.rows[i][0] < table.rows[j][0]
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func (table *Table) Addheaders(headers ...string) {
|
|
||||||
for idx, header := range headers {
|
|
||||||
switch table.Mode {
|
|
||||||
case "json", "yaml":
|
|
||||||
table.Headers[idx] = strings.ReplaceAll(strings.ToLower(header), " ", "_")
|
|
||||||
default:
|
|
||||||
table.Headers[idx] = Bold(strings.ReplaceAll(strings.ToUpper(header), " ", "-"))
|
|
||||||
}
|
|
||||||
|
|
||||||
table.RawHeaders[idx] = header
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (table *Table) AddRow(fields ...any) {
|
|
||||||
table.Entries = append(table.Entries, fields)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (table *Table) AddRowLate(fields ...any) {
|
|
||||||
table.AddRow(fields)
|
|
||||||
|
|
||||||
if !table.processed {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
row := make([]string, len(fields))
|
|
||||||
|
|
||||||
for idx, field := range fields {
|
|
||||||
row[idx] = any2string(field)
|
|
||||||
}
|
|
||||||
|
|
||||||
table.rows = append(table.rows, row)
|
|
||||||
}
|
|
||||||
|
|
||||||
// needed for json and yaml output
|
// needed for json and yaml output
|
||||||
func (table *Table) toMap() []map[string]any {
|
func (t *Table) toMap() []map[string]any {
|
||||||
raw := make([]map[string]any, len(table.Entries))
|
raw := make([]map[string]any, len(t.Entries))
|
||||||
|
|
||||||
for idx, entries := range table.Entries {
|
for idx, entries := range t.Entries {
|
||||||
raw[idx] = make(map[string]any, len(table.Headers))
|
raw[idx] = make(map[string]any, len(t.Headers))
|
||||||
for eidx, entry := range entries {
|
for eidx, entry := range entries {
|
||||||
raw[idx][table.Headers[eidx]] = entry
|
raw[idx][t.Headers[eidx]] = entry
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return raw
|
return raw
|
||||||
}
|
}
|
||||||
|
|
||||||
// return the length of a string but only visible chars, w/o ansi color escapes
|
func (t *Table) preprocessRows() {
|
||||||
func visibleLen(word string) int {
|
if t.processed {
|
||||||
return len(ansiCtrlSeq.ReplaceAllLiteralString(word, ""))
|
// only do it once
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// convert entries to strings
|
||||||
|
t.rows = make([][]string, len(t.Entries))
|
||||||
|
for rowidx, entries := range t.Entries {
|
||||||
|
t.rows[rowidx] = make([]string, len(entries))
|
||||||
|
|
||||||
|
for colidx, entry := range t.Entries[rowidx] {
|
||||||
|
t.rows[rowidx][colidx] = stringer(entry)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// determine header lenght's
|
||||||
|
for idx, head := range t.Headers {
|
||||||
|
t.lenHeaders[idx] = visibleLen(head)
|
||||||
|
}
|
||||||
|
|
||||||
|
// determine max width per column
|
||||||
|
for _, entries := range t.rows {
|
||||||
|
currentWidth := 0
|
||||||
|
|
||||||
|
for idx, entry := range entries {
|
||||||
|
length := visibleLen(entry)
|
||||||
|
|
||||||
|
if t.lenHeaders[idx] < length {
|
||||||
|
if length > currentWidth+t.maxwidth {
|
||||||
|
t.lenHeaders[idx] = t.maxwidth - currentWidth
|
||||||
|
} else {
|
||||||
|
t.lenHeaders[idx] = length
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
currentWidth += t.lenHeaders[idx]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
t.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
|
.PHONY: test clean cluster docs search up down delete runenv
|
||||||
|
|
||||||
# docker stuff
|
# docker stuff
|
||||||
up:
|
up:
|
||||||
@@ -20,6 +20,8 @@ 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