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.

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

Add an option to disable APM user redaction #176566

Merged

Conversation

pgayvallet
Copy link
Contributor

@pgayvallet pgayvallet commented Feb 9, 2024

Summary

Fix #174743

Add an elastic.apm.redactUsers configuration option that defaults to true (preserving current behavior)

@pgayvallet pgayvallet added release_note:enhancement Team:Core Core services & architecture: plugins, logging, config, saved objects, http, ES client, i18n, etc v8.13.0 labels Feb 9, 2024
@pgayvallet
Copy link
Contributor Author

/ci

@pgayvallet
Copy link
Contributor Author

/ci

@pgayvallet pgayvallet marked this pull request as ready for review February 9, 2024 14:16
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-core (Team:Core)

Copy link
Member

@vigneshshanmugam vigneshshanmugam left a comment

Choose a reason for hiding this comment

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

LGTM

@pgayvallet
Copy link
Contributor Author

@elasticmachine merge upstream

@pgayvallet pgayvallet enabled auto-merge (squash) February 18, 2024 14:25
@pgayvallet pgayvallet merged commit d65460c into elastic:main Feb 18, 2024
16 checks passed
@kibana-ci
Copy link
Collaborator

💚 Build Succeeded

Metrics [docs]

Public APIs missing comments

Total count of every public API that lacks a comment. Target amount is 0. Run node scripts/build_api_docs --plugin [yourplugin] --stats comments for more detailed information.

id before after diff
@kbn/apm-config-loader 17 18 +1

Async chunks

Total size of all lazy-loaded chunks that will be downloaded as the user navigates the app

id before after diff
securitySolution 11.6MB 11.6MB +6.4KB
securitySolutionServerless 177.4KB 183.7KB +6.3KB
total +12.7KB
Unknown metric groups

API count

id before after diff
@kbn/apm-config-loader 17 18 +1

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Feb 18, 2024
## Summary

Fix elastic#174743

Add an `elastic.apm.redactUsers` configuration option that defaults to
`true` (preserving current behavior)

---------

Co-authored-by: Kibana Machine <[email protected]>
(cherry picked from commit d65460c)
@kibanamachine
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
8.13

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

kibanamachine added a commit that referenced this pull request Feb 18, 2024
# Backport

This will backport the following commits from `main` to `8.13`:
- [Add an option to disable APM user redaction
(#176566)](#176566)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Pierre
Gayvallet","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-02-18T15:30:01Z","message":"Add
an option to disable APM user redaction (#176566)\n\n##
Summary\r\n\r\nFix
https://github.com/elastic/kibana/issues/174743\r\n\r\nAdd an
`elastic.apm.redactUsers` configuration option that defaults
to\r\n`true` (preserving current
behavior)\r\n\r\n---------\r\n\r\nCo-authored-by: Kibana Machine
<[email protected]>","sha":"d65460cb3973826f680b0934815b9de7a0682905","branchLabelMapping":{"^v8.14.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:enhancement","Team:Core","v8.13.0","v8.14.0"],"title":"Add
an option to disable APM user
redaction","number":176566,"url":"https://github.com/elastic/kibana/pull/176566","mergeCommit":{"message":"Add
an option to disable APM user redaction (#176566)\n\n##
Summary\r\n\r\nFix
https://github.com/elastic/kibana/issues/174743\r\n\r\nAdd an
`elastic.apm.redactUsers` configuration option that defaults
to\r\n`true` (preserving current
behavior)\r\n\r\n---------\r\n\r\nCo-authored-by: Kibana Machine
<[email protected]>","sha":"d65460cb3973826f680b0934815b9de7a0682905"}},"sourceBranch":"main","suggestedTargetBranches":["8.13"],"targetPullRequestStates":[{"branch":"8.13","label":"v8.13.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.14.0","branchLabelMappingKey":"^v8.14.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/176566","number":176566,"mergeCommit":{"message":"Add
an option to disable APM user redaction (#176566)\n\n##
Summary\r\n\r\nFix
https://github.com/elastic/kibana/issues/174743\r\n\r\nAdd an
`elastic.apm.redactUsers` configuration option that defaults
to\r\n`true` (preserving current
behavior)\r\n\r\n---------\r\n\r\nCo-authored-by: Kibana Machine
<[email protected]>","sha":"d65460cb3973826f680b0934815b9de7a0682905"}}]}]
BACKPORT-->

Co-authored-by: Pierre Gayvallet <[email protected]>
fkanout pushed a commit to fkanout/kibana that referenced this pull request Mar 4, 2024
## Summary

Fix elastic#174743

Add an `elastic.apm.redactUsers` configuration option that defaults to
`true` (preserving current behavior)

---------

Co-authored-by: Kibana Machine <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release_note:enhancement Team:Core Core services & architecture: plugins, logging, config, saved objects, http, ES client, i18n, etc v8.13.0 v8.14.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Configuration option to not redact usernames for APM
6 participants