Skip to content

[v12] Track user connections across clusters#33019

Merged
rosstimothy merged 3 commits intobranch/v12from
tross/backport-32688/v12
Oct 5, 2023
Merged

[v12] Track user connections across clusters#33019
rosstimothy merged 3 commits intobranch/v12from
tross/backport-32688/v12

Conversation

@rosstimothy
Copy link
Copy Markdown
Contributor

@rosstimothy rosstimothy commented Oct 5, 2023

Backport #32688 and #33035 to branch/v12

In order to prevent circular imports this also backports a portion of #28357

@rosstimothy rosstimothy force-pushed the tross/backport-32688/v12 branch from 0924ebe to 3f8751a Compare October 5, 2023 15:09
Ensure that `proxy_ssh_sessions_total` is incremented in both the
root and the leaf cluster if a session to a node in the leaf cluster
is established through the root cluster. This now also prevents
leaf clusters from terminating during a graceful shutdown if there
is an active connection that was created from the root.

Fixes #32605.
@rosstimothy rosstimothy force-pushed the tross/backport-32688/v12 branch from 3f8751a to 9418df9 Compare October 5, 2023 16:38
#32688 added support for tracking connections to sessions via a
reverse tunnel node but failed to account for sessions to direct
dial nodes.
@rosstimothy rosstimothy marked this pull request as ready for review October 5, 2023 20:28
@github-actions github-actions Bot added backport database-access Database access related issues and PRs desktop-access kubernetes-access size/md tctl tctl - Teleport admin tool labels Oct 5, 2023
@public-teleport-github-review-bot public-teleport-github-review-bot Bot removed the request for review from fspmarshall October 5, 2023 20:36
@rosstimothy rosstimothy enabled auto-merge October 5, 2023 20:37
@rosstimothy rosstimothy added this pull request to the merge queue Oct 5, 2023
Merged via the queue into branch/v12 with commit 15e8997 Oct 5, 2023
@rosstimothy rosstimothy deleted the tross/backport-32688/v12 branch October 5, 2023 20:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport database-access Database access related issues and PRs desktop-access kubernetes-access size/md tctl tctl - Teleport admin tool

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants