diff --git a/management/server/http/api/openapi.yml b/management/server/http/api/openapi.yml index f886ccd32..96f6c1972 100644 --- a/management/server/http/api/openapi.yml +++ b/management/server/http/api/openapi.yml @@ -96,20 +96,18 @@ components: type: array items: $ref: '#/components/schemas/GroupMinimum' - activated_by: - description: Provides information of who activated the Peer. User or Setup Key - type: object - properties: - type: - type: string - value: - type: string - required: - - type - - value ssh_enabled: description: Indicates whether SSH server is enabled on this peer type: boolean + user_id: + description: User ID of the user that enrolled this peer + type: string + hostname: + description: Hostname of the machine + type: string + ui_version: + description: Peer's desktop UI version + type: string required: - ip - connected @@ -117,8 +115,8 @@ components: - os - version - groups - - activated_by - ssh_enabled + - hostname SetupKey: type: object properties: diff --git a/management/server/http/api/types.gen.go b/management/server/http/api/types.gen.go index 7a3b6ae5e..0ac2a8135 100644 --- a/management/server/http/api/types.gen.go +++ b/management/server/http/api/types.gen.go @@ -125,18 +125,15 @@ type PatchMinimumOp string // Peer defines model for Peer. type Peer struct { - // Provides information of who activated the Peer. User or Setup Key - ActivatedBy struct { - Type string `json:"type"` - Value string `json:"value"` - } `json:"activated_by"` - // Peer to Management connection status Connected bool `json:"connected"` // Groups that the peer belongs to Groups []GroupMinimum `json:"groups"` + // Hostname of the machine + Hostname string `json:"hostname"` + // Peer ID Id string `json:"id"` @@ -155,6 +152,12 @@ type Peer struct { // Indicates whether SSH server is enabled on this peer SshEnabled bool `json:"ssh_enabled"` + // Peer's desktop UI version + UiVersion *string `json:"ui_version,omitempty"` + + // User ID of the user that enrolled this peer + UserId *string `json:"user_id,omitempty"` + // Peer's daemon or cli version Version string `json:"version"` } diff --git a/management/server/http/peers.go b/management/server/http/peers.go index d78921a6e..f9c04a831 100644 --- a/management/server/http/peers.go +++ b/management/server/http/peers.go @@ -11,7 +11,7 @@ import ( "net/http" ) -//Peers is a handler that returns peers of the account +// Peers is a handler that returns peers of the account type Peers struct { accountManager server.AccountManager authAudience string @@ -144,5 +144,8 @@ func toPeerResponse(peer *server.Peer, account *server.Account) *api.Peer { Version: peer.Meta.WtVersion, Groups: groupsInfo, SshEnabled: peer.SSHEnabled, + Hostname: peer.Meta.Hostname, + UserId: &peer.UserID, + UiVersion: &peer.Meta.UIVersion, } }