aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/MeteringResponse.java
diff options
context:
space:
mode:
Diffstat (limited to 'controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/MeteringResponse.java')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/MeteringResponse.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/MeteringResponse.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/MeteringResponse.java
index 7df216d6c9c..28248560a6f 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/MeteringResponse.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/controller/MeteringResponse.java
@@ -26,13 +26,16 @@ public class MeteringResponse extends SlimeJsonResponse {
List<ResourceSnapshot> snapshots = resourceClient.getRawSnapshotHistoryForTenant(TenantName.from(tenantName), YearMonth.parse(month));
snapshots.forEach(snapshot -> {
Cursor object = root.addObject();
- object.setString("applicationId", snapshot.getApplicationId().toShortString());
+ object.setString("applicationId", snapshot.getApplicationId().toFullString());
object.setLong("timestamp", snapshot.getTimestamp().toEpochMilli());
object.setString("zoneId", snapshot.getZoneId().value());
object.setDouble("cpu", snapshot.resources().vcpu());
object.setDouble("memory", snapshot.resources().memoryGb());
object.setDouble("disk", snapshot.resources().diskGb());
object.setString("architecture", snapshot.resources().architecture().name());
+ object.setString("version", snapshot.getVersion().toFullString());
+ object.setDouble("gpuMemoryGb", snapshot.resources().gpuResources().memoryGb());
+ object.setLong("gpuCount", snapshot.resources().gpuResources().count());
});
return slime;
}