Skip to content

[v13] Track user connections across clusters#32996

Merged
rosstimothy merged 4 commits intobranch/v13from
tross/backport-32688/v13
Oct 5, 2023
Merged

[v13] Track user connections across clusters#32996
rosstimothy merged 4 commits intobranch/v13from
tross/backport-32688/v13

Conversation

@rosstimothy
Copy link
Copy Markdown
Contributor

@rosstimothy rosstimothy commented Oct 4, 2023

Backport #32688 and #33035 to branch/v13

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

@rosstimothy rosstimothy force-pushed the tross/backport-32688/v13 branch from 49deb97 to c4f660f Compare October 4, 2023 22:07
rosstimothy and others added 2 commits October 5, 2023 09:23
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/v13 branch from c4f660f to de4b81b Compare October 5, 2023 13:23
@rosstimothy rosstimothy marked this pull request as ready for review October 5, 2023 14:03
@github-actions github-actions Bot added database-access Database access related issues and PRs desktop-access kubernetes-access size/md tctl tctl - Teleport admin tool tsh tsh - Teleport's command line tool for logging into nodes running Teleport. 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 14:40
rosstimothy and others added 2 commits October 5, 2023 15:33
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.
#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 added this pull request to the merge queue Oct 5, 2023
Merged via the queue into branch/v13 with commit 4dcb648 Oct 5, 2023
@rosstimothy rosstimothy deleted the tross/backport-32688/v13 branch October 5, 2023 20:51
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 tsh tsh - Teleport's command line tool for logging into nodes running Teleport.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants