summaryrefslogtreecommitdiffstats
path: root/controller-server
Commit message (Collapse)AuthorAgeFilesLines
* Serverpool in ZK (#3764)Valerij Fredriksen2017-10-171-3/+35
| | | | | | * Serverpool in ZK * Change timeouts
* Merge pull request #3772 from vespa-engine/bjorncs/athenz-migrationJon Bratseth2017-10-171-1/+1
|\ | | | | Method should be PUT, not POST
| * Method should be PUT, not POSTBjørn Christian Seime2017-10-161-1/+1
| |
* | Fix typoBjørn Christian Seime2017-10-161-1/+1
| |
* | Use correct Athenz domain identifierBjørn Christian Seime2017-10-162-8/+8
| |
* | Make ZmsKeystoreImpl constructor publicBjørn Christian Seime2017-10-161-1/+3
|/
* Open-source Athenz integration for controller-serverBjørn Christian Seime2017-10-1642-120/+1838
|
* Revert "Open-source Athenz integration for controller-server"Bjørn Christian Seime2017-10-1642-1838/+120
| | | | This reverts commit 2d12b78dc2dd3a755e9a9dd05fa7f98acb2f544c.
* Merge pull request #3754 from vespa-engine/bratseth/dont-validate-on-readMartin Polden2017-10-161-1/+1
|\ | | | | Bratseth/dont validate on read
| * Don't validate when reading stored applicationsJon Bratseth2017-10-161-1/+1
| |
* | Open-source Athenz integration for controller-serverBjørn Christian Seime2017-10-1642-120/+1838
| |
* | Merge pull request #3743 from vespa-engine/smorgrav/synch_app_metricsTorbjørn Smørgrav2017-10-1611-41/+235
|\ \ | |/ |/| Decouple deployment metrics from the metricservice
| * Update controller test result file maintenance.json with the new maintainertoby2017-10-131-11/+14
| |
| * Schedule deployment metrics to run every 10 minutestoby2017-10-131-0/+3
| |
| * Simplify getting maintained deployments infotoby2017-10-131-7/+3
| |
| * Add deployment metric maintainertoby2017-10-132-0/+84
| |
| * Decouple deployment metrics from the metricservice - to avoid external calls ↵toby2017-10-137-25/+133
| | | | | | | | to metric providers when asking for deployment info
* | Merge pull request #3746 from vespa-engine/mpolden/freeze-confidenceJon Bratseth2017-10-1514-161/+361
|\ \ | | | | | | Freeze confidence for previous versions
| * | Freeze confidence for previous versionsMartin Polden2017-10-137-107/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Once the system upgrades to a new version we're only interested in keeping confidence for that version up to date. The confidence for previous versions should be frozen. This solves several issues: * Confidence does not change to 'low' for all other version once canaries move to the newest version * Applications can keep upgrading to the newest 'normal' or 'high' version in case the newest version is either 'low' or 'broken'
| * | Persist version statusMartin Polden2017-10-139-55/+252
| |/
* | Merge pull request #3729 from vespa-engine/smorgrav/cost_add_flavor_infoTorbjørn Smørgrav2017-10-1312-28/+180
|\ \ | |/ |/| Application Cost - add flavor info and redefine deployment level tco, waste and utilization
| * Use correct fieldnames in deserialization of flavor infotoby2017-10-132-3/+6
| |
| * Spellingtoby2017-10-131-2/+2
| |
| * Specify better waste and tco and redefine deployment utilizationtoby2017-10-129-13/+103
| |
| * Add more flavor info and redefine cluster tco and wastetoby2017-10-127-13/+68
| |
| * Add more javadoc for utilization classestoby2017-10-122-4/+8
| |
* | Merge pull request #3735 from vespa-engine/bratseth/shorter-job-timeout-in-cdMartin Polden2017-10-121-1/+4
|\ \ | | | | | | Use a shorter job timeout in CD.
| * | Use a shorter job timeout in CD.Jon Bratseth2017-10-121-1/+4
| | | | | | | | | | | | | | | | | | We won't need very long running jobs there and a shorter timeout helps us make progress if there is a Screwdriver issue preventing callbacks on completion.
* | | Merge pull request #3734 from ↵Martin Polden2017-10-122-3/+4
|\ \ \ | |/ / |/| | | | | | | | vespa-engine/bratseth/only-consider-prod-applications Bratseth/only consider prod applications
| * | Filter out pull requestsJon Bratseth2017-10-122-3/+4
| |/
* | Merge pull request #3731 from ↵Martin Polden2017-10-122-10/+9
|\ \ | |/ |/| | | | | vespa-engine/bratseth/use-better-info-to-decide-failing-version Bratseth/use better info to decide failing version
| * Verify the actual change we are deployingJon Bratseth2017-10-122-10/+9
| | | | | | | | | | | | | | | | | | | | | | This code verified the change we believe we are currently deploying according to application.deploying(). Since we now allow new changes to enter while an application change is already in progress, application.deploying() is not reliable. Moving the check to after we update application.deploying() to what we received in this deploy request should solve this problem.
* | Fix disk usage from percent to ratiotoby2017-10-121-1/+1
|/
* Merge pull request #3704 from vespa-engine/bratseth/remove-in-progressMartin Polden2017-10-116-40/+48
|\ | | | | Bratseth/remove in progress
| * Remove printlnJon Bratseth2017-10-111-1/+0
| |
| * Remove dead codeJon Bratseth2017-10-101-12/+0
| |
| * Use isRunningJon Bratseth2017-10-101-1/+1
| |
| * Use isRunningJon Bratseth2017-10-101-5/+4
| |
| * Use isRunningJon Bratseth2017-10-103-11/+11
| |
| * Fix test and use isRunningJon Bratseth2017-10-104-11/+33
| |
* | Merge pull request #3516 from vespa-engine/smorgrav/cost_api_take_2Torbjørn Smørgrav2017-10-1127-228/+883
|\ \ | | | | | | Smorgrav/cost api take 2
| * | Fix bad conflict resolution on test responsetoby2017-10-101-2/+2
| | |
| * | Lock must be taken and released on application storetoby2017-10-103-28/+36
| | |
| * | Add two new maintainers to mainters responsetoby2017-10-101-10/+16
| | |
| * | Remove cost from wadl test response tootoby2017-10-101-5/+0
| | |
| * | Update Rest API to conform with previous unit test - adjust for api changes ↵toby2017-10-103-48/+74
| | | | | | | | | | | | and use real numbers
| * | Rebase mastertoby2017-10-104-10/+10
| | |
| * | The missing unit teststoby2017-10-102-0/+76
| | |
| * | Add unit test for maintainerstoby2017-10-101-1/+21
| | |
| * | Add getNodeList to configserverclienttoby2017-10-102-57/+23
| | |