Don't generate switch targets for sites without a switch #332
Conversation
This file contains 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
Now that we are supporting minimal physical sites without a switch, we don't
want to generate Prometheus switch targets for these sites. This PR adds a
simple conditional to check whether the siteinfo value for "switch" is None
("null" in the JSON), and whether the target begins with "s1-", which would
indicate a switch target.
Adds a "switch" field to default sites variable. Adds a new global variable for a site where switch=None. Edits test to be sure that this site is excluded from switch targets.
Today, the calls to select_prometheus_site_targets() all filter on "only_physical", but perhaps in the future we might want targets that aren't physical and don't have switches, in which case site['switch'] would not exist and might throw an error, so explicitly check for its existence before trying to figure out if its value is None.
robertodauria
approved these changes
Apr 18, 2024
There was a problem hiding this comment.
Reviewed 2 of 2 files at r1, all commit messages.
Reviewable status:complete! 1 of 1 approvals obtained
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.
Now that we are supporting minimal physical sites without a switch, we don't want to generate Prometheus switch targets for these sites. This PR adds a simple conditional to check whether the siteinfo value for "switch" is None ("null" in the JSON), and whether the target begins with "s1", which would`indicate a switch target.
This change is