diff options
| author | Ola Aunrønning <olaa@verizonmedia.com> | 2020-10-02 20:01:49 +0200 |
|---|---|---|
| committer | Ola Aunrønning <olaa@verizonmedia.com> | 2020-10-05 10:21:00 +0200 |
| commit | 1aadccbd3b1adb517ba0cff6e53309e1f4850e92 (patch) | |
| tree | aa87cae4dc7aa3e475c5232d5e03990a7170fdbc /controller-server | |
| parent | 33efcf14454f3d03d8a2a917cb9d1ec070e0e2b9 (diff) | |
Include resource usage in line items
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java index 915c5a71cd0..17dd49dd505 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandler.java @@ -341,6 +341,20 @@ public class BillingApiHandler extends LoggingRequestHandler { lineItem.applicationId().ifPresent(appId -> { cursor.setString("application", appId.application().value()); }); + lineItem.zoneId().ifPresent(zoneId -> + cursor.setString("zone", zoneId.value()) + ); + + lineItem.getCpuHours().ifPresent(cpuHours -> + cursor.setString("cpuHours", cpuHours.toString()) + ); + lineItem.getMemoryHours().ifPresent(memoryHours -> + cursor.setString("memoryHours", memoryHours.toString()) + ); + lineItem.getDiskHours().ifPresent(diskHours -> + cursor.setString("diskHours", diskHours.toString()) + ); + } private HttpResponse deleteInstrument(String tenant, String userId, String instrument) { |