New CAS endpoints for ruler configs on ruler itself #649
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Works around the fact that `database.uri` has a default value, so we cannot detect whether the user has explicitly asked for a database or not.
Contributor
Author
|
I've verified it starts correctly on our local environment with these changes and doesn't produce the warnings seen on dev. |
bboreham
approved these changes
Jan 12, 2018
jml
added a commit
that referenced
this pull request
Feb 13, 2018
In #649, we only served DB-backed endpoints for ruler if the configs API flag was _not_ set. This turns out to be hostile to a smooth migration, as we want to have points where we are serving _both_ sets of endpoints so we can update the service-ui to go from pointing at one to pointing at the other.
jml
added a commit
that referenced
this pull request
Feb 15, 2018
* Change database.uri flag to default to empty This could theoretically break deployments of the configs service that relied on the default being set. In practice, we anticipate very few configs deployments expecting a database at `configs-db.weave.local` * Only serve DB-backed stuff if DB set In #649, we only served DB-backed endpoints for ruler if the configs API flag was _not_ set. This turns out to be hostile to a smooth migration, as we want to have points where we are serving _both_ sets of endpoints so we can update the service-ui to go from pointing at one to pointing at the other.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Repeat of #620 with a bug fix.
What was the bug fix?
In #620 (and in this PR), the ruler can get configs either from the configs server or directly from the DB. If the configs DB URL flag is set, the ruler will get the configs from the DB. Unfortunately, the DB URL flag is always set, due to defaults. This means we try to get configs from a nonexistent database. Ugh.
This PR changes the check to be for absence of configs API setting, rather than presence of configs DB setting. This works because the URL flag has no default value.
The test failure appears to be unrelated flakiness.