Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[v9] Add Session tracker to DB, App, and Windows Desktop Sessions #12611

Merged
merged 3 commits into from
May 12, 2022
Merged

[v9] Add Session tracker to DB, App, and Windows Desktop Sessions #12611

merged 3 commits into from
May 12, 2022

Conversation

Joerger
Copy link
Contributor

@Joerger Joerger commented May 12, 2022 •
edited
Loading

Backports #12304
Backports #10478 (make grpc fix)

@github-actions github-actions bot added application-access audit-log Issues related to Teleports Audit Log database-access Database access related issues and PRs desktop-access kubernetes tsh tsh - Teleport's command line tool for logging into nodes running Teleport. labels May 12, 2022
codingllama
codingllama reviewed May 12, 2022
View reviewed changes
Copy link
Contributor

@codingllama codingllama left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you have to do any noteworthy adaptations or did it backport cleanly?

@Joerger
Copy link
Contributor Author

Joerger commented May 12, 2022 •
edited
Loading

Did you have to do any noteworthy adaptations or did it backport cleanly?

It should have backported cleanly, but I had to run make grpc, and it looks like running make grpc currently causes linting errors on branch/v9.

codingllama and others added 2 commits May 12, 2022 14:04
@codingllama @Joerger
Read API_IMPORT_PATH from api/go.mod in make grpc (#10478)
a269244 
API_IMPORT_PATH is consistently being resolved as an empty string, breaking
proto generation.

Since the path is fixed, it seems simpler to read api/go.mod and do away with
the Go program.

* Explicitly set API_IMPORT_PATH
* Delete the print-import-path program
* Read api module from api/go.mod, push variables to target
@Joerger
Add Session tracker to DB, App, and Windows Desktop Sessions (#12304)
3b3f925
@Joerger Joerger force-pushed the joerger/v9/track-all-sessions branch from 1d7fde0 to 3b3f925 Compare May 12, 2022 21:05
@Joerger Joerger requested a review from codingllama May 12, 2022 21:05
@Joerger
Copy link
Contributor Author

Joerger commented May 12, 2022

@codingllama I just had to include the fix for make grpc that you made a while back. So no other adaptations from the original PR were needed.

@Joerger Joerger enabled auto-merge (squash) May 12, 2022 21:11
@codingllama
Copy link
Contributor

@codingllama I just had to include the fix for make grpc that you made a while back. So no other adaptations from the original PR were needed.

Right, completely forgot about that. Thanks for pulling it in.

@Joerger Joerger merged commit 4759645 into branch/v9 May 12, 2022
@r0mant r0mant deleted the joerger/v9/track-all-sessions branch May 16, 2022 23:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xacrimon xacrimon xacrimon approved these changes

@codingllama codingllama codingllama approved these changes

@zmb3 zmb3 zmb3 approved these changes

@r0mant r0mant Awaiting requested review from r0mant

Assignees
No one assigned
Labels
application-access audit-log Issues related to Teleports Audit Log database-access Database access related issues and PRs desktop-access kubernetes tsh tsh - Teleport's command line tool for logging into nodes running Teleport.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Joerger @codingllama @zmb3 @xacrimon