upd todo

.golangci.yml

@@ -1,110 +0,0 @@
-version: "2"
-
-linters:
-  enable:
-    - errcheck
-    - govet
-    - ineffassign
-    - staticcheck
-    - unused
-    - arangolint
-    - asasalint
-    - asciicheck
-    - bidichk
-    - bodyclose
-    - canonicalheader
-    - clickhouselint
-    - containedctx
-    #- contextcheck
-    - copyloopvar
-    #- cyclop
-    - decorder
-    - dogsled
-    - dupword
-    - durationcheck
-    - embeddedstructfieldcheck
-    - errchkjson
-    - errname
-    #- errorlint
-    - exhaustive
-    - exptostd
-    - fatcontext
-    - funcorder
-    #- funlen
-    - ginkgolinter
-    - gocheckcompilerdirectives
-    - gochecknoinits
-    - gochecksumtype
-    #- gocognit
-    - gocritic
-    #- gocyclo
-    #- godoclint
-    - goheader
-    - gomoddirectives
-    - gomodguard_v2
-    - goprintffuncname
-    #- gosec
-    - gosmopolitan
-    - grouper
-    - iface
-    - importas
-    - inamedparam
-    - interfacebloat
-    - intrange
-    - iotamixing
-    - lll
-    - loggercheck
-    - makezero
-    - misspell
-    - modernize
-    - nakedret
-    #- nestif
-    - nilerr
-    - nilnesserr
-    - nlreturn
-    - nonamedreturns
-    - nosprintfhostport
-    - paralleltest
-    - perfsprint
-    - prealloc
-    #- predeclared
-    - promlinter
-    - protogetter
-    - reassign
-    - recvcheck
-    #- revive
-    - rowserrcheck
-    - sloglint
-    - spancheck
-    - sqlclosecheck
-    - tagalign
-    - testableexamples
-    - testifylint
-    - testpackage
-    - thelper
-    - tparallel
-    - unconvert
-    - unparam
-    - unqueryvet
-    - usestdlibvars
-    - usetesting
-    - varnamelen
-    - wastedassign
-    - whitespace
-    - wsl_v5
-    - zerologlint
-
-  settings:
-    varnamelen:
-      ignore-names:
-        - err
-        - wg
-        - mu
-        - ts
-        - to
-        - es
-        - op
-        - fd
-        - id
-        - fn
-      

.woodpecker/build.yaml

@@ -2,7 +2,7 @@ matrix:
   platform:
     - linux/amd64
   goversion:
-    - 1.26.4
+    - 1.25.8
 
 labels:
   platform: ${platform}
@@ -21,6 +21,6 @@ steps:
       event: [push,manual]
     image: golang:${goversion}
     commands:
-      - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/HEAD/install.sh | sh -s -- -b $(go env GOPATH)/bin v2.12.2
+      - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/HEAD/install.sh | sh -s -- -b $(go env GOPATH)/bin v2.5.0
       - golangci-lint --version
       - golangci-lint run ./...

Makefile

@@ -67,11 +67,11 @@ test: clean buildlocal
 
 testlint: test lint
 
-lint-basic:
-	golangci-lint run --enable-only errcheck,govet,ineffassign,staticcheck,unused
-
 lint:
-	golangci-lint run --show-stats=false
+	golangci-lint run
+
+lint-full:
+	golangci-lint run --enable-all --exclude-use-default --disable exhaustivestruct,exhaustruct,depguard,interfacer,deadcode,golint,structcheck,scopelint,varcheck,ifshort,maligned,nosnakecase,godot,funlen,gofumpt,cyclop,noctx,gochecknoglobals,paralleltest
 
 testfuzzy: clean
 	go test -fuzz ./... $(ARGS)

README.md

@@ -29,7 +29,6 @@ Features:
   logical condition (OR, AND), use PIT, limit datetime (ES date math
   can be used), etc. It is however not yet possible to create
   recursive searches like: `(cond1 AND cond2) OR (cond3 OR cond4)`.
-- Search using ES|QL language: `esctl searchql`.
 - Cross cluster replication (ccr): view, pause, resume, delete
   replication. You can also manage follower configuration.
 - Index management: manage aliases, create, modify, delete indices,
@@ -353,30 +352,6 @@ $ esctl search -i foo* -F title=zeitbuchung message=pause | jq
 }
 ```
 
-You can also search using [ES|QL](https://www.elastic.co/docs/reference/query-languages/esql/esql-getting-started):
-
-```console
-$ esctl searchql "from hyperdrive | sort @timestamp | limit 5" 
-@TIMESTAMP                MESSAGE     TAG
-2026-06-24T08:24:56.000Z  arosu       loop
-2026-06-24T08:24:58.000Z  hami        loop
-2026-06-24T08:24:59.000Z  ishininu    loop
-2026-06-24T08:25:00.000Z  uyomoruron  loop
-2026-06-24T08:25:02.000Z  ishimime    loop
-```
-
-There are several output modes (json, yaml, csv), to get esql output as CSV:
-
-```console
-$ esctl searchql "from hyperdrive | sort @timestamp | limit 5"  -o csv
-@timestamp,message,tag
-2026-06-24T08:24:56.000Z,arosu,loop
-2026-06-24T08:24:58.000Z,hami,loop
-2026-06-24T08:24:59.000Z,ishininu,loop
-2026-06-24T08:25:00.000Z,uyomoruron,loop
-2026-06-24T08:25:02.000Z,ishimime,loop
-```
-
 To check which field mappings are available for an index:
 ```console
 $ esctl index show foo2 
@@ -563,7 +538,6 @@ index                       - manage indicies
   close                     - close an index
   fields                    - show info about field capabilities
   ilm                       - show ilm status
-  du                        - show index disk usage
   alias                     - manage index aliases
     create                  - create an index alias
     list                    - list index aliases
@@ -581,7 +555,6 @@ node                        - manage nodes
   list                      - list nodes
   show                      - show details about a node
   clients                   - show node http clients
-  usage                     - show node usage stats
 role                        - manage roles
   list                      - list roles
   show                      - show details about a role
@@ -601,7 +574,6 @@ version                     - show esctl version information
 debug                       - developer only
 help-jsonpath               - show jsonpath help
 help-usage                  - show overview of all available commands
-help-esql                   - show esql help
 ```
 
 # Development

assets/assets.go

@@ -24,11 +24,10 @@ import (
 	"github.com/go-openapi/swag/loading"
 )
 
-//go:embed *.json *.md
+//go:embed *.json
 var AssetFS embed.FS
 
 var OpenAPI *loads.Document
-var EsQlCheatSheet string
 
 func LoadAssetOpenApi() {
 	doc, err := loads.Spec(
@@ -42,12 +41,3 @@ func LoadAssetOpenApi() {
 
 	OpenAPI = doc
 }
-
-func LoadEsql() {
-	md, err := AssetFS.ReadFile("esql.md")
-	if err != nil {
-		panic(err)
-	}
-
-	EsQlCheatSheet = string(md)
-}

assets/esql.md

@@ -1,951 +0,0 @@
-<!-- courtesy https://github.com/linkan-per/ES-QL-Cheat-Sheet by |linkan-per -->
-# ES|QL (Elasticsearch Query Language) Cheat Sheet
-
-## Table of Contents
-1. [Introduction](#introduction)
-2. [Basic Query Structure](#basic-query-structure)
-3. [Source Commands](#source-commands)
-4. [Processing Commands](#processing-commands)
-5. [Data Selection & Filtering](#data-selection--filtering)
-6. [Aggregations & Statistics](#aggregations--statistics)
-7. [String Functions](#string-functions)
-8. [Mathematical Functions](#mathematical-functions)
-9. [Date/Time Functions](#datetime-functions)
-10. [Type Conversion Functions](#type-conversion-functions)
-11. [Conditional Functions](#conditional-functions)
-12. [Array Functions](#array-functions)
-13. [Join Operations (LOOKUP)](#join-operations-lookup)
-14. [Sorting & Limiting](#sorting--limiting)
-15. [Grouping & Aggregating](#grouping--aggregating)
-16. [Advanced Patterns](#advanced-patterns)
-
----
-
-## Introduction
-
-ES|QL is Elasticsearch's new query language designed for data exploration, analysis, and transformation. It uses a pipe (`|`) syntax to chain commands together.
-
-**Basic Syntax:**
-```
-FROM <data-source>
-| <processing-command>
-| <processing-command>
-| ...
-```
-
----
-
-## Basic Query Structure
-
-### Simple Query
-```esql
-FROM logs-*
-| LIMIT 10
-```
-
-### Query with Multiple Commands
-```esql
-FROM employees
-| WHERE department == "Engineering"
-| KEEP name, salary, hire_date
-| SORT salary DESC
-| LIMIT 5
-```
-
----
-
-## Source Commands
-
-### FROM - Specify Data Source
-```esql
-// From a single index
-FROM logs-2024
-
-// From multiple indices with wildcard
-FROM logs-*, metrics-*
-
-// From specific indices
-FROM index1, index2, index3
-
-// With metadata
-FROM logs-* METADATA _id, _index
-```
-
-### ROW - Generate Inline Data
-```esql
-// Create a single row
-ROW name = "John", age = 30, city = "NYC"
-
-// Multiple rows
-ROW a = 1, b = "x"
-| EVAL c = a * 10
-```
-
----
-
-## Processing Commands
-
-### KEEP - Select Specific Fields
-```esql
-FROM employees
-| KEEP name, department, salary
-
-// Keep with pattern
-FROM logs-*
-| KEEP @timestamp, message, host.*
-```
-
-### DROP - Remove Specific Fields
-```esql
-FROM employees
-| DROP password, ssn, internal_notes
-
-// Drop with pattern
-FROM logs-*
-| DROP *.keyword
-```
-
-### RENAME - Rename Fields
-```esql
-FROM employees
-| RENAME emp_name AS name, emp_dept AS department
-
-// Multiple renames
-FROM logs-*
-| RENAME source.ip AS src_ip, destination.ip AS dst_ip
-```
-
----
-
-## Data Selection & Filtering
-
-### WHERE - Filter Rows
-```esql
-// Equality
-FROM employees
-| WHERE department == "Sales"
-
-// Comparison operators
-FROM products
-| WHERE price > 100 AND stock < 50
-
-// IS NULL / IS NOT NULL
-FROM logs-*
-| WHERE error_code IS NOT NULL
-
-// IN operator
-FROM employees
-| WHERE department IN ("Sales", "Marketing", "HR")
-
-// LIKE operator (wildcards)
-FROM logs-*
-| WHERE message LIKE "*error*"
-
-// RLIKE operator (regex)
-FROM logs-*
-| WHERE message RLIKE "error|exception|failure"
-
-// NOT operator
-FROM employees
-| WHERE NOT department == "IT"
-
-// Multiple conditions
-FROM orders
-| WHERE status == "completed" 
-  AND total_amount > 1000 
-  AND order_date >= "2024-01-01"
-```
-
----
-
-## Aggregations & Statistics
-
-### STATS - Aggregate Functions
-
-#### COUNT
-```esql
-// Count all rows
-FROM logs-*
-| STATS count = COUNT()
-
-// Count distinct
-FROM employees
-| STATS unique_departments = COUNT_DISTINCT(department)
-
-// Count by group
-FROM logs-*
-| STATS event_count = COUNT() BY log_level
-```
-
-#### SUM, AVG, MIN, MAX
-```esql
-FROM sales
-| STATS 
-    total_revenue = SUM(amount),
-    avg_sale = AVG(amount),
-    min_sale = MIN(amount),
-    max_sale = MAX(amount)
-
-// With grouping
-FROM sales
-| STATS 
-    total = SUM(amount),
-    average = AVG(amount)
-  BY product_category
-```
-
-#### MEDIAN, PERCENTILE
-```esql
-FROM response_times
-| STATS 
-    median_time = MEDIAN(duration),
-    p95 = PERCENTILE(duration, 95),
-    p99 = PERCENTILE(duration, 99)
-```
-
-#### Multiple Aggregations
-```esql
-FROM orders
-| STATS 
-    order_count = COUNT(),
-    total_revenue = SUM(amount),
-    avg_order_value = AVG(amount),
-    unique_customers = COUNT_DISTINCT(customer_id)
-  BY region, product_category
-```
-
----
-
-## String Functions
-
-### CONCAT - Concatenate Strings
-```esql
-FROM employees
-| EVAL full_name = CONCAT(first_name, " ", last_name)
-
-// With separator
-FROM logs-*
-| EVAL log_info = CONCAT(level, ": ", message)
-```
-
-### SUBSTRING - Extract Substring
-```esql
-FROM employees
-| EVAL first_initial = SUBSTRING(first_name, 0, 1)
-
-// Extract with length
-FROM products
-| EVAL short_code = SUBSTRING(product_id, 0, 5)
-```
-
-### LENGTH - String Length
-```esql
-FROM messages
-| EVAL message_length = LENGTH(message)
-| WHERE message_length > 100
-```
-
-### TRIM, LTRIM, RTRIM - Remove Whitespace
-```esql
-FROM user_input
-| EVAL cleaned = TRIM(input_field)
-| EVAL left_trimmed = LTRIM(input_field)
-| EVAL right_trimmed = RTRIM(input_field)
-```
-
-### UPPER, LOWER - Case Conversion
-```esql
-FROM employees
-| EVAL name_upper = UPPER(name)
-| EVAL email_lower = LOWER(email)
-```
-
-### REPLACE - Replace String
-```esql
-FROM logs-*
-| EVAL cleaned_message = REPLACE(message, "ERROR", "Warning")
-```
-
-### SPLIT - Split String into Array
-```esql
-FROM logs-*
-| EVAL tags_array = SPLIT(tags, ",")
-```
-
-### STARTS_WITH, ENDS_WITH
-```esql
-FROM files
-| WHERE STARTS_WITH(filename, "log_")
-| WHERE ENDS_WITH(filename, ".txt")
-```
-
----
-
-## Mathematical Functions
-
-### Basic Operations
-```esql
-FROM sales
-| EVAL 
-    total = price * quantity,
-    discount_price = price * 0.9,
-    tax = price * 0.08
-
-// Multiple operations
-FROM metrics
-| EVAL 
-    sum_val = field1 + field2,
-    diff_val = field1 - field2,
-    product = field1 * field2,
-    ratio = field1 / field2,
-    remainder = field1 % field2
-```
-
-### ABS - Absolute Value
-```esql
-FROM transactions
-| EVAL abs_amount = ABS(transaction_amount)
-```
-
-### ROUND, FLOOR, CEIL
-```esql
-FROM measurements
-| EVAL 
-    rounded = ROUND(value, 2),
-    floored = FLOOR(value),
-    ceiled = CEIL(value)
-```
-
-### POW - Power
-```esql
-FROM data
-| EVAL squared = POW(value, 2)
-| EVAL cubed = POW(value, 3)
-```
-
-### SQRT - Square Root
-```esql
-FROM measurements
-| EVAL sqrt_value = SQRT(value)
-```
-
-### LOG, LOG10
-```esql
-FROM data
-| EVAL 
-    natural_log = LOG(value),
-    log_base_10 = LOG10(value)
-```
-
-### GREATEST, LEAST
-```esql
-FROM comparisons
-| EVAL 
-    max_val = GREATEST(val1, val2, val3),
-    min_val = LEAST(val1, val2, val3)
-```
-
----
-
-## Date/Time Functions
-
-### NOW - Current Timestamp
-```esql
-FROM logs-*
-| EVAL current_time = NOW()
-```
-
-### DATE_EXTRACT - Extract Date Parts
-```esql
-FROM events
-| EVAL 
-    year = DATE_EXTRACT("year", @timestamp),
-    month = DATE_EXTRACT("month", @timestamp),
-    day = DATE_EXTRACT("day", @timestamp),
-    hour = DATE_EXTRACT("hour", @timestamp),
-    minute = DATE_EXTRACT("minute", @timestamp),
-    day_of_week = DATE_EXTRACT("day_of_week", @timestamp)
-```
-
-### DATE_FORMAT - Format Date
-```esql
-FROM events
-| EVAL formatted_date = DATE_FORMAT("yyyy-MM-dd", @timestamp)
-| EVAL custom_format = DATE_FORMAT("MMM dd, yyyy HH:mm", @timestamp)
-```
-
-### DATE_TRUNC - Truncate Date
-```esql
-FROM logs-*
-| EVAL 
-    hour_bucket = DATE_TRUNC("hour", @timestamp),
-    day_bucket = DATE_TRUNC("day", @timestamp),
-    month_bucket = DATE_TRUNC("month", @timestamp)
-```
-
-### DATE_DIFF - Date Difference
-```esql
-FROM orders
-| EVAL days_since_order = DATE_DIFF("days", order_date, NOW())
-| EVAL hours_to_delivery = DATE_DIFF("hours", order_date, delivery_date)
-```
-
-### DATE_PARSE - Parse String to Date
-```esql
-FROM data
-| EVAL parsed_date = DATE_PARSE("yyyy-MM-dd", date_string)
-```
-
----
-
-## Type Conversion Functions
-
-### TO_STRING - Convert to String
-```esql
-FROM data
-| EVAL id_string = TO_STRING(id)
-| EVAL amount_string = TO_STRING(amount)
-```
-
-### TO_INTEGER, TO_LONG - Convert to Integer
-```esql
-FROM data
-| EVAL age_int = TO_INTEGER(age_string)
-| EVAL id_long = TO_LONG(id_string)
-```
-
-### TO_DOUBLE - Convert to Double
-```esql
-FROM data
-| EVAL price_double = TO_DOUBLE(price_string)
-```
-
-### TO_BOOLEAN - Convert to Boolean
-```esql
-FROM data
-| EVAL is_active = TO_BOOLEAN(active_string)
-```
-
-### TO_DATETIME - Convert to DateTime
-```esql
-FROM data
-| EVAL timestamp = TO_DATETIME(date_string)
-```
-
-### TO_IP - Convert to IP Address
-```esql
-FROM logs-*
-| EVAL ip_address = TO_IP(ip_string)
-```
-
----
-
-## Conditional Functions
-
-### CASE - Conditional Logic
-```esql
-FROM employees
-| EVAL salary_grade = CASE(
-    salary < 50000, "Entry",
-    salary < 80000, "Mid",
-    salary < 120000, "Senior",
-    "Executive"
-  )
-
-// With multiple conditions
-FROM orders
-| EVAL order_status = CASE(
-    status == "pending" AND days_old > 7, "Overdue",
-    status == "pending", "Processing",
-    status == "shipped", "In Transit",
-    status == "delivered", "Completed",
-    "Unknown"
-  )
-```
-
-### COALESCE - Return First Non-Null Value
-```esql
-FROM data
-| EVAL display_name = COALESCE(nickname, first_name, username, "Unknown")
-```
-
-### IF - Simple Conditional
-```esql
-FROM products
-| EVAL stock_status = 
-    CASE(stock > 0, "Available", "Out of Stock")
-
-// Nested conditions
-FROM employees
-| EVAL bonus = CASE(
-    performance_rating >= 4.5, salary * 0.15,
-    performance_rating >= 3.5, salary * 0.10,
-    performance_rating >= 2.5, salary * 0.05,
-    0
-  )
-```
-
----
-
-## Array Functions
-
-### MV_COUNT - Count Array Elements
-```esql
-FROM logs-*
-| EVAL tag_count = MV_COUNT(tags)
-| WHERE tag_count > 3
-```
-
-### MV_AVG, MV_SUM, MV_MIN, MV_MAX - Array Aggregations
-```esql
-FROM metrics
-| EVAL 
-    avg_value = MV_AVG(values),
-    total = MV_SUM(values),
-    min_value = MV_MIN(values),
-    max_value = MV_MAX(values)
-```
-
-### MV_CONCAT - Concatenate Array Elements
-```esql
-FROM logs-*
-| EVAL all_tags = MV_CONCAT(tags, ", ")
-```
-
-### MV_DEDUPE - Remove Duplicates from Array
-```esql
-FROM data
-| EVAL unique_values = MV_DEDUPE(values)
-```
-
-### MV_FIRST, MV_LAST - Get First/Last Element
-```esql
-FROM logs-*
-| EVAL first_tag = MV_FIRST(tags)
-| EVAL last_tag = MV_LAST(tags)
-```
-
-### MV_SLICE - Extract Array Slice
-```esql
-FROM data
-| EVAL first_three = MV_SLICE(values, 0, 3)
-```
-
----
-
-## Join Operations (LOOKUP)
-
-ES|QL uses ENRICH (similar to LOOKUP/JOIN) to join data from enrich policies.
-
-### Prerequisites: Create Enrich Policy
-First, create an enrich policy in Kibana Dev Tools:
-
-```json
-PUT /_enrich/policy/user_lookup
-{
-  "match": {
-    "indices": "users",
-    "match_field": "user_id",
-    "enrich_fields": ["username", "email", "department"]
-  }
-}
-
-POST /_enrich/policy/user_lookup/_execute
-```
-
-### ENRICH - Join/Lookup Data
-```esql
-FROM logs-*
-| ENRICH user_lookup ON user_id
-| KEEP @timestamp, user_id, username, email, message
-
-// With field renaming
-FROM transactions
-| ENRICH product_lookup ON product_id WITH product_name, category, price
-| KEEP transaction_id, product_name, category, quantity, price
-
-// Multiple enrichments
-FROM orders
-| ENRICH customer_lookup ON customer_id WITH customer_name, customer_tier
-| ENRICH product_lookup ON product_id WITH product_name, product_category
-| KEEP order_id, customer_name, product_name, order_amount
-```
-
-### Complex Join Example
-```esql
-FROM orders
-| ENRICH customer_lookup ON customer_id 
-    WITH customer_name, customer_email, customer_segment
-| ENRICH product_lookup ON product_id 
-    WITH product_name, product_category, product_price
-| EVAL total_price = quantity * product_price
-| WHERE customer_segment == "Premium"
-| STATS 
-    total_orders = COUNT(),
-    total_revenue = SUM(total_price)
-  BY customer_name, product_category
-| SORT total_revenue DESC
-```
-
----
-
-## Sorting & Limiting
-
-### SORT - Order Results
-```esql
-// Ascending order (default)
-FROM employees
-| SORT salary
-
-// Descending order
-FROM employees
-| SORT salary DESC
-
-// Multiple fields
-FROM employees
-| SORT department ASC, salary DESC
-
-// With nulls first/last
-FROM data
-| SORT value DESC NULLS FIRST
-```
-
-### LIMIT - Limit Results
-```esql
-// Get first 10 rows
-FROM logs-*
-| LIMIT 10
-
-// Top 5 highest salaries
-FROM employees
-| SORT salary DESC
-| LIMIT 5
-
-// Pagination (skip and limit)
-FROM products
-| SORT price
-| LIMIT 20  // Results 0-19
-```
-
-### HEAD - Get First N Rows (Alias for LIMIT)
-```esql
-FROM logs-*
-| HEAD 100
-```
-
----
-
-## Grouping & Aggregating
-
-### GROUP BY with STATS
-```esql
-// Single field grouping
-FROM sales
-| STATS total_sales = SUM(amount) BY region
-
-// Multiple field grouping
-FROM orders
-| STATS 
-    order_count = COUNT(),
-    total_revenue = SUM(amount)
-  BY region, product_category, sales_rep
-
-// Time-based grouping
-FROM logs-*
-| EVAL hour = DATE_TRUNC("hour", @timestamp)
-| STATS event_count = COUNT() BY hour, log_level
-| SORT hour DESC
-```
-
-### Complex Aggregation Example
-```esql
-FROM sales_data
-| WHERE order_date >= "2024-01-01"
-| EVAL month = DATE_TRUNC("month", order_date)
-| STATS 
-    total_orders = COUNT(),
-    total_revenue = SUM(amount),
-    avg_order_value = AVG(amount),
-    unique_customers = COUNT_DISTINCT(customer_id),
-    max_order = MAX(amount),
-    min_order = MIN(amount)
-  BY month, region, product_category
-| EVAL revenue_per_customer = total_revenue / unique_customers
-| WHERE total_orders > 100
-| SORT month DESC, total_revenue DESC
-| LIMIT 50
-```
-
----
-
-## Advanced Patterns
-
-### Window Functions Pattern
-```esql
-// Running total by group
-FROM sales
-| SORT date
-| STATS 
-    daily_sales = SUM(amount),
-    order_count = COUNT()
-  BY date, region
-| SORT region, date
-```
-
-### Pivoting Data
-```esql
-// Count by status and priority
-FROM tickets
-| STATS ticket_count = COUNT() BY status, priority
-| SORT status, priority
-```
-
-### Finding Duplicates
-```esql
-FROM users
-| STATS count = COUNT() BY email
-| WHERE count > 1
-| SORT count DESC
-```
-
-### Time Series Analysis
-```esql
-FROM metrics-*
-| EVAL 
-    hour = DATE_TRUNC("hour", @timestamp),
-    day = DATE_EXTRACT("day", @timestamp)
-| STATS 
-    avg_cpu = AVG(cpu_percent),
-    max_cpu = MAX(cpu_percent),
-    avg_memory = AVG(memory_percent)
-  BY hour, host
-| WHERE avg_cpu > 80
-| SORT hour DESC
-```
-
-### Percentage Calculations
-```esql
-FROM sales
-| STATS 
-    total_sales = SUM(amount),
-    count = COUNT()
-  BY product_category
-| EVAL percentage = ROUND(total_sales / SUM(total_sales) * 100, 2)
-| SORT percentage DESC
-```
-
-### Top N per Group
-```esql
-// Top 3 products per category by sales
-FROM sales
-| STATS total_sales = SUM(amount) BY product_category, product_name
-| SORT product_category, total_sales DESC
-// Note: ES|QL doesn't have native PARTITION BY, 
-// so you may need to process this in multiple queries or use aggregations
-```
-
-### Data Cleaning
-```esql
-FROM raw_data
-| EVAL 
-    // Clean whitespace
-    cleaned_name = TRIM(name),
-    // Standardize case
-    email_lower = LOWER(email),
-    // Replace values
-    status = REPLACE(status, "N/A", "Unknown"),
-    // Handle nulls
-    age = COALESCE(age, 0),
-    // Validate ranges
-    valid_age = CASE(age < 0 OR age > 150, NULL, age)
-| WHERE cleaned_name IS NOT NULL
-| DROP name, email
-| RENAME cleaned_name AS name, email_lower AS email
-```
-
-### Cohort Analysis
-```esql
-FROM user_events
-| EVAL 
-    signup_month = DATE_TRUNC("month", signup_date),
-    event_month = DATE_TRUNC("month", event_date)
-| STATS 
-    active_users = COUNT_DISTINCT(user_id)
-  BY signup_month, event_month
-| SORT signup_month, event_month
-```
-
-### Anomaly Detection Pattern
-```esql
-FROM metrics-*
-| EVAL hour = DATE_TRUNC("hour", @timestamp)
-| STATS 
-    avg_value = AVG(value),
-    stddev = SQRT(AVG(POW(value - AVG(value), 2)))
-  BY hour
-| EVAL 
-    upper_bound = avg_value + (2 * stddev),
-    lower_bound = avg_value - (2 * stddev)
-```
-
----
-
-## Complete Real-World Examples
-
-### Example 1: User Activity Dashboard
-```esql
-FROM user_logs-*
-| WHERE @timestamp >= NOW() - 7 days
-| ENRICH user_lookup ON user_id WITH username, user_tier
-| EVAL day = DATE_TRUNC("day", @timestamp)
-| STATS 
-    daily_active_users = COUNT_DISTINCT(user_id),
-    total_sessions = COUNT(),
-    avg_session_duration = AVG(session_duration)
-  BY day, user_tier
-| EVAL avg_duration_minutes = ROUND(avg_session_duration / 60, 2)
-| SORT day DESC, user_tier
-```
-
-### Example 2: E-commerce Sales Report
-```esql
-FROM orders
-| WHERE order_date >= "2024-01-01"
-| ENRICH customer_lookup ON customer_id 
-    WITH customer_name, customer_segment
-| ENRICH product_lookup ON product_id 
-    WITH product_name, product_category, cost_price
-| EVAL 
-    profit = (price - cost_price) * quantity,
-    month = DATE_TRUNC("month", order_date)
-| STATS 
-    total_orders = COUNT(),
-    total_revenue = SUM(price * quantity),
-    total_profit = SUM(profit),
-    avg_order_value = AVG(price * quantity),
-    unique_customers = COUNT_DISTINCT(customer_id)
-  BY month, product_category, customer_segment
-| EVAL profit_margin = ROUND(total_profit / total_revenue * 100, 2)
-| WHERE total_revenue > 10000
-| SORT month DESC, total_revenue DESC
-| LIMIT 100
-```
-
-### Example 3: Security Log Analysis
-```esql
-FROM security-logs-*
-| WHERE @timestamp >= NOW() - 24 hours
-| WHERE event_type IN ("login_failed", "suspicious_activity")
-| EVAL hour = DATE_TRUNC("hour", @timestamp)
-| STATS 
-    event_count = COUNT(),
-    unique_ips = COUNT_DISTINCT(source_ip),
-    unique_users = COUNT_DISTINCT(username)
-  BY hour, event_type, country
-| WHERE event_count > 100
-| SORT hour DESC, event_count DESC
-```
-
-### Example 4: Application Performance Monitoring
-```esql
-FROM apm-*
-| WHERE @timestamp >= NOW() - 1 hour
-| EVAL 
-    response_category = CASE(
-        response_time < 100, "Fast",
-        response_time < 500, "Medium",
-        response_time < 1000, "Slow",
-        "Very Slow"
-    ),
-    minute = DATE_TRUNC("minute", @timestamp)
-| STATS 
-    request_count = COUNT(),
-    avg_response = AVG(response_time),
-    p95_response = PERCENTILE(response_time, 95),
-    p99_response = PERCENTILE(response_time, 99),
-    error_count = COUNT() WHERE status_code >= 400
-  BY minute, endpoint, response_category
-| EVAL error_rate = ROUND(error_count / request_count * 100, 2)
-| WHERE request_count > 10
-| SORT minute DESC, avg_response DESC
-```
-
----
-
-## Tips & Best Practices
-
-1. **Use KEEP instead of SELECT** - More explicit about which fields to retain
-2. **Filter early with WHERE** - Reduce data processing by filtering before aggregations
-3. **Use DATE_TRUNC for time bucketing** - Essential for time series analysis
-4. **Leverage ENRICH for joins** - Pre-create enrich policies for frequently joined data
-5. **Use EVAL for calculated fields** - Create derived fields before aggregation
-6. **Combine multiple conditions in WHERE** - More efficient than multiple WHERE clauses
-7. **Use STATS with BY for grouping** - Replaces traditional GROUP BY
-8. **Sort after aggregation** - More efficient than sorting before
-9. **Use LIMIT to control output size** - Especially important for large datasets
-10. **Use metadata fields when needed** - Access _id, _index with METADATA keyword
-
----
-
-## Common Patterns Cheat Sheet
-
-```esql
-// Count by field
-FROM index | STATS count = COUNT() BY field
-
-// Top N
-FROM index | STATS value = SUM(amount) BY category | SORT value DESC | LIMIT 10
-
-// Time series
-FROM index | EVAL bucket = DATE_TRUNC("hour", @timestamp) | STATS count = COUNT() BY bucket
-
-// Percentage of total
-FROM index | STATS total = SUM(amount) BY category | EVAL pct = total / SUM(total) * 100
-
-// Filter nulls
-FROM index | WHERE field IS NOT NULL
-
-// String matching
-FROM index | WHERE field LIKE "*pattern*"
-
-// Date range
-FROM index | WHERE @timestamp >= NOW() - 7 days
-
-// Multiple aggregations
-FROM index | STATS count = COUNT(), sum = SUM(val), avg = AVG(val) BY group
-
-// Conditional aggregation
-FROM index | STATS error_count = COUNT() WHERE status == "error" BY service
-```
-
----
-
-## Comparison with Traditional SQL
-
-| SQL | ES|QL |
-|-----|-------|
-| SELECT * | FROM index |
-| SELECT field1, field2 | FROM index \| KEEP field1, field2 |
-| WHERE condition | WHERE condition (same) |
-| GROUP BY field | STATS ... BY field |
-| ORDER BY field | SORT field |
-| LIMIT 10 | LIMIT 10 (same) |
-| COUNT(*) | STATS count = COUNT() |
-| SUM(field) | STATS total = SUM(field) |
-| AVG(field) | STATS avg = AVG(field) |
-| JOIN | ENRICH (using enrich policies) |
-| CASE WHEN | CASE(...) |
-| CONCAT(a, b) | CONCAT(a, b) (same) |
-
----
-
-## Resources
-
-- Official ES|QL Documentation: https://www.elastic.co/guide/en/elasticsearch/reference/current/esql.html
-- ES|QL Functions Reference: https://www.elastic.co/guide/en/elasticsearch/reference/current/esql-functions.html
-- Enrich Processor: https://www.elastic.co/guide/en/elasticsearch/reference/current/enrich-processor.html
-
----
-
-*Last Updated: 2024*
-*ES|QL is actively evolving - check official documentation for latest features*

cmd/api.go

@@ -72,7 +72,7 @@ func ApiShow(conf *cfg.Config) *cli.Command {
 		},
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(conf, cmd, Capi)
+			complete(cmd, Capi)
 		},
 	}
 }
@@ -91,12 +91,6 @@ func ApiRepl(conf *cfg.Config) *cli.Command {
 				Aliases:     []string{"p"},
 				Sources:     cli.EnvVars("PAGER", "ES_JSON_PAGER"),
 			},
-			&cli.BoolFlag{
-				Name:        "human-readable-cat",
-				Usage:       "enable human readable /_cat output",
-				Destination: &conf.HumanCat,
-				Aliases:     []string{"H"},
-			},
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {

cmd/ccr.go

@@ -59,7 +59,7 @@ func CcrStatus(conf *cfg.Config) *cli.Command {
 		},
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(conf, cmd, Ccluster)
+			complete(cmd, Ccluster)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
@@ -115,7 +115,7 @@ func CcrRemoteInfo(conf *cfg.Config) *cli.Command {
 		UsageText: "info [options] [<index>]",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(conf, cmd, Cindex)
+			complete(cmd, Cindex)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {

cmd/ccr_follower.go

@@ -60,7 +60,7 @@ func CcrFollowerRenew(conf *cfg.Config) *cli.Command {
 		},
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(conf, cmd, Cindex)
+			complete(cmd, Cindex)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
@@ -82,7 +82,7 @@ func CcrFollowerResume(conf *cfg.Config) *cli.Command {
 		UsageText: "resume [options] <index>",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(conf, cmd, Cindex)
+			complete(cmd, Cindex)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
@@ -104,7 +104,7 @@ func CcrFollowerPause(conf *cfg.Config) *cli.Command {
 		UsageText: "pause [options] <index>",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(conf, cmd, Cindex)
+			complete(cmd, Cindex)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
@@ -126,7 +126,7 @@ func CcrFollowerUnfollow(conf *cfg.Config) *cli.Command {
 		UsageText: "unfollow [options] <index>",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(conf, cmd, Cindex)
+			complete(cmd, Cindex)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
@@ -158,7 +158,7 @@ func CcrFollowerAdd(conf *cfg.Config) *cli.Command {
 		},
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(conf, cmd, Cindex)
+			complete(cmd, Cindex)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
@@ -181,7 +181,7 @@ func CcrFollowerDelete(conf *cfg.Config) *cli.Command {
 		UsageText: "delete <index>",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(conf, cmd, Cindex)
+			complete(cmd, Cindex)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
@@ -205,7 +205,7 @@ func CcrFollowerShow(conf *cfg.Config) *cli.Command {
 		UsageText: "show <index>",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(conf, cmd, Cindex)
+			complete(cmd, Cindex)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {

cmd/cluster.go

@@ -83,7 +83,7 @@ func ClusterSwitch(conf *cfg.Config) *cli.Command {
 		Aliases:   []string{"ctx"},
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(conf, cmd, Ccluster)
+			complete(cmd, Ccluster)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {

cmd/cluster_reroute.go

@@ -50,7 +50,7 @@ func ClusterRerouteMove(conf *cfg.Config) *cli.Command {
 		UsageText: "move [options] <index>",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(conf, cmd, Cindex)
+			complete(cmd, Cindex)
 		},
 
 		Flags: []cli.Flag{
@@ -95,7 +95,7 @@ func ClusterRerouteAllocateReplica(conf *cfg.Config) *cli.Command {
 		UsageText: "allocate-replica [options] <index>",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(conf, cmd, Cindex)
+			complete(cmd, Cindex)
 		},
 
 		Flags: []cli.Flag{
@@ -133,7 +133,7 @@ func ClusterRerouteCancel(conf *cfg.Config) *cli.Command {
 		UsageText: "cancel [options] <index>",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(conf, cmd, Cindex)
+			complete(cmd, Cindex)
 		},
 
 		Flags: []cli.Flag{
@@ -177,6 +177,7 @@ func ClusterRerouteAllocatePrimary(conf *cfg.Config, stale bool) *cli.Command {
 	if stale {
 		name = "allocate-stale-primary"
 		usage = "allocate a stale primary shard to a node"
+
 	}
 
 	return &cli.Command{
@@ -185,7 +186,7 @@ func ClusterRerouteAllocatePrimary(conf *cfg.Config, stale bool) *cli.Command {
 		UsageText: name + " [options] <index>",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(conf, cmd, Cindex)
+			complete(cmd, Cindex)
 		},
 
 		Flags: []cli.Flag{

cmd/cluster_settings.go

@@ -105,7 +105,7 @@ func ClusterSettingsSet(conf *cfg.Config) *cli.Command {
 		},
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(conf, cmd, Cclustersettings)
+			complete(cmd, Cclustersettings)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {

cmd/completion.go

@@ -34,18 +34,22 @@ const (
 	Cilm
 	Cnode
 	Cclustersettings
-	Cindextemplate
 )
 
-func complete(conf *cfg.Config, cmd *cli.Command, what int) {
+func complete(cmd *cli.Command, what int) {
 	if cmd.NArg() > 0 {
 		return
 	}
 
-	var (
-		list []string
-		err  error
-	)
+	// FIXME: config should load from root.Before(), see https://github.com/urfave/cli/issues/2348
+	// workaround: load it directly here
+	conf := cfg.NewConfig()
+	if err := conf.Init(); err != nil {
+		return
+	}
+
+	var list []string
+	var err error
 
 	switch what {
 	case Cindex:
@@ -66,8 +70,6 @@ func complete(conf *cfg.Config, cmd *cli.Command, what int) {
 		list, err = es.NodeNames(conf)
 	case Cclustersettings:
 		list, err = es.ClusterSettingsNames(conf)
-	case Cindextemplate:
-		list, err = es.IndexTemplateNames(conf)
 	}
 
 	if err != nil {

cmd/datastream.go

@@ -91,7 +91,7 @@ func DatastreamShow(conf *cfg.Config) *cli.Command {
 		},
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(conf, cmd, Cdatastream)
+			complete(cmd, Cdatastream)
 		},
 	}
 }
@@ -113,7 +113,7 @@ func DatastreamCreate(conf *cfg.Config) *cli.Command {
 		},
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(conf, cmd, Cdatastream)
+			complete(cmd, Cdatastream)
 		},
 	}
 }
@@ -135,7 +135,7 @@ func DatastreamDelete(conf *cfg.Config) *cli.Command {
 		},
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(conf, cmd, Cdatastream)
+			complete(cmd, Cdatastream)
 		},
 	}
 }
@@ -148,7 +148,7 @@ func DatastreamRollover(conf *cfg.Config) *cli.Command {
 		UsageText: "rollover <data stream>",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(conf, cmd, Cindex)
+			complete(cmd, Cindex)
 		},
 
 		Flags: []cli.Flag{
@@ -205,7 +205,7 @@ func DatastreamIlm(conf *cfg.Config) *cli.Command {
 		UsageText: "ds ilm <name>",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(conf, cmd, Cdatastream)
+			complete(cmd, Cdatastream)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {

cmd/ilm.go

@@ -123,7 +123,7 @@ func IlmShow(conf *cfg.Config) *cli.Command {
 		},
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(conf, cmd, Cilm)
+			complete(cmd, Cilm)
 		},
 	}
 }

cmd/ilm_forecast.go

@@ -71,7 +71,7 @@ func IlmForecastList(conf *cfg.Config) *cli.Command {
 			},
 			&cli.StringFlag{
 				Name:        "within",
-				Usage:       "<duration> within which to forecast",
+				Usage:       "<duration> withing which to forecast",
 				Destination: &conf.Ilm.Within,
 				Aliases:     []string{"w"},
 			},
@@ -121,7 +121,7 @@ func IlmForecastShow(conf *cfg.Config) *cli.Command {
 			},
 			&cli.StringFlag{
 				Name:        "within",
-				Usage:       "duration within which to forecast",
+				Usage:       "duration withing which to forecast",
 				Destination: &conf.Ilm.Within,
 				Aliases:     []string{"w"},
 			},

cmd/index.go

@@ -19,6 +19,7 @@ package cmd
 import (
 	"context"
 	"errors"
+	"fmt"
 
 	"codeberg.org/scip/esctl/pkg/cfg"
 	"codeberg.org/scip/esctl/pkg/es"
@@ -41,7 +42,6 @@ func Index(conf *cfg.Config) *cli.Command {
 			IndexClose(conf),
 			IndexFields(conf),
 			IndexIlm(conf),
-			IndexDu(conf),
 
 			// sub commands
 			IndexAlias(conf),
@@ -76,10 +76,10 @@ func IndexList(conf *cfg.Config) *cli.Command {
 				Aliases:     []string{"H"},
 			},
 			&cli.BoolFlag{
-				Name:        "failed",
+				Name:        "reds",
 				Usage:       "include only red failed indicies",
 				Destination: &conf.Failed,
-				Aliases:     []string{"f"},
+				Aliases:     []string{"r"},
 			},
 			&cli.StringSliceFlag{
 				Name:        "filter",
@@ -111,7 +111,7 @@ func IndexShow(conf *cfg.Config) *cli.Command {
 		},
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(conf, cmd, Cindex)
+			complete(cmd, Cindex)
 		},
 	}
 }
@@ -163,7 +163,7 @@ Valid field mapping types: integer, text, date, keyword`,
 		Action: func(ctx context.Context, cmd *cli.Command) error {
 			args := cmd.Args()
 			if args.Len() == 0 {
-				return errors.New("no index specified")
+				return fmt.Errorf("no index specified")
 			}
 
 			mappings := args.Slice()[1:]
@@ -181,7 +181,7 @@ func IndexDelete(conf *cfg.Config) *cli.Command {
 		UsageText: "delete <index>",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(conf, cmd, Cindex)
+			complete(cmd, Cindex)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
@@ -202,7 +202,7 @@ func IndexClose(conf *cfg.Config) *cli.Command {
 		UsageText: "close <index>",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(conf, cmd, Cindex)
+			complete(cmd, Cindex)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
@@ -244,7 +244,7 @@ func IndexFields(conf *cfg.Config) *cli.Command {
 		},
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(conf, cmd, Cindex)
+			complete(cmd, Cindex)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
@@ -265,7 +265,7 @@ func IndexIlm(conf *cfg.Config) *cli.Command {
 		UsageText: "index ilm <index>",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(conf, cmd, Cindex)
+			complete(cmd, Cindex)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
@@ -278,24 +278,3 @@ func IndexIlm(conf *cfg.Config) *cli.Command {
 		},
 	}
 }
-
-func IndexDu(conf *cfg.Config) *cli.Command {
-	return &cli.Command{
-		Name:      "du",
-		Usage:     "show index disk usage",
-		UsageText: "index du <index>",
-
-		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(conf, cmd, Cindex)
-		},
-
-		Action: func(ctx context.Context, cmd *cli.Command) error {
-			index := cmd.Args().Get(0)
-			if index == "" {
-				return errors.New("no index specified")
-			}
-
-			return es.IndexDiskusage(conf, index)
-		},
-	}
-}

cmd/index_alias.go

@@ -38,8 +38,7 @@ func IndexAlias(conf *cfg.Config) *cli.Command {
 			IndexAliasDelete(conf),
 			IndexAliasRollover(conf),
 			// FIXME: implement IndexAliasAdd
-			// see https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-update-aliases
-			// IndexAliasAdd(conf),
+			//IndexAliasAdd(conf), // see https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-indices-update-aliases
 		},
 	}
 }
@@ -52,7 +51,7 @@ func IndexAliasCreate(conf *cfg.Config) *cli.Command {
 		UsageText: "create <index> <alias>",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(conf, cmd, Cindex)
+			complete(cmd, Cindex)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
@@ -76,7 +75,7 @@ func IndexAliasDelete(conf *cfg.Config) *cli.Command {
 		UsageText: "delete <index> <alias>",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(conf, cmd, Cindex)
+			complete(cmd, Cindex)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
@@ -100,7 +99,7 @@ func IndexAliasRollover(conf *cfg.Config) *cli.Command {
 		UsageText: "rollover <alias>",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(conf, cmd, Cindex)
+			complete(cmd, Cindex)
 		},
 
 		Flags: []cli.Flag{

cmd/index_template.go

@@ -19,6 +19,7 @@ package cmd
 import (
 	"context"
 	"errors"
+	"fmt"
 	"slices"
 
 	"codeberg.org/scip/esctl/pkg/cfg"
@@ -49,23 +50,8 @@ func IndexTemplateList(conf *cfg.Config) *cli.Command {
 		Aliases: []string{"ls"},
 		Usage:   "list index templates",
 
-		Flags: []cli.Flag{
-			&cli.StringSliceFlag{
-				Name:        "filter-index-pattern",
-				Usage:       "show only index templates which use patterns, which match the filter",
-				Destination: &conf.Filter,
-				Aliases:     []string{"F"},
-			},
-			&cli.BoolFlag{
-				Name:        "hidden",
-				Usage:       "show hidden index templates as well",
-				Destination: &conf.Hidden,
-				Aliases:     []string{"H"},
-			},
-		},
-
 		Action: func(ctx context.Context, cmd *cli.Command) error {
-			return es.IndexTemplateList(conf, cmd.Args().Get(0))
+			return es.IndexTemplateList(conf)
 		},
 	}
 }
@@ -86,7 +72,7 @@ func IndexTemplateShow(conf *cfg.Config) *cli.Command {
 		},
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(conf, cmd, Cindextemplate)
+			complete(cmd, Cindex)
 		},
 	}
 }
@@ -194,7 +180,7 @@ https://www.elastic.co/docs/reference/elasticsearch/index-settings
 		Action: func(ctx context.Context, cmd *cli.Command) error {
 			args := cmd.Args()
 			if args.Len() == 0 {
-				return errors.New("no name specified")
+				return fmt.Errorf("no name specified")
 			}
 
 			if conf.Mode != "" {
@@ -230,7 +216,7 @@ func IndexTemplateDelete(conf *cfg.Config) *cli.Command {
 		},
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(conf, cmd, Cindextemplate)
+			complete(cmd, Cindex)
 		},
 	}
 }

cmd/node.go

@@ -36,7 +36,6 @@ func Node(conf *cfg.Config) *cli.Command {
 			NodeList(conf),
 			NodeShow(conf),
 			NodeClients(conf),
-			NodeUsage(conf),
 		},
 	}
 }
@@ -61,7 +60,7 @@ func NodeShow(conf *cfg.Config) *cli.Command {
 		UsageText: "show [options] <node>",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(conf, cmd, Cnode)
+			complete(cmd, Cnode)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
@@ -91,7 +90,7 @@ func NodeClients(conf *cfg.Config) *cli.Command {
 		},
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(conf, cmd, Cnode)
+			complete(cmd, Cnode)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
@@ -104,19 +103,3 @@ func NodeClients(conf *cfg.Config) *cli.Command {
 		},
 	}
 }
-
-func NodeUsage(conf *cfg.Config) *cli.Command {
-	return &cli.Command{
-		Name:      "usage",
-		Usage:     "show node usage stats",
-		UsageText: "usage [options] [<node>]",
-
-		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(conf, cmd, Cnode)
-		},
-
-		Action: func(ctx context.Context, cmd *cli.Command) error {
-			return es.NodeUsage(conf, cmd.Args().Get(0))
-		},
-	}
-}

cmd/roles.go

@@ -68,7 +68,7 @@ func RoleShow(conf *cfg.Config) *cli.Command {
 		UsageText: "show [options] <role>",
 
 		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
-			complete(conf, cmd, Crole)
+			complete(cmd, Crole)
 		},
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {

cmd/root.go

@@ -21,30 +21,147 @@ import (
 	"fmt"
 	golog "log"
 	"os"
-	"runtime/debug"
 	"runtime/pprof"
 	"strings"
 
-	"codeberg.org/scip/esctl/assets"
 	"codeberg.org/scip/esctl/pkg/cfg"
 	"codeberg.org/scip/esctl/pkg/es"
 	"codeberg.org/scip/esctl/pkg/log"
-	"codeberg.org/scip/esctl/pkg/printer"
 
-	markdown "github.com/MichaelMure/go-term-markdown"
 	"github.com/urfave/cli/v3"
 )
 
-const (
-	versionFmt = `esctl version: %s
-  build: %s
-  branch: %s
-  commit: %s
-  go version: %s
-  API Version: %s
-`
+func Finish(err error) int {
+	if err != nil {
+		fmt.Fprintln(os.Stderr, "Error: ", err.Error())
+		return 1
+	}
 
-	jsonPathUsage = `jsonPath usage:
+	return 0
+}
+
+func Main() int {
+	conf := cfg.NewConfig()
+
+	cmd := &cli.Command{
+		Name:                  "esctl",
+		Usage:                 "manage elasticsearch from cli",
+		EnableShellCompletion: true,
+
+		Flags: []cli.Flag{
+			&cli.BoolFlag{
+				Name:        "debug",
+				Aliases:     []string{"d"},
+				Value:       false,
+				Usage:       "enable debugging",
+				Sources:     cli.EnvVars("ES_DEBUG"),
+				Destination: &conf.Debug,
+			},
+			&cli.BoolFlag{
+				Name:        "debug-http",
+				Value:       false,
+				Usage:       "enable HTTP debugging",
+				Destination: &conf.DebugHTTP,
+			},
+			&cli.BoolFlag{
+				Name:        "align-ints",
+				Aliases:     []string{"I"},
+				Value:       false,
+				Usage:       "right align integers in tabular output",
+				Destination: &conf.AlignInts,
+			},
+			&cli.StringFlag{
+				Name:        "config",
+				Aliases:     []string{"c"},
+				Value:       "",
+				Usage:       "config file",
+				Sources:     cli.EnvVars("ES_CONFIG"),
+				Destination: &conf.ConfigFile,
+			},
+			&cli.StringFlag{
+				Name:        "cluster",
+				Aliases:     []string{"C"},
+				Value:       "",
+				Usage:       "cluster alias to work with",
+				Destination: &conf.CurrentCluster,
+			},
+			&cli.StringFlag{
+				Name:        "output",
+				Aliases:     []string{"o"},
+				Value:       "",
+				Usage:       "output mode (tsv, json, yaml) default: tsv",
+				Destination: &conf.Output,
+			},
+			&cli.StringFlag{
+				Name:        "profile-file",
+				Usage:       "golang profiler output file",
+				Destination: &conf.ProfileFile,
+				Hidden:      true,
+			},
+		},
+
+		Commands: []*cli.Command{
+			Api(conf),
+			Ccr(conf),
+			Cluster(conf),
+			Datastream(conf),
+			Doc(conf),
+			Ilm(conf),
+			Index(conf),
+			License(conf),
+			Node(conf),
+			Roles(conf),
+			Search(conf),
+			Shard(conf),
+			Snapshot(conf),
+			Task(conf),
+			Version(conf),
+			Debug(conf),
+			HelpJsonPath(conf),
+			HelpUsage(conf),
+		},
+
+		Before: func(ctx context.Context, cmd *cli.Command) (context.Context, error) {
+			if err := conf.Init(); err != nil {
+				if len(os.Args) > 1 {
+					return nil, err
+				} else {
+					fmt.Println(cmd.UsageText)
+					return nil, nil
+				}
+			}
+
+			log.Init(conf)
+
+			if conf.ProfileFile != "" {
+				// enable  cpu profiling. Do  NOT use q  to stop the  game but
+				// close the window to get a profile
+				fd, err := os.Create(conf.ProfileFile)
+				if err != nil {
+					return nil, err
+				}
+				defer func() {
+					if err := fd.Close(); err != nil {
+						golog.Fatal(err)
+					}
+				}()
+
+				if err := pprof.StartCPUProfile(fd); err != nil {
+					golog.Fatal(err)
+				}
+
+				defer pprof.StopCPUProfile()
+			}
+
+			return nil, nil
+		},
+	}
+
+	return Finish(cmd.Run(context.Background(), os.Args))
+}
+
+func HelpJsonPath(conf *cfg.Config) *cli.Command {
+	msg := `jsonPath usage:
 
 name.last          >> "Anderson"
 age                >> 37
@@ -84,191 +201,26 @@ To extract more than one field, use:
 
 
 Documentation: https://github.com/tidwall/gjson/blob/master/SYNTAX.md`
-)
 
-func Finish(err error) int {
-	if err != nil {
-		fmt.Fprintln(os.Stderr, "Error: ", err.Error())
-
-		return 1
-	}
-
-	return 0
-}
-
-func Main() int {
-	conf := cfg.NewConfig()
-
-	cmd := &cli.Command{
-		Name:                  "esctl",
-		Usage:                 "manage elasticsearch from cli",
-		EnableShellCompletion: true,
-
-		Flags: []cli.Flag{
-			&cli.BoolFlag{
-				Name:        "debug",
-				Aliases:     []string{"d"},
-				Value:       false,
-				Usage:       "enable debugging",
-				Sources:     cli.EnvVars("ES_DEBUG"),
-				Destination: &conf.Debug,
-			},
-			&cli.BoolFlag{
-				Name:        "debug-http",
-				Value:       false,
-				Usage:       "enable HTTP debugging",
-				Destination: &conf.DebugHTTP,
-			},
-			&cli.BoolFlag{
-				Name:        "debug-goroutines",
-				Value:       false,
-				Usage:       "enable goroutine debugging",
-				Destination: &conf.DebugGoRoutines,
-			},
-			&cli.BoolFlag{
-				Name:        "align-ints",
-				Aliases:     []string{"I"},
-				Value:       false,
-				Usage:       "right align integers in tabular output",
-				Destination: &conf.AlignInts,
-			},
-			&cli.StringFlag{
-				Name:        "config",
-				Aliases:     []string{"c"},
-				Value:       "",
-				Usage:       "config file",
-				Sources:     cli.EnvVars("ES_CONFIG"),
-				Destination: &conf.ConfigFile,
-			},
-			&cli.StringFlag{
-				Name:        "cluster",
-				Aliases:     []string{"C"},
-				Value:       "",
-				Usage:       "cluster alias to work with",
-				Destination: &conf.CurrentCluster,
-			},
-			&cli.StringFlag{
-				Name:        "output",
-				Aliases:     []string{"o"},
-				Value:       "",
-				Usage:       "output mode (tsv, csv, json, yaml) default: tsv",
-				Destination: &conf.Output,
-			},
-			&cli.StringFlag{
-				Name:        "profile-file",
-				Usage:       "golang profiler output file",
-				Destination: &conf.ProfileFile,
-				Hidden:      true,
-			},
-		},
-
-		Commands: []*cli.Command{
-			Api(conf),
-			Ccr(conf),
-			Cluster(conf),
-			Datastream(conf),
-			Doc(conf),
-			Ilm(conf),
-			Index(conf),
-			License(conf),
-			Node(conf),
-			Roles(conf),
-			Search(conf),
-			SearchQL(conf),
-			Shard(conf),
-			Snapshot(conf),
-			Task(conf),
-			Version(conf),
-			Debug(conf),
-			HelpJsonPath(conf),
-			HelpUsage(conf),
-			HelpEsQl(conf),
-		},
-
-		Before: func(ctx context.Context, cmd *cli.Command) (context.Context, error) {
-			if err := conf.Init(); err != nil {
-				if len(os.Args) > 1 {
-					return nil, err
-				} else {
-					fmt.Println(cmd.UsageText)
-
-					return nil, nil
-				}
-			}
-
-			log.Init(conf)
-
-			if conf.ProfileFile != "" {
-				// enable  cpu profiling. Do  NOT use q  to stop the  game but
-				// close the window to get a profile
-				fd, err := os.Create(conf.ProfileFile)
-				if err != nil {
-					return nil, err
-				}
-				defer func() {
-					if err := fd.Close(); err != nil {
-						golog.Fatal(err)
-					}
-				}()
-
-				if err := pprof.StartCPUProfile(fd); err != nil {
-					golog.Fatal(err)
-				}
-
-				defer pprof.StopCPUProfile()
-			}
-
-			return nil, nil
-		},
-	}
-
-	return Finish(cmd.Run(context.Background(), os.Args))
-}
-
-func HelpJsonPath(conf *cfg.Config) *cli.Command {
 	return &cli.Command{
 		Name:  "help-jsonpath",
 		Usage: "show jsonpath help",
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
-			_, err := fmt.Println(jsonPathUsage)
-
+			_, err := fmt.Println(msg)
 			return err
 		},
 	}
 }
 
-func HelpEsQl(conf *cfg.Config) *cli.Command {
-	return &cli.Command{
-		Name:  "help-esql",
-		Usage: "show esql help",
-
-		Action: func(ctx context.Context, cmd *cli.Command) error {
-			assets.LoadEsql()
-
-			width := cfg.GetTermWidth()
-			printer.Pager("esql cheat sheet", string(markdown.Render(assets.EsQlCheatSheet, width, cfg.DefaultMargin)))
-
-			return nil
-		},
-	}
-}
-
 func Version(conf *cfg.Config) *cli.Command {
 	return &cli.Command{
 		Name:  "version",
 		Usage: "show esctl version information",
 
 		Action: func(ctx context.Context, cmd *cli.Command) error {
-			info, _ := debug.ReadBuildInfo()
-
-			if strings.Contains(info.Main.Version, "+dirty") {
-				cfg.COMMIT += "+dirty"
-			}
-
-			_, err := fmt.Printf(versionFmt,
+			_, err := fmt.Printf("esctl version: %s\n  build: %s\n  branch: %s\n  commit: %s\n  go version: %s\n  API Version: %s\n",
 				cfg.Version, cfg.BUILD, cfg.BRANCH, cfg.COMMIT, cfg.GOVERSION, cfg.APIVERSION)
-
 			return err
 		},
 	}
@@ -375,6 +327,7 @@ func HelpUsage(conf *cfg.Config) *cli.Command {
 			})
 		},
 	}
+
 }
 
 // copy of cmd.Walk() with the exception to skip hidden commands and its siblings

cmd/search.go

@@ -18,7 +18,6 @@ package cmd
 
 import (
 	"context"
-	"strings"
 
 	"codeberg.org/scip/esctl/pkg/cfg"
 	"codeberg.org/scip/esctl/pkg/es"
@@ -46,11 +45,6 @@ https://www.elastic.co/docs/reference/elasticsearch/rest-apis/common-options#dat
 For timestamp formats refer to:
 https://www.elastic.co/docs/reference/elasticsearch/mapping-reference/mapping-date-format`
 
-const QlUsage = `ES|QL documentation:
-https://www.elastic.co/docs/reference/query-languages/esql/esql-getting-started
-
-See also: esctl help-esql`
-
 func Search(conf *cfg.Config) *cli.Command {
 	return &cli.Command{
 		Name:               "search",
@@ -155,19 +149,3 @@ func Search(conf *cfg.Config) *cli.Command {
 		},
 	}
 }
-
-func SearchQL(conf *cfg.Config) *cli.Command {
-	return &cli.Command{
-		Name:               "searchql",
-		Aliases:            []string{"/"},
-		Usage:              "search using ES/QL language",
-		UsageText:          "search <ES/QL term>",
-		CustomHelpTemplate: addReference(QlUsage),
-
-		Action: func(ctx context.Context, cmd *cli.Command) error {
-			args := cmd.Args()
-
-			return es.SearchQL(conf, strings.Join(args.Slice(), " "))
-		},
-	}
-}

cmd/utilities.go

@@ -26,10 +26,9 @@ import (
 func addReference(ref string) string {
 	indentedRef := []string{}
 
-	for line := range strings.SplitSeq(ref, "\n") {
+	for _, line := range strings.Split(ref, "\n") {
 		indentedRef = append(indentedRef, "   "+line)
 	}
-
 	return fmt.Sprintf("%s\nREFERENCE:\n%s\n",
 		cli.SubcommandHelpTemplate,
 		strings.Join(indentedRef, "\n"))

go.mod

@@ -14,7 +14,7 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 module codeberg.org/scip/esctl
 
-go 1.26
+go 1.25.8
 
 require (
 	github.com/MichaelMure/go-term-markdown v0.1.4

pkg/cfg/cluster.go

@@ -55,6 +55,37 @@ func (cluster *Cluster) SetClient(client *elasticsearch.TypedClient) {
 	cluster.client = client
 }
 
+func (cluster *Cluster) getTransport() elastictransport.Option {
+	transport := &http.Transport{
+		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+	}
+
+	if cluster.DebugHTTP {
+		return elastictransport.WithTransport(
+			&DebugTransport{Transport: transport},
+		)
+	}
+
+	return elastictransport.WithTransport(transport)
+}
+
+func (cluster *Cluster) getDefaultOptions() []elasticsearch.Option {
+	// These headers are  not needed with ES 9, but with  ES 8, we set
+	// them here  so every API call uses it.  The only exception being
+	// the api repl, which does it on its own.
+	headers := http.Header{}
+	headers.Add("content-type", "application/json")
+	headers.Add("Accept", "application/json")
+
+	return []elasticsearch.Option{
+		elasticsearch.WithAddresses(cluster.Uri),
+		elasticsearch.WithTransportOptions(
+			cluster.getTransport(),
+			elastictransport.WithHeader(headers),
+		),
+	}
+}
+
 // return the  go-elasticsearch client  object but before  doing that,
 // check if we need to tune auth
 func (cluster *Cluster) ES() *elasticsearch.TypedClient {
@@ -83,8 +114,7 @@ func (cluster *Cluster) CheckAuth() error {
 		} else {
 			// k, try interactively
 			fmt.Fprintf(os.Stderr, "Enter password for elasticsearch user %s@%s: ", cluster.User, cluster.Name)
-
-			pass, err := term.ReadPassword(syscall.Stdin)
+			pass, err := term.ReadPassword(int(syscall.Stdin))
 			if err != nil {
 				return err
 			}
@@ -95,7 +125,6 @@ func (cluster *Cluster) CheckAuth() error {
 			}
 
 			cluster.Pass = string(pass)
-
 			fmt.Println()
 		}
 
@@ -103,6 +132,7 @@ func (cluster *Cluster) CheckAuth() error {
 		opts = append(opts, elasticsearch.WithBasicAuth(cluster.User, cluster.Pass))
 
 		es, err := elasticsearch.NewTyped(opts...)
+
 		if err != nil {
 			return fmt.Errorf("failed to setup elasticsearch connection: %w", err)
 		}
@@ -175,40 +205,6 @@ func (cluster *Cluster) IsReachable() (bool, error) {
 	return true, conn.Close()
 }
 
-func (cluster *Cluster) getDefaultOptions() []elasticsearch.Option {
-	// These headers are  not needed with ES 9, but with  ES 8, we set
-	// them here  so every API call uses it.  The only exception being
-	// the api repl, which does it on its own.
-	headers := http.Header{}
-	headers.Add("Content-Type", "application/json")
-	headers.Add("Accept", "application/json")
-
-	return []elasticsearch.Option{
-		elasticsearch.WithAddresses(cluster.Uri),
-		elasticsearch.WithTransportOptions(
-			cluster.getTransport(),
-			elastictransport.WithHeader(headers),
-		),
-		elasticsearch.WithCompatibilityMode(),
-	}
-}
-
-func (cluster *Cluster) getTransport() elastictransport.Option {
-	transport := new(http.Transport{
-		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-	})
-
-	if cluster.DebugHTTP {
-		return elastictransport.WithTransport(
-			new(DebugTransport{Transport: transport}),
-		)
-	}
-
-	return elastictransport.WithTransport(
-		new(CompatibilityTransport{Transport: transport}),
-	)
-}
-
 func (conf *Config) SetupES() error {
 	for name, cluster := range conf.Clusters {
 		cluster.Name = name
@@ -224,6 +220,7 @@ func (conf *Config) SetupES() error {
 		}
 
 		es, err := elasticsearch.NewTyped(opts...)
+
 		if err != nil {
 			return fmt.Errorf("failed to setup elasticsearch connection: %w", err)
 		}

pkg/cfg/config.go

@@ -28,7 +28,7 @@ import (
 )
 
 const (
-	Version string = `v0.0.27`
+	Version string = `v0.0.26`
 )
 
 var (
@@ -82,15 +82,13 @@ type Config struct {
 	SortBy    string // sort: -k
 	Ascending bool   // sort: -a
 
-	All                            bool   // doc + node ls: -a
 	Exclude                        string // cluster compare: -e (regexp)
-	Verbose                        bool   // cluster status: -v
+	All, Verbose                   bool   // cluster status: -a -v
 	Persistent, Transient, Default bool   // cluster settings set: -p -t -D
 
 	Force bool // ccr follower renew: -f
 
 	DebugHTTP   bool   // root: --debug-http
-	DebugGoRoutines bool   // root: --debug-goroutines
 	Separator   string // role diff: -s
 	NotDeployed bool   // role diff: -n
 	Undefined   bool   // role diff: -u
@@ -103,7 +101,6 @@ type Config struct {
 	DryRun                              bool // rollover: -n
 
 	Tag string // api ls: -t
-	HumanCat bool   // api repl: -H
 
 	Ilm Ilm // ilm create
 
@@ -114,7 +111,7 @@ type Config struct {
 }
 
 func NewConfig() *Config {
-	return new(Config{Clusters: map[string]*Cluster{}})
+	return &Config{Clusters: map[string]*Cluster{}}
 }
 
 func getDefaultPath() string {
@@ -154,6 +151,45 @@ func (conf *Config) Init() error {
 	return nil
 }
 
+func (conf *Config) determineDefaultCluster() error {
+	if conf.CurrentCluster != "" {
+		// -C specified, set current cluster explicitly, no matter what the config says
+		current, exists := conf.Clusters[conf.CurrentCluster]
+		if !exists {
+			return fmt.Errorf("no cluster with alias %s configured", conf.CurrentCluster)
+		} else {
+			conf.DefaultCluster = current
+
+			// disable all others
+			for _, cluster := range conf.Clusters {
+				cluster.Default = false
+			}
+
+			conf.DefaultCluster.Default = true
+		}
+	} else {
+		// we need to determine ourselfes
+		if len(conf.Clusters) == 1 {
+			// ok, just one cluster configured, use this, of course
+			for name, cluster := range conf.Clusters {
+				conf.DefaultCluster = cluster
+				conf.CurrentCluster = name
+				conf.DefaultCluster.Default = true
+			}
+		} else {
+			// multiple ones exists, look if one is set as default
+			for name, cluster := range conf.Clusters {
+				if cluster.Default {
+					conf.DefaultCluster = cluster
+					conf.CurrentCluster = name
+				}
+			}
+		}
+	}
+
+	return nil
+}
+
 // we are  using reflect to  clone a config obj  w/o the ES  stuff for
 // shorter repr.Println() output (the ES structure is just too large)
 func (conf *Config) Clone() Config {
@@ -162,14 +198,14 @@ func (conf *Config) Clone() Config {
 	ref := reflect.ValueOf(*conf)
 	typeOfS := ref.Type()
 
-	for idx := range ref.NumField() {
-		field := typeOfS.Field(idx).Name
+	for i := 0; i < ref.NumField(); i++ {
+		field := typeOfS.Field(i).Name
 
-		if field == "Clusters" || field == "DefaultCluster" || !ref.Field(idx).CanInterface() {
+		if field == "Clusters" || field == "DefaultCluster" || !ref.Field(i).CanInterface() {
 			continue
 		}
 
-		reflect.ValueOf(&clone).Elem().FieldByName(field).Set(reflect.ValueOf(ref.Field(idx).Interface()))
+		reflect.ValueOf(&clone).Elem().FieldByName(field).Set(reflect.ValueOf(ref.Field(i).Interface()))
 	}
 
 	return clone
@@ -217,7 +253,7 @@ func (conf *Config) LoadConfig() error {
 		return fmt.Errorf("failed to read config file: %w", err)
 	}
 
-	newconf := new(Config{})
+	newconf := &Config{}
 
 	err = yaml.Unmarshal(data, newconf)
 	if err != nil {
@@ -230,7 +266,6 @@ func (conf *Config) LoadConfig() error {
 		for _, cluster := range conf.Clusters {
 			if cluster.Default {
 				conf.DefaultCluster = cluster
-
 				break
 			}
 		}
@@ -243,47 +278,9 @@ func (conf *Config) LoadConfig() error {
 	return nil
 }
 
-func (conf *Config) determineDefaultCluster() error {
-	if conf.CurrentCluster != "" {
-		// -C specified, set current cluster explicitly, no matter what the config says
-		current, exists := conf.Clusters[conf.CurrentCluster]
-		if !exists {
-			return fmt.Errorf("no cluster with alias %s configured", conf.CurrentCluster)
-		} else {
-			conf.DefaultCluster = current
-
-			// disable all others
-			for _, cluster := range conf.Clusters {
-				cluster.Default = false
-			}
-
-			conf.DefaultCluster.Default = true
-		}
-	} else {
-		// we need to determine ourselfes
-		if len(conf.Clusters) == 1 {
-			// ok, just one cluster configured, use this, of course
-			for name, cluster := range conf.Clusters {
-				conf.DefaultCluster = cluster
-				conf.CurrentCluster = name
-				conf.DefaultCluster.Default = true
-			}
-		} else {
-			// multiple ones exists, look if one is set as default
-			for name, cluster := range conf.Clusters {
-				if cluster.Default {
-					conf.DefaultCluster = cluster
-					conf.CurrentCluster = name
-				}
-			}
-		}
-	}
-
-	return nil
-}
-
 func fileExists(filename string) bool {
 	info, err := os.Stat(filename)
+
 	if err != nil {
 		// return false on any error
 		return false

pkg/cfg/jq.go

@@ -25,7 +25,6 @@ import (
 
 func isJQinstalled() bool {
 	cmd := exec.CommandContext(context.Background(), "jq", "-h")
-
 	out, err := cmd.Output()
 	if err != nil {
 		return false

pkg/cfg/transport.go

@@ -43,18 +43,15 @@ func (t *DebugTransport) RoundTrip(req *http.Request) (*http.Response, error) {
 		}
 
 		var pretty bytes.Buffer
-
 		err = json.Indent(&pretty, buf.Bytes(), "", "\t")
 		if err != nil {
-			return nil, fmt.Errorf("json parse error: %w", err)
+			return nil, fmt.Errorf("json parse error: %s", err)
 		}
 
 		content = pretty.String()
 		contentline = buf.String()
 	}
 
-	req = fixRequestHeaders(req)
-
 	slog.Info("req", "host", req.URL.Host, "uri", req.URL.Path,
 		"body", content, "bodyline", contentline,
 		"headers", req.Header,
@@ -62,32 +59,3 @@ func (t *DebugTransport) RoundTrip(req *http.Request) (*http.Response, error) {
 
 	return t.Transport.RoundTrip(req)
 }
-
-type CompatibilityTransport struct {
-	Transport http.RoundTripper
-}
-
-func (t *CompatibilityTransport) RoundTrip(req *http.Request) (*http.Response, error) {
-	req = fixRequestHeaders(req)
-
-	return t.Transport.RoundTrip(req)
-}
-
-// Fixes https://codeberg.org/scip/esctl/issues/79:
-// the API client has this Accept header hardcoded everywhere:
-// req.Header.Set("Accept", "application/vnd.elasticsearch+json;compatible-with=9")
-// While this works pretty well with ES9, it doesn't with ES8. So, we replace
-// this header with a new one without the compatibility part.
-func fixRequestHeaders(req *http.Request) *http.Request {
-	if req.Header.Get("Accept") != "" {
-		req.Header.Del("Accept")
-		req.Header.Add("Accept", "application/json")
-	}
-
-	if req.Header.Get("Content-Type") != "" {
-		req.Header.Del("Content-Type")
-		req.Header.Add("Content-Type", "application/json")
-	}
-
-	return req
-}

pkg/es/api.go

@@ -26,9 +26,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"log"
 	"log/slog"
-	"maps"
 	"net/http"
 	"os"
 	"os/exec"
@@ -46,25 +44,22 @@ import (
 )
 
 const (
-	intro = `# Input format: verb path [data]"
-# 
-# Example:
-# 
-# post /yourindex/_ccr/pause_follow
-# put /yourindex/_settings {"number_of_replicas": 1}
-# 
-# You can also put multiline JSON after the path like:
-# 
-# put /yourindex/_settings
-# {
-#   "number_of_replicas": 1
-# }
-# 
-# If you do NOT  supply a JSON in the first line, you  need to hit ENTER
-# twice to complete.
-#
-# Supply the flag --human-readable-cat, -H to view /_cat API calls in
-# human readable form.`
+	intro = `Input format: verb path [data]"
+
+Example:
+
+post /yourindex/_ccr/pause_follow
+put /yourindex/_settings {"number_of_replicas": 1}
+
+You can also put multiline JSON after the path like:
+
+put /yourindex/_settings
+{
+  "number_of_replicas": 1
+}
+
+If you do NOT  supply a JSON in the first line, you  need to hit ENTER
+twice to complete.`
 )
 
 // holds an API operation via go-openapi/spec
@@ -97,8 +92,9 @@ func ApiRepl(conf *cfg.Config) error {
 		EOFPrompt:         "exit",
 		HistorySearchFold: true,
 	})
+
 	if err != nil {
-		return fmt.Errorf("failed to initialize readline lib: %w", err)
+		return fmt.Errorf("failed to initialize readline lib: %s", err)
 	}
 
 	for {
@@ -116,13 +112,11 @@ func ApiRepl(conf *cfg.Config) error {
 		parts := strings.SplitN(strings.TrimSpace(text), " ", 3)
 		if len(parts) < 2 {
 			fmt.Println("error: you need to input a verb, uri [and post data]")
-
 			continue
 		}
 
 		if !slices.Contains(verbs, strings.ToLower(parts[0])) {
 			fmt.Println("error: verb must be one of " + strings.Join(verbs, ","))
-
 			continue
 		}
 
@@ -147,19 +141,14 @@ func ApiRepl(conf *cfg.Config) error {
 			fmt.Printf("failed to call API: %s\n", esErrorString(err))
 		}
 
-		if conf.HumanCat && strings.HasPrefix(parts[1], "/_cat") {
-			fmt.Println(string(raw))
-		} else {
 		pageJsonOutput(conf, raw)
 	}
-	}
 
-	//nolint:nilerr
 	return nil
 }
 
 func pageJsonOutput(conf *cfg.Config, raw []byte) {
-	tmpconf := new(cfg.Config{HaveJQ: conf.HaveJQ})
+	tmpconf := &cfg.Config{HaveJQ: conf.HaveJQ}
 
 	if conf.Pager != "" {
 		tmpconf.HaveJQ = false
@@ -186,6 +175,7 @@ func pageJsonOutput(conf *cfg.Config, raw []byte) {
 			pager.Stderr = os.Stderr
 
 			err := pager.Run()
+
 			if err != nil {
 				fmt.Printf("failed to execute pager '%s': %s", conf.Pager, err)
 			}
@@ -207,16 +197,16 @@ func CallAPI(conf *cfg.Config, verb, path, data string) ([]byte, error) {
 	verb = strings.ToUpper(verb)
 
 	// we're using port-forwards anyway
-	noVerifyTransport := new(http.Transport{
-		TLSClientConfig: new(tls.Config{InsecureSkipVerify: true}),
-	})
+	tr := &http.Transport{
+		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+	}
 
-	client := new(http.Client{Transport: noVerifyTransport})
+	client := &http.Client{Transport: tr}
 
 	if conf.DebugHTTP {
-		client = new(http.Client{
-			Transport: new(cfg.DebugTransport{
-				Transport: noVerifyTransport})})
+		client = &http.Client{
+			Transport: &cfg.DebugTransport{
+				Transport: tr}}
 	}
 
 	req, err := http.NewRequest(verb, conf.DefaultCluster.Uri+path, bytes.NewBuffer([]byte(data)))
@@ -224,10 +214,8 @@ func CallAPI(conf *cfg.Config, verb, path, data string) ([]byte, error) {
 		return nil, err
 	}
 
-	if !conf.HumanCat || (conf.HumanCat && !strings.HasPrefix(path, "/_cat")) {
 	req.Header.Add("Content-Type", "application/json")
-		req.Header.Add("Accept", "application/json")
-	}
+	req.Header.Add("accept", "application/json")
 
 	// make sure we have got all we need
 	if err := conf.DefaultCluster.CheckAuth(); err != nil {
@@ -245,16 +233,11 @@ func CallAPI(conf *cfg.Config, verb, path, data string) ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
-	defer func() {
-		if err := resp.Body.Close(); err != nil {
-			log.Fatal(err)
-		}
-	}()
 
 	// Read and print response
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
-		return nil, fmt.Errorf("failed to read response body: %w", err)
+		return nil, fmt.Errorf("failed to read response body: %s", err)
 	}
 
 	return body, nil
@@ -266,7 +249,6 @@ func prettyfiJson(conf *cfg.Config, raw []byte) (string, error) {
 		cmd.Stdin = bytes.NewReader(raw)
 
 		var out bytes.Buffer
-
 		cmd.Stdout = &out
 
 		err := cmd.Run()
@@ -276,13 +258,10 @@ func prettyfiJson(conf *cfg.Config, raw []byte) (string, error) {
 
 		return out.String(), nil
 	}
-
 	var pretty bytes.Buffer
-
 	err := json.Indent(&pretty, raw, "", "\t")
 	if err != nil {
-		//nolint:nilerr
-		return string(raw), nil
+		return "", fmt.Errorf("json parse error: %s", err)
 	}
 
 	return pretty.String(), nil
@@ -291,10 +270,10 @@ func prettyfiJson(conf *cfg.Config, raw []byte) (string, error) {
 // interactively  read  arbitrary  JSON  data  from  STDIN,  which  is
 // virtually a repl inside the primary repl
 func readJSON(input string) (string, error) {
-	data := strings.Builder{}
+	data := ""
 
 	if input != "" {
-		data.WriteString(input)
+		data = input
 	} else {
 		scanner := bufio.NewScanner(os.Stdin)
 		for scanner.Scan() {
@@ -304,23 +283,23 @@ func readJSON(input string) (string, error) {
 				break
 			}
 
-			data.WriteString(line)
+			data += line
 		}
 	}
 
-	if data.Len() == 0 {
-		return "", nil
+	if data == "" {
+		return data, nil
 	}
 
 	// validate
 	check := map[string]any{}
-
-	err := json.Unmarshal([]byte(data.String()), &check)
+	err := json.Unmarshal([]byte(data), &check)
 	if err != nil {
-		return "", fmt.Errorf("error: input data is not proper JSON: %w", err)
+		return "", fmt.Errorf("error: input data is not proper JSON: %s", err)
+
 	}
 
-	return data.String(), nil
+	return data, nil
 }
 
 func ApiList(conf *cfg.Config, pattern string) error {
@@ -359,7 +338,6 @@ func ApiList(conf *cfg.Config, pattern string) error {
 	}
 
 	table.Sort()
-
 	return table.Print()
 }
 
@@ -367,12 +345,17 @@ func ApiList(conf *cfg.Config, pattern string) error {
 func ApiPathNames() []string {
 	assets.LoadAssetOpenApi()
 
-	return slices.Collect(maps.Keys(assets.OpenAPI.Spec().Paths.Paths))
+	paths := []string{}
+
+	for path := range assets.OpenAPI.Spec().Paths.Paths {
+		paths = append(paths, path)
+	}
+
+	return paths
 }
 
 func ApiShow(conf *cfg.Config, showpath, verb string) error {
 	assets.LoadAssetOpenApi()
-
 	out := printer.Builder{}
 
 	op, err := matchOperation(showpath, verb)
@@ -389,20 +372,18 @@ func ApiShow(conf *cfg.Config, showpath, verb string) error {
 	sample := getApiExample(op)
 	description := markdown.Render(cleanMarkup.ReplaceAllString(op.Op.Description, ""), width, cfg.DefaultMargin)
 
-	var (
-		bold = lipgloss.NewStyle().
+	var bold = lipgloss.NewStyle().
 		Bold(true)
-		paragraph = lipgloss.NewStyle().
+	var paragraph = lipgloss.NewStyle().
 		MarginBottom(1).
 		MarginLeft(cfg.DefaultMargin)
-		boldparagraph = lipgloss.NewStyle().
+	var boldparagraph = lipgloss.NewStyle().
 		MarginBottom(1).
 		MarginLeft(cfg.DefaultMargin).
 		Bold(true)
-		indentparagraph = lipgloss.NewStyle().
+	var indentparagraph = lipgloss.NewStyle().
 		MarginBottom(1).
 		MarginLeft(2)
-	)
 
 	out.WriteStringLine(bold.Render("ID: " + op.Op.ID))
 	out.WriteStringLine(paragraph.Render(fmt.Sprintf("%s %s", op.Verb, showpath)))
@@ -418,11 +399,10 @@ func ApiShow(conf *cfg.Config, showpath, verb string) error {
 
 	if len(params.Path) > 0 {
 		out.WriteStringLine(bold.Render("Path Parameters"))
-
 		for _, param := range params.Path {
 			out.WriteStringLine(boldparagraph.Render(param.Param))
-
 			if param.Description != "" {
+				//out.WriteStringLine(indentparagraph.Render(param.Description))
 				out.WriteStringLine(param.Description)
 			}
 		}
@@ -430,10 +410,8 @@ func ApiShow(conf *cfg.Config, showpath, verb string) error {
 
 	if len(params.Query) > 0 {
 		out.WriteStringLine(bold.Render("Query Parameters"))
-
 		for _, param := range params.Query {
 			out.WriteStringLine(boldparagraph.Render(param.Param))
-
 			if param.Description != "" {
 				out.WriteStringLine(indentparagraph.Render(param.Description))
 			}
@@ -515,8 +493,10 @@ func getApiExample(op *Op) string {
 					if hassource {
 						sample = strings.TrimSpace(source.(string))
 					}
+
 				}
 			}
+
 		}
 	}
 
@@ -528,14 +508,12 @@ func getApiExample(op *Op) string {
 // otherwise showpath+verb have to match precisely.
 func matchOperation(showpath, verb string) (*Op, error) {
 	ops := []*Op{}
-	op := new(Op{})
-
+	op := &Op{}
 	var found bool
 
 	for path, item := range assets.OpenAPI.Spec().Paths.Paths {
 		if path == showpath {
 			ops = findOperation(item.PathItemProps)
-
 			break
 		}
 	}
@@ -552,7 +530,6 @@ func matchOperation(showpath, verb string) (*Op, error) {
 		if strings.ToLower(item.Verb) == verb {
 			op = item
 			found = true
-
 			break
 		}
 	}

pkg/es/ccr.go

@@ -46,8 +46,9 @@ func CcrStatus(conf *cfg.Config, leader, follower string) error {
 		}
 
 		// reverse attribution
-		follower, leader = leader, follower
-
+		f := follower
+		follower = leader
+		leader = f
 		slog.Debug("leader/follower attribution is invalid, reversing", "leader", leader, "follower", follower)
 	}
 
@@ -57,7 +58,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 indicies on %s: %w", alias, esErrorString(err))
+			return fmt.Errorf("failed to get indicies on %s: %s", alias, esErrorString(err))
 		}
 
 		indices[alias] = make(map[string]*types.IndicesRecord, len(res))
@@ -86,19 +87,17 @@ func CcrRemoteInfo(conf *cfg.Config, index string) error {
 	res, err := conf.DefaultCluster.ES().Cluster.RemoteInfo().
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to retrieve follower info: %w", esErrorString(err))
+		return fmt.Errorf("failed to retrieve follower info: %s", esErrorString(err))
 	}
 
 	slog.Debug("ccr remote info", "info", res)
 
 	remote := ""
-
 	var info *types.ClusterRemoteProxyInfo
 
 	for name, data := range res {
 		remote = name
 		info = data.(*types.ClusterRemoteProxyInfo)
-
 		break
 	}
 

pkg/es/ccr_follower.go

@@ -18,7 +18,6 @@ package es
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"log/slog"
 
@@ -30,18 +29,17 @@ func getRemoteName(conf *cfg.Config) (string, error) {
 	res, err := conf.DefaultCluster.ES().Cluster.RemoteInfo().
 		Do(context.Background())
 	if err != nil {
-		return "", fmt.Errorf("failed to retrieve follower info: %w", esErrorString(err))
+		return "", fmt.Errorf("failed to retrieve follower info: %s", esErrorString(err))
 	}
 
 	remote := ""
 	for name := range res {
 		remote = name
-
 		break
 	}
 
 	if remote == "" {
-		return "", errors.New("cluster doesn't have a follower")
+		return "", fmt.Errorf("cluster doesn't have a follower")
 	}
 
 	return remote, nil
@@ -63,31 +61,26 @@ func CcrFollowerRenew(conf *cfg.Config, index string) error {
 	if err := wrapError(IndexClose, conf, index); err != nil {
 		return err
 	}
-
 	fmt.Printf("closed %s", index)
 
 	if err := wrapError(CcrFollowerPause, conf, index); err != nil {
 		return err
 	}
-
 	fmt.Printf("paused %s", index)
 
 	if err := wrapError(CcrFollowerUnfollow, conf, index); err != nil {
 		return err
 	}
-
 	fmt.Printf("unfollowed %s", index)
 
 	if err := wrapError(IndexDelete, conf, index); err != nil {
 		return err
 	}
-
 	fmt.Printf("deleted %s", index)
 
 	if err := CcrFollowerAdd(conf, index); err != nil {
 		return err
 	}
-
 	fmt.Printf("added follower %s", index)
 
 	return nil
@@ -96,8 +89,9 @@ func CcrFollowerRenew(conf *cfg.Config, index string) error {
 func CcrFollowerResume(conf *cfg.Config, index string) error {
 	_, err := conf.DefaultCluster.ES().Ccr.ResumeFollow(index).
 		Do(context.Background())
+
 	if err != nil {
-		return fmt.Errorf("failed to resume ccr following: %w", esErrorString(err))
+		return fmt.Errorf("failed to resume ccr following: %s", esErrorString(err))
 	}
 
 	return nil
@@ -106,8 +100,9 @@ func CcrFollowerResume(conf *cfg.Config, index string) error {
 func CcrFollowerPause(conf *cfg.Config, index string) error {
 	_, err := conf.DefaultCluster.ES().Ccr.PauseFollow(index).
 		Do(context.Background())
+
 	if err != nil {
-		return fmt.Errorf("failed to pause ccr following: %w", esErrorString(err))
+		return fmt.Errorf("failed to pause ccr following: %s", esErrorString(err))
 	}
 
 	return nil
@@ -116,8 +111,9 @@ func CcrFollowerPause(conf *cfg.Config, index string) error {
 func CcrFollowerUnfollow(conf *cfg.Config, index string) error {
 	_, err := conf.DefaultCluster.ES().Ccr.ForgetFollower(index).
 		Do(context.Background())
+
 	if err != nil {
-		return fmt.Errorf("failed to unfollow index: %w", esErrorString(err))
+		return fmt.Errorf("failed to unfollow index: %s", esErrorString(err))
 	}
 
 	return nil
@@ -138,8 +134,9 @@ func CcrFollowerAdd(conf *cfg.Config, index string) error {
 	}
 
 	_, err = create.Do(context.Background())
+
 	if err != nil {
-		return fmt.Errorf("failed to create follower index: %w", esErrorString(err))
+		return fmt.Errorf("failed to create follower index: %s", esErrorString(err))
 	}
 
 	return nil
@@ -149,7 +146,7 @@ func CcrFollowerShow(conf *cfg.Config, index string) error {
 	res, err := conf.DefaultCluster.ES().Ccr.FollowStats(index).
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to retrieve follower index info: %w", esErrorString(err))
+		return fmt.Errorf("failed to retrieve follower index info: %s", esErrorString(err))
 	}
 
 	slog.Debug("ES result", "follower stats", res.Indices)

pkg/es/cluser_health_report.go

@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 package es
 
 import (
-
-	// "encoding/json/jsontext"
-	// "encoding/json/v2"
-
 	"encoding/json"
 	"fmt"
 
@@ -53,22 +49,11 @@ func getHealthReport(conf *cfg.Config) (*HealthReport, error) {
 		return nil, err
 	}
 
-	report := new(HealthReport{})
-
-	// FIXME: use this once jsonv2  is no more experimental it already
-	//  builds  and works  like  intended,  but golangci-lint  doesn't
-	// recognize it with: go: unknown GOEXPERIMENT jsonv2
-	//
-	// if err := json.UnmarshalDecode(
-	// 	jsontext.NewDecoder(
-	// 		bytes.NewBuffer(raw)),
-	// 	&report); err != nil {
-	// 	return nil, fmt.Errorf("failed to unmarshal healthreport response: %w", err)
-	// }
+	report := HealthReport{}
 
 	if err := json.Unmarshal(raw, &report); err != nil {
 		return nil, fmt.Errorf("failed to unmarshal healthreport response: %w", err)
 	}
 
-	return report, nil
+	return &report, nil
 }

pkg/es/cluster.go

@@ -38,22 +38,22 @@ type clusterReachable struct {
 }
 
 func ClusterList(conf *cfg.Config) error {
-	var (
-		mu sync.Mutex
-		wg sync.WaitGroup
-	)
-
+	var mu sync.Mutex
+	var wg sync.WaitGroup
 	reachable := make(map[string]clusterReachable, len(conf.Clusters))
 
 	// check endpoints in parallel to speed things up
 	for name, cluster := range conf.Clusters {
-		wg.Go(func() {
+		wg.Add(1)
+
+		go func() {
+			defer wg.Done()
 			online, err := cluster.IsReachable()
 
 			mu.Lock()
 			reachable[name] = clusterReachable{reachable: online, err: err}
 			mu.Unlock()
-		})
+		}()
 	}
 
 	wg.Wait()
@@ -101,66 +101,50 @@ func getClusterStatus(conf *cfg.Config) (*apiResponse, error) {
 	es := conf.DefaultCluster.ES()
 
 	responses := make(chan apiResponse, gocount)
-	wg := new(sync.WaitGroup{})
+	wg := &sync.WaitGroup{}
 
-	wg.Go(func() {
-		getApiData(conf, es, responses, "health")
-	})
-
-	wg.Go(func() {
-		getApiData(conf, es, responses, "healthreport")
-	})
-
-	wg.Go(func() {
-		getApiData(conf, es, responses, "info")
-	})
-
-	wg.Go(func() {
-		getApiData(conf, es, responses, "ccr")
-	})
-
-	wg.Go(func() {
-		getApiData(conf, es, responses, "indices")
-	})
-
-	wg.Go(func() {
-		getApiData(conf, es, responses, "tasks")
-	})
+	wg.Add(gocount)
+	go getApiData(conf, es, wg, responses, "health")
+	go getApiData(conf, es, wg, responses, "healthreport")
+	go getApiData(conf, es, wg, responses, "info")
+	go getApiData(conf, es, wg, responses, "ccr")
+	go getApiData(conf, es, wg, responses, "indices")
+	go getApiData(conf, es, wg, responses, "tasks")
 
 	if conf.Verbose {
-		getApiData(conf, es, responses, "stats")
+		go getApiData(conf, es, wg, responses, "stats")
 	}
 
 	wg.Wait()
 
-	all := new(apiResponse{})
+	all := apiResponse{}
 
 	var err error
 
-	for range gocount {
-		res := <-responses
+	for i := 0; i < gocount; i++ {
+		r := <-responses
 
-		err = errors.Join(err, res.error)
+		err = errors.Join(err, r.error)
 
-		switch res.which {
+		switch r.which {
 		case ResponseHealth:
-			all.health = res.health
+			all.health = r.health
 		case ResponseCcr:
-			all.ccr = res.ccr
+			all.ccr = r.ccr
 		case ResponseInfo:
-			all.info = res.info
+			all.info = r.info
 		case ResponseStats:
-			all.stats = res.stats
+			all.stats = r.stats
 		case ResponseIndices:
-			all.indices = res.indices
+			all.indices = r.indices
 		case ResponseTasks:
-			all.tasks = res.tasks
+			all.tasks = r.tasks
 		case ResponseHealthReport:
-			all.healthreport = res.healthreport
+			all.healthreport = r.healthreport
 		}
 	}
 
-	return all, err
+	return &all, err
 }
 
 func ClusterStatus(conf *cfg.Config) error {
@@ -171,10 +155,8 @@ func ClusterStatus(conf *cfg.Config) error {
 
 	slog.Debug("ES result", "cluster health", res.health)
 
-	var (
-		isleader     bool
-		ccrfollowing string
-	)
+	var isleader bool
+	var ccrfollowing string
 
 	if res.ccr != nil {
 		isleader = len(res.ccr.AutoFollowStats.AutoFollowedClusters) == 0
@@ -190,22 +172,15 @@ func ClusterStatus(conf *cfg.Config) error {
 	}
 
 	// look for red indices, if any
-	failedIndices := 0
-	greenIndices := 0
-
+	redindices := 0
 	for _, index := range *res.indices {
-		switch {
-		case *index.Health != "green":
-			failedIndices++
-		case !strings.HasPrefix(*index.Index, "."):
-			// don't count internal indices
-			greenIndices++
+		if *index.Health == "red" {
+			redindices++
 		}
 	}
 
 	// look for long running tasks
 	longtasks := 0
-
 	for _, task := range *res.tasks {
 		if strings.Contains(*task.RunningTime, "d") {
 			longtasks++
@@ -226,8 +201,7 @@ func ClusterStatus(conf *cfg.Config) error {
 		{"Unassigned Primary Shards", res.health.UnassignedPrimaryShards},
 		{"Pending Tasks", res.health.NumberOfPendingTasks},
 		{"Nodes", res.health.NumberOfNodes},
-		{"Green Indices", greenIndices},
-		{"Failed Indices", failedIndices},
+		{"Red Indices", redindices},
 		{"Long Running Tasks", longtasks},
 	}
 
@@ -239,7 +213,7 @@ func ClusterStatus(conf *cfg.Config) error {
 	}
 
 	if conf.Verbose {
-		table = gatherClusterStats(res.stats, table)
+		table = gatherClusterStats(conf, res.stats, table)
 	}
 
 	if res.health.Status.Name != "green" {
@@ -255,10 +229,6 @@ func ClusterStatus(conf *cfg.Config) error {
 					for resource, items := range diag.AffectedResources {
 						table.Entries = append(table.Entries, []any{"    -> affected " + resource, strings.Join(items, ",")})
 					}
-
-					if diag.Action != "" {
-						table.AddRow("        -> suggested action to fix", diag.Action)
-					}
 				}
 			}
 		}
@@ -271,11 +241,9 @@ func ClusterStatus(conf *cfg.Config) error {
 	return nil
 }
 
-func gatherClusterStats(clusterstats *clusterstats.Response, table *printer.Table) *printer.Table {
-	var (
-		querycount int64
-		vmversion  string
-	)
+func gatherClusterStats(conf *cfg.Config, clusterstats *clusterstats.Response, table *printer.Table) *printer.Table {
+	var querycount int64
+	var vmversion string
 
 	for _, count := range clusterstats.Indices.Search.Queries {
 		querycount += count

pkg/es/cluster_reroute.go

@@ -29,12 +29,12 @@ func ClusterRerouteMove(conf *cfg.Config, index string) error {
 	move := conf.DefaultCluster.ES().Cluster.Reroute()
 
 	commands := esdsl.NewCommand()
-	moveCommand := new(types.CommandMoveAction{
+	moveCommand := &types.CommandMoveAction{
 		Shard:    conf.Shards,
 		FromNode: conf.FromNode,
 		ToNode:   conf.ToNode,
 		Index:    index,
-	})
+	}
 
 	commands.CommandCaster().Move = moveCommand
 
@@ -52,11 +52,11 @@ func ClusterRerouteAllocateReplica(conf *cfg.Config, index string) error {
 	move := conf.DefaultCluster.ES().Cluster.Reroute()
 
 	commands := esdsl.NewCommand()
-	allocCommand := new(types.CommandAllocateReplicaAction{
+	allocCommand := &types.CommandAllocateReplicaAction{
 		Shard: conf.Shards,
 		Node:  conf.ToNode,
 		Index: index,
-	})
+	}
 
 	commands.CommandCaster().AllocateReplica = allocCommand
 
@@ -74,12 +74,12 @@ func ClusterRerouteCancel(conf *cfg.Config, index string) error {
 	move := conf.DefaultCluster.ES().Cluster.Reroute()
 
 	commands := esdsl.NewCommand()
-	cancelCommand := new(types.CommandCancelAction{
+	cancelCommand := &types.CommandCancelAction{
 		Shard:        conf.Shards,
 		Node:         conf.ToNode,
 		Index:        index,
 		AllowPrimary: &conf.AllowPrimary,
-	})
+	}
 
 	commands.CommandCaster().Cancel = cancelCommand
 
@@ -97,12 +97,12 @@ func ClusterRerouteAllocatePrimary(conf *cfg.Config, index string, stale bool) e
 	move := conf.DefaultCluster.ES().Cluster.Reroute()
 
 	commands := esdsl.NewCommand()
-	allocCommand := new(types.CommandAllocatePrimaryAction{
+	allocCommand := &types.CommandAllocatePrimaryAction{
 		Shard:          conf.Shards,
 		Node:           conf.ToNode,
 		Index:          index,
 		AcceptDataLoss: conf.AcceptDataLoss,
-	})
+	}
 
 	if stale {
 		commands.CommandCaster().AllocateStalePrimary = allocCommand
@@ -118,7 +118,6 @@ func ClusterRerouteAllocatePrimary(conf *cfg.Config, index string, stale bool) e
 		if stale {
 			which = "stale"
 		}
-
 		return fmt.Errorf("failed to allocate %s primary shard: %w", which, err)
 	}
 

pkg/es/cluster_settings.go

@@ -35,12 +35,11 @@ func ClusterSettingsList(conf *cfg.Config) error {
 		FlatSettings(true).
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get cluster settings: %w", esErrorString(err))
+		return fmt.Errorf("failed to get cluster settings: %s", esErrorString(err))
 	}
 
 	table := printer.NewTable(conf, 2, 0)
 	table.Addheaders("setting", "value")
-
 	entries := [][]any{}
 
 	settingshash := res.Persistent // == map[string]json.RawMessage
@@ -76,25 +75,23 @@ func ClusterSettingsSet(conf *cfg.Config, args cli.Args) error {
 		case conf.Transient:
 			message, err := json.Marshal(value)
 			if err != nil {
-				return fmt.Errorf("failed to marshall transient value <%v> to valid JSON: %w", value, err)
+				return fmt.Errorf("failed to marshall transient value <%v> to valid JSON: %s", value, err)
 			}
-
 			put.AddTransient(setting, message)
 		case conf.Persistent:
 			fallthrough
 		default:
 			message, err := json.Marshal(value)
 			if err != nil {
-				return fmt.Errorf("failed to marshall persistent value <%v> to valid JSON: %w", value, err)
+				return fmt.Errorf("failed to marshall persistent value <%v> to valid JSON: %s", value, err)
 			}
-
 			put.AddPersistent(setting, message)
 		}
 	}
 
 	_, err := put.Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to set settings: %w", esErrorString(err))
+		return fmt.Errorf("failed to set settings: %s", esErrorString(err))
 	}
 
 	return nil
@@ -103,14 +100,15 @@ func ClusterSettingsSet(conf *cfg.Config, args cli.Args) error {
 func ClusterSettingsSetSingle(conf *cfg.Config, setting, value string) error {
 	message, err := json.Marshal(value)
 	if err != nil {
-		return fmt.Errorf("failed to marshall persistent value <%v> to valid JSON: %w", value, err)
+		return fmt.Errorf("failed to marshall persistent value <%v> to valid JSON: %s", value, err)
 	}
 
 	_, err = conf.DefaultCluster.ES().Cluster.PutSettings().
 		AddPersistent(setting, message).
 		Do(context.Background())
+
 	if err != nil {
-		return fmt.Errorf("failed to set %s: %w", setting, esErrorString(err))
+		return fmt.Errorf("failed to set %s: %s", setting, esErrorString(err))
 	}
 
 	return nil

pkg/es/cluster_util.go

@@ -37,7 +37,6 @@ func checkClusterIsLeader(conf *cfg.Config, leader string) bool {
 		Do(context.Background())
 	if err != nil {
 		fmt.Printf("failed to get ccr stats from %s: %s", leader, esErrorString(err))
-
 		return false
 	}
 
@@ -48,7 +47,6 @@ func checkClusterIsLeader(conf *cfg.Config, leader string) bool {
 
 	if stats.AutoFollowStats.AutoFollowedClusters[0].ClusterName != "" {
 		fmt.Println("leader/follower attribution is invalid, reverse cluster attribution and retry")
-
 		return false
 	}
 
@@ -60,15 +58,14 @@ func checkClusterStatus(conf *cfg.Config, leader, follower string) bool {
 	status := map[string]*health.Response{}
 
 	for _, cluster := range []string{leader, follower} {
-		clusterHealth, err := conf.Clusters[leader].ES().Cluster.Health().
+		st, err := conf.Clusters[leader].ES().Cluster.Health().
 			Do(context.Background())
 		if err != nil {
 			fmt.Printf("failed to get health from %s: %s", cluster, esErrorString(err))
-
 			return false
 		}
 
-		status[cluster] = clusterHealth
+		status[cluster] = st
 	}
 
 	table := printer.NewTable(conf, 3, 6)
@@ -101,7 +98,6 @@ func checkClusterStatus(conf *cfg.Config, leader, follower string) bool {
 
 	if err := table.Print(); err != nil {
 		fmt.Println(err)
-
 		return false
 	}
 
@@ -124,7 +120,6 @@ func findIlmErrors(conf *cfg.Config, leader, follower string) bool {
 			Do(context.Background())
 		if err != nil {
 			fmt.Printf("failed to get ilm status from %s: %s", cluster, esErrorString(err))
-
 			return false
 		}
 
@@ -163,7 +158,6 @@ func findIlmErrors(conf *cfg.Config, leader, follower string) bool {
 
 			if err := table.Print(); err != nil {
 				fmt.Println(err)
-
 				return false
 			}
 		}
@@ -180,7 +174,6 @@ func findIndicesOnlyOnLeader(conf *cfg.Config, indices ClusterIndices, leader, f
 	}
 
 	indexOnlyOnLeader := map[string]*types.IndicesRecord{}
-
 	for name, index := range indices[leader] {
 		if exclude.MatchString(name) {
 			continue
@@ -202,11 +195,9 @@ func findIndicesOnlyOnLeader(conf *cfg.Config, indices ClusterIndices, leader, f
 			}
 
 			isWritable := false
-
 			for _, alias := range res[name].Aliases {
 				if *alias.IsWriteIndex {
 					isWritable = true
-
 					break
 				}
 			}
@@ -236,10 +227,8 @@ func findIndicesOnlyOnLeader(conf *cfg.Config, indices ClusterIndices, leader, f
 	}
 
 	table.Sort()
-
 	if err := table.Print(); err != nil {
 		fmt.Println(err)
-
 		return false
 	}
 
@@ -286,10 +275,8 @@ func findOrphanedIndices(conf *cfg.Config, indices ClusterIndices, leader, follo
 	}
 
 	table.Sort()
-
 	if err := table.Print(); err != nil {
 		fmt.Println(err)
-
 		return false
 	}
 
@@ -322,10 +309,8 @@ func findFailedFollowerIndices(conf *cfg.Config, indices ClusterIndices, followe
 	}
 
 	table.Sort()
-
 	if err := table.Print(); err != nil {
 		fmt.Println(err)
-
 		return false
 	}
 

pkg/es/datastream.go

@@ -32,7 +32,7 @@ func DatastreamNames(conf *cfg.Config) ([]string, error) {
 	res, err := conf.DefaultCluster.ES().Indices.GetDataStream().
 		Do(context.Background())
 	if err != nil {
-		return nil, fmt.Errorf("failed to get data streams: %w", esErrorString(err))
+		return nil, fmt.Errorf("failed to get data streams: %s", esErrorString(err))
 	}
 
 	dss := make([]string, len(res.DataStreams))
@@ -47,7 +47,7 @@ func DatastreamList(conf *cfg.Config) error {
 	res, err := conf.DefaultCluster.ES().Indices.GetDataStream().
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get data streams: %w", esErrorString(err))
+		return fmt.Errorf("failed to get data streams: %s", esErrorString(err))
 	}
 
 	slog.Debug("ES result", "data streams", res)
@@ -65,22 +65,21 @@ func DatastreamList(conf *cfg.Config) error {
 	table := printer.NewTable(conf, 7, size)
 	table.Addheaders("name", "ilm policy", "hidden", "system", "replicated", "generation", "timestamp field")
 
-	for idx, datastream := range list {
-		name := printer.Colorize(conf, datastream.Status.String(), datastream.Name)
-
+	for idx, ds := range list {
+		name := printer.Colorize(conf, ds.Status.String(), ds.Name)
 		policy := ""
-		if datastream.IlmPolicy != nil {
-			policy = *datastream.IlmPolicy
+		if ds.IlmPolicy != nil {
+			policy = *ds.IlmPolicy
 		}
 
 		table.Entries[idx] = []any{
 			name,
 			policy,
-			datastream.Hidden,
-			*datastream.System,
-			*datastream.Replicated,
-			datastream.Generation,
-			datastream.TimestampField.Name,
+			ds.Hidden,
+			*ds.System,
+			*ds.Replicated,
+			ds.Generation,
+			ds.TimestampField.Name,
 		}
 
 		if idx == size-1 {
@@ -89,7 +88,6 @@ func DatastreamList(conf *cfg.Config) error {
 	}
 
 	table.Sort()
-
 	if err := table.Print(); err != nil {
 		return err
 	}
@@ -130,7 +128,7 @@ func DatastreamShow(conf *cfg.Config, dsname string) error {
 		Name(dsname).
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get data stream: %w", esErrorString(err))
+		return fmt.Errorf("failed to get data stream: %s", esErrorString(err))
 	}
 
 	slog.Debug("ES result", "data stream", res)
@@ -143,29 +141,28 @@ func DatastreamShow(conf *cfg.Config, dsname string) error {
 		Name(dsname).
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get data stream stats: %w", esErrorString(err))
+		return fmt.Errorf("failed to get data stream stats: %s", esErrorString(err))
 	}
 
 	table := printer.NewTable(conf, 11, 2)
 	table.Addheaders("data stream property", "value")
 
-	datastream := res.DataStreams[0]
-
-	name := printer.Colorize(conf, datastream.Status.String(), datastream.Name)
+	ds := res.DataStreams[0]
 
+	name := printer.Colorize(conf, ds.Status.String(), ds.Name)
 	policy := ""
-	if datastream.IlmPolicy != nil {
-		policy = *datastream.IlmPolicy
+	if ds.IlmPolicy != nil {
+		policy = *ds.IlmPolicy
 	}
 
 	table.Entries = [][]any{
 		{"name", name},
 		{"ilm policy", policy},
-		{"hidden", datastream.Hidden},
-		{"system", *datastream.System},
-		{"replicated", *datastream.Replicated},
-		{"generation", datastream.Generation},
-		{"timestamp field", datastream.TimestampField.Name},
+		{"hidden", ds.Hidden},
+		{"system", *ds.System},
+		{"replicated", *ds.Replicated},
+		{"generation", ds.Generation},
+		{"timestamp field", ds.TimestampField.Name},
 		{"backing indices", stats.BackingIndices},
 		{"size", printer.Bytes(stats.TotalStoreSizeBytes)},
 		{"shards-failed", stats.Shards_.Failed},
@@ -176,13 +173,13 @@ func DatastreamShow(conf *cfg.Config, dsname string) error {
 		return err
 	}
 
-	table = printer.NewTable(conf, 5, len(datastream.Indices))
+	table = printer.NewTable(conf, 5, len(ds.Indices))
 	table.Addheaders("backing index name", "uuid", "prefer ilm", "ilm policy", "managed by")
 
-	for idx, index := range datastream.Indices {
+	for idx, index := range ds.Indices {
 		policy := ""
-		if datastream.IlmPolicy != nil {
-			policy = *datastream.IlmPolicy
+		if ds.IlmPolicy != nil {
+			policy = *ds.IlmPolicy
 		}
 
 		table.Entries[idx] = []any{
@@ -193,13 +190,12 @@ func DatastreamShow(conf *cfg.Config, dsname string) error {
 			index.ManagedBy.Name,
 		}
 
-		if idx < len(datastream.Indices) {
+		if idx < len(ds.Indices) {
 			fmt.Println()
 		}
 	}
 
 	table.Sort()
-
 	if err := table.Print(); err != nil {
 		return err
 	}
@@ -210,8 +206,9 @@ func DatastreamShow(conf *cfg.Config, dsname string) error {
 func DatastreamCreate(conf *cfg.Config, dsname string) error {
 	_, err := conf.DefaultCluster.ES().Indices.CreateDataStream(dsname).
 		Do(context.Background())
+
 	if err != nil {
-		return fmt.Errorf("failed to create datastream: %w", esErrorString(err))
+		return fmt.Errorf("failed to create datastream: %s", esErrorString(err))
 	}
 
 	return nil
@@ -220,8 +217,9 @@ func DatastreamCreate(conf *cfg.Config, dsname string) error {
 func DatastreamDelete(conf *cfg.Config, dsname string) error {
 	_, err := conf.DefaultCluster.ES().Indices.DeleteDataStream(dsname).
 		Do(context.Background())
+
 	if err != nil {
-		return fmt.Errorf("failed to delete datastream: %w", esErrorString(err))
+		return fmt.Errorf("failed to delete datastream: %s", esErrorString(err))
 	}
 
 	return nil
@@ -229,8 +227,9 @@ func DatastreamDelete(conf *cfg.Config, dsname string) error {
 
 func DatastreamRollover(conf *cfg.Config, ds string) error {
 	res, err := RolloverAlias(conf, ds)
+
 	if err != nil {
-		return fmt.Errorf("failed to rollover data stream: %w", esErrorString(err))
+		return fmt.Errorf("failed to rollover data stream: %s", esErrorString(err))
 	}
 
 	table := printer.NewTable(conf, 2, 5)

pkg/es/doc.go

@@ -22,7 +22,6 @@ import (
 	"errors"
 	"fmt"
 	"math/rand/v2"
-	"strconv"
 	"strings"
 
 	"codeberg.org/scip/esctl/pkg/cfg"
@@ -43,16 +42,16 @@ func DocAdd(conf *cfg.Config, jsondoc string) error {
 
 	err := json.Unmarshal([]byte(jsondoc), &data)
 	if err != nil {
-		return fmt.Errorf("supplied document was not valid JSON: %w", err)
+		return fmt.Errorf("supplied document was not valid JSON: %s", err)
 	}
 
-	now := strconv.FormatInt(rand.Int64(), 10)
+	now := fmt.Sprintf("%d", rand.Int64())
 
 	res, err := conf.DefaultCluster.ES().Create(conf.Index, now).
 		Document(data).
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to create new doc in index %s: %w", conf.Index, esErrorString(err))
+		return fmt.Errorf("failed to create new doc in index %s: %s", conf.Index, esErrorString(err))
 	}
 
 	fmt.Println(res.Id_)
@@ -64,7 +63,7 @@ func DocShow(conf *cfg.Config, id string) error {
 	res, err := conf.DefaultCluster.ES().Get(conf.Index, id).
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to retrieve doc in index %s: %w", conf.Index, esErrorString(err))
+		return fmt.Errorf("failed to retrieve doc in index %s: %s", conf.Index, esErrorString(err))
 	}
 
 	if !res.Found {
@@ -95,13 +94,13 @@ func DocDelete(conf *cfg.Config, queries []string) error {
 		_, err := conf.DefaultCluster.ES().Delete(conf.Index, id).
 			Do(context.Background())
 		if err != nil {
-			return fmt.Errorf("failed to delete doc in index %s: %w", conf.Index, esErrorString(err))
+			return fmt.Errorf("failed to delete doc in index %s: %s", conf.Index, esErrorString(err))
 		}
 
 		return nil
 	}
 
-	req := new(deletebyquery.Request{})
+	req := &deletebyquery.Request{}
 
 	if len(queries) == 0 && conf.All {
 		req.Query = esdsl.NewMatchAllQuery().QueryCaster()
@@ -118,7 +117,7 @@ func DocDelete(conf *cfg.Config, queries []string) error {
 		Request(req).
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to delete docs in index %s: %w", conf.Index, esErrorString(err))
+		return fmt.Errorf("failed to delete docs in index %s: %s", conf.Index, esErrorString(err))
 	}
 
 	return nil

pkg/es/duration.go

@@ -45,6 +45,7 @@ Convert a  duration into  an integer.  Valid  time units  are "s", "m", "h" and
 	via https://codeberg.org/scip/tablizer/src/branch/main/lib/sort.go#L113
 */
 func parseDuration(duration string) time.Duration {
+
 	seconds := 0
 
 	for _, match := range matchDuration.FindAllStringSubmatch(duration, -1) {
@@ -110,14 +111,12 @@ func formatDuration(val time.Duration) string {
 		if esd.minutes == 0 {
 			return fmt.Sprintf("%dh", esd.hours)
 		}
-
 		return fmt.Sprintf("%dh:%dm", esd.hours, int64(esd.minutes))
 
 	default:
 		if esd.minutes == 0 && hoursLeft == 0 {
 			return fmt.Sprintf("%dd", int64(days))
 		}
-
 		return fmt.Sprintf("%dd:%dh:%dm",
 			int64(days),
 			int64(hoursLeft),

pkg/es/errors.go

@@ -17,31 +17,29 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 package es
 
 import (
-	"errors"
 	"fmt"
-	"strings"
 
 	"github.com/elastic/go-elasticsearch/v9/typedapi/types"
 )
 
-func esErrorString(err error) error {
+func esErrorString(err error) string {
 	msg := err.Error()
 
-	//nolint:gocritic
-	switch errVal := err.(type) {
+	switch e := err.(type) {
 	case *types.ElasticsearchError:
-		var causes strings.Builder
+		causes := ""
 
-		for _, cause := range errVal.ErrorCause.RootCause {
-			fmt.Fprintf(&causes, "%s\n", *cause.Reason)
+		for _, cause := range e.ErrorCause.RootCause {
+			causes += fmt.Sprintf("%s\n", *cause.Reason)
 		}
 
-		if errVal.ErrorCause.Reason != nil {
-			msg = *errVal.ErrorCause.Reason + ": " + causes.String()
+		if e.ErrorCause.Reason != nil {
+			msg = *e.ErrorCause.Reason + ": " + causes
 		} else {
-			msg = fmt.Sprintf("http status %d: ", errVal.Status)
-		}
+			msg = fmt.Sprintf("http status %d: ", e.Status)
 		}
 
-	return errors.New(msg)
+	}
+
+	return msg
 }

pkg/es/ilm.go

@@ -22,8 +22,6 @@ import (
 	"errors"
 	"fmt"
 	"log/slog"
-	"maps"
-	"slices"
 	"strings"
 
 	"codeberg.org/scip/esctl/pkg/cfg"
@@ -39,7 +37,7 @@ func IlmRetry(conf *cfg.Config, index string) error {
 	_, err := conf.DefaultCluster.ES().Ilm.Retry(index).
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to retry ilm: %w", esErrorString(err))
+		return fmt.Errorf("failed to retry ilm: %s", esErrorString(err))
 	}
 
 	return nil
@@ -49,7 +47,7 @@ func IlmStatus(conf *cfg.Config) error {
 	res, err := conf.DefaultCluster.ES().Ilm.GetStatus().
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get ilm status: %w", esErrorString(err))
+		return fmt.Errorf("failed to get ilm status: %s", esErrorString(err))
 	}
 
 	fmt.Println(res.OperationMode.Name)
@@ -61,10 +59,16 @@ func IlmNames(conf *cfg.Config) ([]string, error) {
 	res, err := conf.DefaultCluster.ES().Ilm.GetLifecycle().
 		Do(context.Background())
 	if err != nil {
-		return nil, fmt.Errorf("failed to get ilm policies: %w", esErrorString(err))
+		return nil, fmt.Errorf("failed to get ilm policies: %s", esErrorString(err))
 	}
 
-	names := slices.Collect(maps.Keys(res))
+	names := make([]string, len(res))
+	idx := 0
+
+	for name := range res {
+		names[idx] = name
+		idx++
+	}
 
 	return names, nil
 }
@@ -78,7 +82,7 @@ func IlmList(conf *cfg.Config, pattern string) error {
 
 	res, err := ilm.Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get ilm policies: %w", esErrorString(err))
+		return fmt.Errorf("failed to get ilm policies: %s", esErrorString(err))
 	}
 
 	if conf.Debug {
@@ -98,7 +102,6 @@ func IlmList(conf *cfg.Config, pattern string) error {
 	}
 
 	table.Sort()
-
 	return table.Print()
 }
 
@@ -107,7 +110,7 @@ func IlmShow(conf *cfg.Config, policy string) error {
 		Policy(policy).
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get ilm status: %w", esErrorString(err))
+		return fmt.Errorf("failed to get ilm status: %s", esErrorString(err))
 	}
 
 	if conf.Debug {
@@ -163,7 +166,6 @@ func IlmShowTree(conf *cfg.Config, ilm types.IlmPolicy) error {
 			}
 
 			indent += "    "
-
 			continue
 		}
 
@@ -258,7 +260,7 @@ func ilmPhaseString(phase *types.Phase, short bool) string {
 	}
 
 	if phase.Actions.SearchableSnapshot != nil {
-		out = append(out, "searchable-snapshot:"+phase.Actions.SearchableSnapshot.SnapshotRepository)
+		out = append(out, fmt.Sprintf("searchable-snapshot:%s", phase.Actions.SearchableSnapshot.SnapshotRepository))
 	}
 
 	return strings.Join(out, ",")
@@ -268,7 +270,7 @@ func IlmExplain(conf *cfg.Config, index string) error {
 	res, err := conf.DefaultCluster.ES().Ilm.ExplainLifecycle(index).
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get ilm state: %w", esErrorString(err))
+		return fmt.Errorf("failed to get ilm state: %s", esErrorString(err))
 	}
 
 	slog.Debug("ilm status", "ilm", res)
@@ -284,7 +286,6 @@ func IlmExplain(conf *cfg.Config, index string) error {
 	table.Addheaders("ilm status field", "value")
 
 	info := ""
-
 	err = json.Unmarshal(ilm.StepInfo["reason"], &info)
 	if err != nil {
 		return fmt.Errorf("failed to unmarshal step info: %w", err)
@@ -344,10 +345,8 @@ func IlmCreate(conf *cfg.Config, policyname string) error {
 
 	if cfg.HaveHot() {
 		hot := types.Phase{}
-
 		var actions types.IlmActionsVariant = esdsl.NewIlmActions()
-
-		rollover := new(types.RolloverAction{})
+		rollover := &types.RolloverAction{}
 		haveroll := false
 
 		if policy != nil {
@@ -384,14 +383,15 @@ func IlmCreate(conf *cfg.Config, policyname string) error {
 
 		hot.Actions = actions.IlmActionsCaster()
 		phases.PhasesCaster().Hot = &hot
-	} else if policy != nil {
+	} else {
+		if policy != nil {
 			// update
 			phases.PhasesCaster().Hot = policy.Phases.Hot
 		}
+	}
 
 	if cfg.HaveWarm() {
 		warm := types.Phase{}
-
 		var actions types.IlmActionsVariant = esdsl.NewIlmActions()
 
 		if policy != nil {
@@ -417,14 +417,15 @@ func IlmCreate(conf *cfg.Config, policyname string) error {
 
 		warm.Actions = actions.IlmActionsCaster()
 		phases.PhasesCaster().Warm = &warm
-	} else if policy != nil && policy.Phases.Warm != nil {
+	} else {
+		if policy != nil && policy.Phases.Warm != nil {
 			// update
 			phases.PhasesCaster().Warm = policy.Phases.Warm
 		}
+	}
 
 	if cfg.HaveCold() {
 		cold := types.Phase{}
-
 		var actions types.IlmActionsVariant = esdsl.NewIlmActions()
 
 		if policy != nil {
@@ -451,14 +452,15 @@ func IlmCreate(conf *cfg.Config, policyname string) error {
 
 		cold.Actions = actions.IlmActionsCaster()
 		phases.PhasesCaster().Cold = &cold
-	} else if policy != nil && policy.Phases.Cold != nil {
+	} else {
+		if policy != nil && policy.Phases.Cold != nil {
 			// update
 			phases.PhasesCaster().Cold = policy.Phases.Cold
 		}
+	}
 
 	if cfg.HaveFrozen() {
 		froze := types.Phase{}
-
 		var actions types.IlmActionsVariant = esdsl.NewIlmActions()
 
 		if policy != nil {
@@ -477,15 +479,16 @@ func IlmCreate(conf *cfg.Config, policyname string) error {
 
 		froze.Actions = actions.IlmActionsCaster()
 		phases.PhasesCaster().Frozen = &froze
-	} else if policy != nil && policy.Phases.Frozen != nil {
+	} else {
+		if policy != nil && policy.Phases.Frozen != nil {
 			// update
 			phases.PhasesCaster().Frozen = policy.Phases.Frozen
 		}
+	}
 
 	if cfg.HaveDelete() {
 		del := types.Phase{}
 		delete := types.DeleteAction{}
-
 		var actions types.IlmActionsVariant = esdsl.NewIlmActions()
 
 		if policy != nil {
@@ -504,13 +507,15 @@ func IlmCreate(conf *cfg.Config, policyname string) error {
 		actions.IlmActionsCaster().Delete = &delete
 		del.Actions = actions.IlmActionsCaster()
 		phases.PhasesCaster().Delete = &del
-	} else if policy != nil && policy.Phases.Delete != nil {
+	} else {
+		if policy != nil && policy.Phases.Delete != nil {
 			// update
 			phases.PhasesCaster().Delete = policy.Phases.Delete
 		}
+	}
 
-	put := new(putlifecycle.Request{})
-	newpolicy := new(types.IlmPolicy{})
+	put := &putlifecycle.Request{}
+	newpolicy := &types.IlmPolicy{}
 	newpolicy.IlmPolicyCaster().Phases = *phases.PhasesCaster()
 	put.Policy = newpolicy
 
@@ -518,7 +523,7 @@ func IlmCreate(conf *cfg.Config, policyname string) error {
 
 	_, err = ilm.Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed create ilm policy: %w", esErrorString(err))
+		return fmt.Errorf("failed create ilm policy: %s", esErrorString(err))
 	}
 
 	return nil

pkg/es/ilm_forecast.go

@@ -138,7 +138,6 @@ func IlmForecastList(conf *cfg.Config, filter string) error {
 	}
 
 	table.Sort()
-
 	return table.Print()
 }
 
@@ -155,11 +154,14 @@ func IlmForecastShow(conf *cfg.Config) error {
 	}
 
 	within := parseDuration(conf.Ilm.Within)
-
 	var toBeFreed int64 = 0
 
 	for _, phase := range phaseData {
-		age := max(virtualAge(&phase), phase.age)
+		age := virtualAge(&phase)
+
+		if age < phase.age {
+			age = phase.age
+		}
 
 		if age+within >= phase.minage {
 			toBeFreed += phase.size
@@ -185,42 +187,33 @@ func virtualAge(phase *PhaseData) time.Duration {
 // Retrieve all index, ilm-explain and ilm-policies in parallel
 func getIlmPhaseData(conf *cfg.Config) ([]PhaseData, error) {
 	responses := make(chan apiResponse, 3)
-	wg := new(sync.WaitGroup{})
+	wg := &sync.WaitGroup{}
+	wg.Add(3)
 
-	wg.Go(func() {
-		getApiData(conf, conf.DefaultCluster.ES(), responses, "indicesbytes")
-	})
-
-	wg.Go(func() {
-		getApiData(conf, conf.DefaultCluster.ES(), responses, "explain")
-	})
-
-	wg.Go(func() {
-		getApiData(conf, conf.DefaultCluster.ES(), responses, "policies")
-	})
+	go getApiData(conf, conf.DefaultCluster.ES(), wg, responses, "indicesbytes")
+	go getApiData(conf, conf.DefaultCluster.ES(), wg, responses, "explain")
+	go getApiData(conf, conf.DefaultCluster.ES(), wg, responses, "policies")
 
 	wg.Wait()
 
-	var (
-		ilmdetails  *explainlifecycle.Response
-		indicesres  *indices.Response
-		ilmpolicies getlifecycle.Response
-	)
+	var ilmdetails *explainlifecycle.Response
+	var indicesres *indices.Response
+	var ilmpolicies getlifecycle.Response
 
-	for range 3 {
-		res := <-responses
+	for i := 0; i < 3; i++ {
+		r := <-responses
 
-		if res.error != nil {
-			return nil, res.error
+		if r.error != nil {
+			return nil, r.error
 		}
 
-		switch res.which {
+		switch r.which {
 		case ResponseExplain:
-			ilmdetails = res.explainlifecycle
+			ilmdetails = r.explainlifecycle
 		case ResponseIndices:
-			indicesres = res.indicesbytes
+			indicesres = r.indicesbytes
 		case ResponseLifecycle:
-			ilmpolicies = *res.lifecycle
+			ilmpolicies = *r.lifecycle
 		}
 	}
 
@@ -338,7 +331,7 @@ func findNextPhase(policy types.IlmPolicy, currentPhase string) *NextPhase {
 	// phase list to determine which comes next
 	phases, start := registerPhases(policy, currentPhase)
 
-	nextPhase := new(NextPhase{})
+	nextPhase := &NextPhase{}
 
 	// finally determine which phase comes next
 	// exception: hot, where we look for rollover rules

pkg/es/index.go

@@ -18,8 +18,6 @@ package es
 
 import (
 	"context"
-	"encoding/json"
-	"errors"
 	"fmt"
 	"log/slog"
 	"regexp"
@@ -30,7 +28,6 @@ import (
 
 	"codeberg.org/scip/esctl/pkg/cfg"
 	"codeberg.org/scip/esctl/pkg/printer"
-	"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/enums/healthstatus"
@@ -40,8 +37,9 @@ import (
 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 indicies: %w", esErrorString(err))
+		return nil, fmt.Errorf("failed to get indicies: %s", esErrorString(err))
 	}
 
 	indices := make([]string, len(res))
@@ -99,7 +97,7 @@ func IndexList(conf *cfg.Config) error {
 
 	res, err := cat.Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get indicies: %w", esErrorString(err))
+		return fmt.Errorf("failed to get indicies: %s", esErrorString(err))
 	}
 
 	slog.Debug("ES result", "indicies", res)
@@ -128,7 +126,6 @@ func IndexList(conf *cfg.Config) error {
 	}
 
 	table.Sort()
-
 	return table.Print()
 }
 
@@ -136,14 +133,13 @@ func IndexShow(conf *cfg.Config, indexpattern string) error {
 	res, err := conf.DefaultCluster.ES().Indices.Get(indexpattern).
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get index: %w", esErrorString(err))
+		return fmt.Errorf("failed to get index: %s", esErrorString(err))
 	}
 
 	slog.Debug("index show", "index", res)
 
 	for name, index := range res {
 		fields := make([]string, len(index.Mappings.Properties))
-
 		idx := 0
 		for field := range index.Mappings.Properties {
 			fields[idx] = field
@@ -199,7 +195,6 @@ func IndexCreate(conf *cfg.Config, index string, mappings []string) error {
 	if conf.Shards > 0 {
 		settings.NumberOfShards(strconv.Itoa(conf.Shards))
 	}
-
 	if conf.Replicas > 0 {
 		settings.NumberOfReplicas(strconv.Itoa(conf.Replicas))
 	}
@@ -237,8 +232,9 @@ func IndexCreate(conf *cfg.Config, index string, mappings []string) error {
 
 	_, err := create.Settings(settings).
 		Do(context.Background())
+
 	if err != nil {
-		return fmt.Errorf("failed to create index: %w", esErrorString(err))
+		return fmt.Errorf("failed to create index: %s", esErrorString(err))
 	}
 
 	return nil
@@ -248,7 +244,7 @@ func IndexDelete(conf *cfg.Config, index string) error {
 	_, err := conf.DefaultCluster.ES().Indices.Delete(index).
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to delete index: %w", esErrorString(err))
+		return fmt.Errorf("failed to delete index: %s", esErrorString(err))
 	}
 
 	return nil
@@ -257,8 +253,9 @@ func IndexDelete(conf *cfg.Config, index string) error {
 func IndexClose(conf *cfg.Config, index string) error {
 	_, err := conf.DefaultCluster.ES().Indices.Close(index).
 		Do(context.Background())
+
 	if err != nil {
-		return fmt.Errorf("failed to close index: %w", esErrorString(err))
+		return fmt.Errorf("failed to close index: %s", esErrorString(err))
 	}
 
 	return nil
@@ -270,14 +267,13 @@ func IndexFields(conf *cfg.Config, index string) error {
 		Fields("*").
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to retrieve field capabilties: %w", esErrorString(err))
+		return fmt.Errorf("failed to retrieve field capabilties: %s", esErrorString(err))
 	}
 
 	table := printer.NewTable(conf, 5, 0)
 	table.Addheaders("field", "type", "searchable", "aggretable", "metadata")
 
 	idx := 0
-
 	for name, field := range res.Fields {
 		for fieldtype, caps := range field {
 			// fields only have 1 type, so this one is it
@@ -309,79 +305,3 @@ func IndexFields(conf *cfg.Config, index string) error {
 
 	return nil
 }
-
-type Diskusage struct {
-	Total       int64 `json:"total_in_bytes"`
-	Points      int64 `json:"points_in_bytes"`
-	Norms       int64 `json:"norms_in_bytes"`
-	TermVectors int64 `json:"term_vectors_in_bytes"`
-	KnnVectors  int64 `json:"knn_vectors_in_bytes"`
-	BloomFilter int64 `json:"bloom_filter_in_bytes"`
-}
-
-type IndexDiskUsage struct {
-	AllFields Diskusage            `json:"all_fields"`
-	Fields    map[string]Diskusage `json:"fields"`
-}
-
-type ResIndexDiskUsage map[string]IndexDiskUsage
-
-func IndexDiskusage(conf *cfg.Config, index string) error {
-	var bold = lipgloss.NewStyle().Bold(true)
-
-	res, err := conf.DefaultCluster.ES().Indices.DiskUsage(index).
-		RunExpensiveTasks(true).
-		Do(context.Background())
-	if err != nil {
-		return fmt.Errorf("failed to retrieve index disk usage: %w", esErrorString(err))
-	}
-
-	duRes := ResIndexDiskUsage{}
-	if err := json.Unmarshal(res, &duRes); err != nil {
-		return fmt.Errorf("failed to unmarshal disk usage response: %w", err)
-	}
-
-	diskusage, exists := duRes[index]
-	if !exists {
-		return errors.New("no disk usage reported for index")
-	}
-
-	table := printer.NewTableEmpty(conf).
-		WithHeaders("field", "bloom filter", "norms", "points", "term vectors", "knn vectors", "total")
-
-	for name, field := range diskusage.Fields {
-		if strings.HasPrefix(name, "_") || strings.HasSuffix(name, ".keyword") {
-			continue
-		}
-
-		table.AddRow(
-			name,
-			printer.Bytes(field.BloomFilter),
-			printer.Bytes(field.Norms),
-			printer.Bytes(field.Points),
-			printer.Bytes(field.TermVectors),
-			printer.Bytes(field.KnnVectors),
-			printer.Bytes(field.Total),
-		)
-	}
-
-	all := diskusage.AllFields
-
-	table.Sort()
-
-	table.AddRowLate(
-		bold.Render("Summary"),
-		printer.Bytes(all.BloomFilter),
-		printer.Bytes(all.Norms),
-		printer.Bytes(all.Points),
-		printer.Bytes(all.TermVectors),
-		printer.Bytes(all.KnnVectors),
-		printer.Bytes(all.Total),
-	)
-
-	if err := table.Print(); err != nil {
-		return err
-	}
-
-	return nil
-}

pkg/es/index_alias.go

@@ -35,7 +35,7 @@ func IndexAliasCreate(conf *cfg.Config, index, alias string) error {
 	slog.Debug("create alias", "result", res)
 
 	if err != nil {
-		return fmt.Errorf("failed to create index alias: %w", esErrorString(err))
+		return fmt.Errorf("failed to create index alias: %s", esErrorString(err))
 	}
 
 	return nil
@@ -52,8 +52,9 @@ func IndexAliasList(conf *cfg.Config) error {
 	res, err := conf.DefaultCluster.ES().Indices.GetAlias().
 		Index("_all").
 		Do(context.Background())
+
 	if err != nil {
-		return fmt.Errorf("failed to list index aliases: %w", esErrorString(err))
+		return fmt.Errorf("failed to list index aliases: %s", esErrorString(err))
 	}
 
 	slog.Debug("aliases list", "result", res)
@@ -101,7 +102,7 @@ func IndexAliasDelete(conf *cfg.Config, index, alias string) error {
 	slog.Debug("delete alias", "result", res)
 
 	if err != nil {
-		return fmt.Errorf("failed to delete index alias: %w", esErrorString(err))
+		return fmt.Errorf("failed to delete index alias: %s", esErrorString(err))
 	}
 
 	return nil
@@ -109,8 +110,9 @@ func IndexAliasDelete(conf *cfg.Config, index, alias string) error {
 
 func IndexAliasRollover(conf *cfg.Config, alias string) error {
 	res, err := RolloverAlias(conf, alias)
+
 	if err != nil {
-		return fmt.Errorf("failed to rollover index alias: %w", esErrorString(err))
+		return fmt.Errorf("failed to rollover index alias: %s", esErrorString(err))
 	}
 
 	table := printer.NewTable(conf, 2, 5)

pkg/es/index_template.go

@@ -22,7 +22,6 @@ import (
 	"errors"
 	"fmt"
 	"log/slog"
-	"maps"
 	"strconv"
 	"strings"
 
@@ -33,71 +32,29 @@ import (
 )
 
 // used for completion
-func IndexTemplateNames(conf *cfg.Config) ([]string, error) {
+func IndexTemplateList(conf *cfg.Config) error {
 	res, err := conf.DefaultCluster.ES().Indices.GetIndexTemplate().
 		Do(context.Background())
+
 	if err != nil {
-		return nil, fmt.Errorf("failed to get index templates: %w", esErrorString(err))
-	}
-
-	names := make([]string, len(res.IndexTemplates))
-
-	for idx, tpl := range res.IndexTemplates {
-		names[idx] = tpl.Name
-	}
-
-	return names, nil
-}
-
-func IndexTemplateList(conf *cfg.Config, filter string) error {
-	res, err := conf.DefaultCluster.ES().Indices.GetIndexTemplate().
-		Do(context.Background())
-	if err != nil {
-		return fmt.Errorf("failed to get index templates: %w", esErrorString(err))
+		return fmt.Errorf("failed to get index templates: %s", esErrorString(err))
 	}
 
 	slog.Debug("res", "index templates", res)
 
-	table := printer.NewTable(conf, 5, 0)
-	table.Addheaders("name", "description", "index patterns", "priority")
+	table := printer.NewTable(conf, 5, len(res.IndexTemplates))
+	table.Addheaders("name", "description", "priority")
 
-	for _, tpl := range res.IndexTemplates {
-		if !conf.Hidden && strings.HasPrefix(tpl.Name, ".") {
-			continue
+	for idx, tpl := range res.IndexTemplates {
+		desc, err := json.Marshal(tpl.IndexTemplate.Meta_["description"])
+		if err != nil {
+			return fmt.Errorf("failed to unmarshal meta json data: %w", err)
 		}
 
-		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
-			}
-		}
-
-		desc := strings.TrimPrefix(strings.TrimSuffix(string(tpl.IndexTemplate.Meta_["description"]), `"`), `"`)
-
-		var prio int64
-		if tpl.IndexTemplate.Priority != nil {
-			prio = *tpl.IndexTemplate.Priority
-		}
-
-		table.AddRow(tpl.Name, desc, tpl.IndexTemplate.IndexPatterns, prio)
+		table.Entries[idx] = []any{tpl.Name, desc, tpl.IndexTemplate.Priority}
 	}
 
 	table.Sort()
-
 	return table.Print()
 }
 
@@ -105,8 +62,9 @@ func IndexTemplateShow(conf *cfg.Config, tplname string) error {
 	res, err := conf.DefaultCluster.ES().Indices.GetIndexTemplate().
 		Name(tplname).
 		Do(context.Background())
+
 	if err != nil {
-		return fmt.Errorf("failed to get index template: %w", esErrorString(err))
+		return fmt.Errorf("failed to get index template: %s", esErrorString(err))
 	}
 
 	slog.Debug("res", "index template", res)
@@ -150,11 +108,10 @@ func IndexTemplateShow(conf *cfg.Config, tplname string) error {
 
 	err = getIndexTemplateSettings(conf, tplname, table)
 	if err != nil {
-		return err
+		return nil
 	}
 
 	fmt.Println()
-
 	if err := table.Print(); err != nil {
 		return err
 	}
@@ -179,7 +136,6 @@ func IndexTemplateShow(conf *cfg.Config, tplname string) error {
 		}
 
 		fmt.Println()
-
 		if err := table.Print(); err != nil {
 			return err
 		}
@@ -267,8 +223,9 @@ func IndexTemplateCreate(conf *cfg.Config, name string, mappings []string) error
 	create.IndexPatterns(conf.Patterns...)
 
 	_, err := create.Do(context.Background())
+
 	if err != nil {
-		return fmt.Errorf("failed to create index template: %w", esErrorString(err))
+		return fmt.Errorf("failed to create index template: %s", esErrorString(err))
 	}
 
 	return nil
@@ -283,8 +240,9 @@ func IndexTemplateModify(conf *cfg.Config, name string, mappings []string) error
 	res, err := conf.DefaultCluster.ES().Indices.GetIndexTemplate().
 		Name(name).
 		Do(context.Background())
+
 	if err != nil {
-		return fmt.Errorf("failed to get index template: %w", esErrorString(err))
+		return fmt.Errorf("failed to get index template: %s", esErrorString(err))
 	}
 
 	slog.Debug("res", "index template", res)
@@ -376,8 +334,9 @@ func IndexTemplateModify(conf *cfg.Config, name string, mappings []string) error
 	modify.IndexPatterns(patterns...)
 
 	_, err = modify.Do(context.Background())
+
 	if err != nil {
-		return fmt.Errorf("failed to modify index template: %w", esErrorString(err))
+		return fmt.Errorf("failed to modify index template: %s", esErrorString(err))
 	}
 
 	if conf.Rollover {
@@ -393,7 +352,7 @@ func IndexTemplateDelete(conf *cfg.Config, name string) error {
 	_, err := conf.DefaultCluster.ES().Indices.DeleteIndexTemplate(name).
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to delete index template: %w", esErrorString(err))
+		return fmt.Errorf("failed to delete index template: %s", esErrorString(err))
 	}
 
 	return nil
@@ -406,8 +365,9 @@ func rolloverAliasIndexTemplate(conf *cfg.Config, name string) error {
 	res, err := conf.DefaultCluster.ES().Indices.GetIndexTemplate().
 		Name(name).
 		Do(context.Background())
+
 	if err != nil {
-		return fmt.Errorf("failed to get index template: %w", esErrorString(err))
+		return fmt.Errorf("failed to get index template: %s", esErrorString(err))
 	}
 
 	slog.Debug("res", "index template", res)
@@ -424,7 +384,7 @@ func rolloverAliasIndexTemplate(conf *cfg.Config, name string) error {
 		res, err := conf.DefaultCluster.ES().Indices.ResolveIndex(pattern).
 			Do(context.Background())
 		if err != nil {
-			return fmt.Errorf("failed to resolve index pattern: %w", esErrorString(err))
+			return fmt.Errorf("failed to resolve index pattern: %s", esErrorString(err))
 		}
 
 		for _, index := range res.Indices {
@@ -456,6 +416,7 @@ func rolloverAliasIndexTemplate(conf *cfg.Config, name string) error {
 	}
 
 	return nil
+
 }
 
 func modMappings(mappings []string) (types.TypeMappingVariant, error) {
@@ -487,7 +448,9 @@ func modMappings(mappings []string) (types.TypeMappingVariant, error) {
 func modMeta(conf *cfg.Config, meta types.Metadata) (map[string]json.RawMessage, error) {
 	metadata := map[string]json.RawMessage{}
 
-	maps.Copy(metadata, meta)
+	for key, value := range meta {
+		metadata[key] = value
+	}
 
 	for _, meta := range conf.Meta {
 		parts := strings.Split(meta, ":")

pkg/es/index_template_settings.go

@@ -43,7 +43,6 @@ func getIndexTemplateSettings(conf *cfg.Config, tplname string, table *printer.T
 		if err != nil {
 			return err
 		}
-
 		fmt.Println(output)
 	}
 

pkg/es/license.go

@@ -20,7 +20,6 @@ import (
 	"context"
 	"fmt"
 	"log/slog"
-	"strconv"
 
 	"codeberg.org/scip/esctl/pkg/cfg"
 	"codeberg.org/scip/esctl/pkg/printer"
@@ -30,7 +29,7 @@ func LicenseShow(conf *cfg.Config) error {
 	res, err := conf.DefaultCluster.ES().License.Get().
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get license: %w", esErrorString(err))
+		return fmt.Errorf("failed to get license: %s", esErrorString(err))
 	}
 
 	slog.Debug("license show", "license", res)
@@ -39,14 +38,12 @@ func LicenseShow(conf *cfg.Config) error {
 
 	lic := res.License
 
-	var (
-		maxnodes = "infinite"
-		maxunits = "infinite"
-		expire   = "never"
-	)
+	var maxnodes = "infinite"
+	var maxunits = "infinite"
+	var expire = "never"
 
 	if lic.MaxNodes != nil {
-		maxnodes = strconv.FormatInt(*lic.MaxNodes, 10)
+		maxnodes = fmt.Sprintf("%d", *lic.MaxNodes)
 	}
 
 	if lic.ExpiryDate != nil {
@@ -54,7 +51,7 @@ func LicenseShow(conf *cfg.Config) error {
 	}
 
 	if lic.MaxResourceUnits != nil {
-		maxunits = strconv.Itoa(*lic.MaxResourceUnits)
+		maxunits = fmt.Sprintf("%d", *lic.MaxResourceUnits)
 	}
 
 	table.Entries = [][]any{

pkg/es/node.go

@@ -20,28 +20,28 @@ import (
 	"context"
 	"fmt"
 	"log/slog"
-	"strconv"
 	"strings"
 	"time"
 
 	"codeberg.org/scip/esctl/pkg/cfg"
 	"codeberg.org/scip/esctl/pkg/printer"
+	"github.com/dustin/go-humanize"
 )
 
 func NodeList(conf *cfg.Config) error {
 	// get nodes
 	nodes, err := conf.DefaultCluster.ES().Cat.Nodes().Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get nodes: %w", esErrorString(err))
+		return fmt.Errorf("failed to get nodes: %s", esErrorString(err))
 	}
 
 	slog.Debug("ES result", "nodes", nodes)
 
-	table := printer.NewTableEmpty(conf).WithHeaders(
-		"name", "ip", "load1m", "load5m", "load15m", "ram %", "heap %")
+	table := printer.NewTable(conf, 7, len(nodes))
+	table.Addheaders("name", "ip", "load1m", "load5m", "load15m", "ram %", "heap %")
 
-	for _, node := range nodes {
-		table.AddRow(
+	for idx, node := range nodes {
+		table.Entries[idx] = []any{
 			*node.Name,
 			*node.Ip,
 			*node.Load1M,
@@ -49,11 +49,10 @@ func NodeList(conf *cfg.Config) error {
 			*node.Load15M,
 			node.RamPercent,
 			node.HeapPercent,
-		)
+		}
 	}
 
 	table.Sort()
-
 	if err := table.Print(); err != nil {
 		return err
 	}
@@ -65,7 +64,7 @@ func NodeNames(conf *cfg.Config) ([]string, error) {
 	nodes, err := conf.DefaultCluster.ES().Cat.Nodes().
 		Do(context.Background())
 	if err != nil {
-		return nil, fmt.Errorf("failed to get nodes: %w", esErrorString(err))
+		return nil, fmt.Errorf("failed to get nodes: %s", esErrorString(err))
 	}
 
 	slog.Debug("ES result", "nodes", nodes)
@@ -87,7 +86,7 @@ func NodeShow(conf *cfg.Config, nodename string) error {
 		Metric("os, jvm, thread_pool, remote_cluster_server").
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get node info: %w", esErrorString(err))
+		return fmt.Errorf("failed to get node info: %s", esErrorString(err))
 	}
 
 	slog.Debug("ES result", "node", res)
@@ -96,7 +95,7 @@ func NodeShow(conf *cfg.Config, nodename string) error {
 		NodeId(nodename).
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get node stats: %w", esErrorString(err))
+		return fmt.Errorf("failed to get node stats: %s", esErrorString(err))
 	}
 
 	slog.Debug("ES result", "stat", stats)
@@ -113,27 +112,18 @@ func NodeShow(conf *cfg.Config, nodename string) error {
 		}
 
 		k8snode := info.Attributes["k8s_node_name"]
-		rank := "none"
-
-		adsel, exists := stat.AdaptiveSelection[id]
-		if exists {
-			rank = *adsel.Rank
-		}
 
 		table.Entries = [][]any{
 			{"Id", id},
 			{"Name", nodename},
 			{"Kubernetes node", k8snode},
 			{"Ip address", info.Ip},
-			{"Node rank", rank},
+			{"Node rank", *stat.AdaptiveSelection[id].Rank},
 			{"JVM", info.Jvm.VmName + " " + info.Jvm.Version},
 			{"JVM Started", time.UnixMilli(info.Jvm.StartTimeInMillis)},
 			{"OS", info.Os.PrettyName + " " + info.Os.Version},
 			{"Node roles", roles},
 			{"Node version", info.Version},
-			// FIXME: not implemented upstream
-			// see: https://github.com/elastic/go-elasticsearch/issues/1526
-			// {"Allocated shards", stat.Allocations.XXX},
 			{"HTTP clients", *stat.Http.CurrentOpen},
 			{"CPUs", *info.Os.AllocatedProcessors},
 			{"Load 15m/5m/1m", fmt.Sprintf("%.2f/%.2f/%.2f",
@@ -142,41 +132,18 @@ func NodeShow(conf *cfg.Config, nodename string) error {
 				stat.Os.Cpu.LoadAverage["1m"],
 			)},
 			{"Open FD's", *stat.Process.OpenFileDescriptors},
-			{"HTTP sesssions current/total", fmt.Sprintf("%d/%d",
-				*stat.Http.CurrentOpen,
-				*stat.Http.TotalOpened,
-			)},
-			{"Traffic rx/tx",
-				printer.ByteString(*stat.Transport.RxSizeInBytes) + " / " + printer.ByteString(*stat.Transport.TxSizeInBytes)},
-			{"Response time avg", time.Duration(*stat.AdaptiveSelection[id].AvgResponseTimeNs)},
+			{"Response time avg", fmt.Sprintf("%dns", *stat.AdaptiveSelection[id].AvgResponseTimeNs)},
 			{"Memory usage (used/avail)",
-				printer.ByteString(*stat.Os.Mem.UsedInBytes) + " / " + printer.ByteString(*stat.Os.Mem.TotalInBytes)},
-			{"Search queries current/total", fmt.Sprintf("%d/%d",
-				stat.Indices.Search.QueryCurrent,
-				stat.Indices.Search.QueryTotal,
-			)},
-			{"Search efficiency", stat.Indices.Search.QueryTimeInMillis / stat.Indices.Search.QueryTotal},
-			{"Docs count", stat.Indices.Docs.Count},
-			{"Merges current/total", fmt.Sprintf("%d/%d",
-				stat.Indices.Merges.Current,
-				stat.Indices.Merges.Total,
-			)},
-			{"Merge docs count current/total", fmt.Sprintf("%d/%d",
-				stat.Indices.Merges.CurrentDocs,
-				stat.Indices.Merges.TotalDocs,
-			)},
-			{"Merge size current/total", fmt.Sprintf("%s/%s",
-				printer.ByteString(stat.Indices.Merges.CurrentSizeInBytes),
-				printer.ByteString(stat.Indices.Merges.TotalSizeInBytes),
-			)},
-			{"CircuitBreaker trip count", *stat.Breakers["fielddata"].Tripped},
+				humanize.Bytes(uint64(*stat.Os.Mem.UsedInBytes)) + " / " + humanize.Bytes(uint64(*stat.Os.Mem.TotalInBytes))},
 		}
 
 		if len(stat.Fs.Data) > 0 {
 			fs := stat.Fs.Data[0]
-			table.AddRow("Storage usage (used/avail)",
-				printer.ByteString(*fs.AvailableInBytes)+" / "+printer.ByteString(*fs.TotalInBytes))
-			table.AddRow("Storage mount", *fs.Mount)
+			table.Entries = append(table.Entries, [][]any{
+				{"Storage usage (used/avail)",
+					humanize.Bytes(uint64(*fs.AvailableInBytes)) + " / " + humanize.Bytes(uint64(*fs.TotalInBytes))},
+				{"Storage mount", *fs.Mount},
+			}...)
 		}
 
 		if err := table.Print(); err != nil {
@@ -192,7 +159,7 @@ func NodeClients(conf *cfg.Config, nodename string) error {
 		NodeId(nodename).
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get node stats: %w", esErrorString(err))
+		return fmt.Errorf("failed to get node stats: %s", esErrorString(err))
 	}
 
 	slog.Debug("ES result", "stat", stats)
@@ -220,7 +187,7 @@ func NodeClients(conf *cfg.Config, nodename string) error {
 
 				table.AddRow(
 					agent,
-					strconv.FormatInt(*client.Id, 10),
+					fmt.Sprintf("%d", *client.Id),
 					time.UnixMilli(*client.LastRequestTimeMillis).String(),
 					*client.RemoteAddress,
 					uri,
@@ -232,75 +199,5 @@ func NodeClients(conf *cfg.Config, nodename string) error {
 	}
 
 	table.Sort()
-
 	return table.Print()
 }
-
-func NodeUsage(conf *cfg.Config, nodeid string) error {
-	usage := conf.DefaultCluster.ES().Nodes.Usage()
-
-	if nodeid != "" {
-		usage.NodeId(nodeid)
-	}
-
-	stats, err := usage.Do(context.Background())
-	if err != nil {
-		return fmt.Errorf("failed to get node usage: %w", esErrorString(err))
-	}
-
-	slog.Debug("ES result", "usage", stats)
-
-	table := printer.NewTableEmpty(conf).WithHeaders(
-		"node",
-		"bulk",
-		"doc get",
-		"doc mget",
-		"doc update",
-		"index doc",
-		"index stats",
-		"search",
-		"msearch",
-		"open pit",
-	)
-
-	for id, actions := range stats.Nodes {
-		node, err := getNodeName(conf, id)
-		if err != nil {
-			return err
-		}
-
-		stat := actions.RestActions
-
-		table.AddRow(
-			node,
-			stat["bulk_action"],
-			stat["document_get_action"],
-			stat["document_mget_action"],
-			stat["document_update_action"],
-			stat["document_index_action"],
-			stat["indices_stats_action"],
-			stat["search_action"],
-			stat["msearch_action"],
-			stat["open_point_in_time"],
-		)
-	}
-
-	return table.Print()
-}
-
-func getNodeName(conf *cfg.Config, id string) (string, error) {
-	res, err := conf.DefaultCluster.ES().Nodes.Info().
-		Metric("os").
-		Do(context.Background())
-	if err != nil {
-		return "", fmt.Errorf("failed to get node info: %w", esErrorString(err))
-	}
-
-	for nodeid, node := range res.Nodes {
-		if id == nodeid {
-			return node.Name, nil
-		}
-	}
-
-	return "", nil
-}

pkg/es/parallel.go

@@ -19,6 +19,7 @@ package es
 import (
 	"context"
 	"fmt"
+	"sync"
 
 	"codeberg.org/scip/esctl/pkg/cfg"
 	"github.com/elastic/go-elasticsearch/v9"
@@ -60,9 +61,15 @@ type apiResponse struct {
 	which            int
 }
 
-func getApiData(conf *cfg.Config, es *elasticsearch.TypedClient, reschan chan apiResponse, which string) {
-	apiRes := apiResponse{}
+func getApiData(
+	conf *cfg.Config,
+	es *elasticsearch.TypedClient,
+	wg *sync.WaitGroup,
+	reschan chan apiResponse,
+	which string) {
+	defer wg.Done()
 
+	ar := apiResponse{}
 	var arerr error
 
 	switch which {
@@ -70,47 +77,47 @@ func getApiData(conf *cfg.Config, es *elasticsearch.TypedClient, reschan chan ap
 		res, err := es.Cluster.Health().
 			Do(context.Background())
 
-		apiRes.health = res
-		apiRes.which = ResponseHealth
+		ar.health = res
+		ar.which = ResponseHealth
 		arerr = err
 
 	case "healthreport":
 		report, err := getHealthReport(conf)
 
-		apiRes.healthreport = report
-		apiRes.which = ResponseHealthReport
+		ar.healthreport = report
+		ar.which = ResponseHealthReport
 		arerr = err
 
 	case "info":
 		res, err := es.Info().
 			Do(context.Background())
 
-		apiRes.info = res
-		apiRes.which = ResponseInfo
+		ar.info = res
+		ar.which = ResponseInfo
 		arerr = err
 
 	case "ccr":
 		res, err := es.Ccr.Stats().
 			Do(context.Background())
 
-		apiRes.ccr = res
-		apiRes.which = ResponseCcr
+		ar.ccr = res
+		ar.which = ResponseCcr
 		arerr = err
 
 	case "stats":
 		res, err := es.Cluster.Stats().
 			Do(context.Background())
 
-		apiRes.stats = res
-		apiRes.which = ResponseStats
+		ar.stats = res
+		ar.which = ResponseStats
 		arerr = err
 
 	case "indices":
 		res, err := es.Cat.Indices().
 			Do(context.Background())
 
-		apiRes.indices = &res
-		apiRes.which = ResponseIndices
+		ar.indices = &res
+		ar.which = ResponseIndices
 		arerr = err
 
 	case "indicesbytes":
@@ -119,16 +126,16 @@ func getApiData(conf *cfg.Config, es *elasticsearch.TypedClient, reschan chan ap
 			Bytes(bytes.Bytes{Name: "b"}).
 			Do(context.Background())
 
-		apiRes.indicesbytes = &res
-		apiRes.which = ResponseIndices
+		ar.indicesbytes = &res
+		ar.which = ResponseIndices
 		arerr = err
 
 	case "tasks":
 		res, err := es.Cat.Tasks().
 			Do(context.Background())
 
-		apiRes.tasks = &res
-		apiRes.which = ResponseTasks
+		ar.tasks = &res
+		ar.which = ResponseTasks
 		arerr = err
 
 	case "explain":
@@ -136,8 +143,8 @@ func getApiData(conf *cfg.Config, es *elasticsearch.TypedClient, reschan chan ap
 			ExplainLifecycle("_all").
 			Do(context.Background())
 
-		apiRes.explainlifecycle = res
-		apiRes.which = ResponseExplain
+		ar.explainlifecycle = res
+		ar.which = ResponseExplain
 		arerr = err
 
 	case "policies":
@@ -145,14 +152,14 @@ func getApiData(conf *cfg.Config, es *elasticsearch.TypedClient, reschan chan ap
 			GetLifecycle().
 			Do(context.Background())
 
-		apiRes.lifecycle = &res
-		apiRes.which = ResponseLifecycle
+		ar.lifecycle = &res
+		ar.which = ResponseLifecycle
 		arerr = err
 	}
 
 	if arerr != nil {
-		apiRes.error = fmt.Errorf("failed to get data from API: %w", arerr)
+		ar.error = fmt.Errorf("failed to get data from API: %s", arerr)
 	}
 
-	reschan <- apiRes
+	reschan <- ar
 }

pkg/es/role.go

@@ -20,8 +20,6 @@ import (
 	"context"
 	"fmt"
 	"log/slog"
-	"maps"
-	"slices"
 
 	"codeberg.org/scip/esctl/pkg/cfg"
 	"codeberg.org/scip/esctl/pkg/printer"
@@ -32,17 +30,24 @@ func RoleNames(conf *cfg.Config) ([]string, error) {
 	res, err := conf.DefaultCluster.ES().Security.GetRole().
 		Do(context.Background())
 	if err != nil {
-		return nil, fmt.Errorf("failed to get roles: %w", esErrorString(err))
+		return nil, fmt.Errorf("failed to get roles: %s", esErrorString(err))
 	}
 
-	return slices.Collect(maps.Keys(res)), nil
+	roles := make([]string, len(res))
+	idx := 0
+	for name := range res {
+		roles[idx] = name
+		idx++
+	}
+
+	return roles, nil
 }
 
 func RoleList(conf *cfg.Config) error {
 	res, err := conf.DefaultCluster.ES().Security.GetRole().
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get roles: %w", esErrorString(err))
+		return fmt.Errorf("failed to get roles: %s", esErrorString(err))
 	}
 
 	slog.Debug("ES result", "roles", res)
@@ -61,7 +66,6 @@ func RoleList(conf *cfg.Config) error {
 	}
 
 	table.Sort()
-
 	return table.Print()
 }
 
@@ -70,7 +74,7 @@ func RoleShow(conf *cfg.Config, rolename string) error {
 		Name(rolename).
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get role: %w", esErrorString(err))
+		return fmt.Errorf("failed to get role: %s", esErrorString(err))
 	}
 
 	slog.Debug("ES result", "role", res)
@@ -128,9 +132,7 @@ func roleRemoteClusters(conf *cfg.Config, role types.Role) error {
 
 	table := printer.NewTable(conf, 2, len(role.RemoteCluster))
 	table.Addheaders("remote cluster", "privilege")
-
 	idx := 0
-
 	for _, priv := range role.RemoteCluster {
 		perms := []string{}
 		for _, perm := range priv.Privileges {
@@ -143,7 +145,6 @@ func roleRemoteClusters(conf *cfg.Config, role types.Role) error {
 	}
 
 	table.Sort()
-
 	return table.Print()
 }
 
@@ -154,7 +155,6 @@ func roleClusters(conf *cfg.Config, role types.Role) error {
 
 	table := printer.NewTable(conf, 1, len(role.Cluster))
 	table.Addheaders("cluster rights")
-
 	idx := 0
 	for _, cluster := range role.Cluster {
 		table.Entries[idx] = []any{cluster.Name}
@@ -162,7 +162,6 @@ func roleClusters(conf *cfg.Config, role types.Role) error {
 	}
 
 	table.Sort()
-
 	return table.Print()
 }
 
@@ -173,9 +172,7 @@ func roleRemoteIndices(conf *cfg.Config, role types.Role) error {
 
 	table := printer.NewTable(conf, 3, len(role.RemoteIndices))
 	table.Addheaders("remote index names", "index permissions", "allow restricted")
-
 	idx := 0
-
 	for _, priv := range role.RemoteIndices {
 		perms := []string{}
 		for _, perm := range priv.Privileges {
@@ -188,7 +185,6 @@ func roleRemoteIndices(conf *cfg.Config, role types.Role) error {
 	}
 
 	table.Sort()
-
 	return table.Print()
 }
 
@@ -199,9 +195,7 @@ func roleIndices(conf *cfg.Config, role types.Role) error {
 
 	table := printer.NewTable(conf, 3, len(role.Indices))
 	table.Addheaders("index names", "index permissions", "allow restricted")
-
 	idx := 0
-
 	for _, priv := range role.Indices {
 		perms := []string{}
 		for _, perm := range priv.Privileges {
@@ -214,7 +208,6 @@ func roleIndices(conf *cfg.Config, role types.Role) error {
 	}
 
 	table.Sort()
-
 	return table.Print()
 }
 
@@ -225,7 +218,6 @@ func roleApplications(conf *cfg.Config, role types.Role) error {
 
 	table := printer.NewTable(conf, 3, len(role.Applications))
 	table.Addheaders("application", "privileges", "resources")
-
 	idx := 0
 	for _, priv := range role.Applications {
 		table.Entries[idx] = []any{
@@ -238,6 +230,5 @@ func roleApplications(conf *cfg.Config, role types.Role) error {
 	}
 
 	table.Sort()
-
 	return table.Print()
 }

pkg/es/role_diff.go

@@ -75,7 +75,7 @@ type Register struct {
 func getCsvRecords(conf *cfg.Config, csvfile string) (map[string]Record, error) {
 	data, err := os.ReadFile(csvfile)
 	if err != nil {
-		return nil, fmt.Errorf("failed to read CSV file: %w", err)
+		return nil, fmt.Errorf("failed to read CSV file: %s", err)
 	}
 
 	csvreader := csv.NewReader(bytes.NewReader(data))
@@ -85,7 +85,7 @@ func getCsvRecords(conf *cfg.Config, csvfile string) (map[string]Record, error)
 
 	rows, err := csvreader.ReadAll()
 	if err != nil {
-		return nil, fmt.Errorf("failed to parse CSV: %w", err)
+		return nil, fmt.Errorf("failed to parse CSV: %s", err)
 	}
 
 	records := make(map[string]Record, len(rows)-1)
@@ -118,7 +118,7 @@ func getCsvRecords(conf *cfg.Config, csvfile string) (map[string]Record, error)
 func getCsvRecord(conf *cfg.Config, csvfile, rolename string) (*Record, error) {
 	fd, err := os.Open(csvfile)
 	if err != nil {
-		return nil, fmt.Errorf("failed to open CSV file: %w", err)
+		return nil, fmt.Errorf("failed to open CSV file: %s", err)
 	}
 	defer func() {
 		if err := fd.Close(); err != nil {
@@ -127,7 +127,7 @@ func getCsvRecord(conf *cfg.Config, csvfile, rolename string) (*Record, error) {
 	}()
 
 	scanner := bufio.NewScanner(fd)
-	record := new(Record{role: rolename})
+	record := Record{role: rolename}
 
 	for scanner.Scan() {
 		line := strings.TrimSpace(scanner.Text())
@@ -150,7 +150,7 @@ func getCsvRecord(conf *cfg.Config, csvfile, rolename string) (*Record, error) {
 		}
 	}
 
-	return record, nil
+	return &record, nil
 }
 
 func diffRoles(conf *cfg.Config, records map[string]Record, res getrole.Response) []Register {
@@ -179,7 +179,6 @@ func diffRoles(conf *cfg.Config, records map[string]Record, res getrole.Response
 	// iterate over records from CSV and register only those which are not deployed
 	for name := range records {
 		reg := Register{name: name, defined: true}
-
 		_, deployed := deployed[name]
 		if !deployed {
 			rows = append(rows, reg)
@@ -211,7 +210,7 @@ func RoleDiff(conf *cfg.Config, csvfile, role string) error {
 	res, err := conf.DefaultCluster.ES().Security.GetRole().
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get roles: %w", esErrorString(err))
+		return fmt.Errorf("failed to get roles: %s", esErrorString(err))
 	}
 
 	rows := diffRoles(conf, records, res)
@@ -246,11 +245,10 @@ func getRoleMappingGroups(conf *cfg.Config, rolename string) ([]string, error) {
 	mappings, err := conf.DefaultCluster.ES().Security.GetRoleMapping().
 		Do(context.Background())
 	if err != nil {
-		return nil, fmt.Errorf("failed to get role mappings: %w", esErrorString(err))
+		return nil, fmt.Errorf("failed to get role mappings: %s", esErrorString(err))
 	}
 
 	groups := []string{}
-
 	for _, mapping := range mappings {
 		if slices.Contains(mapping.Roles, rolename) {
 			for _, rule := range mapping.Rules.Any {
@@ -264,13 +262,13 @@ func getRoleMappingGroups(conf *cfg.Config, rolename string) ([]string, error) {
 	return groups, nil
 }
 
-func compareSlices(name string, left, right []string) {
-	slices.Sort(left)
-	slices.Sort(right)
+func compareSlices(name string, a, b []string) {
+	slices.Sort(a)
+	slices.Sort(b)
 
-	if slices.Compare(left, right) != 0 {
+	if slices.Compare(a, b) != 0 {
 		fmt.Printf("%s differs:\ndeployed: %s\n     csv: %s\n",
-			name, strings.Join(left, ","), strings.Join(right, ","))
+			name, strings.Join(a, ","), strings.Join(b, ","))
 	} else {
 		fmt.Printf("deployed %s matches csv definition\n", name)
 	}
@@ -281,7 +279,7 @@ func RoleDiffSingle(conf *cfg.Config, csvfile, rolename string) error {
 		Name(rolename).
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get role: %w", esErrorString(err))
+		return fmt.Errorf("failed to get role: %s", esErrorString(err))
 	}
 
 	record, err := getCsvRecord(conf, csvfile, rolename)
@@ -291,19 +289,16 @@ func RoleDiffSingle(conf *cfg.Config, csvfile, rolename string) error {
 
 	if !record.defined {
 		fmt.Printf("role %s is not defined\n", rolename)
-
 		return nil
 	}
 
 	role, exists := res[rolename]
 	if !exists {
 		fmt.Printf("role %s is not deployed\n", rolename)
-
 		return nil
 	} else {
 		fmt.Printf("role %s is deployed\n", rolename)
 	}
-
 	slog.Debug("found role", "role", role)
 
 	if conf.Debug {
@@ -315,7 +310,6 @@ func RoleDiffSingle(conf *cfg.Config, csvfile, rolename string) error {
 	if err != nil {
 		return err
 	}
-
 	slog.Debug("group mappings", "groups", groups)
 
 	// check cluster setting
@@ -327,7 +321,6 @@ func RoleDiffSingle(conf *cfg.Config, csvfile, rolename string) error {
 	// check index names+privs
 	indices := []string{}
 	privs := []string{}
-
 	for _, index := range role.Indices {
 		for _, name := range index.Names {
 			indices = append(indices, strings.ReplaceAll(name, "**", "*"))
@@ -340,7 +333,6 @@ func RoleDiffSingle(conf *cfg.Config, csvfile, rolename string) error {
 
 	// check kibana application space
 	spaces := []string{}
-
 	for _, app := range role.Applications {
 		for _, resource := range app.Resources {
 			if strings.Contains(resource, "space:") {

pkg/es/rollover.go

@@ -31,17 +31,14 @@ func RolloverConditions(conf *cfg.Config) types.RolloverConditionsVariant {
 	if conf.MaxAge != "" {
 		cond.MaxAge(esdsl.NewDuration().String(conf.MaxAge))
 	}
-
 	if conf.MaxDocs > 0 {
 		cond.MaxDocs(int64(conf.MaxDocs))
 	}
-
 	if conf.MaxShardSize > 0 {
 		bs := esdsl.NewByteSize()
 		bs.Int64(int64(conf.MaxShardSize))
 		cond.MaxPrimaryShardSize(bs)
 	}
-
 	if conf.MaxShardDocs > 0 {
 		cond.MaxPrimaryShardDocs(int64(conf.MaxShardDocs))
 	}

pkg/es/search.go

@@ -56,7 +56,7 @@ func Search(conf *cfg.Config, queries []string) error {
 		return err
 	}
 
-	req := new(search.Request{Query: queryCaster})
+	req := &search.Request{Query: queryCaster}
 
 	searchEs.Request(req)
 
@@ -82,13 +82,13 @@ func explainSearch(conf *cfg.Config, search *search.Search) error {
 		Size(1). // one's enough for explain
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to call explain search (esdsl): %w", esErrorString(err))
+		return fmt.Errorf("failed to call explain search (esdsl): %s", esErrorString(err))
 	}
 
 	if conf.Debug {
 		raw, err := json.Marshal(res)
 		if err != nil {
-			return fmt.Errorf("failed to marshal explain result: %w", err)
+			return fmt.Errorf("failed to marshal explain result: %s", err)
 		}
 
 		value := gjson.Get(string(raw), "hits.hits.0._explanation")
@@ -111,7 +111,6 @@ func explainSearch(conf *cfg.Config, search *search.Search) error {
 
 func explain(res *types.ExplanationDetail, indent string) {
 	fmt.Println(indent + "- " + res.Description)
-
 	for _, ex := range res.Details {
 		fmt.Println(indent + "  - " + ex.Description)
 		fmt.Println(indent + fmt.Sprintf("    score: %f", res.Value))
@@ -128,14 +127,14 @@ func validateSearch(conf *cfg.Config, queries []string) error {
 		return err
 	}
 
-	req := new(validatequery.Request{Query: queryCaster})
+	req := &validatequery.Request{Query: queryCaster}
 
 	validate.Request(req)
 
 	res, err := validate.
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to validate search (esdsl): %w", esErrorString(err))
+		return fmt.Errorf("failed to validate search (esdsl): %s", esErrorString(err))
 	}
 
 	slog.Debug("ES result", "search", res)
@@ -155,7 +154,7 @@ func searchOnce(conf *cfg.Config, search *search.Search) error {
 		Size(conf.To).
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to run search (esdsl): %w", esErrorString(err))
+		return fmt.Errorf("failed to run search (esdsl): %s", esErrorString(err))
 	}
 
 	slog.Debug("ES result", "search", res)
@@ -168,10 +167,9 @@ func searchOnce(conf *cfg.Config, search *search.Search) error {
 // https://www.elastic.co/docs/reference/elasticsearch/clients/go/using-the-api/searching#_pit_search_after
 func searchPit(conf *cfg.Config, req *search.Request) error {
 	ctx := context.Background()
-
 	pit, err := conf.DefaultCluster.ES().OpenPointInTime(conf.Index).KeepAlive("1m").Do(ctx)
 	if err != nil {
-		return fmt.Errorf("failed to open point-in-time request for search: %w", err)
+		return fmt.Errorf("failed to open point-in-time request for search: %s", err)
 	}
 	defer func() {
 		_, err := conf.DefaultCluster.ES().ClosePointInTime().Id(pit.Id).Do(ctx)
@@ -194,7 +192,7 @@ func searchPit(conf *cfg.Config, req *search.Request) error {
 	for {
 		res, err := search.Do(ctx)
 		if err != nil {
-			return fmt.Errorf("failed to run search (esdsl pit): %w", esErrorString(err))
+			return fmt.Errorf("failed to run search (esdsl pit): %s", esErrorString(err))
 		}
 
 		if len(res.Hits.Hits) == 0 {
@@ -224,7 +222,7 @@ func searchTail(conf *cfg.Config, search *search.Search) error {
 	for {
 		res, err := search.Do(context.Background())
 		if err != nil {
-			return fmt.Errorf("failed to run search (esdsl): %w", esErrorString(err))
+			return fmt.Errorf("failed to run search (esdsl): %s", esErrorString(err))
 		}
 
 		slog.Debug("ES result", "search", res)

pkg/es/search_filter.go

@@ -63,7 +63,6 @@ type filter struct {
 // must match literally, and range filters using -r "@timestamp:2026-05-28T10:00:00 to now"
 func NewFilter(query string) (*filter, error) {
 	var separator string
-
 	var criteria int // we use the constants on top for this
 
 	switch {
@@ -77,10 +76,10 @@ func NewFilter(query string) (*filter, error) {
 
 	part := strings.Split(query, separator)
 	if len(part) != 2 {
-		return nil, errors.New("search queries must be in the form field<sep>pattern where <sep> must be one of: = or !=")
+		return nil, fmt.Errorf("search queries must be in the form field<sep>pattern where <sep> must be one of: = or !=")
 	}
 
-	flt := new(filter{term: part[0], filter: part[1], criteria: criteria})
+	flt := &filter{term: part[0], filter: part[1], criteria: criteria}
 
 	if strings.Contains(part[0], ",") {
 		// a MultiMatchQuery, match across multiple fields at once
@@ -235,6 +234,7 @@ func addFilters(conf *cfg.Config) ([]types.QueryVariant, error) {
 		}
 
 		filters[count-1] = rng
+
 	}
 
 	return filters, nil
@@ -247,6 +247,7 @@ func addSort(conf *cfg.Config, search *search.Search) *search.Search {
 		Index(conf.Index).
 		Fields(conf.SortBy).
 		Do(context.Background())
+
 	if err != nil {
 		// whatever it was, do not add Sort()
 		slog.Debug("get field capabilities", "field", conf.SortBy, "error", esErrorString(err))

pkg/es/searchql.go

@@ -1,79 +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"
-	"encoding/json"
-	"fmt"
-	"log/slog"
-
-	"codeberg.org/scip/esctl/pkg/cfg"
-	"codeberg.org/scip/esctl/pkg/printer"
-)
-
-type searchQlColumn struct {
-	Name string `json:"name"`
-	Type string `json:"type"`
-}
-
-type searchQlResult struct {
-	Partial bool             `json:"is_partial"`
-	Docs    int              `json:"documents_found"`
-	Columns []searchQlColumn `json:"columns"`
-	Values  [][]any          `json:"values"`
-}
-
-func SearchQL(conf *cfg.Config, querystring string) error {
-	query := conf.DefaultCluster.ES().Esql.Query().
-		Query(querystring).
-		DropNullColumns(true)
-
-	res, err := query.Do(context.Background())
-	if err != nil {
-		return fmt.Errorf("failed to run esql query: %w", esErrorString(err))
-	}
-
-	if conf.Debug {
-		fmt.Println(string(res))
-	}
-
-	qlResult := searchQlResult{}
-
-	if err = json.Unmarshal(res, &qlResult); err != nil {
-		return fmt.Errorf("failed to unmarshal esql result: %w", err)
-	}
-
-	slog.Debug("searchql result", "qlres", qlResult)
-
-	if qlResult.Docs == 0 {
-		return nil
-	}
-
-	table := printer.NewTable(conf, len(qlResult.Columns), len(qlResult.Values))
-
-	headers := make([]string, len(qlResult.Columns))
-	for idx, col := range qlResult.Columns {
-		headers[idx] = col.Name
-	}
-
-	table.Addheaders(headers...)
-
-	table.Entries = qlResult.Values
-
-	return table.Print()
-}

pkg/es/shard.go

@@ -40,7 +40,8 @@ func colorzizeShard(conf *cfg.Config, state, name string) string {
 }
 
 func resolvePrirep(state string) string {
-	if state == "p" {
+	switch state {
+	case "p":
 		return "primary"
 	}
 
@@ -85,7 +86,7 @@ func ShardList(conf *cfg.Config) error {
 	res, err := conf.DefaultCluster.ES().Cat.Shards().
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get shards: %w", esErrorString(err))
+		return fmt.Errorf("failed to get shards: %s", esErrorString(err))
 	}
 
 	shardlist := filterShards(conf, res)
@@ -124,7 +125,6 @@ func printShards(conf *cfg.Config, shardlist shards.Response) error {
 	}
 
 	table.Sort()
-
 	if err := table.Print(); err != nil {
 		return err
 	}
@@ -136,7 +136,7 @@ func ShardShow(conf *cfg.Config, index string) error {
 	res, err := conf.DefaultCluster.ES().Cat.Shards().Index(index).
 		Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get shards: %w", esErrorString(err))
+		return fmt.Errorf("failed to get shards: %s", esErrorString(err))
 	}
 
 	slog.Debug("ES result", "shards", res)
@@ -158,40 +158,33 @@ func ShardAllocation(conf *cfg.Config, index string) error {
 
 	res, err := explain.Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get shard allocation explain: %w", esErrorString(err))
+		return fmt.Errorf("failed to get shard allocation explain: %s", esErrorString(err))
 	}
 
 	slog.Debug("ES result", "explain", res)
 
+	currentNode := res.CurrentNode
+
 	table := printer.NewTable(conf, 2, 10)
 	table.Addheaders("shard allocation setting", "value")
 
-	table.Entries = [][]any{
-		{"Index", index},
-		{"Current state", res.CurrentState},
-		{"Can rebalance cluster", res.CanRebalanceCluster.Name},
-		{"Can rebalance to another node", res.CanRebalanceToOtherNode.Name},
-		{"Can remain on current node", res.CanRemainOnCurrentNode.Name},
-	}
-
-	if res.CurrentNode != nil {
-		currentNode := res.CurrentNode
 	roles := make([]string, len(currentNode.Roles))
-
 	for idx, role := range currentNode.Roles {
 		roles[idx] = role.Name
 	}
 
-		table.Entries = append(table.Entries, [][]any{
+	table.Entries = [][]any{
+		{"Index", index},
+		{"Current state", res.CurrentState},
 		{"Current node", currentNode.Name},
 		{"Current k8s node", currentNode.Attributes["k8s_node_name"]},
 		{"Current node address", currentNode.TransportAddress},
 		{"Current node id", currentNode.Id},
 		{"Current node weight", currentNode.WeightRanking},
 		{"Current node roles", roles},
-		}...)
-	} else {
-		table.AddRow("Current node", "not currently assigned to any node")
+		{"Can rebalance cluster", res.CanRebalanceCluster.Name},
+		{"Can rebalance to another node", res.CanRebalanceToOtherNode.Name},
+		{"Can remain on current node", res.CanRemainOnCurrentNode.Name},
 	}
 
 	if res.CurrentState == "unassigned" {

pkg/es/snapshot.go

@@ -45,7 +45,7 @@ func SnapshotList(conf *cfg.Config) error {
 	// get partial indicies
 	ires, err := conf.DefaultCluster.ES().Cat.Indices().Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get indicies: %w", esErrorString(err))
+		return fmt.Errorf("failed to get indicies: %s", esErrorString(err))
 	}
 
 	indicies := map[string]int{}
@@ -58,7 +58,7 @@ func SnapshotList(conf *cfg.Config) error {
 	// get snapshots
 	sres, err := conf.DefaultCluster.ES().Cat.Snapshots().Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get snapshots: %w", esErrorString(err))
+		return fmt.Errorf("failed to get snapshots: %s", esErrorString(err))
 	}
 
 	slog.Debug("ES result", "indicies", sres)
@@ -66,13 +66,13 @@ func SnapshotList(conf *cfg.Config) error {
 	snapshots := []*Snapshot{} // original snapshot names
 
 	for _, snapshot := range sres {
-		snap := new(Snapshot{
+		snap := &Snapshot{
 			Name:     *snapshot.Id,
 			Status:   *snapshot.Status,
 			Start:    fmt.Sprintf("%s", snapshot.StartTime),
 			Forindex: indexFromSnapshot(*snapshot.Id),
 			Orphaned: "no",
-		})
+		}
 
 		_, exists := indicies[snap.Forindex]
 		if !exists {
@@ -98,7 +98,6 @@ func SnapshotList(conf *cfg.Config) error {
 	}
 
 	table.Sort()
-
 	if err := table.Print(); err != nil {
 		return err
 	}
@@ -109,7 +108,7 @@ func SnapshotList(conf *cfg.Config) error {
 func SnapshotShow(conf *cfg.Config, snapshot string) error {
 	res, err := conf.DefaultCluster.ES().Snapshot.Get("*", snapshot).Do(context.Background())
 	if err != nil {
-		return fmt.Errorf("failed to get snapshot: %w", esErrorString(err))
+		return fmt.Errorf("failed to get snapshot: %s", esErrorString(err))
 	}
 
 	slog.Debug("ES result", "snapshot", res)

pkg/es/task.go

@@ -30,15 +30,15 @@ import (
 func TaskList(conf *cfg.Config) error {
 	res, err := conf.DefaultCluster.ES().Cat.Tasks().
 		Do(context.Background())
+
 	if err != nil {
-		return fmt.Errorf("failed to get index templates: %w", esErrorString(err))
+		return fmt.Errorf("failed to get index templates: %s", esErrorString(err))
 	}
 
 	slog.Debug("res", "tasks", res)
 
 	table := printer.NewTable(conf, 8, len(res))
 	table.Addheaders("task id", "action", "start time", "run time", "node", "type")
-
 	for idx, task := range res {
 		var ts time.Time
 
@@ -66,8 +66,9 @@ func TaskCancel(conf *cfg.Config, taskid string) error {
 	_, err := conf.DefaultCluster.ES().Tasks.Cancel().
 		TaskId(taskid).
 		Do(context.Background())
+
 	if err != nil {
-		return fmt.Errorf("failed to cancel task: %w", esErrorString(err))
+		return fmt.Errorf("failed to cancel task: %s", esErrorString(err))
 	}
 
 	return nil

pkg/log/logger.go

@@ -29,13 +29,13 @@ import (
 const LevelNotice = slog.Level(2)
 
 func Init(conf *cfg.Config) {
-	logLevel := new(slog.LevelVar{})
+	logLevel := &slog.LevelVar{}
 
-	opts := new(yadu.Options{
+	opts := &yadu.Options{
 		Level:     logLevel,
 		AddSource: true,
 		NoColor:   !isatty.IsTerminal(os.Stdout.Fd()),
-	})
+	}
 
 	buildInfo, _ := debug.ReadBuildInfo()
 

pkg/printer/bytes.go

@@ -22,16 +22,10 @@ type ByteSize struct {
 	size uint64
 }
 
+func Bytes(size int64) ByteSize {
+	return ByteSize{size: uint64(size)}
+}
+
 func (b *ByteSize) String() string {
 	return humanize.Bytes(b.size)
 }
-
-func Bytes(size int64) *ByteSize {
-	return new(ByteSize{size: uint64(size)})
-}
-
-func ByteString(size int64) string {
-	b := ByteSize{size: uint64(size)}
-
-	return b.String()
-}

pkg/printer/cast.go

@@ -26,7 +26,6 @@ import (
 )
 
 func any2string(in any) string {
-	//nolint:gocritic
 	switch val := in.(type) {
 	case string:
 		return val
@@ -38,24 +37,18 @@ func any2string(in any) string {
 		return strconv.Itoa(val)
 	case float64:
 		return fmt.Sprintf("%.2f", val)
-	case float32:
-		return fmt.Sprintf("%.2f", val)
 	case []string:
 		return strings.Join(val, ",")
 	case ByteSize:
 		return val.String()
-	case *ByteSize:
-		return val.String()
 	case time.Time:
 		return val.Format("2006-01-02 15:04:05")
-	case time.Duration:
-		return val.String()
 	case []byte:
 		return string(val)
+	case types.DateTime, types.Percentage:
+		return val.(string)
 	case nil:
 		return "null"
-	case types.Percentage, types.DateTime:
-		return val.(string)
 	}
 
 	return ""
@@ -85,7 +78,6 @@ func (data *Table) preprocessRows() {
 	// determine max width per column
 	for _, entries := range data.rows {
 		currentWidth := 0
-
 		for idx, entry := range entries {
 			length := visibleLen(entry)
 

pkg/printer/doc.go

@@ -33,6 +33,7 @@ func PrintDocs(conf *cfg.Config, hits []types.Hit) {
 	for _, hit := range hits {
 		PrintDoc(conf, hit)
 	}
+
 }
 
 func PrintDoc(conf *cfg.Config, hit types.Hit) {

pkg/printer/metrics.go

@@ -1,55 +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 printer
-
-import (
-	"fmt"
-	"runtime/metrics"
-	"strconv"
-)
-
-func printGoRoutineMetrics() {
-	fmt.Println("\nGoroutine metrics:")
-	printMetric("/sched/goroutines-created:goroutines", "Created")
-	printMetric("/sched/goroutines:goroutines", "Live")
-	printMetric("/sched/goroutines/not-in-go:goroutines", "Syscall/CGO")
-	printMetric("/sched/goroutines/runnable:goroutines", "Runnable")
-	printMetric("/sched/goroutines/running:goroutines", "Running")
-	printMetric("/sched/goroutines/waiting:goroutines", "Waiting")
-
-	fmt.Println("Thread metrics:")
-	printMetric("/sched/gomaxprocs:threads", "Max")
-	printMetric("/sched/threads/total:threads", "Live")
-}
-
-func printMetric(name string, descr string) {
-	sample := []metrics.Sample{{Name: name}}
-	metrics.Read(sample)
-
-	var val string
-
-	switch sample[0].Value.Kind() {
-	case metrics.KindFloat64, metrics.KindFloat64Histogram:
-		val = fmt.Sprintf("%.2f", sample[0].Value.Float64())
-	case metrics.KindUint64:
-		val = strconv.FormatUint(sample[0].Value.Uint64(), 10)
-	case metrics.KindBad:
-		val = "n/a"
-	}
-
-	fmt.Printf("  %s: %v\n", descr, val)
-}

pkg/printer/pager.go

@@ -34,14 +34,12 @@ var (
 	titleStyle = func() lipgloss.Style {
 		b := lipgloss.RoundedBorder()
 		b.Right = "├"
-
 		return lipgloss.NewStyle().BorderStyle(b).Padding(0, 1)
 	}()
 
 	infoStyle = func() lipgloss.Style {
 		b := lipgloss.RoundedBorder()
 		b.Left = "┤"
-
 		return titleStyle.BorderStyle(b)
 	}()
 )
@@ -58,9 +56,10 @@ func (m model) Init() tea.Cmd {
 }
 
 func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
-	var cmd tea.Cmd
-
-	cmds := make([]tea.Cmd, 1)
+	var (
+		cmd  tea.Cmd
+		cmds []tea.Cmd
+	)
 
 	switch msg := msg.(type) {
 	case tea.KeyMsg:
@@ -91,7 +90,7 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 	// Handle keyboard and mouse events in the viewport
 	m.viewport, cmd = m.viewport.Update(msg)
-	cmds[0] = cmd
+	cmds = append(cmds, cmd)
 
 	return m, tea.Batch(cmds...)
 }
@@ -100,7 +99,6 @@ func (m model) View() string {
 	if !m.ready {
 		return "\n  Initializing..."
 	}
-
 	return fmt.Sprintf("%s\n%s\n%s", m.headerView(), m.viewport.View(), m.footerView())
 }
 
@@ -108,25 +106,30 @@ func (m model) headerView() string {
 	// title := titleStyle.Render("RPN Help Overview")
 	title := titleStyle.Render(m.title)
 	line := strings.Repeat("─", max(0, m.viewport.Width-lipgloss.Width(title)))
-
 	return lipgloss.JoinHorizontal(lipgloss.Center, title, line)
 }
 
 func (m model) footerView() string {
 	info := infoStyle.Render(fmt.Sprintf("%3.f%%", m.viewport.ScrollPercent()*100))
 	line := strings.Repeat("─", max(0, m.viewport.Width-lipgloss.Width(info)))
-
 	return lipgloss.JoinHorizontal(lipgloss.Center, line, info)
 }
 
+func max(a, b int) int {
+	if a > b {
+		return a
+	}
+	return b
+}
+
 func Pager(title, message string) {
-	pager := tea.NewProgram(
+	p := tea.NewProgram(
 		model{content: message, title: title},
 		tea.WithAltScreen(),       // use the full size of the terminal in its "alternate screen buffer"
 		tea.WithMouseCellMotion(), // turn on mouse support so we can track the mouse wheel
 	)
 
-	if _, err := pager.Run(); err != nil {
+	if _, err := p.Run(); err != nil {
 		fmt.Println("could not run pager:", err)
 		os.Exit(1)
 	}

pkg/printer/table.go

@@ -32,7 +32,6 @@ import (
 type Table struct {
 	Mode    string // tsv, json, yaml
 	Headers []string
-	RawHeaders []string
 	Entries [][]any
 
 	rows       [][]string // representation used for printing
@@ -40,34 +39,23 @@ type Table struct {
 	lenHeaders []int
 	alignInts  bool
 	maxwidth   int
-	debugGoRoutines bool
 }
 
 func NewTable(conf *cfg.Config, columns, rows int) *Table {
-	table := new(Table{
-		Mode:            conf.Output,
-		maxwidth:        cfg.GetTermWidth(),
-		debugGoRoutines: conf.DebugGoRoutines,
-	})
+	table := Table{Mode: conf.Output, maxwidth: cfg.GetTermWidth()}
 
 	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
+	return &table
 }
 
 func NewTableEmpty(conf *cfg.Config) *Table {
-	table := new(Table{
-		Mode:            conf.Output,
-		maxwidth:        cfg.GetTermWidth(),
-		debugGoRoutines: conf.DebugGoRoutines,
-	})
+	table := Table{Mode: conf.Output, maxwidth: cfg.GetTermWidth()}
 	table.alignInts = conf.AlignInts
-
-	return table
+	return &table
 }
 
 func (table *Table) WithHeaders(headers ...string) *Table {
@@ -76,44 +64,47 @@ func (table *Table) WithHeaders(headers ...string) *Table {
 	table.Entries = [][]any{}
 	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 {
-	var err error
-
-	switch table.Mode {
+func (data *Table) Print() error {
+	switch data.Mode {
 	case "json":
-		err = table.PrintJSON()
+		return data.PrintJSON()
 	case "yaml":
-		err = table.PrintYAML()
-	case "csv":
-		err = table.PrintCSV()
+		return data.PrintYAML()
 	default:
-		err = table.PrintTSV()
+		return data.PrintTSV()
 	}
-
-	if table.debugGoRoutines {
-		printGoRoutineMetrics()
-	}
-
-	return err
 }
 
 var (
 	ansiCtrlSeq = regexp.MustCompile(`\033.[0-9;]+m`)
 )
 
-func (table *Table) PrintYAML() error {
-	raw := table.toMap()
+// needed for json and yaml output
+func (data *Table) toMap() []map[string]any {
+	raw := make([]map[string]any, len(data.Entries))
+
+	for idx, entries := range data.Entries {
+		raw[idx] = make(map[string]any, len(data.Headers))
+		for eidx, entry := range entries {
+			raw[idx][data.Headers[eidx]] = entry
+		}
+	}
+
+	return raw
+}
+
+func (data *Table) PrintYAML() error {
+	raw := data.toMap()
 
 	body, err := yaml.Marshal(raw)
 	if err != nil {
-		return fmt.Errorf("failed to produce YAML output: %w", err)
+		return fmt.Errorf("failed to produce YAML output: %s", err)
 	}
 
 	fmt.Println(string(body))
@@ -121,12 +112,12 @@ func (table *Table) PrintYAML() error {
 	return nil
 }
 
-func (table *Table) PrintJSON() error {
-	raw := table.toMap()
+func (data *Table) PrintJSON() error {
+	raw := data.toMap()
 
 	body, err := json.MarshalIndent(raw, "", "  ")
 	if err != nil {
-		return fmt.Errorf("failed to produce JSON output: %w", err)
+		return fmt.Errorf("failed to produce JSON output: %s", err)
 	}
 
 	fmt.Println(string(body))
@@ -134,154 +125,95 @@ func (table *Table) PrintJSON() error {
 	return nil
 }
 
-func (table *Table) PrintTSV() error {
+func (data *Table) PrintTSV() error {
 	// length's, convert cell types
-	table.preprocessRows()
+	data.preprocessRows()
 
 	// output headers
-	for idx, header := range table.Headers {
-		if idx+1 != len(table.Headers) {
-			fmt.Print(header, strings.Repeat(" ", table.lenHeaders[idx]-visibleLen(header)))
+	for idx, header := range data.Headers {
+		if idx+1 != len(data.Headers) {
+			fmt.Print(header, strings.Repeat(" ", data.lenHeaders[idx]-visibleLen(header)))
 		} else {
 			// no padding for last header
 			fmt.Print(header)
 		}
 
-		if idx < len(table.Headers)-1 {
+		if idx < len(data.Headers)-1 {
 			fmt.Print("  ")
 		}
 	}
-
 	fmt.Println()
 
-	for _, entries := range table.rows {
+	for _, entries := range data.rows {
 		currentWidth := 0
 
 		for idx, entry := range entries {
 			length := visibleLen(entry)
 
-			if length+currentWidth > table.maxwidth && table.maxwidth-currentWidth > 1 {
+			if length+currentWidth > data.maxwidth && data.maxwidth-currentWidth > 1 {
 				// text is too wide to be put into one line, wrap it
-				wrapper := wordwrap.Wrapper(table.maxwidth-currentWidth, false)
+				wrapper := wordwrap.Wrapper(data.maxwidth-currentWidth, false)
 				wrapped := wrapper(entry)
 
 				// and indent it
-				first := true
-				for line := range strings.Lines(wrapped) {
-					if first {
+				for idx, line := range strings.Split(wrapped, "\n") {
+					if idx == 0 {
 						entry = line
-						first = false
 					} else {
 						entry += "\n  " + strings.Repeat(" ", currentWidth) + line
 					}
 				}
 			}
 
-			currentWidth += table.lenHeaders[idx]
+			currentWidth += data.lenHeaders[idx]
 
-			switch {
-			case isInt(entry) && table.alignInts:
+			if isInt(entry) && data.alignInts {
 				// align right
-				fmt.Print(strings.Repeat(" ", table.lenHeaders[idx]-length), entry)
-			case length < table.lenHeaders[idx] && idx+1 != len(entries):
+				fmt.Print(strings.Repeat(" ", data.lenHeaders[idx]-length), entry)
+			} else if length < data.lenHeaders[idx] && idx+1 != len(entries) {
 				// pad right, if required
-				fmt.Print(entry, strings.Repeat(" ", table.lenHeaders[idx]-length))
-			default:
+				fmt.Print(entry, strings.Repeat(" ", data.lenHeaders[idx]-length))
+			} else {
 				// no padding for last entry
 				fmt.Print(entry)
 			}
 
-			if idx < len(table.Headers)-1 {
+			if idx < len(data.Headers)-1 {
 				fmt.Print("  ")
 			}
 		}
-
 		fmt.Println()
 	}
 
 	return nil
 }
 
-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() {
+func (data *Table) Sort() {
 	// sanity checks
-	if len(table.Entries) == 0 {
+	if len(data.Entries) == 0 {
 		return
 	}
 
-	table.preprocessRows()
+	data.preprocessRows()
 
-	sort.Slice(table.rows, func(i, j int) bool {
-		return table.rows[i][0] < table.rows[j][0]
+	sort.Slice(data.rows, func(i, j int) bool {
+		return data.rows[i][0] < data.rows[j][0]
 	})
 }
 
-func (table *Table) Addheaders(headers ...string) {
+func (data *Table) Addheaders(headers ...string) {
 	for idx, header := range headers {
-		switch table.Mode {
+		switch data.Mode {
 		case "json", "yaml":
-			table.Headers[idx] = strings.ReplaceAll(strings.ToLower(header), " ", "_")
+			data.Headers[idx] = strings.ReplaceAll(strings.ToLower(header), " ", "_")
 		default:
-			table.Headers[idx] = bold(strings.ReplaceAll(strings.ToUpper(header), " ", "-"))
+			data.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
-func (table *Table) toMap() []map[string]any {
-	raw := make([]map[string]any, len(table.Entries))
-
-	for idx, entries := range table.Entries {
-		raw[idx] = make(map[string]any, len(table.Headers))
-		for eidx, entry := range entries {
-			raw[idx][table.Headers[eidx]] = entry
-		}
-	}
-
-	return raw
+func (data *Table) AddRow(fields ...any) {
+	data.Entries = append(data.Entries, fields)
 }
 
 // return the length of a string but only visible chars, w/o ansi color escapes