Skip to content
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

Report origin/cache version info in Director display #2083

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Report origin/cache version info in Director display #2083

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions director/director_ui.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ type (
HealthStatus HealthTestStatus `json:"healthStatus"`
IOLoad float64 `json:"ioLoad"`
NamespacePrefixes []string `json:"namespacePrefixes"`
Version string `json:"version"`
}

// A response struct for a server Ad that provides a detailed view into the servers data
Expand All @@ -84,6 +85,7 @@ type (
HealthStatus HealthTestStatus `json:"healthStatus"`
IOLoad float64 `json:"ioLoad"`
Namespaces []NamespaceAdV2Response `json:"namespaces"`
Version string `json:"version"`
}

// TokenIssuerResponse creates a response struct for TokenIssuer
Expand Down Expand Up @@ -246,6 +248,7 @@ func advertisementToServerResponse(ad *server_structs.Advertisement) serverRespo
FromTopology: ad.FromTopology,
HealthStatus: healthStatus,
IOLoad: ad.GetIOLoad(),
Version: ad.Version,
}
for _, ns := range ad.NamespaceAds {
nsRes := namespaceAdV2ToResponse(&ns)
Expand Down Expand Up @@ -273,6 +276,7 @@ func serverResponseToListServerResponse(res serverResponse) listServerResponse {
FromTopology: res.FromTopology,
HealthStatus: res.HealthStatus,
IOLoad: res.IOLoad,
Version: res.Version,
}
for _, ns := range res.Namespaces {
listRes.NamespacePrefixes = append(listRes.NamespacePrefixes, ns.Path)
Expand Down
Loading