diff --git a/web/packages/teleport/src/Discover/Server/EnrollEc2Instance/Ec2InstanceList.tsx b/web/packages/teleport/src/Discover/Server/EnrollEc2Instance/Ec2InstanceList.tsx index 21189b26ec648..a81a860ddd2f7 100644 --- a/web/packages/teleport/src/Discover/Server/EnrollEc2Instance/Ec2InstanceList.tsx +++ b/web/packages/teleport/src/Discover/Server/EnrollEc2Instance/Ec2InstanceList.tsx @@ -117,6 +117,15 @@ export const Ec2InstanceList = ({ ); }, }, + { + altKey: 'name', + headerText: 'Name', + render: ({ labels, ec2InstanceExists }) => ( + + {labels.find(label => label.name === 'Name')?.value} + + ), + }, { key: 'hostname', headerText: 'Hostname', diff --git a/web/packages/teleport/src/Discover/Server/EnrollEc2Instance/EnrollEc2Instance.story.tsx b/web/packages/teleport/src/Discover/Server/EnrollEc2Instance/EnrollEc2Instance.story.tsx index 9059b0aba22ee..5184782287825 100644 --- a/web/packages/teleport/src/Discover/Server/EnrollEc2Instance/EnrollEc2Instance.story.tsx +++ b/web/packages/teleport/src/Discover/Server/EnrollEc2Instance/EnrollEc2Instance.story.tsx @@ -222,4 +222,26 @@ const ec2InstancesResponse = [ subnetId: 'test', }, }, + { + id: 'ec2-instance-5', + kind: 'node', + clusterId: 'cluster', + hostname: 'ec2-hostname-5', + tags: [ + { name: 'instance', value: 'ec2-5' }, + { name: 'Name', value: 'My EC2 Box' }, + ], + addr: 'ec2.5.com', + tunnel: false, + subKind: 'openssh-ec2-ice', + sshLogins: ['test'], + aws: { + accountId: 'test-account', + instanceId: 'instance-ec2-5', + region: 'us-west-1', + vpcId: 'test', + integration: 'test', + subnetId: 'test', + }, + }, ];