Indexes being written to are sorted to the top now

Added thread pool information parsing for node ingestion/task stats, fixed some dynamic padding on the transport address
Added API authentication support
2024-12-02 22:36:12 -05:00 · 2024-12-02 22:29:34 -05:00 · 2024-12-02 21:29:34 -05:00 · 2024-11-30 15:08:01 -05:00 · 2024-11-29 13:24:14 -05:00 · 2024-11-29 12:08:23 -05:00
3 changed files with 427 additions and 155 deletions
--- a/README.md
+++ b/README.md
@ -20,7 +20,7 @@ Elastop is a terminal-based dashboard for monitoring Elasticsearch clusters in r

 ```bash
 # Clone the repository
-git git clone https://github.com/yourusername/elastop.git
+git clone https://github.com/acidvegas/elastop.git
 cd elastop
 go build
 ```
--- a/BIN
+++ b/BIN
--- a/elastop.go
+++ b/elastop.go
@ -1,6 +1,7 @@
 package main

 import (
+	"crypto/tls"
 	"encoding/json"
 	"flag"
 	"fmt"
@ -205,6 +206,37 @@ type CatNodesStats struct {
 	Name   string `json:"name"`
 }

+var (
+	showNodes         = true
+	showRoles         = true
+	showIndices       = true
+	showMetrics       = true
+	showHiddenIndices = false
+)
+
+var (
+	header       *tview.TextView
+	nodesPanel   *tview.TextView
+	rolesPanel   *tview.TextView
+	indicesPanel *tview.TextView
+	metricsPanel *tview.TextView
+)
+
+type DataStreamResponse struct {
+	DataStreams []DataStream `json:"data_streams"`
+}
+
+type DataStream struct {
+	Name      string `json:"name"`
+	Timestamp string `json:"timestamp"`
+	Status    string `json:"status"`
+	Template  string `json:"template"`
+}
+
+var (
+	apiKey string
+)
+
 func bytesToHuman(bytes int64) string {
 	const unit = 1024
 	if bytes < unit {
@ -223,14 +255,9 @@ func bytesToHuman(bytes int64) string {
 	return fmt.Sprintf("%.1f%s", val, units[exp])
 }

-// In the indices panel section, update the formatting part:
-
-// First, let's create a helper function at package level for number formatting
 func formatNumber(n int) string {
-	// Convert number to string
 	str := fmt.Sprintf("%d", n)

-	// Add commas
 	var result []rune
 	for i, r := range str {
 		if i > 0 && (len(str)-i)%3 == 0 {
@ -241,24 +268,20 @@ func formatNumber(n int) string {
 	return string(result)
 }

-// Update the convertSizeFormat function to remove decimal points
 func convertSizeFormat(sizeStr string) string {
 	var size float64
 	var unit string
 	fmt.Sscanf(sizeStr, "%f%s", &size, &unit)

-	// Convert units like "gb" to "G"
 	unit = strings.ToUpper(strings.TrimSuffix(unit, "b"))

-	// Return without decimal points
 	return fmt.Sprintf("%d%s", int(size), unit)
 }

-// Update formatResourceSize to return just the number and unit
-func formatResourceSize(bytes int64, targetUnit string) string {
+func formatResourceSize(bytes int64) string {
 	const unit = 1024
 	if bytes < unit {
-		return fmt.Sprintf("%3d%s", bytes, targetUnit)
+		return fmt.Sprintf("%4d B", bytes)
 	}

 	units := []string{"B", "K", "M", "G", "T", "P"}
@ -270,10 +293,9 @@ func formatResourceSize(bytes int64, targetUnit string) string {
 		exp++
 	}

-	return fmt.Sprintf("%3d%s", int(val), targetUnit)
+	return fmt.Sprintf("%3d%s", int(val), units[exp])
 }

-// Add this helper function at package level
 func getPercentageColor(percent float64) string {
 	switch {
 	case percent < 30:
@ -305,7 +327,6 @@ func getLatestVersion() string {
 		return ""
 	}

-	// Clean up version string (remove 'v' prefix if present)
 	latestVersion = strings.TrimPrefix(release.TagName, "v")
 	versionCache = time.Now()
 	return latestVersion
@ -313,7 +334,7 @@ func getLatestVersion() string {

 func compareVersions(current, latest string) bool {
 	if latest == "" {
-		return true // If we can't get latest version, assume current is ok
+		return true
 	}

 	// Clean up version strings
@ -335,7 +356,6 @@ func compareVersions(current, latest string) bool {
 	return len(currentParts) >= len(latestParts)
 }

-// Update roleColors map with lighter colors for I and R
 var roleColors = map[string]string{
 	"master":                "#ff5555", // red
 	"data":                  "#50fa7b", // green
@ -352,7 +372,6 @@ var roleColors = map[string]string{
 	"coordinating_only":     "#d65d0e", // burnt orange
 }

-// Add this map alongside the roleColors map at package level
 var legendLabels = map[string]string{
 	"master":                "Master",
 	"data":                  "Data",
@ -369,7 +388,6 @@ var legendLabels = map[string]string{
 	"coordinating_only":     "Coordinating Only",
 }

-// Update the formatNodeRoles function to use full width for all possible roles
 func formatNodeRoles(roles []string) string {
 	roleMap := map[string]string{
 		"master":                "M",
@ -396,24 +414,20 @@ func formatNodeRoles(roles []string) string {
 	}
 	sort.Strings(letters)

-	// Create a fixed-width string of 13 spaces (one for each possible role)
-	formattedRoles := "             " // 13 spaces
+	formattedRoles := "             "
 	runeRoles := []rune(formattedRoles)

-	// Fill in the sorted letters
 	for i, letter := range letters {
-		if i < 13 { // Now we can accommodate all possible roles
+		if i < 13 {
 			runeRoles[i] = []rune(letter)[0]
 		}
 	}

-	// Build the final string with colors
 	var result string
 	for _, r := range runeRoles {
 		if r == ' ' {
 			result += " "
 		} else {
-			// Find the role that corresponds to this letter
 			for role, shortRole := range roleMap {
 				if string(r) == shortRole {
 					result += fmt.Sprintf("[%s]%s[white]", roleColors[role], string(r))
@ -426,7 +440,6 @@ func formatNodeRoles(roles []string) string {
 	return result
 }

-// Add a helper function to get health color
 func getHealthColor(health string) string {
 	switch health {
 	case "green":
@ -440,7 +453,6 @@ func getHealthColor(health string) string {
 	}
 }

-// Update the indexInfo struct to include health
 type indexInfo struct {
 	index        string
 	health       string
@ -455,38 +467,146 @@ type indexInfo struct {
 // Add startTime at package level
 var startTime = time.Now()

+func updateGridLayout(grid *tview.Grid, showRoles, showIndices, showMetrics bool) {
+	// Start with clean grid
+	grid.Clear()
+
+	visiblePanels := 0
+	if showRoles {
+		visiblePanels++
+	}
+	if showIndices {
+		visiblePanels++
+	}
+	if showMetrics {
+		visiblePanels++
+	}
+
+	// Adjust row configuration based on whether nodes panel is shown
+	if showNodes {
+		grid.SetRows(3, 0, 0) // Header, nodes, bottom panels
+	} else {
+		grid.SetRows(3, 0) // Just header and bottom panels
+	}
+
+	// Configure columns based on visible panels
+	switch {
+	case visiblePanels == 3:
+		if showRoles {
+			grid.SetColumns(30, -2, -1) // Changed from 20 to 30 for roles panel width
+		}
+	case visiblePanels == 2:
+		if showRoles {
+			grid.SetColumns(30, 0) // Changed from 20 to 30 for roles panel width
+		} else {
+			grid.SetColumns(-1, -1) // Equal split between two panels
+		}
+	case visiblePanels == 1:
+		grid.SetColumns(0) // Single column takes full width
+	}
+
+	// Always show header at top spanning all columns
+	grid.AddItem(header, 0, 0, 1, visiblePanels, 0, 0, false)
+
+	// Add nodes panel if visible, spanning all columns
+	if showNodes {
+		grid.AddItem(nodesPanel, 1, 0, 1, visiblePanels, 0, 0, false)
+	}
+
+	// Add bottom panels in their respective positions
+	col := 0
+	if showRoles {
+		row := 1
+		if showNodes {
+			row = 2
+		}
+		grid.AddItem(rolesPanel, row, col, 1, 1, 0, 0, false)
+		col++
+	}
+	if showIndices {
+		row := 1
+		if showNodes {
+			row = 2
+		}
+		grid.AddItem(indicesPanel, row, col, 1, 1, 0, 0, false)
+		col++
+	}
+	if showMetrics {
+		row := 1
+		if showNodes {
+			row = 2
+		}
+		grid.AddItem(metricsPanel, row, col, 1, 1, 0, 0, false)
+	}
+}
+
 func main() {
-	host := flag.String("host", "localhost", "Elasticsearch host")
+	host := flag.String("host", "http://localhost", "Elasticsearch host URL (e.g., http://localhost or https://example.com)")
 	port := flag.Int("port", 9200, "Elasticsearch port")
-	user := flag.String("user", "elastic", "Elasticsearch username")
+	user := flag.String("user", os.Getenv("ES_USER"), "Elasticsearch username")
 	password := flag.String("password", os.Getenv("ES_PASSWORD"), "Elasticsearch password")
+	flag.StringVar(&apiKey, "apikey", os.Getenv("ES_API_KEY"), "Elasticsearch API key")
 	flag.Parse()

+	// Validate and process the host URL
+	if !strings.HasPrefix(*host, "http://") && !strings.HasPrefix(*host, "https://") {
+		fmt.Fprintf(os.Stderr, "Error: host must start with http:// or https://\n")
+		os.Exit(1)
+	}
+
+	// Validate authentication
+	if apiKey != "" && (*user != "" || *password != "") {
+		fmt.Fprintf(os.Stderr, "Error: Cannot use both API key and username/password authentication\n")
+		os.Exit(1)
+	}
+
+	if apiKey == "" && (*user == "" || *password == "") {
+		fmt.Fprintf(os.Stderr, "Error: Must provide either API key or both username and password\n")
+		os.Exit(1)
+	}
+
+	// Strip any trailing slash from the host
+	*host = strings.TrimRight(*host, "/")
+
+	// Create custom HTTP client with SSL configuration
+	tr := &http.Transport{
+		TLSClientConfig: &tls.Config{
+			InsecureSkipVerify: true, // Allow self-signed certificates
+		},
+	}
+	client := &http.Client{
+		Transport: tr,
+		Timeout:   time.Second * 10,
+	}
+
 	app := tview.NewApplication()

-	// Update the grid layout to use three columns for the bottom section
+	// Update the grid layout to use proportional columns
 	grid := tview.NewGrid().
 		SetRows(3, 0, 0).       // Three rows: header, nodes, bottom panels
 		SetColumns(-1, -2, -1). // Three columns for bottom row: roles (1), indices (2), metrics (1)
 		SetBorders(true)

-	// Create the individual panels
-	header := tview.NewTextView().
+	// Initialize the panels (move initialization to package level)
+	header = tview.NewTextView().
 		SetDynamicColors(true).
 		SetTextAlign(tview.AlignLeft)

-	nodesPanel := tview.NewTextView().
+	nodesPanel = tview.NewTextView().
 		SetDynamicColors(true)

-	rolesPanel := tview.NewTextView(). // New panel for roles
+	rolesPanel = tview.NewTextView(). // New panel for roles
 						SetDynamicColors(true)

-	indicesPanel := tview.NewTextView().
+	indicesPanel = tview.NewTextView().
 		SetDynamicColors(true)

-	metricsPanel := tview.NewTextView().
+	metricsPanel = tview.NewTextView().
 		SetDynamicColors(true)

+	// Initial layout
+	updateGridLayout(grid, showRoles, showIndices, showMetrics)
+
 	// Add panels to grid
 	grid.AddItem(header, 0, 0, 1, 3, 0, 0, false). // Header spans all columns
 							AddItem(nodesPanel, 1, 0, 1, 3, 0, 0, false).   // Nodes panel spans all columns
@ -496,8 +616,7 @@ func main() {

 	// Update function
 	update := func() {
-		baseURL := fmt.Sprintf("http://%s:%d", *host, *port)
-		client := &http.Client{}
+		baseURL := fmt.Sprintf("%s:%d", *host, *port)

 		// Helper function for ES requests
 		makeRequest := func(path string, target interface{}) error {
@ -505,12 +624,25 @@ func main() {
 			if err != nil {
 				return err
 			}
-			req.SetBasicAuth(*user, *password)
+
+			// Set authentication
+			if apiKey != "" {
+				req.Header.Set("Authorization", fmt.Sprintf("ApiKey %s", apiKey))
+			} else {
+				req.SetBasicAuth(*user, *password)
+			}
+
 			resp, err := client.Do(req)
 			if err != nil {
 				return err
 			}
 			defer resp.Body.Close()
+
+			if resp.StatusCode != http.StatusOK {
+				body, _ := io.ReadAll(resp.Body)
+				return fmt.Errorf("API request failed with status %d: %s", resp.StatusCode, string(body))
+			}
+
 			body, err := io.ReadAll(resp.Body)
 			if err != nil {
 				return err
@ -553,6 +685,13 @@ func main() {
 			return
 		}

+		// Get index write stats
+		var indexWriteStats IndexWriteStats
+		if err := makeRequest("/_stats", &indexWriteStats); err != nil {
+			indicesPanel.SetText(fmt.Sprintf("[red]Error getting write stats: %v", err))
+			return
+		}
+
 		// Calculate aggregate metrics
 		var (
 			totalQueries       int64
@ -591,46 +730,45 @@ func main() {
 			"red":    "red",
 		}[clusterStats.Status]

-		// Calculate maxNodeNameLen first
-		maxNodeNameLen := 20 // default minimum length
-		for _, nodeInfo := range nodesInfo.Nodes {
-			if len(nodeInfo.Name) > maxNodeNameLen {
-				maxNodeNameLen = len(nodeInfo.Name)
-			}
-		}
+		// Get max lengths after fetching node and index info
+		maxNodeNameLen, maxIndexNameLen, maxTransportLen := getMaxLengths(nodesInfo, indicesStats)

-		// Then use it in header formatting
+		// Update header with dynamic padding
 		header.Clear()
 		latestVer := getLatestVersion()
-		fmt.Fprintf(header, "[#00ffff]Cluster:[white] %s [%s]%s[-]%s[#00ffff]Latest: [white]%s\n",
+		padding := 0
+		if maxNodeNameLen > len(clusterStats.ClusterName) {
+			padding = maxNodeNameLen - len(clusterStats.ClusterName)
+		}
+		fmt.Fprintf(header, "[#00ffff]Cluster :[white] %s [#666666]([%s]%s[-]%s[#666666]) [#00ffff]Latest: [white]%s\n",
 			clusterStats.ClusterName,
 			statusColor,
 			strings.ToUpper(clusterStats.Status),
-			strings.Repeat(" ", maxNodeNameLen-len(clusterStats.ClusterName)), // Add padding
+			strings.Repeat(" ", padding),
 			latestVer)
-		fmt.Fprintf(header, "[#00ffff]Nodes:[white] %d Total, [green]%d[white] Successful, [#ff5555]%d[white] Failed\n",
+		fmt.Fprintf(header, "[#00ffff]Nodes   :[white] %d Total, [green]%d[white] Successful, [#ff5555]%d[white] Failed\n",
 			clusterStats.Nodes.Total,
 			clusterStats.Nodes.Successful,
 			clusterStats.Nodes.Failed)
+		fmt.Fprintf(header, "[#666666]Press 2-5 to toggle panels, 'h' to toggle hidden indices, 'q' to quit[white]\n")

-		// Update nodes panel
+		// Update nodes panel with dynamic width
 		nodesPanel.Clear()
-		fmt.Fprintf(nodesPanel, "[::b][#00ffff]Nodes Information[::-]\n\n")
-		fmt.Fprintf(nodesPanel, "[::b]%-*s [#444444]│[#00ffff] %-13s [#444444]│[#00ffff] %-20s [#444444]│[#00ffff] %-7s [#444444]│[#00ffff] %4s      [#444444]│[#00ffff] %4s [#444444]│[#00ffff] %-16s [#444444]│[#00ffff] %-16s [#444444]│[#00ffff] %-16s [#444444]│[#00ffff] %-25s[white]\n",
-			maxNodeNameLen,
-			"Node Name",
-			"Roles",
-			"Transport Address",
-			"Version",
-			"CPU",
-			"Load",
-			"Memory",
-			"Heap",
-			"Disk ",
-			"OS")
+		fmt.Fprintf(nodesPanel, "[::b][#00ffff][[#ff5555]2[#00ffff]] Nodes Information[::-]\n\n")
+		fmt.Fprint(nodesPanel, getNodesPanelHeader(maxNodeNameLen, maxTransportLen))

-		// Display nodes with resource usage
-		for id, nodeInfo := range nodesInfo.Nodes {
+		// Create a sorted slice of node IDs based on node names
+		var nodeIDs []string
+		for id := range nodesInfo.Nodes {
+			nodeIDs = append(nodeIDs, id)
+		}
+		sort.Slice(nodeIDs, func(i, j int) bool {
+			return nodesInfo.Nodes[nodeIDs[i]].Name < nodesInfo.Nodes[nodeIDs[j]].Name
+		})
+
+		// Update node entries with dynamic width
+		for _, id := range nodeIDs {
+			nodeInfo := nodesInfo.Nodes[id]
 			nodeStats, exists := nodesStats.Nodes[id]
 			if !exists {
 				continue
@ -646,8 +784,8 @@ func main() {
 			diskAvailable := int64(0)
 			if len(nodeStats.FS.Data) > 0 {
 				// Use the first data path's stats - this is the Elasticsearch data directory
-				diskTotal = nodeStats.FS.Data[0].TotalInBytes         // e.g. 5.6TB for r320-1
-				diskAvailable = nodeStats.FS.Data[0].AvailableInBytes // e.g. 5.0TB available
+				diskTotal = nodeStats.FS.Data[0].TotalInBytes
+				diskAvailable = nodeStats.FS.Data[0].AvailableInBytes
 			} else {
 				// Fallback to total stats if data path stats aren't available
 				diskTotal = nodeStats.FS.Total.TotalInBytes
@ -674,10 +812,29 @@ func main() {
 				nodeLoads[node.Name] = node.Load1m
 			}

-			fmt.Fprintf(nodesPanel, "[#5555ff]%-*s[white] [#444444]│[white] %s [#444444]│[white] [white]%-20s[white] [#444444]│[white] [%s]%-7s[white] [#444444]│[white] [%s]%3d%% [#444444](%d)[white] [#444444]│[white] %4s [#444444]│[white] %4s / %4s [%s]%3d%%[white] [#444444]│[white] %4s / %4s [%s]%3d%%[white] [#444444]│[white] %4s / %4s [%s]%3d%%[white] [#444444]│[white] %s [#bd93f9]%s[white] [#444444](%s)[white]\n",
+			// In the update() function, add this request before processing nodes:
+			var threadPoolStats []ThreadPoolStats
+			if err := makeRequest("/_cat/thread_pool/generic?format=json&h=node_name,name,active,queue,rejected,completed", &threadPoolStats); err != nil {
+				nodesPanel.SetText(fmt.Sprintf("[red]Error getting thread pool stats: %v", err))
+				return
+			}
+
+			// Create a map for quick lookup of thread pool stats by node name
+			threadPoolMap := make(map[string]ThreadPoolStats)
+			for _, stat := range threadPoolStats {
+				threadPoolMap[stat.NodeName] = stat
+			}
+
+			active, _ := strconv.Atoi(threadPoolMap[nodeInfo.Name].Active)
+			queue, _ := strconv.Atoi(threadPoolMap[nodeInfo.Name].Queue)
+			rejected, _ := strconv.Atoi(threadPoolMap[nodeInfo.Name].Rejected)
+			completed, _ := strconv.Atoi(threadPoolMap[nodeInfo.Name].Completed)
+
+			fmt.Fprintf(nodesPanel, "[#5555ff]%-*s  [white] [#444444]│[white] %s [#444444]│[white] [white]%-*s[white] [#444444]│[white] [%s]%-7s[white] [#444444]│[white] [%s]%3d%% [#444444](%d)[white] [#444444]│[white] %4s [#444444]│[white] %4s / %4s [%s]%3d%%[white] [#444444]│[white] %4s / %4s [%s]%3d%%[white] [#444444]│[white] %4s / %4s [%s]%3d%%[white] [#444444]│[white] %6s [#444444]│[white] %5s [#444444]│[white] %8s [#444444]│[white] %9s [#444444]│[white] %s [#bd93f9]%s[white] [#444444](%s)[white]\n",
 				maxNodeNameLen,
 				nodeInfo.Name,
 				formatNodeRoles(nodeInfo.Roles),
+				maxTransportLen,
 				nodeInfo.TransportAddress,
 				versionColor,
 				nodeInfo.Version,
@ -685,118 +842,127 @@ func main() {
 				cpuPercent,
 				nodeInfo.OS.AvailableProcessors,
 				nodeLoads[nodeInfo.Name],
-				formatResourceSize(nodeStats.OS.Memory.UsedInBytes, "G"),
-				formatResourceSize(nodeStats.OS.Memory.TotalInBytes, "G"),
+				formatResourceSize(nodeStats.OS.Memory.UsedInBytes),
+				formatResourceSize(nodeStats.OS.Memory.TotalInBytes),
 				getPercentageColor(memPercent),
 				int(memPercent),
-				formatResourceSize(nodeStats.JVM.Memory.HeapUsedInBytes, "G"),
-				formatResourceSize(nodeStats.JVM.Memory.HeapMaxInBytes, "G"),
+				formatResourceSize(nodeStats.JVM.Memory.HeapUsedInBytes),
+				formatResourceSize(nodeStats.JVM.Memory.HeapMaxInBytes),
 				getPercentageColor(heapPercent),
 				int(heapPercent),
-				formatResourceSize(diskUsed, "G"),
-				formatResourceSize(diskTotal, "T"),
+				formatResourceSize(diskUsed),
+				formatResourceSize(diskTotal),
 				getPercentageColor(diskPercent),
 				int(diskPercent),
+				formatNumber(active),
+				formatNumber(queue),
+				formatNumber(rejected),
+				formatNumber(completed),
 				nodeInfo.OS.PrettyName,
 				nodeInfo.OS.Version,
 				nodeInfo.OS.Arch)
 		}

-		// Update indices panel
-		indicesPanel.Clear()
-		fmt.Fprintf(indicesPanel, "[::b][#00ffff]Indices Information[::-]\n\n")
-		fmt.Fprintf(indicesPanel, "   [::b]%-20s  %15s  %12s  %8s  %8s  %-12s  %-10s[white]\n",
-			"Index Name",
-			"Documents",
-			"Size",
-			"Shards",
-			"Replicas",
-			"Ingested",
-			"Rate")
+		// Get data streams info
+		var dataStreamResp DataStreamResponse
+		if err := makeRequest("/_data_stream", &dataStreamResp); err != nil {
+			indicesPanel.SetText(fmt.Sprintf("[red]Error getting data streams: %v", err))
+			return
+		}

-		totalDocs := 0
-		totalSize := int64(0)
+		// Update indices panel with dynamic width
+		indicesPanel.Clear()
+		fmt.Fprintf(indicesPanel, "[::b][#00ffff][[#ff5555]4[#00ffff]] Indices Information[::-]\n\n")
+		fmt.Fprint(indicesPanel, getIndicesPanelHeader(maxIndexNameLen))
+
+		// Update index entries with dynamic width
+		var indices []indexInfo
+		var totalDocs int
+		var totalSize int64
+
+		// Collect index information
+		for _, index := range indicesStats {
+			// Skip hidden indices unless showHiddenIndices is true
+			if (!showHiddenIndices && strings.HasPrefix(index.Index, ".")) || index.DocsCount == "0" {
+				continue
+			}
+			docs := 0
+			fmt.Sscanf(index.DocsCount, "%d", &docs)
+			totalDocs += docs
+
+			// Track document changes
+			activity, exists := indexActivities[index.Index]
+			if !exists {
+				indexActivities[index.Index] = &IndexActivity{
+					LastDocsCount:    docs,
+					InitialDocsCount: docs,
+					StartTime:        time.Now(),
+				}
+			} else {
+				activity.LastDocsCount = docs
+			}
+
+			// Get write operations count and calculate rate
+			writeOps := int64(0)
+			indexingRate := float64(0)
+			if stats, exists := indexWriteStats.Indices[index.Index]; exists {
+				writeOps = stats.Total.Indexing.IndexTotal
+				if activity, ok := indexActivities[index.Index]; ok {
+					timeDiff := time.Since(activity.StartTime).Seconds()
+					if timeDiff > 0 {
+						indexingRate = float64(docs-activity.InitialDocsCount) / timeDiff
+					}
+				}
+			}
+
+			indices = append(indices, indexInfo{
+				index:        index.Index,
+				health:       index.Health,
+				docs:         docs,
+				storeSize:    index.StoreSize,
+				priShards:    index.PriShards,
+				replicas:     index.Replicas,
+				writeOps:     writeOps,
+				indexingRate: indexingRate,
+			})
+		}
+
+		// Calculate total size
 		for _, node := range nodesStats.Nodes {
 			totalSize += node.FS.Total.TotalInBytes - node.FS.Total.AvailableInBytes
 		}

-		// Get detailed index stats for write operations
-		var indexWriteStats IndexWriteStats
-		if err := makeRequest("/_stats", &indexWriteStats); err != nil {
-			indicesPanel.SetText(fmt.Sprintf("[red]Error getting write stats: %v", err))
-			return
-		}
-
-		// Create a slice to hold indices for sorting
-		var indices []indexInfo
-
-		// Collect index information
-		for _, index := range indicesStats {
-			// Skip hidden indices
-			if !strings.HasPrefix(index.Index, ".") && index.DocsCount != "0" {
-				docs := 0
-				fmt.Sscanf(index.DocsCount, "%d", &docs)
-				totalDocs += docs
-
-				// Track document changes
-				activity, exists := indexActivities[index.Index]
-				if !exists {
-					indexActivities[index.Index] = &IndexActivity{
-						LastDocsCount:    docs,
-						InitialDocsCount: docs,
-						StartTime:        time.Now(),
-					}
-				} else {
-					activity.LastDocsCount = docs
-				}
-
-				// Get write operations count and calculate rate
-				writeOps := int64(0)
-				indexingRate := float64(0)
-				if stats, exists := indexWriteStats.Indices[index.Index]; exists {
-					writeOps = stats.Total.Indexing.IndexTotal
-					if activity, ok := indexActivities[index.Index]; ok {
-						timeDiff := time.Since(activity.StartTime).Seconds()
-						if timeDiff > 0 {
-							indexingRate = float64(docs-activity.InitialDocsCount) / timeDiff
-						}
-					}
-				}
-
-				indices = append(indices, indexInfo{
-					index:        index.Index,
-					health:       index.Health,
-					docs:         docs,
-					storeSize:    index.StoreSize,
-					priShards:    index.PriShards,
-					replicas:     index.Replicas,
-					writeOps:     writeOps,
-					indexingRate: indexingRate,
-				})
-			}
-		}
-
-		// Sort indices by document count (descending)
+		// Sort indices - active ones first, then alphabetically within each group
 		sort.Slice(indices, func(i, j int) bool {
-			return indices[i].docs > indices[j].docs
+			// If one is active and the other isn't, active goes first
+			if (indices[i].indexingRate > 0) != (indices[j].indexingRate > 0) {
+				return indices[i].indexingRate > 0
+			}
+			// Within the same group (both active or both inactive), sort alphabetically
+			return indices[i].index < indices[j].index
 		})

-		// Display sorted indices
+		// Update index entries with dynamic width
 		for _, idx := range indices {
-			// Only show purple dot if there's actual indexing happening
 			writeIcon := "[#444444]⚪"
 			if idx.indexingRate > 0 {
 				writeIcon = "[#5555ff]⚫"
 			}

+			// Add data stream indicator
+			streamIndicator := " "
+			if isDataStream(idx.index, dataStreamResp) {
+				streamIndicator = "[#bd93f9]⚡[white]"
+			}
+
 			// Calculate document changes
 			activity := indexActivities[idx.index]
 			ingestedStr := ""
 			if activity != nil && activity.InitialDocsCount < idx.docs {
 				docChange := idx.docs - activity.InitialDocsCount
-				ingestedStr = fmt.Sprintf("[green]+%-11s", formatNumber(docChange))
+				ingestedStr = fmt.Sprintf("[green]%-12s", fmt.Sprintf("+%s", formatNumber(docChange)))
 			} else {
-				ingestedStr = fmt.Sprintf("%-12s", "") // Empty space if no changes
+				ingestedStr = fmt.Sprintf("%-12s", "")
 			}

 			// Format indexing rate
@ -814,9 +980,11 @@ func main() {
 			// Convert the size format before display
 			sizeStr := convertSizeFormat(idx.storeSize)

-			fmt.Fprintf(indicesPanel, "%s [%s]%-20s[white]  %15s  %12s  %8s  %8s  %s  %-10s\n",
+			fmt.Fprintf(indicesPanel, "%s %s[%s]%-*s[white] [#444444]│[white] %15s [#444444]│[white] %12s [#444444]│[white] %8s [#444444]│[white] %8s [#444444]│[white] %s [#444444]│[white] %-8s\n",
 				writeIcon,
+				streamIndicator,
 				getHealthColor(idx.health),
+				maxIndexNameLen,
 				idx.index,
 				formatNumber(idx.docs),
 				sizeStr,
@ -863,7 +1031,7 @@ func main() {

 		// Update metrics panel
 		metricsPanel.Clear()
-		fmt.Fprintf(metricsPanel, "[::b][#00ffff]Cluster Metrics[::-]\n\n")
+		fmt.Fprintf(metricsPanel, "[::b][#00ffff][[#ff5555]5[#00ffff]] Cluster Metrics[::-]\n\n")

 		// Helper function to format metric lines with consistent alignment
 		formatMetric := func(name string, value string) string {
@ -930,7 +1098,7 @@ func main() {

 		// Update roles panel
 		rolesPanel.Clear()
-		fmt.Fprintf(rolesPanel, "[::b][#00ffff]Node Roles[::-]\n\n")
+		fmt.Fprintf(rolesPanel, "[::b][#00ffff][[#ff5555]3[#00ffff]] Node Roles[::-]\n\n")

 		// Create a map of used roles
 		usedRoles := make(map[string]bool)
@ -983,8 +1151,29 @@ func main() {

 	// Handle quit
 	app.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
-		if event.Key() == tcell.KeyEsc || event.Rune() == 'q' {
+		switch event.Key() {
+		case tcell.KeyEsc:
 			app.Stop()
+		case tcell.KeyRune:
+			switch event.Rune() {
+			case 'q':
+				app.Stop()
+			case '2':
+				showNodes = !showNodes
+				updateGridLayout(grid, showRoles, showIndices, showMetrics)
+			case '3':
+				showRoles = !showRoles
+				updateGridLayout(grid, showRoles, showIndices, showMetrics)
+			case '4':
+				showIndices = !showIndices
+				updateGridLayout(grid, showRoles, showIndices, showMetrics)
+			case '5':
+				showMetrics = !showMetrics
+				updateGridLayout(grid, showRoles, showIndices, showMetrics)
+			case 'h':
+				showHiddenIndices = !showHiddenIndices
+				// Let the regular update cycle handle it
+			}
 		}
 		return event
 	})
@ -994,7 +1183,6 @@ func main() {
 	}
 }

-// Add these helper functions at package level
 func getTotalSegments(stats NodesStats) int64 {
 	var total int64
 	for _, node := range stats.Nodes {
@ -1026,3 +1214,87 @@ func getTotalNetworkRX(stats NodesStats) int64 {
 	}
 	return total
 }
+
+func getMaxLengths(nodesInfo NodesInfo, indicesStats IndexStats) (int, int, int) {
+	maxNodeNameLen := 0
+	maxIndexNameLen := 0
+	maxTransportLen := 0
+
+	// Get max node name and transport address length
+	for _, nodeInfo := range nodesInfo.Nodes {
+		if len(nodeInfo.Name) > maxNodeNameLen {
+			maxNodeNameLen = len(nodeInfo.Name)
+		}
+		if len(nodeInfo.TransportAddress) > maxTransportLen {
+			maxTransportLen = len(nodeInfo.TransportAddress)
+		}
+	}
+
+	// Get max index name length only for visible indices
+	for _, index := range indicesStats {
+		// Only consider indices that should be visible based on showHiddenIndices
+		if (showHiddenIndices || !strings.HasPrefix(index.Index, ".")) && index.DocsCount != "0" {
+			if len(index.Index) > maxIndexNameLen {
+				maxIndexNameLen = len(index.Index)
+			}
+		}
+	}
+
+	// Add padding
+	maxNodeNameLen += 2
+	maxIndexNameLen += 1 // Single space before separator
+	maxTransportLen += 2 // Add some padding for transport address
+
+	return maxNodeNameLen, maxIndexNameLen, maxTransportLen
+}
+
+func getNodesPanelHeader(maxNodeNameLen, maxTransportLen int) string {
+	return fmt.Sprintf("[::b]%-*s  [#444444]│[#00ffff] %-13s [#444444]│[#00ffff] %-*s [#444444]│[#00ffff] %-7s [#444444]│[#00ffff] %4s      [#444444]│[#00ffff] %4s [#444444]│[#00ffff] %-16s [#444444]│[#00ffff] %-16s [#444444]│[#00ffff] %-16s [#444444]│[#00ffff] %6s [#444444]│[#00ffff] %5s [#444444]│[#00ffff] %8s [#444444]│[#00ffff] %9s [#444444]│[#00ffff] %-25s[white]\n",
+		maxNodeNameLen,
+		"Node Name",
+		"Roles",
+		maxTransportLen,
+		"Transport Address",
+		"Version",
+		"CPU",
+		"Load",
+		"Memory",
+		"Heap",
+		"Disk",
+		"Active",
+		"Queue",
+		"Rejected",
+		"Completed",
+		"OS")
+}
+
+func getIndicesPanelHeader(maxIndexNameLen int) string {
+	return fmt.Sprintf("   [::b] %-*s [#444444]│[#00ffff] %15s [#444444]│[#00ffff] %12s [#444444]│[#00ffff] %8s [#444444]│[#00ffff] %8s [#444444]│[#00ffff] %-12s [#444444]│[#00ffff] %-8s[white]\n",
+		maxIndexNameLen,
+		"Index Name",
+		"Documents",
+		"Size",
+		"Shards",
+		"Replicas",
+		"Ingested",
+		"Rate")
+}
+
+func isDataStream(name string, dataStreams DataStreamResponse) bool {
+	for _, ds := range dataStreams.DataStreams {
+		if ds.Name == name {
+			return true
+		}
+	}
+	return false
+}
+
+// Add this with the other type definitions near the top of the file
+type ThreadPoolStats struct {
+	NodeName  string `json:"node_name"`
+	Name      string `json:"name"`
+	Active    string `json:"active"`
+	Queue     string `json:"queue"`
+	Rejected  string `json:"rejected"`
+	Completed string `json:"completed"`
+}
Author	SHA1	Message	Date
acidvegas	1d08518847	Indexes being written to are sorted to the top now	2024-12-02 22:36:12 -05:00
acidvegas	80303143ef	Added thread pool information parsing for node ingestion/task stats, fixed some dynamic padding on the transport address	2024-12-02 22:29:34 -05:00
acidvegas	55db2a7a13	Added API authentication support	2024-12-02 21:29:34 -05:00
acidvegas	1caff77734	Added support for data streams	2024-11-30 15:08:01 -05:00
acidvegas	29ea00fb73	Sorting nodes by name now, dynamic padding for indexes based on if hidden indexes are toggled, fixed width for the node roles panel	2024-11-29 13:24:14 -05:00
acidvegas	7d2187ae85	Added a toggle to press h to hide/show hidden indexes	2024-11-29 12:08:23 -05:00
acidvegas	12b106cda5	Added http support	2024-11-29 11:57:37 -05:00
acidvegas	2bc93bf707	Removed leftover dev comments	2024-11-29 03:21:02 -05:00
acidvegas	1992593b01	Pointless comments removed from source	2024-11-29 03:11:02 -05:00
acidvegas	6e7759e8c2	Removed un-used var	2024-11-29 03:04:43 -05:00
acidvegas	e18be60221	Ensure no negative padding	2024-11-29 02:56:56 -05:00
acidvegas	dc52d4e862	Fixed typo in git clone command	2024-11-29 02:46:22 -05:00
acidvegas	4005778512	Added dynamic node/index name padding & togglable boxes	2024-11-29 02:42:54 -05:00
acidvegas	744fd5a57d	Fixed size displays	2024-11-29 02:23:16 -05:00
acidvegas	992943aa84	Fixed incorrect size letter shown	2024-11-29 02:14:22 -05:00
acidvegas	7ecdede375	fixed typo in readme git clone url	2024-11-29 01:43:55 -05:00