Add remoteUser (from http basic auth) and remoteAddr to Thanos slow query logs #6153
Conversation
This file contains 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
kfdm
force-pushed
the
frontend-remote-address
branch
2 times, most recently
from
f18afdc to
3b1601f
Compare
fpetkovski
reviewed
Feb 22, 2023
| @@ -177,11 +177,15 @@ func (f *Handler) reportSlowQuery(r *http.Request, responseHeaders http.Header, | |||
| thanosTraceID = traceID | |||
| } | |||
|
|
|||
| remoteUser, _, _ := r.BasicAuth() | |||
There was a problem hiding this comment.
Is this the only way we can get the remote user? Are there maybe some Grafana headers we can use as fallback when basic auth is not used?
There was a problem hiding this comment.
Grafana can be but one client. It's highly possible that users may use custom clients to query some data from Thanos.
There was a problem hiding this comment.
Should we indicate in the changelog that this only works for basic auth?
There was a problem hiding this comment.
Added mention of basic auth
matej-g
reviewed
Feb 22, 2023
There was a problem hiding this comment.
Thanks, this makes sense to me as well + @fpetkovski's feedback
…uery logs When tracking where a suspicious query came from, one often needs to know the remote address or remote user that made the request. Adding these should help with debugging. Signed-off-by: Paul Traylor <[email protected]>
kfdm
force-pushed
the
frontend-remote-address
branch
from
3b1601f to
655eea0
Compare
kfdm
changed the title
saswatamcode
approved these changes
Feb 24, 2023
ngraham20
pushed a commit
to ngraham20/thanos
that referenced
this pull request
Apr 17, 2023
…uery logs (thanos-io#6153) When tracking where a suspicious query came from, one often needs to know the remote address or remote user that made the request. Adding these should help with debugging. Signed-off-by: Paul Traylor <[email protected]>
ngraham20
pushed a commit
to ngraham20/thanos
that referenced
this pull request
Apr 17, 2023
…uery logs (thanos-io#6153) When tracking where a suspicious query came from, one often needs to know the remote address or remote user that made the request. Adding these should help with debugging. Signed-off-by: Paul Traylor <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Changes
When tracking where a suspicious query came from, one often needs to know the remote address or remote user that made the request. Adding these should help with debugging.
Verification
Built locally and ran locally then queried with http client.
Notes
So this is posted slightly early as a proof of concept to see if the basic idea makes sense to the Thanos team.
It seems like
reportQueryStatsis not actually called from anywhere, onlyreportSlowQuerybut I've updated both in the interest of keeping things in sync.