(nats-io#1230) Add line break after each group in server/consumer check

ploubser · Jan 27, 2025 · 2800f02 · 2800f02
1 parent ae19611
commit 2800f02
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/cli/server_consumer_check.go b/cli/server_consumer_check.go
@@ -202,7 +202,8 @@ func (c *ConsumerCheckCmd) consumerCheck(_ *fisk.ParseContext) error {
 		table.AddHeaders("Consumer", "Stream", "Raft", "Account", "Account ID", "Node", "Delivered (S,C)", "ACK Floor (S,C)", "Counters", "Status", "Leader", "Stream Cluster Leader", "Peers")
 	}
 
-	for _, k := range keys {
+	var prev, prevAccount string
+	for i, k := range keys {
 		var unsynced bool
 		av := strings.Split(k, "|")
 		accName := av[0]
@@ -346,6 +347,13 @@ func (c *ConsumerCheckCmd) consumerCheck(_ *fisk.ParseContext) error {
 			clusterLeader = replica.Cluster.Leader
 		}
 
+		if i > 0 && prev != replica.ConsumerName || prevAccount != accName {
+			table.AddSeparator()
+		}
+
+		prev = replica.ConsumerName
+		prevAccount = accName
+
 		table.AddRow(replica.ConsumerName, replica.StreamName, replica.RaftGroup, accountname, replica.AccountID, node, delivered, ackfloor, counters, status, clusterLeader, replica.StreamCluster.Leader, strings.TrimSpace(replicasInfo), healthStatus)
 	}
 

diff --git a/cli/server_stream_check.go b/cli/server_stream_check.go
@@ -145,7 +145,8 @@ func (c *StreamCheckCmd) streamCheck(_ *fisk.ParseContext) error {
 		table.AddHeaders("Stream Replica", "Raft", "Account", "Account ID", "Node", "Messages", "Bytes", "Subjects", "Deleted", "Consumers", "First", "Last", "Status", "Leader", "Peers")
 	}
 
-	for _, k := range keys {
+	var prev, prevAccount string
+	for i, k := range keys {
 		var unsynced bool
 		av := strings.Split(k, "|")
 		accName := av[0]
@@ -238,6 +239,13 @@ func (c *StreamCheckCmd) streamCheck(_ *fisk.ParseContext) error {
 			}
 		}
 
+		if i > 0 && prev != replica.StreamName || prevAccount != accName {
+			table.AddSeparator()
+		}
+
+		prev = replica.StreamName
+		prevAccount = accName
+
 		table.AddRow(replica.StreamName, replica.RaftGroup, account, replica.AccountID, fmt.Sprintf("%s%s", serverName, suffix), replica.State.Msgs, replica.State.Bytes, replica.State.NumSubjects, replica.State.NumDeleted, replica.State.Consumers, replica.State.FirstSeq,
 			replica.State.LastSeq, status, replica.Cluster.Leader, strings.TrimSpace(replicasInfo), healthStatus)
 	}