diff --git a/api/operator_keyring.go b/api/operator_keyring.go index 6b614296ce..038d5d5b02 100644 --- a/api/operator_keyring.go +++ b/api/operator_keyring.go @@ -16,6 +16,9 @@ type KeyringResponse struct { // Segment has the network segment this request corresponds to. Segment string + // Messages has information or errors from serf + Messages map[string]string `json:",omitempty"` + // A map of the encryption keys to the number of nodes they're installed on Keys map[string]int diff --git a/command/keyring/keyring.go b/command/keyring/keyring.go index 33c3297920..b9a12732a7 100644 --- a/command/keyring/keyring.go +++ b/command/keyring/keyring.go @@ -154,6 +154,11 @@ func (c *cmd) handleList(responses []*consulapi.KeyringResponse) { c.UI.Output("") c.UI.Output(pool + ":") + + for from, msg := range response.Messages { + c.UI.Output(fmt.Sprintf(" ===> %s: %s", from, msg)) + } + for key, num := range response.Keys { c.UI.Output(fmt.Sprintf(" %s [%d/%d]", key, num, response.NumNodes)) }