ceph: revert fail if mgr prometheus is not default #7239
Merged
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
travisn
reviewed
Feb 16, 2021
| @@ -988,8 +981,8 @@ def test_monitoring_endpoint_validation(self): | |||
| check_port_val, mon_port)) | |||
| print("MonIP: {}, MonPort: {}".format(mon_ip, mon_port)) | |||
|
|
|||
| invalid_ip_ports = [("10.22.31.131.43", "5334"), ("", "9194"), | |||
| ("10.177.3.81", "90320"), ("", "73422"), ("10.232.12.8", "9092")] | |||
| invalid_ip_ports = [("10.22.31.131.43", "5334"), ("", "91943"), | |||
There was a problem hiding this comment.
Where did ports 91943 and 90922 come from?
There was a problem hiding this comment.
These are just unit tests to validate the port is in the correct range.
| valid_ip_ports = [("10.22.31.131", "9283"), | ||
| ("10.177.3.81", ""), ("", ""), ("", "9283")] | ||
| valid_ip_ports = [("10.22.31.131", "3534"), | ||
| ("10.177.3.81", ""), ("", ""), ("", "9092")] |
There was a problem hiding this comment.
How are these ports used? If we have the ability to override the default in Rook, will we just use the default unless it's overridden?
There was a problem hiding this comment.
They are not used, they are just unit tests.
|
/lgtm |
mergify bot
added a commit
that referenced
this pull request
Feb 17, 2021
ceph: revert fail if mgr prometheus is not default (bp #7239)
10 tasks
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.
This reverts commit 1ed307c. In
8aaff23 we have introduced the ability
to set a specific monitoring port so the block that fails if the port is
not the default 9283 is not needed anymore.
Signed-off-by: Sébastien Han seb@redhat.com
Description of your changes:
Which issue is resolved by this Pull Request:
Resolves #
Checklist:
make codegen) has been run to update object specifications, if necessary.