Get zone for cluster nodes

humio · Oct 6, 2020 · 38ed959 · 38ed959
1 parent 9a04e73
commit 38ed959
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/api/cluster.go b/api/cluster.go
@@ -33,6 +33,8 @@ type ClusterNode struct {
 	SolitarySegmentSize     float64
 	IsAvailable             bool
 	LastHeartbeat           string
+	// Zone holds the availability zone as configured in the `ZONE` configuration of the Humio server.
+	Zone string
 }
 
 type IngestPartition struct {

diff --git a/cmd/humioctl/cluster_nodes_list.go b/cmd/humioctl/cluster_nodes_list.go
@@ -44,11 +44,11 @@ func newClusterNodesListCmd() *cobra.Command {
 
 			rows := make([][]string, len(nodes))
 			for i, node := range nodes {
-				rows[i] = []string{strconv.Itoa(node.Id), node.Name, strconv.FormatBool(node.CanBeSafelyUnregistered)}
+				rows[i] = []string{strconv.Itoa(node.Id), node.Name, strconv.FormatBool(node.CanBeSafelyUnregistered), node.Zone}
 			}
 
 			w := tablewriter.NewWriter(cmd.OutOrStdout())
-			w.SetHeader([]string{"ID", "Name", "Can be safely unregistered"})
+			w.SetHeader([]string{"ID", "Name", "Can be safely unregistered", "Availability Zone"})
 			w.AppendBulk(rows)
 			w.SetBorder(false)
 

diff --git a/cmd/humioctl/cluster_nodes_show.go b/cmd/humioctl/cluster_nodes_show.go
@@ -68,6 +68,7 @@ func printClusterNodeInfo(cmd *cobra.Command, node api.ClusterNode) {
 		{"Solitary segment size", ByteCountDecimal(int64(node.SolitarySegmentSize))},
 		{"Is available", strconv.FormatBool(node.IsAvailable)},
 		{"Last heartbeat", node.LastHeartbeat},
+		{"Availability Zone", node.Zone},
 	}
 
 	w := tablewriter.NewWriter(cmd.OutOrStdout())