summaryrefslogtreecommitdiffstats
path: root/controller-api/src/main/java
Commit message (Expand)AuthorAgeFilesLines
* Stop using name for each applicationHarald Musum2023-10-164-19/+10
* Minor test cleanup and add enclave() method to ApplicationResourcesHarald Musum2023-10-141-0/+2
* Remove support for legacy price calculations from APIHarald Musum2023-10-134-28/+18
* Test pricing API with 2 appsHarald Musum2023-10-131-6/+20
* Support calculating and presenting prices per applications and in totalHarald Musum2023-10-136-19/+37
* Add some convenience methods to PriceInformationHarald Musum2023-10-121-0/+12
* Merge pull request #28899 from vespa-engine/hmusum/support-price-calculation-...Harald Musum2023-10-124-6/+71
|\
| * Update controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/int...Harald Musum2023-10-121-1/+0
| * Use separate keys for enclave node resourcesHarald Musum2023-10-122-8/+17
| * Support price calculations with more than 1 appHarald Musum2023-10-124-6/+63
* | Merge pull request #28837 from vespa-engine/ogronnesby/enclave-billingOla Aunrønning2023-10-126-19/+62
|\ \ | |/ |/|
| * Add cloudAccount as dimension to bills and resourcesØyvind Grønnesby2023-10-116-19/+62
* | Combine list price and support cost into one price itemHarald Musum2023-10-122-4/+4
* | Merge pull request #28842 from vespa-engine/mpolden/cert-assignmentMartin Polden2023-10-121-0/+23
|\ \
| * | Require that endpoint DNS name is matched by SANMartin Polden2023-10-091-0/+23
* | | Minor: Use committed spend in pricing unit testsHarald Musum2023-10-121-1/+1
| |/ |/|
* | Merge branch 'master' into hmusum/add-support-level-costHarald Musum2023-10-113-2/+39
|\ \
| * \ Merge pull request #28839 from vespa-engine/write-external-ids-to-dbGjøran Voldengen2023-10-113-2/+39
| |\ \
| | * | bugfix: set exported id in ctorgjoranv2023-10-101-0/+1
| | * | Add exportedId to Bill and Bill.LineItemgjoranv2023-10-091-2/+20
| | * | Add billing db client methods to set exported invoice/item ids.gjoranv2023-10-092-0/+18
| | |/
* | / Add support level cost to pricing API responseHarald Musum2023-10-112-4/+9
|/ /
* | Return amounts with 2 decimalsValerij Fredriksen2023-10-111-5/+3
* | Merge pull request #28852 from vespa-engine/jonmv/no-wait-for-initial-aws-lb-...Jon Marius Venstad2023-10-102-2/+2
|\ \
| * | Avoid wait for health check for first-time dev deploymentsjonmv2023-10-102-2/+2
* | | Merge pull request #28832 from vespa-engine/hmusum/add-handler-for-pricing-apiHarald Musum2023-10-104-3/+17
|\ \ \ | |/ / |/| |
| * | Discounts are negativeHarald Musum2023-10-101-2/+2
| * | Add committedAmountDiscount, enclaveDiscount and totalAmountHarald Musum2023-10-092-9/+14
| * | Rename support level standard to basicHarald Musum2023-10-091-1/+1
| * | Update controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/int...Harald Musum2023-10-081-1/+0
| * | Add handler for pricing APIHarald Musum2023-10-072-1/+11
| |/
* / Update copyrightJon Bratseth2023-10-09339-333/+354
|/
* Add volume discount to price information and use BigDecimalHarald Musum2023-10-062-2/+5
* Export packageHarald Musum2023-10-061-0/+5
* Add pricing controller to service registryHarald Musum2023-10-062-0/+22
* Add PriceInformationHarald Musum2023-10-051-0/+5
* Merge branch 'master' into hmusum/add-pricing-info-and-controllerHarald Musum2023-10-053-13/+19
|\
| * Merge pull request #28074 from vespa-engine/ogronnesby/make-all-tenants-fasterØyvind Grønnesby2023-10-051-1/+1
| |\
| | * Make the all tenants console view quickerØyvind Grønnesby2023-08-171-1/+1
| * | Merge pull request #28786 from vespa-engine/mpolden/generate-all-auth-methodsMartin Polden2023-10-041-10/+10
| |\ \
| | * | randomizedId -> generatedIdMartin Polden2023-10-041-10/+10
| * | | Revert "Revert "Add support for persisting plan in ZooKeeper for a tenant""Harald Musum2023-10-041-2/+8
* | | | Add pricing info and pricing controller to APIHarald Musum2023-10-052-0/+27
|/ / /
* | | Revert "Add support for persisting plan in ZooKeeper for a tenant"Andreas Eriksen2023-10-041-8/+2
* | | Use PlanIdHarald Musum2023-10-041-4/+5
* | | Add support for persisting plan in ZooKeeper for a tenantHarald Musum2023-10-041-2/+7
|/ /
* | Track used tokens with freshness in Deployment, and use for re-triggering job...jonmv2023-10-021-1/+1
* | Pass only relevant token data, and store in Deployment what tokens were usedjonmv2023-10-021-4/+4
* | Merge pull request #28711 from vespa-engine/jonmv/token-tell-handlerJon Marius Venstad2023-09-291-0/+6
|\ \
| * | Group fingerprints by token idjonmv2023-09-281-1/+4