Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Allow no application resources | Valerij Fredriksen | 2023-10-17 | 1 | -22/+22 |
| | |||||
* | Revert "Revert "Set creator as contact when initiating new tenant"" | Bjørn Christian Seime | 2023-10-17 | 1 | -1/+6 |
| | |||||
* | Add description for enclave item for total spend | Harald Musum | 2023-10-17 | 1 | -12/+20 |
| | |||||
* | Merge pull request #28949 from vespa-engine/olaa/billing-verification | Ola Aunrønning | 2023-10-17 | 1 | -1/+2 |
|\ | | | | | Billing mail verification | ||||
| * | Billing mail verification | Ola Aunronning | 2023-10-16 | 1 | -1/+2 |
| | | |||||
* | | Merge pull request #28909 from vespa-engine/maintain-invoices | Gjøran Voldengen | 2023-10-17 | 6 | -5/+78 |
|\ \ | | | | | | | Allow maintaining and updating invoices. | ||||
| * | | Add test for invoice maintenance done by BillingReportMaintainer. | gjoranv | 2023-10-16 | 4 | -12/+30 |
| | | | | | | | | | | | | | | | - Add a (mock) database client to the mock billing controller. - Improve InvoiceUpdate class. | ||||
| * | | Add method comment. | gjoranv | 2023-10-16 | 1 | -0/+1 |
| | | | |||||
| * | | Wire in invoice maintainance | gjoranv | 2023-10-16 | 2 | -1/+7 |
| | | | | | | | | | | | | .. and move control to BillingReportMaintainer | ||||
| * | | Allow maintaining and updating invoices. | gjoranv | 2023-10-16 | 2 | -0/+48 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/master' into ogronnesby/additional-items-v2 | Øyvind Grønnesby | 2023-10-16 | 4 | -19/+12 |
|\| | | |||||
| * | | Stop using name for each application | Harald Musum | 2023-10-16 | 4 | -19/+10 |
| | | | |||||
| * | | Minor test cleanup and add enclave() method to ApplicationResources | Harald Musum | 2023-10-14 | 1 | -0/+2 |
| |/ | |||||
* / | Add additional items to billing/v2 | Øyvind Grønnesby | 2023-10-16 | 1 | -1/+1 |
|/ | | | | This will allow us to remove billing/v1 once console has moved | ||||
* | Remove support for legacy price calculations from API | Harald Musum | 2023-10-13 | 4 | -28/+18 |
| | |||||
* | Test pricing API with 2 apps | Harald Musum | 2023-10-13 | 1 | -6/+20 |
| | |||||
* | Support calculating and presenting prices per applications and in total | Harald Musum | 2023-10-13 | 6 | -19/+37 |
| | |||||
* | Add some convenience methods to PriceInformation | Harald Musum | 2023-10-12 | 1 | -0/+12 |
| | |||||
* | Merge pull request #28899 from ↵ | Harald Musum | 2023-10-12 | 4 | -6/+71 |
|\ | | | | | | | | | vespa-engine/hmusum/support-price-calculation-with-more-than-1-app Support price calculations with more than 1 app | ||||
| * | Update ↵ | Harald Musum | 2023-10-12 | 1 | -1/+0 |
| | | | | | | | | | | controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/MockPricingController.java Co-authored-by: Valerij Fredriksen <freva@users.noreply.github.com> | ||||
| * | Use separate keys for enclave node resources | Harald Musum | 2023-10-12 | 2 | -8/+17 |
| | | |||||
| * | Support price calculations with more than 1 app | Harald Musum | 2023-10-12 | 4 | -6/+63 |
| | | |||||
* | | Merge pull request #28837 from vespa-engine/ogronnesby/enclave-billing | Ola Aunrønning | 2023-10-12 | 6 | -19/+62 |
|\ \ | |/ |/| | Add cloudAccount as dimension to bills and resources | ||||
| * | Add cloudAccount as dimension to bills and resources | Øyvind Grønnesby | 2023-10-11 | 6 | -19/+62 |
| | | |||||
* | | Combine list price and support cost into one price item | Harald Musum | 2023-10-12 | 2 | -4/+4 |
| | | |||||
* | | Merge pull request #28842 from vespa-engine/mpolden/cert-assignment | Martin Polden | 2023-10-12 | 1 | -0/+23 |
|\ \ | | | | | | | Refactor certificate assignment and migration | ||||
| * | | Require that endpoint DNS name is matched by SAN | Martin Polden | 2023-10-09 | 1 | -0/+23 |
| | | | |||||
* | | | Minor: Use committed spend in pricing unit tests | Harald Musum | 2023-10-12 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge branch 'master' into hmusum/add-support-level-cost | Harald Musum | 2023-10-11 | 3 | -2/+39 |
|\ \ | |||||
| * \ | Merge pull request #28839 from vespa-engine/write-external-ids-to-db | Gjøran Voldengen | 2023-10-11 | 3 | -2/+39 |
| |\ \ | | | | | | | | | Add billing db client methods to set exported invoice/item ids. | ||||
| | * | | bugfix: set exported id in ctor | gjoranv | 2023-10-10 | 1 | -0/+1 |
| | | | | |||||
| | * | | Add exportedId to Bill and Bill.LineItem | gjoranv | 2023-10-09 | 1 | -2/+20 |
| | | | | |||||
| | * | | Add billing db client methods to set exported invoice/item ids. | gjoranv | 2023-10-09 | 2 | -0/+18 |
| | |/ | |||||
* | / | Add support level cost to pricing API response | Harald Musum | 2023-10-11 | 2 | -4/+9 |
|/ / | |||||
* | | Return amounts with 2 decimals | Valerij Fredriksen | 2023-10-11 | 1 | -5/+3 |
| | | |||||
* | | Merge pull request #28852 from ↵ | Jon Marius Venstad | 2023-10-10 | 2 | -2/+2 |
|\ \ | | | | | | | | | | | | | vespa-engine/jonmv/no-wait-for-initial-aws-lb-checks-in-dev-first-time Avoid wait for health check for first-time dev deployments | ||||
| * | | Avoid wait for health check for first-time dev deployments | jonmv | 2023-10-10 | 2 | -2/+2 |
| | | | |||||
* | | | Merge pull request #28832 from vespa-engine/hmusum/add-handler-for-pricing-api | Harald Musum | 2023-10-10 | 4 | -3/+17 |
|\ \ \ | |/ / |/| | | Add handler for pricing API | ||||
| * | | Discounts are negative | Harald Musum | 2023-10-10 | 1 | -2/+2 |
| | | | |||||
| * | | Add committedAmountDiscount, enclaveDiscount and totalAmount | Harald Musum | 2023-10-09 | 2 | -9/+14 |
| | | | |||||
| * | | Rename support level standard to basic | Harald Musum | 2023-10-09 | 1 | -1/+1 |
| | | | |||||
| * | | Update ↵ | Harald Musum | 2023-10-08 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/MockPricingController.java Co-authored-by: Valerij Fredriksen <freva@users.noreply.github.com> | ||||
| * | | Add handler for pricing API | Harald Musum | 2023-10-07 | 2 | -1/+11 |
| |/ | |||||
* / | Update copyright | Jon Bratseth | 2023-10-09 | 339 | -333/+354 |
|/ | |||||
* | Add volume discount to price information and use BigDecimal | Harald Musum | 2023-10-06 | 2 | -2/+5 |
| | |||||
* | Export package | Harald Musum | 2023-10-06 | 1 | -0/+5 |
| | |||||
* | Add pricing controller to service registry | Harald Musum | 2023-10-06 | 2 | -0/+22 |
| | |||||
* | Add PriceInformation | Harald Musum | 2023-10-05 | 1 | -0/+5 |
| | |||||
* | Merge branch 'master' into hmusum/add-pricing-info-and-controller | Harald Musum | 2023-10-05 | 3 | -13/+19 |
|\ | |||||
| * | Merge pull request #28074 from vespa-engine/ogronnesby/make-all-tenants-faster | Øyvind Grønnesby | 2023-10-05 | 1 | -1/+1 |
| |\ | | | | | | | Make the all tenants console view quicker |