add index template completion, index pattern filter and name filter

forgot to push
2026-08-24 13:14:18 +02:00 · 2026-07-15 14:51:12 +02:00 · 2026-07-15 14:50:58 +02:00
36 changed files with 186 additions and 409 deletions
--- a/9
+++ b/9
@@ -110,12 +110,3 @@ profile: buildlocal
 	./esctl api ls --profile-file cpu.profile
 	go tool pprof -text esctl cpu.profile
 	go tool pprof --http localhost:8888 ./esctl cpu.profile
-
-docker-up:
-	make -C t up
-
-docker-waitup:
-	make -C t up
-
-docker-down:
-	make -C t down
--- a/README.md
+++ b/README.md
@@ -216,7 +216,7 @@ Pending Tasks              0
 Nodes                      3                                   
 Red Indices                0                                   
 Long Running Tasks         2                                   
-indices                   221                                 
+Indicies                   221                                 
 Docs                       9854777                             
 Total Size                 3.4 GB                              
 Total Queries              4210411                             
@@ -534,7 +534,7 @@ cluster                     - manage cluster[s]
    allocate-empty-primary  - allocate an empty primary shard to a node
    allocate-stale-primary  - allocate a stale primary shard to a node
 datastream                  - manage data streams
-  list                      - list indices
+  list                      - list indicies
  show                      - show details about an data stream
  create                    - create a new data stream
  delete                    - delete a data stream
@@ -554,8 +554,8 @@ ilm                         - manage index lifecycle
    list                    - list index rollover config
    show                    - show rollover forecast over all indices
  explain                   - explain ilm condition of an index
-index                       - manage indices
-  list                      - list indices
+index                       - manage indicies
+  list                      - list indicies
  show                      - show details about an index
  create                    - create a new index
  update                    - update an index
@@ -564,7 +564,6 @@ index                       - manage indices
  fields                    - show info about field capabilities
  ilm                       - show ilm status
  du                        - show index disk usage
-  copy                      - copy (reindex) documents from one index to another
  alias                     - manage index aliases
    create                  - create an index alias
    list                    - list index aliases
@@ -588,7 +587,6 @@ role                        - manage roles
  show                      - show details about a role
  diff                      - show differences between roles and CSV baseline
 search                      - search within an index
-searchql                    - search using ES/QL language
 shard                       - manage shards
  list                      - list shards
  show                      - show details about a shard
--- a/TODO.md
+++ b/TODO.md
@@ -5,3 +5,5 @@

 - add datastream support:
  https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-get-data-stream
+  
+  also exclude data stream backing indices from index ls
--- a/cmd/ccr.go
+++ b/cmd/ccr.go
@@ -52,7 +52,7 @@ func CcrStatus(conf *cfg.Config) *cli.Command {
 		Flags: []cli.Flag{
 			&cli.StringFlag{
 				Name:        "exclude",
-				Usage:       "regexp of indices to exclude",
+				Usage:       "regexp of indicies to exclude",
 				Destination: &conf.Exclude,
 				Aliases:     []string{"e"},
 			},
--- a/cmd/datastream.go
+++ b/cmd/datastream.go
@@ -46,7 +46,7 @@ func DatastreamList(conf *cfg.Config) *cli.Command {
 	return &cli.Command{
 		Name:    "list",
 		Aliases: []string{"ls"},
-		Usage:   "list indices",
+		Usage:   "list indicies",

 		Flags: []cli.Flag{
 			&cli.IntFlag{
@@ -169,7 +169,7 @@ func DatastreamRollover(conf *cfg.Config) *cli.Command {
 				Usage:       "roll over after max age (eg: 7d, 2m, 8h)",
 				Destination: &conf.MaxAge,
 			},
-			&cli.Int64Flag{
+			&cli.IntFlag{
 				Name:        "max-docs",
 				Usage:       "roll over after max docs",
 				Destination: &conf.MaxDocs,
--- a/cmd/ilm_forecast.go
+++ b/cmd/ilm_forecast.go
@@ -89,7 +89,7 @@ func IlmForecastList(conf *cfg.Config) *cli.Command {
 			},
 			&cli.BoolFlag{
 				Name:        "hidden",
-				Usage:       "include hidden indices",
+				Usage:       "include hidden indicies",
 				Destination: &conf.Hidden,
 				Aliases:     []string{"H"},
 			},
--- a/cmd/index.go
+++ b/cmd/index.go
@@ -30,7 +30,7 @@ func Index(conf *cfg.Config) *cli.Command {
 	return &cli.Command{
 		Name:    "index",
 		Aliases: []string{"i"},
-		Usage:   "manage indices",
+		Usage:   "manage indicies",

 		Commands: []*cli.Command{
 			IndexList(conf),
@@ -42,7 +42,6 @@ func Index(conf *cfg.Config) *cli.Command {
 			IndexFields(conf),
 			IndexIlm(conf),
 			IndexDu(conf),
-			IndexCopy(conf),

 			// sub commands
 			IndexAlias(conf),
@@ -55,7 +54,7 @@ func IndexList(conf *cfg.Config) *cli.Command {
 	return &cli.Command{
 		Name:    "list",
 		Aliases: []string{"ls"},
-		Usage:   "list indices",
+		Usage:   "list indicies",

 		Flags: []cli.Flag{
 			&cli.IntFlag{
@@ -66,25 +65,25 @@ func IndexList(conf *cfg.Config) *cli.Command {
 			},
 			&cli.BoolFlag{
 				Name:        "partials",
-				Usage:       "include partial indices",
+				Usage:       "include partial indicies",
 				Destination: &conf.Partials,
 				Aliases:     []string{"p"},
 			},
 			&cli.BoolFlag{
 				Name:        "hidden",
-				Usage:       "include hidden indices",
+				Usage:       "include hidden indicies",
 				Destination: &conf.Hidden,
 				Aliases:     []string{"H"},
 			},
 			&cli.BoolFlag{
 				Name:        "failed",
-				Usage:       "include only red failed indices",
+				Usage:       "include only red failed indicies",
 				Destination: &conf.Failed,
 				Aliases:     []string{"f"},
 			},
 			&cli.StringSliceFlag{
 				Name:        "filter",
-				Usage:       "show only indices matching the filter",
+				Usage:       "show only indicies matching the filter",
 				Destination: &conf.Filter,
 				Aliases:     []string{"F"},
 			},
@@ -300,82 +299,3 @@ func IndexDu(conf *cfg.Config) *cli.Command {
 		},
 	}
 }
-
-func IndexCopy(conf *cfg.Config) *cli.Command {
-	return &cli.Command{
-		Name:      "copy",
-		Aliases:   []string{"alias", "cp"},
-		Usage:     "copy (reindex) documents from one index to another",
-		UsageText: "index copy [options] -s <source-index> -t <dest-index>",
-
-		Flags: []cli.Flag{
-			// FIXME: not implemented by typed API
-			// &cli.BoolFlag{
-			// 	Name:        "missing", // op_type
-			// 	Usage:       "copy only missing docs",
-			// 	Destination: &conf.Missing,
-			// 	Aliases:     []string{"m"},
-			// },
-			// &cli.BoolFlag{
-			// 	Name:        "sync", // version_type to external
-			// 	Usage:       "create missing docs and update outdated docs",
-			// 	Destination: &conf.Sync,
-			// 	Aliases:     []string{"S"},
-			// },
-			&cli.BoolFlag{
-				Name:        "force", // conflicts to proceed
-				Usage:       "continue reindexing even when conflicts happen",
-				Destination: &conf.Force,
-				Aliases:     []string{"f"},
-			},
-			&cli.Float64Flag{
-				Name:        "requests-per-second",
-				Usage:       "the maximum number of documents to index per second (-1 turns off throttling)",
-				Destination: &conf.RequestsPerSecond,
-				Aliases:     []string{"R"},
-			},
-			&cli.Int64Flag{
-				Name:        "max-docs",
-				Usage:       "the maximum number of documents to reindex",
-				Destination: &conf.MaxDocs,
-				Aliases:     []string{"m"},
-			},
-			&cli.DurationFlag{
-				Name:        "timeout",
-				Usage:       "timeout for write operations (e.g. 300m or 120s)",
-				Destination: &conf.Timeout,
-				Aliases:     []string{"T"},
-			},
-			&cli.BoolFlag{
-				Name:        "refresh",
-				Usage:       "refresh affected shards to make this operation visible to search",
-				Destination: &conf.Refresh,
-				Aliases:     []string{"r"},
-			},
-			&cli.BoolFlag{
-				Name:        "wait",
-				Usage:       "wait for active shards",
-				Destination: &conf.Wait,
-				Aliases:     []string{"w"},
-			},
-			&cli.StringSliceFlag{
-				Name:        "source",
-				Usage:       "source index (multiple supported)",
-				Destination: &conf.SourceIndices,
-				Aliases:     []string{"s"},
-				Required:    true,
-			},
-			&cli.StringFlag{
-				Name:        "target",
-				Usage:       "target index",
-				Destination: &conf.Index,
-				Aliases:     []string{"t"},
-				Required:    true,
-			},
-		},
-
-		Action: func(ctx context.Context, cmd *cli.Command) error {
-			return es.IndexCopy(conf)
-		},
-	}
-}
--- a/cmd/index_alias.go
+++ b/cmd/index_alias.go
@@ -121,7 +121,7 @@ func IndexAliasRollover(conf *cfg.Config) *cli.Command {
 				Usage:       "roll over after max age (eg: 7d, 2m, 8h)",
 				Destination: &conf.MaxAge,
 			},
-			&cli.Int64Flag{
+			&cli.IntFlag{
 				Name:        "max-docs",
 				Usage:       "roll over after max docs",
 				Destination: &conf.MaxDocs,
@@ -159,7 +159,7 @@ func IndexAliasList(conf *cfg.Config) *cli.Command {
 		Flags: []cli.Flag{
 			&cli.StringSliceFlag{
 				Name:        "filter",
-				Usage:       "show only aliases for indices matching the filter",
+				Usage:       "show only aliases for indicies matching the filter",
 				Destination: &conf.Filter,
 				Aliases:     []string{"F"},
 			},
--- a/go.mod
+++ b/go.mod
@@ -17,9 +17,8 @@ module codeberg.org/scip/esctl
 go 1.26

 require (
-	codeberg.org/scip/mapmap v0.0.2
 	github.com/MichaelMure/go-term-markdown v0.1.4
-	github.com/alecthomas/repr v0.5.3
+	github.com/alecthomas/repr v0.5.2
 	github.com/charmbracelet/bubbles v1.0.0
 	github.com/charmbracelet/bubbletea v1.3.10
 	github.com/charmbracelet/lipgloss v1.1.0
@@ -32,6 +31,7 @@ require (
 	github.com/go-openapi/spec v0.22.5
 	github.com/go-openapi/swag/loading v0.26.1
 	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/tlinden/yadu v0.1.3
 	github.com/urfave/cli/v3 v3.10.1-0.20260623012112-f980ca84bf65
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,3 @@
-codeberg.org/scip/mapmap v0.0.2 h1:0i61jOUwFmGVwPukrMzrx0Fi4T9Qru2nlmibuaJimBo=
-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/go.mod h1:EhcA3+pKYnlUsxYKBJ5Sn1cTQmmBMjeNlpV8nRb+JxA=
 github.com/MichaelMure/go-term-text v0.3.1 h1:Kw9kZanyZWiCHOYu9v/8pWEgDQ6UVN9/ix2Vd2zzWf0=
@@ -12,8 +10,8 @@ github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721 h1:JHZL0hZKJ1VEN
 github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod h1:QO9JBoKquHd+jz9nshCh40fOfO+JzsoXy8qTHF68zU0=
 github.com/alecthomas/kong v0.2.1-0.20190708041108-0548c6b1afae/go.mod h1:+inYUSluD+p4L8KdviBSgzcqEjUQOfC5fQDRFuc36lI=
 github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/go.mod h1:xTS7Pm1pD1mvyM075QCDSRqH6qRLXylzS24ZTpRiSzQ=
-github.com/alecthomas/repr v0.5.3 h1:Ebk3yZ0kvrHC7TkTHLDJGDq1LxKeu9sQBQREFMcesS8=
-github.com/alecthomas/repr v0.5.3/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
+github.com/alecthomas/repr v0.5.2 h1:SU73FTI9D1P5UNtvseffFSGmdNci/O6RsqzeXJtP0Qs=
+github.com/alecthomas/repr v0.5.2/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
 github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
 github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
 github.com/charmbracelet/bubbles v1.0.0 h1:12J8/ak/uCZEMQ6KU7pcfwceyjLlWsDLAxB5fXonfvc=
@@ -153,6 +151,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/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/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/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
--- a/pkg/cfg/config.go
+++ b/pkg/cfg/config.go
@@ -22,7 +22,6 @@ import (
 	"os"
 	"path/filepath"
 	"reflect"
-	"time"

 	"github.com/alecthomas/repr"
 	"gopkg.in/yaml.v3"
@@ -69,13 +68,6 @@ type Config struct {
 	Retention  string   // index template create: -r
 	Rollover   bool     // index template create: -R

-	Missing           bool          // index copy: -m
-	Sync              bool          // index copy: -S
-	RequestsPerSecond float64       // index copy: -R
-	Timeout           time.Duration // index copy: -T
-	Refresh           bool          // index copy: -r
-	SourceIndices     []string      // index copy: -s
-
 	From, To, MaxItems int      // search: flags
 	Filter             []string // search: -F
 	Path               string   // search+doc sh: -p
@@ -106,10 +98,9 @@ type Config struct {
 	Hidden          bool   // ds ls: -H

 	// rollover
-	MaxAge                     string
-	MaxDocs                    int64 // roll over, plus others
-	MaxShardSize, MaxShardDocs int   // roll over
-	DryRun                     bool  // rollover: -n
+	MaxAge                              string
+	MaxDocs, MaxShardSize, MaxShardDocs int  // roll over
+	DryRun                              bool // rollover: -n

 	Tag      string // api ls: -t
 	HumanCat bool   // api repl: -H
--- a/pkg/es/api.go
+++ b/pkg/es/api.go
@@ -328,7 +328,7 @@ func ApiList(conf *cfg.Config, pattern string) error {

 	filter := regexp.MustCompile(pattern)

-	table := printer.NewTable(conf).WithSize(4, 0)
+	table := printer.NewTable(conf, 4, 0)
 	table.Addheaders("path", "http verb", "tag", "description")

 	for path, item := range assets.OpenAPI.Spec().Paths.Paths {
--- a/pkg/es/ccr.go
+++ b/pkg/es/ccr.go
@@ -57,7 +57,7 @@ func CcrStatus(conf *cfg.Config, leader, follower string) error {
 		res, err := conf.Clusters[alias].ES().Cat.Indices().
 			Do(context.Background())
 		if err != nil {
-			return fmt.Errorf("failed to get indices on %s: %w", alias, esErrorString(err))
+			return fmt.Errorf("failed to get indicies on %s: %w", alias, esErrorString(err))
 		}

 		indices[alias] = make(map[string]*types.IndicesRecord, len(res))
@@ -111,7 +111,7 @@ func CcrRemoteInfo(conf *cfg.Config, index string) error {
 		mode = "leader"
 	}

-	table := printer.NewTable(conf).WithSize(2, 5)
+	table := printer.NewTable(conf, 2, 5)
 	table.Addheaders("ccr remote property", "value")

 	table.Entries = [][]any{
--- a/pkg/es/ccr_follower.go
+++ b/pkg/es/ccr_follower.go
@@ -164,7 +164,7 @@ func CcrFollowerShow(conf *cfg.Config, index string) error {

 	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.Entries = [][]any{
--- a/pkg/es/cluster.go
+++ b/pkg/es/cluster.go
@@ -58,7 +58,7 @@ func ClusterList(conf *cfg.Config) error {

 	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")

 	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.Entries = [][]any{
@@ -288,7 +288,7 @@ func gatherClusterStats(clusterstats *clusterstats.Response, table *printer.Tabl
 	}

 	table.Entries = append(table.Entries, [][]any{
-		{"indices", clusterstats.Indices.Count},
+		{"Indicies", clusterstats.Indices.Count},
 		{"Docs", clusterstats.Indices.Docs.Count},
 		{"Total Size", printer.Bytes(clusterstats.Indices.Docs.TotalSizeInBytes)},
 		{"Total Queries", "%d", querycount},
--- a/pkg/es/cluster_settings.go
+++ b/pkg/es/cluster_settings.go
@@ -38,7 +38,7 @@ func ClusterSettingsList(conf *cfg.Config) error {
 		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")

 	entries := [][]any{}
--- a/pkg/es/cluster_util.go
+++ b/pkg/es/cluster_util.go
@@ -71,7 +71,7 @@ func checkClusterStatus(conf *cfg.Config, leader, follower string) bool {
 		status[cluster] = clusterHealth
 	}

-	table := printer.NewTable(conf).WithSize(3, 6)
+	table := printer.NewTable(conf, 3, 6)

 	table.Addheaders("setting", "leader:"+leader, "follower:"+follower)

@@ -89,7 +89,7 @@ func checkClusterStatus(conf *cfg.Config, leader, follower string) bool {
 			status[leader].ActivePrimaryShards,
 			status[follower].ActivePrimaryShards,
 		},
-		{"indices",
+		{"Indicies",
 			len(status[leader].Indices),
 			len(status[follower].Indices),
 		},
@@ -151,7 +151,7 @@ func findIlmErrors(conf *cfg.Config, leader, follower string) bool {

 		if len(failed[cluster]) > 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")

 			for name, count := range failed[cluster] {
@@ -172,7 +172,7 @@ func findIlmErrors(conf *cfg.Config, leader, follower string) bool {
 	return false
 }

-// find unsynchronized indices only present on leader
+// find unsynchronized indicies only present on leader
 func findIndicesOnlyOnLeader(conf *cfg.Config, indices ClusterIndices, leader, follower string) bool {
 	exclude := regexp.MustCompile(DefaultExclude)
 	if conf.Exclude != "" {
@@ -225,7 +225,7 @@ func findIndicesOnlyOnLeader(conf *cfg.Config, indices ClusterIndices, leader, f
 	}

 	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")

 	for name, index := range indexOnlyOnLeader {
@@ -275,7 +275,7 @@ func findOrphanedIndices(conf *cfg.Config, indices ClusterIndices, leader, follo
 	}

 	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")

 	for name, index := range orphaned {
@@ -311,7 +311,7 @@ func findFailedFollowerIndices(conf *cfg.Config, indices ClusterIndices, followe
 	}

 	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")

 	for name, index := range red {
--- a/pkg/es/datastream.go
+++ b/pkg/es/datastream.go
@@ -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")

 	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))
 	}

-	table := printer.NewTable(conf).WithSize(11, 2)
+	table := printer.NewTable(conf, 11, 2)
 	table.Addheaders("data stream property", "value")

 	datastream := res.DataStreams[0]
@@ -176,7 +176,7 @@ func DatastreamShow(conf *cfg.Config, dsname string) error {
 		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")

 	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))
 	}

-	table := printer.NewTable(conf).WithSize(2, 5)
+	table := printer.NewTable(conf, 2, 5)
 	table.Addheaders("rollover response", "value")
 	table.Entries = [][]any{
 		{"acknowledged", res.Acknowledged},
--- a/pkg/es/ilm.go
+++ b/pkg/es/ilm.go
@@ -85,7 +85,7 @@ func IlmList(conf *cfg.Config, pattern string) error {
 		repr.Println(res)
 	}

-	table := printer.NewTable(conf).WithSize(5, 0)
+	table := printer.NewTable(conf, 5, 0)
 	table.Addheaders("ilm policy", "hot", "warm", "frozen", "delete")

 	for name, ilm := range res {
@@ -123,7 +123,7 @@ func IlmShow(conf *cfg.Config, policy string) error {
 		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.Entries = [][]any{
@@ -142,7 +142,7 @@ func IlmShow(conf *cfg.Config, policy string) error {
 func IlmShowTree(conf *cfg.Config, ilm types.IlmPolicy) error {
 	indent := ""

-	table := printer.NewTable(conf).WithSize(4, 0)
+	table := printer.NewTable(conf, 4, 0)
 	table.Addheaders("phase", "min age", "min size", "snapshot repo")

 	for _, phase := range IlmPhaseOrder {
@@ -280,16 +280,14 @@ func IlmExplain(conf *cfg.Config, index string) error {

 	ilm := explain.(*types.LifecycleExplainManaged)

-	table := printer.NewTable(conf).WithSize(2, 0)
+	table := printer.NewTable(conf, 2, 0)
 	table.Addheaders("ilm status field", "value")

 	info := ""

-	if len(ilm.StepInfo["reason"]) > 0 {
-		err = json.Unmarshal(ilm.StepInfo["reason"], &info)
-		if err != nil {
-			return fmt.Errorf("failed to unmarshal step info: %w", err)
-		}
+	err = json.Unmarshal(ilm.StepInfo["reason"], &info)
+	if err != nil {
+		return fmt.Errorf("failed to unmarshal step info: %w", err)
 	}

 	table.Entries = [][]any{
@@ -301,11 +299,8 @@ func IlmExplain(conf *cfg.Config, index string) error {
 		{"phase", *ilm.Phase},
 		{"phase execution", ilmPhaseString(ilm.PhaseExecution.PhaseDefinition, false)},
 		{"step", *ilm.Step},
-	}
-
-	if ilm.FailedStep != nil {
-		table.AddRow("failed step", *ilm.FailedStep)
-		table.AddRow("failed step retry count", ilm.FailedStepRetryCount)
+		{"failed step", *ilm.FailedStep},
+		{"failed step retry count", ilm.FailedStepRetryCount},
 	}

 	if err := table.Print(); err != nil {
--- a/pkg/es/ilm_forecast.go
+++ b/pkg/es/ilm_forecast.go
@@ -105,7 +105,7 @@ func IlmForecastList(conf *cfg.Config, filter string) error {
 		headers = append(headers, "ilm policy")
 	}

-	table := printer.NewTable(conf).WithSize(len(headers), 0)
+	table := printer.NewTable(conf, len(headers), 0)
 	table.Addheaders(headers...)

 	for _, phase := range phaseData {
--- a/pkg/es/index.go
+++ b/pkg/es/index.go
@@ -30,11 +30,9 @@ import (

 	"codeberg.org/scip/esctl/pkg/cfg"
 	"codeberg.org/scip/esctl/pkg/printer"
-	"codeberg.org/scip/mapmap"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/elastic/go-elasticsearch/v9/typedapi/cat/indices"
 	"github.com/elastic/go-elasticsearch/v9/typedapi/esdsl"
-	"github.com/elastic/go-elasticsearch/v9/typedapi/types"
 	"github.com/elastic/go-elasticsearch/v9/typedapi/types/enums/healthstatus"
 )

@@ -43,7 +41,7 @@ func IndexNames(conf *cfg.Config) ([]string, error) {
 	res, err := conf.DefaultCluster.ES().Cat.Indices().
 		Do(context.Background())
 	if err != nil {
-		return nil, fmt.Errorf("failed to get indices: %w", esErrorString(err))
+		return nil, fmt.Errorf("failed to get indicies: %w", esErrorString(err))
 	}

 	indices := make([]string, len(res))
@@ -55,29 +53,41 @@ func IndexNames(conf *cfg.Config) ([]string, error) {
 }

 func filterIndices(conf *cfg.Config, list indices.Response) indices.Response {
-	var filter *regexp.Regexp
+	// apply partials filter first
+	selectedlist := indices.Response{}

-	if len(conf.Filter) > 0 {
-		filter = regexp.MustCompile(conf.Filter[0])
-	}
-
-	return mapmap.NewSlicer(list).MapSliceValuesImmutable(func(index types.IndicesRecord) bool {
+	for _, index := range list {
 		if !conf.Partials && strings.HasPrefix(*index.Index, "partial-") {
-			return false
+			continue
 		}

 		if !conf.Hidden && strings.HasPrefix(*index.Index, ".") {
-			return false
+			continue
 		}

-		if len(conf.Filter) > 0 {
-			if !filter.MatchString(*index.Index) {
-				return false
-			}
+		if strings.HasPrefix(*index.Index, ".ds-") {
+			// ignore data stream backing indicies
+			continue
 		}

-		return true
-	})
+		selectedlist = append(selectedlist, index)
+	}
+
+	if len(conf.Filter) == 0 {
+		return selectedlist
+	}
+
+	// we support just one filter here, for now
+	filter := *regexp.MustCompile(conf.Filter[0])
+	newlist := indices.Response{}
+
+	for _, index := range selectedlist {
+		if filter.MatchString(*index.Index) {
+			newlist = append(newlist, index)
+		}
+	}
+
+	return newlist
 }

 func IndexList(conf *cfg.Config) error {
@@ -89,10 +99,10 @@ func IndexList(conf *cfg.Config) error {

 	res, err := cat.Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get indices: %w", esErrorString(err))
+		return fmt.Errorf("failed to get indicies: %w", esErrorString(err))
 	}

-	slog.Debug("ES result", "indices", res)
+	slog.Debug("ES result", "indicies", res)

 	list := filterIndices(conf, res)

@@ -104,7 +114,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")

 	for idx, index := range list {
@@ -140,7 +150,7 @@ func IndexShow(conf *cfg.Config, indexpattern string) error {
 			idx++
 		}

-		table := printer.NewTable(conf).WithSize(2, 7)
+		table := printer.NewTable(conf, 2, 7)
 		table.Addheaders("index property", "value")

 		ts, err := strconv.ParseInt(index.Settings.Index.CreationDate.(string), 10, 64)
@@ -263,7 +273,7 @@ func IndexFields(conf *cfg.Config, index string) error {
 		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")

 	idx := 0
@@ -336,7 +346,7 @@ func IndexDiskusage(conf *cfg.Config, index string) error {
 		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")

 	for name, field := range diskusage.Fields {
--- a/pkg/es/index_alias.go
+++ b/pkg/es/index_alias.go
@@ -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")

 	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))
 	}

-	table := printer.NewTable(conf).WithSize(2, 5)
+	table := printer.NewTable(conf, 2, 5)
 	table.Addheaders("rollover response", "value")
 	table.Entries = [][]any{
 		{"acknowledged", res.Acknowledged},
--- a/pkg/es/index_copy.go
+++ b/pkg/es/index_copy.go
@@ -1,83 +0,0 @@
-/*
-Copyright © 2026 Thomas von Dein
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-package es
-
-import (
-	"context"
-	"fmt"
-	"time"
-
-	"codeberg.org/scip/esctl/pkg/cfg"
-	"codeberg.org/scip/esctl/pkg/printer"
-	"github.com/elastic/go-elasticsearch/v9/typedapi/esdsl"
-	"github.com/elastic/go-elasticsearch/v9/typedapi/types/enums/conflicts"
-)
-
-func IndexCopy(conf *cfg.Config) error {
-	copy := conf.DefaultCluster.ES().Reindex()
-
-	if conf.Force {
-		copy.Conflicts(conflicts.Proceed)
-	}
-
-	if conf.RequestsPerSecond != 0 {
-		copy.RequestsPerSecond(fmt.Sprintf("%.2f", conf.RequestsPerSecond))
-	}
-
-	if conf.MaxDocs > 0 {
-		copy.MaxDocs(conf.MaxDocs)
-	}
-
-	if conf.Timeout > 0 {
-		copy.Timeout(formatDuration(conf.Timeout))
-	}
-
-	if conf.Wait {
-		copy.WaitForActiveShards("all")
-	}
-
-	if conf.Refresh {
-		copy.Refresh(true)
-	}
-
-	copy.Source(esdsl.NewReindexSource().Index(conf.SourceIndices...))
-	copy.Dest(esdsl.NewReindexDestination().Index(conf.Index))
-
-	res, err := copy.Do(context.Background())
-	if err != nil {
-		return fmt.Errorf("failed to copy indices: %w", esErrorString(err))
-	}
-
-	table := printer.NewTable(conf).WithSize(2, 0).
-		WithHeaders("Reindex metrtic", "value")
-
-	table.Entries = [][]any{
-		{"Source indices", conf.SourceIndices},
-		{"Target index", conf.Index},
-		{"Batches", *res.Batches},
-		{"Documents total", *res.Total},
-		{"Documents created", *res.Created},
-		{"Documents deleted", *res.Deleted},
-		{"Documents updated", *res.Updated},
-		{"Requests/s", *res.RequestsPerSecond},
-		{"Timed out", *res.TimedOut},
-		{"Time elapsed", time.Duration(*res.Took) * time.Millisecond},
-		{"Version conflicts", *res.VersionConflicts},
-	}
-
-	return table.Print()
-}
--- a/pkg/es/index_template.go
+++ b/pkg/es/index_template.go
@@ -28,7 +28,6 @@ import (

 	"codeberg.org/scip/esctl/pkg/cfg"
 	"codeberg.org/scip/esctl/pkg/printer"
-	"codeberg.org/scip/mapmap"
 	"github.com/elastic/go-elasticsearch/v9/typedapi/esdsl"
 	"github.com/elastic/go-elasticsearch/v9/typedapi/types"
 )
@@ -59,12 +58,34 @@ func IndexTemplateList(conf *cfg.Config, filter string) error {

 	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")

-	tplList := filterIndexTemplates(conf, filter, res.IndexTemplates)
+	for _, tpl := range res.IndexTemplates {
+		if !conf.Hidden && strings.HasPrefix(tpl.Name, ".") {
+			continue
+		}
+
+		if filter != "" && !strings.Contains(tpl.Name, filter) {
+			continue
+		}
+
+		if len(conf.Filter) > 0 {
+			skip := true
+
+			for _, filter := range conf.Filter {
+				for _, pattern := range tpl.IndexTemplate.IndexPatterns {
+					if strings.Contains(pattern, filter) {
+						skip = false
+					}
+				}
+			}
+
+			if skip {
+				continue
+			}
+		}

-	for _, tpl := range tplList {
 		desc := strings.TrimPrefix(strings.TrimSuffix(string(tpl.IndexTemplate.Meta_["description"]), `"`), `"`)

 		var prio int64
@@ -80,30 +101,6 @@ func IndexTemplateList(conf *cfg.Config, filter string) error {
 	return table.Print()
 }

-// Filter index templates by name, index pattern or hidden flag, using
-// mapmap.Slicer
-func filterIndexTemplates(conf *cfg.Config, nameFilter string,
-	templates []types.IndexTemplateItem) []types.IndexTemplateItem {
-	return mapmap.NewSlicer(templates).MapSliceValuesImmutable(func(tpl types.IndexTemplateItem) bool {
-		if !conf.Hidden && strings.HasPrefix(tpl.Name, ".") {
-			return false
-		}
-
-		if nameFilter != "" && !strings.Contains(tpl.Name, nameFilter) {
-			return false
-		}
-
-		if len(conf.Filter) > 0 {
-			if !mapmap.NewSlicer(tpl.IndexTemplate.IndexPatterns).
-				FindSliceInSlice(conf.Filter, strings.Contains) {
-				return false
-			}
-		}
-
-		return true
-	})
-}
-
 func IndexTemplateShow(conf *cfg.Config, tplname string) error {
 	res, err := conf.DefaultCluster.ES().Indices.GetIndexTemplate().
 		Name(tplname).
@@ -120,7 +117,7 @@ func IndexTemplateShow(conf *cfg.Config, tplname string) error {

 	tpl := res.IndexTemplates[0]

-	table := printer.NewTable(conf).WithSize(2, 6)
+	table := printer.NewTable(conf, 2, 6)
 	table.Addheaders("index template property", "value")

 	desc, err := json.Marshal(tpl.IndexTemplate.Meta_["description"])
@@ -148,7 +145,7 @@ func IndexTemplateShow(conf *cfg.Config, tplname string) error {
 		return err
 	}

-	table = printer.NewTable(conf).WithSize(2, 0)
+	table = printer.NewTable(conf, 2, 0)
 	table.Addheaders("index setting property", "value")

 	err = getIndexTemplateSettings(conf, tplname, table)
@@ -162,7 +159,7 @@ func IndexTemplateShow(conf *cfg.Config, tplname string) error {
 		return err
 	}

-	table = printer.NewTable(conf).WithSize(2, 0)
+	table = printer.NewTable(conf, 2, 0)
 	table.Addheaders("index field mapping", "type")

 	if tpl.IndexTemplate.Template.Mappings != nil {
@@ -441,7 +438,7 @@ func rolloverAliasIndexTemplate(conf *cfg.Config, name string) error {
 		return nil
 	}

-	table := printer.NewTable(conf).WithSize(4, 0)
+	table := printer.NewTable(conf, 4, 0)
 	table.Addheaders("rollover alias", "status", "ack", "new index")

 	// apply rollover to all matching aliases, if any
--- a/pkg/es/license.go
+++ b/pkg/es/license.go
@@ -35,7 +35,7 @@ func LicenseShow(conf *cfg.Config) error {

 	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

--- a/pkg/es/node.go
+++ b/pkg/es/node.go
@@ -37,7 +37,7 @@ func NodeList(conf *cfg.Config) error {

 	slog.Debug("ES result", "nodes", nodes)

-	table := printer.NewTable(conf).WithHeaders(
+	table := printer.NewTableEmpty(conf).WithHeaders(
 		"name", "ip", "load1m", "load5m", "load15m", "ram %", "heap %")

 	for _, node := range nodes {
@@ -104,7 +104,7 @@ func NodeShow(conf *cfg.Config, nodename string) error {
 	for id, info := range res.Nodes {
 		stat := stats.Nodes[id]

-		table := printer.NewTable(conf).WithSize(2, 0)
+		table := printer.NewTable(conf, 2, 0)
 		table.Addheaders(nodename+" property", "value")

 		roles := make([]string, len(info.Roles))
@@ -197,7 +197,7 @@ func NodeClients(conf *cfg.Config, nodename string) error {

 	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")

 	for _, stat := range stats.Nodes {
@@ -250,7 +250,7 @@ func NodeUsage(conf *cfg.Config, nodeid string) error {

 	slog.Debug("ES result", "usage", stats)

-	table := printer.NewTable(conf).WithHeaders(
+	table := printer.NewTableEmpty(conf).WithHeaders(
 		"node",
 		"bulk",
 		"doc get",
--- a/pkg/es/role.go
+++ b/pkg/es/role.go
@@ -47,7 +47,7 @@ func RoleList(conf *cfg.Config) error {

 	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")

 	idx := 0
@@ -126,7 +126,7 @@ func roleRemoteClusters(conf *cfg.Config, role types.Role) error {
 		return nil
 	}

-	table := printer.NewTable(conf).WithSize(2, len(role.RemoteCluster))
+	table := printer.NewTable(conf, 2, len(role.RemoteCluster))
 	table.Addheaders("remote cluster", "privilege")

 	idx := 0
@@ -152,7 +152,7 @@ func roleClusters(conf *cfg.Config, role types.Role) error {
 		return nil
 	}

-	table := printer.NewTable(conf).WithSize(1, len(role.Cluster))
+	table := printer.NewTable(conf, 1, len(role.Cluster))
 	table.Addheaders("cluster rights")

 	idx := 0
@@ -171,7 +171,7 @@ func roleRemoteIndices(conf *cfg.Config, role types.Role) error {
 		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")

 	idx := 0
@@ -197,7 +197,7 @@ func roleIndices(conf *cfg.Config, role types.Role) error {
 		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")

 	idx := 0
@@ -223,7 +223,7 @@ func roleApplications(conf *cfg.Config, role types.Role) error {
 		return nil
 	}

-	table := printer.NewTable(conf).WithSize(3, len(role.Applications))
+	table := printer.NewTable(conf, 3, len(role.Applications))
 	table.Addheaders("application", "privileges", "resources")

 	idx := 0
--- a/pkg/es/role_diff.go
+++ b/pkg/es/role_diff.go
@@ -216,7 +216,7 @@ func RoleDiff(conf *cfg.Config, csvfile, role string) error {

 	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")

 	for idx, row := range rows {
--- a/pkg/es/rollover.go
+++ b/pkg/es/rollover.go
@@ -33,7 +33,7 @@ func RolloverConditions(conf *cfg.Config) types.RolloverConditionsVariant {
 	}

 	if conf.MaxDocs > 0 {
-		cond.MaxDocs(conf.MaxDocs)
+		cond.MaxDocs(int64(conf.MaxDocs))
 	}

 	if conf.MaxShardSize > 0 {
--- a/pkg/es/searchql.go
+++ b/pkg/es/searchql.go
@@ -64,7 +64,7 @@ func SearchQL(conf *cfg.Config, querystring string) error {
 		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))
 	for idx, col := range qlResult.Columns {
--- a/pkg/es/shard.go
+++ b/pkg/es/shard.go
@@ -100,7 +100,7 @@ func printShards(conf *cfg.Config, shardlist shards.Response) error {
 		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...)

 	for idx, shard := range shardlist {
@@ -163,7 +163,7 @@ func ShardAllocation(conf *cfg.Config, index string) error {

 	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.Entries = [][]any{
--- a/pkg/es/snapshot.go
+++ b/pkg/es/snapshot.go
@@ -42,17 +42,17 @@ type Snapshot struct {
 }

 func SnapshotList(conf *cfg.Config) error {
-	// get partial indices
+	// get partial indicies
 	ires, err := conf.DefaultCluster.ES().Cat.Indices().Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get indices: %w", esErrorString(err))
+		return fmt.Errorf("failed to get indicies: %w", esErrorString(err))
 	}

-	indices := map[string]int{}
+	indicies := map[string]int{}

 	for _, index := range ires {
 		name := strings.ReplaceAll(*index.Index, "partial-", "")
-		indices[name] = 1
+		indicies[name] = 1
 	}

 	// get snapshots
@@ -61,7 +61,7 @@ func SnapshotList(conf *cfg.Config) error {
 		return fmt.Errorf("failed to get snapshots: %w", esErrorString(err))
 	}

-	slog.Debug("ES result", "indices", sres)
+	slog.Debug("ES result", "indicies", sres)

 	snapshots := []*Snapshot{} // original snapshot names

@@ -74,7 +74,7 @@ func SnapshotList(conf *cfg.Config) error {
 			Orphaned: "no",
 		})

-		_, exists := indices[snap.Forindex]
+		_, exists := indicies[snap.Forindex]
 		if !exists {
 			snap.Orphaned = "orphaned"
 		}
@@ -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")

 	for idx, snap := range snapshots {
@@ -118,7 +118,7 @@ func SnapshotShow(conf *cfg.Config, snapshot string) error {
 		return errors.New("no snapshot retrieved")
 	}

-	table := printer.NewTable(conf).WithSize(2, 17)
+	table := printer.NewTable(conf, 2, 17)
 	table.Addheaders("snapshot property", "value")

 	snap := res.Snapshots[0]
--- a/pkg/es/task.go
+++ b/pkg/es/task.go
@@ -36,7 +36,7 @@ func TaskList(conf *cfg.Config) error {

 	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")

 	for idx, task := range res {
--- a/pkg/printer/color.go
+++ b/pkg/printer/color.go
@@ -18,11 +18,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 package printer

 import (
-	"os"
-
 	"codeberg.org/scip/esctl/pkg/cfg"
 	"github.com/fatih/color"
-	"github.com/mattn/go-isatty"
 )

 var (
@@ -34,10 +31,6 @@ var (
 )

 func Colorize(conf *cfg.Config, col, what string) string {
-	if !isatty.IsTerminal(os.Stdout.Fd()) {
-		return what
-	}
-
 	switch conf.Output {
 	case "json", "yaml":
 		return what
@@ -56,11 +49,3 @@ func Colorize(conf *cfg.Config, col, what string) string {

 	return what
 }
-
-func Bold(what string) string {
-	if !isatty.IsTerminal(os.Stdout.Fd()) {
-		return what
-	}
-
-	return bold(what)
-}
--- a/pkg/printer/table.go
+++ b/pkg/printer/table.go
@@ -25,6 +25,7 @@ import (
 	"strings"

 	"codeberg.org/scip/esctl/pkg/cfg"
+	"github.com/seeruk/go-wordwrap"
 	"gopkg.in/yaml.v3"
 )

@@ -42,28 +43,29 @@ type Table struct {
 	debugGoRoutines bool
 }

-func NewTable(conf *cfg.Config) *Table {
-	return new(Table{
+func NewTable(conf *cfg.Config, columns, rows int) *Table {
+	table := new(Table{
 		Mode:            conf.Output,
 		maxwidth:        cfg.GetTermWidth(),
 		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 {
-	if columns > 0 {
-		table.Headers = make([]string, columns)
-		table.RawHeaders = make([]string, columns)
-		table.lenHeaders = make([]int, columns)
-	}
-
-	if rows > 0 {
-		table.Entries = make([][]any, rows)
-	}
+func NewTableEmpty(conf *cfg.Config) *Table {
+	table := new(Table{
+		Mode:            conf.Output,
+		maxwidth:        cfg.GetTermWidth(),
+		debugGoRoutines: conf.DebugGoRoutines,
+	})
+	table.alignInts = conf.AlignInts

 	return table
 }
@@ -71,7 +73,12 @@ func (table *Table) WithSize(columns, rows int) *Table {
 func (table *Table) WithHeaders(headers ...string) *Table {
 	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
 }
@@ -149,17 +156,25 @@ func (table *Table) PrintTSV() error {

 	for _, entries := range table.rows {
 		currentWidth := 0
-		columns := len(entries)

 		for idx, entry := range entries {
 			length := visibleLen(entry)

-			if length+currentWidth > table.maxwidth &&
-				table.maxwidth-currentWidth > 1 &&
-				idx == columns-1 {
-				//   text is too wide to be put into one line, and
-				// it's the last cell, so wrap it
-				entry = wrap(table.maxwidth-currentWidth, currentWidth+2, entry)
+			if length+currentWidth > table.maxwidth && table.maxwidth-currentWidth > 1 {
+				// text is too wide to be put into one line, wrap it
+				wrapper := wordwrap.Wrapper(table.maxwidth-currentWidth, false)
+				wrapped := wrapper(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]
@@ -187,48 +202,6 @@ func (table *Table) PrintTSV() error {
 	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 {
 	table.preprocessRows()

@@ -270,7 +243,7 @@ func (table *Table) Addheaders(headers ...string) {
 		case "json", "yaml":
 			table.Headers[idx] = strings.ReplaceAll(strings.ToLower(header), " ", "_")
 		default:
-			table.Headers[idx] = Bold(strings.ReplaceAll(strings.ToUpper(header), " ", "-"))
+			table.Headers[idx] = bold(strings.ReplaceAll(strings.ToUpper(header), " ", "-"))
 		}

 		table.RawHeaders[idx] = header
--- a/t/Makefile
+++ b/t/Makefile
@@ -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
 up:
@@ -20,8 +20,6 @@ delete:
 clean-docker: down delete


-runenv: up waitup cluster docs wait
-
 # mosscap esctl stuff
 test: up waitup cluster docs wait search
Author	SHA1	Message	Date
Thomas von Dein	b73cb87f12	add index template completion, index pattern filter and name filter	2026-07-15 14:51:12 +02:00
Thomas von Dein	6f3df9b885	forgot to push	2026-07-15 14:50:58 +02:00