Skip to content

[v18] Implement Instance Inventory UI #62008

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rudream merged 5 commits into from
Feb 13, 2026
Merged

[v18] Implement Instance Inventory UI #62008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3c81b66
implement instance inventory UI
rudream Dec 1, 2025
a36a52a
fix filtering by no upgrader (#63184)
rudream Jan 29, 2026
4ca76e8
add prometheus metrics to inventory cache
rudream Feb 6, 2026
e9c372d
trim v prefix for all instance versions in inventory cache
rudream Feb 13, 2026
e6a6a17
use accesslistservicev2 and static scoped service in test
rudream Feb 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions api/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ import (
gitserverpb "github.com/gravitational/teleport/api/gen/proto/go/teleport/gitserver/v1"
healthcheckconfigv1 "github.com/gravitational/teleport/api/gen/proto/go/teleport/healthcheckconfig/v1"
integrationpb "github.com/gravitational/teleport/api/gen/proto/go/teleport/integration/v1"
inventoryv1 "github.com/gravitational/teleport/api/gen/proto/go/teleport/inventory/v1"
joinv1 "github.com/gravitational/teleport/api/gen/proto/go/teleport/join/v1"
kubeproto "github.com/gravitational/teleport/api/gen/proto/go/teleport/kube/v1"
kubewaitingcontainerpb "github.com/gravitational/teleport/api/gen/proto/go/teleport/kubewaitingcontainer/v1"
Expand Down Expand Up @@ -926,6 +927,11 @@ func (c *Client) WorkloadIdentityServiceClient() machineidv1pb.WorkloadIdentityS
return machineidv1pb.NewWorkloadIdentityServiceClient(c.conn)
}

// InventoryServiceClient returns an unadorned client for the inventory service.
func (c *Client) InventoryServiceClient() inventoryv1.InventoryServiceClient {
return inventoryv1.NewInventoryServiceClient(c.conn)
}

// NotificationServiceClient returns a notification service client that can be used to fetch notifications.
func (c *Client) NotificationServiceClient() notificationsv1pb.NotificationServiceClient {
return notificationsv1pb.NewNotificationServiceClient(c.conn)
Expand Down
10 changes: 10 additions & 0 deletions api/client/inventory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"github.com/gravitational/trace"

"github.com/gravitational/teleport/api/client/proto"
inventoryv1 "github.com/gravitational/teleport/api/gen/proto/go/teleport/inventory/v1"
"github.com/gravitational/teleport/api/internalutils/stream"
"github.com/gravitational/teleport/api/types"
)
Expand Down Expand Up @@ -247,6 +248,15 @@ func (c *Client) GetInstances(ctx context.Context, filter types.InstanceFilter)
}, cancel)
}

// ListUnifiedInstances returns a paginated list of unified instances (teleport instances and bot instances).
func (c *Client) ListUnifiedInstances(ctx context.Context, req *inventoryv1.ListUnifiedInstancesRequest) (*inventoryv1.ListUnifiedInstancesResponse, error) {
rsp, err := c.InventoryServiceClient().ListUnifiedInstances(ctx, req)
if err != nil {
return nil, trace.Wrap(err)
}
return rsp, nil
}

func newDownstreamInventoryControlStream(stream proto.AuthService_InventoryControlStreamClient, cancel context.CancelFunc) DownstreamInventoryControlStream {
ics := &downstreamICS{
sendC: make(chan upstreamSend),
Expand Down
Loading
Loading