ui: [BUGFIX] Ensure we show the correct count of instances for each node #9749
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
johncowen
added
type/bug
|
🤔 Double check that this PR does not require a changelog entry in the |
johncowen
changed the title
|
🍒 If backport labels were added before merging, cherry-picking will start automatically. To retroactively trigger a backport after merging, add backport labels and re-run https://circleci.com/gh/hashicorp/consul/326669. |
|
🍒✅ Cherry pick of commit 96204a2 onto |
hashicorp-ci
pushed a commit
that referenced
this pull request
Feb 11, 2021
…ode (#9749) * Add MeshServiceInstances property to node model * Use MeshServiceInstances property * Make sure we show the 'No * checks' if Checks.length is zero
dizzyup
pushed a commit
that referenced
this pull request
Apr 21, 2021
…ode (#9749) * Add MeshServiceInstances property to node model * Use MeshServiceInstances property * Make sure we show the 'No * checks' if Checks.length is zero
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.
In our node listing page we show the a number for the amount of Service Instances on each node.
Before this PR, this count included any proxies on the Node, essentially doubling the service count. This was probably correct in a previous version of the UI when we used to show all the proxies across the catalog as well as the services, but since we merged proxies into the services themselves, essentially making the an implementation detail and therefore invisible in the UI, this count should not include proxies.
This PR adds a
MeshServiceInstancesproperty to the node model, 'mesh' here meaning 'services that have a proxy assigned to them, and therefore not a proxy itself'. We then use this property to show the instance count, meaning we omit proxy instances from the final count.We also noticed that we weren't showing an 'empty' icon for services where the check count for either service or node checks was zero. So fixed that here also 🐦 🐦 🥧
This is how consul looks in the node listing after this fix (the consul service only has node checks, no service checks)