Fix connected resource counts after keepalive errors#47931
Merged
espadolini merged 2 commits intomasterfrom Oct 25, 2024
Merged
Fix connected resource counts after keepalive errors#47931espadolini merged 2 commits intomasterfrom
espadolini merged 2 commits intomasterfrom
Conversation
|
This pull request is automatically being deployed by Amplify Hosting (learn more). |
|
This pull request is automatically being deployed by Amplify Hosting (learn more). |
rosstimothy
approved these changes
Oct 25, 2024
zmb3
approved these changes
Oct 25, 2024
public-teleport-github-review-bot
Bot
removed request for
EdwardDowling,
fspmarshall and
hugoShaka
hugoShaka
approved these changes
Oct 25, 2024
|
@espadolini See the table below for backport results.
|
espadolini
added a commit
that referenced
this pull request
Oct 25, 2024
* Fix connected resource counts after keepalive errors * Log server_id when cleaning up resources
espadolini
added a commit
that referenced
this pull request
Oct 25, 2024
* Fix connected resource counts after keepalive errors * Log server_id when cleaning up resources
espadolini
added a commit
that referenced
this pull request
Oct 25, 2024
* Fix connected resource counts after keepalive errors * Log server_id when cleaning up resources
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
The inventory controller updates prom metrics through its
onConnectFuncandonDisconnectFunccallbacks, which are supposed to be called whenever a handle starts or stops heartbeating for a resource. In the case of three consecutive failures in doing aKeepAlive, the app, kube cluster or database that failed to be kept alive was removed from the handle's responsibility but the corresponding metric was not updated. This PR fixes that by calling theonDisconnectFuncappropriately. In addition,onDisconnectFuncis changed to support a count, since at disconnection time we're removing all the heartbeats for the disconnected agent at once (of which there could be many) and it's faster to update the count a single time.changelog: fixed
teleport_connected_resourcemetric overshooting after keepalive errors