Skip to content

feat(support): add client magicsock and agent prometheus metrics to support bundle #12604

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.

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

Merged
merged 6 commits into from
Mar 15, 2024

Conversation

johnstcn
Copy link
Member

@johnstcn johnstcn commented Mar 15, 2024

Part of #12161

  • Refactors agent prometheus handler so we can also serve it on tailnet
  • Adds workspaceagentconn method to retrieve prometheus metrics over tailnet
  • Adds client magicsock HTML and agent prometheus metrics to support bundle

@johnstcn johnstcn changed the title Cj/support agent extra feat(support): add client magicsock and prometheus metrics to support bundle Mar 15, 2024
@johnstcn johnstcn changed the title feat(support): add client magicsock and prometheus metrics to support bundle feat(support): add client magicsock and agent prometheus metrics to support bundle Mar 15, 2024
@johnstcn johnstcn marked this pull request as ready for review March 15, 2024 12:46
Copy link
Member

@mafredri mafredri left a comment

Choose a reason for hiding this comment

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

Mostly LGTM, minor stuff.

@@ -382,6 +385,9 @@ func (c *WorkspaceAgentConn) DebugManifest(ctx context.Context) ([]byte, error)
return nil, xerrors.Errorf("do request: %w", err)
}
defer res.Body.Close()
if res.StatusCode != http.StatusOK {
Copy link
Member

Choose a reason for hiding this comment

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

Ooh, I thought about this in previous PRs but assumed it was handled by c.apiRequest 😅

johnstcn and others added 3 commits March 15, 2024 14:39
Co-authored-by: Mathias Fredriksson <mafredri@gmail.com>
@johnstcn johnstcn merged commit b0c4e75 into main Mar 15, 2024
@johnstcn johnstcn deleted the cj/support-agent-extra branch March 15, 2024 15:33
@github-actions github-actions bot locked and limited conversation to collaborators Mar 15, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants