Additions and enhancements (#14)

- add interactive API repl
- enhance cluster status output (use -v)
- add more ccr commands
- refactoring

pkg/es/cluster.go

@@ -21,11 +21,14 @@ import (
 	"fmt"
 	"log/slog"
 	"slices"
+	"strings"
 	"sync"
 
 	"codeberg.org/scip/esctl/pkg/cfg"
+	"github.com/dustin/go-humanize"
 	"github.com/elastic/go-elasticsearch/v9/typedapi/ccr/stats"
 	"github.com/elastic/go-elasticsearch/v9/typedapi/cluster/health"
+	clusterstats "github.com/elastic/go-elasticsearch/v9/typedapi/cluster/stats"
 	"github.com/elastic/go-elasticsearch/v9/typedapi/core/info"
 	"github.com/elastic/go-elasticsearch/v9/typedapi/types"
 )
@@ -34,6 +37,7 @@ const (
 	ResponseHealth = iota
 	ResponseInfo
 	ResponseCcr
+	ResponseStats
 )
 
 type ClusterIndices map[string]map[string]*types.IndicesRecord
@@ -43,6 +47,7 @@ type apiResponse struct {
 	info   *info.Response
 	health *health.Response
 	ccr    *stats.Response
+	stats  *clusterstats.Response
 	which  int
 }
 
@@ -88,6 +93,10 @@ func ClusterList(conf *cfg.Config) error {
 // have to do 3 of'em for each cluster. This speeds things up.
 func ClusterStatus(conf *cfg.Config) error {
 	clusters := []string{}
+	gocount := 3
+	if conf.Verbose {
+		gocount++
+	}
 
 	if conf.All {
 		for key := range conf.Clusters {
@@ -103,21 +112,26 @@ func ClusterStatus(conf *cfg.Config) error {
 			es = conf.Clusters[cluster].ES
 		}
 
-		responses := make(chan apiResponse, 3)
+		responses := make(chan apiResponse, gocount)
 		wg := &sync.WaitGroup{}
 
-		wg.Add(3)
+		wg.Add(gocount)
 		go getClusterData(es, wg, responses, "health")
 		go getClusterData(es, wg, responses, "info")
 		go getClusterData(es, wg, responses, "ccrstats")
 
+		if conf.Verbose {
+			go getClusterData(es, wg, responses, "stats")
+		}
+
 		wg.Wait()
 
 		var clusterhealth *health.Response
 		var info *info.Response
 		var ccrstats *stats.Response
+		var clusterstats *clusterstats.Response
 
-		for i := 0; i < 3; i++ {
+		for i := 0; i < gocount; i++ {
 			r := <-responses
 
 			if r.error != nil {
@@ -131,6 +145,8 @@ func ClusterStatus(conf *cfg.Config) error {
 				ccrstats = r.ccr
 			case ResponseInfo:
 				info = r.info
+			case ResponseStats:
+				clusterstats = r.stats
 			}
 		}
 
@@ -154,11 +170,14 @@ func ClusterStatus(conf *cfg.Config) error {
 			{"ES Version", info.Version.Int},
 			{"Active Shards", fmt.Sprintf("%d", clusterhealth.ActiveShards)},
 			{"Active Primary Shards", fmt.Sprintf("%d", clusterhealth.ActivePrimaryShards)},
-			{"Indicies", fmt.Sprintf("%d", len(clusterhealth.Indices))},
 			{"Nodes", fmt.Sprintf("%d", clusterhealth.NumberOfNodes)},
 			{"AutoFollow (success/failed indices)", ccrfollowing},
 		}
 
+		if conf.Verbose {
+			table = gatherClusterStats(conf, clusterstats, table)
+		}
+
 		if err := table.PrintMarkdown(); err != nil {
 			return err
 		}
@@ -166,3 +185,47 @@ func ClusterStatus(conf *cfg.Config) error {
 
 	return nil
 }
+
+func gatherClusterStats(conf *cfg.Config, clusterstats *clusterstats.Response, table *Table) *Table {
+	var querycount int64
+	var vmversion string
+
+	for _, count := range clusterstats.Indices.Search.Queries {
+		querycount += count
+	}
+
+	if len(clusterstats.Nodes.Jvm.Versions) > 0 {
+		vmversion = strings.Join([]string{
+			clusterstats.Nodes.Jvm.Versions[0].VmName,
+			clusterstats.Nodes.Jvm.Versions[0].VmVersion}, " ")
+	}
+
+	isleader := checkClusterIsLeader(conf, conf.CurrentCluster)
+
+	table.entries = append(table.entries, [][]string{
+		{"Indicies", fmt.Sprintf("%d", clusterstats.Indices.Count)},
+		{"Is Leader", fmt.Sprintf("%t", isleader)},
+		{"Docs", fmt.Sprintf("%d", clusterstats.Indices.Docs.Count)},
+		{"Total Size", humanize.Bytes(uint64(clusterstats.Indices.Docs.TotalSizeInBytes))},
+		{"Total Queries", fmt.Sprintf("%d", querycount)},
+		{"Shards Primaries", fmt.Sprintf("%d", clusterstats.Indices.Shards.Primaries)},
+		{"Shards Total", fmt.Sprintf("%d", clusterstats.Indices.Shards.Total)},
+		{"Storage", fmt.Sprintf(
+			"%s/%s",
+			humanize.Bytes(uint64(clusterstats.Indices.Store.SizeInBytes)),
+			humanize.Bytes(uint64(*clusterstats.Indices.Store.TotalDataSetSizeInBytes)),
+		)},
+		{"JVM Heap", fmt.Sprintf(
+			"%s/%s",
+			humanize.Bytes(uint64(clusterstats.Nodes.Jvm.Mem.HeapUsedInBytes)),
+			humanize.Bytes(uint64(clusterstats.Nodes.Jvm.Mem.HeapMaxInBytes)),
+		)},
+		{"JVM Threads", fmt.Sprintf("%d", clusterstats.Nodes.Jvm.Threads)},
+		{"JVM Version", vmversion},
+		{"CPUs", fmt.Sprintf("%d", clusterstats.Nodes.Os.AllocatedProcessors)},
+		{"CPU Usage", fmt.Sprintf("%d%%", clusterstats.Nodes.Process.Cpu.Percent)},
+		{"Open FDs", fmt.Sprintf("%d", clusterstats.Nodes.Process.OpenFileDescriptors.Avg)},
+	}...)
+
+	return table
+}