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

Remove details from migrations logging #172732

Merged
merged 4 commits into from Dec 6, 2023

Conversation

legrego
Copy link
Member

@legrego legrego commented Dec 6, 2023

Summary

Bluntly removes details from a debug log message.

@legrego legrego requested a review from a team as a code owner December 6, 2023 20:25
@legrego legrego changed the title Remove res from migrations logging Remove details from migrations logging Dec 6, 2023
@legrego legrego added chore release_note:skip Skip the PR/issue when compiling release notes backport:all-open Backport to all branches that could still receive a release labels Dec 6, 2023
Copy link
Contributor

@TinaHeiligers TinaHeiligers left a comment

Choose a reason for hiding this comment

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

short of introducing a redaction mechanism, removing the res from the debug log is a quick fix.
LGTM

@legrego
Copy link
Member Author

legrego commented Dec 6, 2023

@elastic/kibana-core I am sorry for the crude PR. Please feel free to implement a more nuanced fix in a follow-up. In the interest of release timing, I opted for speed over finesse

@legrego legrego enabled auto-merge (squash) December 6, 2023 20:49
@TinaHeiligers
Copy link
Contributor

Jest Tests #19 / migrationsStateActionMachine logs state transitions, messages in state.logs and action responses when reaching DONE
Jest Tests #19 / migrationsStateActionMachine logs state transitions, messages in state.logs and action responses when reaching FATAL

Both of these fail because the snapshots are stale.

The "Jest Integration Tests #2 / migration v2 clean ups if migration fails" failure I'll need to investigate

@legrego
Copy link
Member Author

legrego commented Dec 6, 2023

Jest Tests #19 / migrationsStateActionMachine logs state transitions, messages in state.logs and action responses when reaching DONE
Jest Tests #19 / migrationsStateActionMachine logs state transitions, messages in state.logs and action responses when reaching FATAL

Both of these fail because the snapshots are stale.

The "Jest Integration Tests #2 / migration v2 clean ups if migration fails" failure I'll need to investigate

Thanks, @TinaHeiligers. I think the integration test was relying on the log data I removed to verify the cleanup worked correctly. I've disabled that portion of the test in f1f9c5c

@legrego legrego merged commit f5d1e45 into elastic:main Dec 6, 2023
37 checks passed
@kibana-ci
Copy link
Collaborator

💛 Build succeeded, but was flaky

Failed CI Steps

Test Failures

  • [job] [logs] Detection Engine - Security Solution Cypress Tests #8 / indicator match Detection rules, Indicator Match Creating new indicator match rules Indicator mapping "before each" hook for "Shows invalidation text when the "AND" button is pressed and both the mappings are blank" "before each" hook for "Shows invalidation text when the "AND" button is pressed and both the mappings are blank"

Metrics [docs]

✅ unchanged

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 Dec 6, 2023
## Summary

Bluntly removes details from a debug log message.

(cherry picked from commit f5d1e45)
@kibanamachine
Copy link
Contributor

💔 Some backports could not be created

Status Branch Result
7.17 Backport failed because of merge conflicts
8.11

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

Manual backport

To create the backport manually run:

node scripts/backport --pr 172732

Questions ?

Please refer to the Backport tool documentation

kibanamachine added a commit that referenced this pull request Dec 6, 2023
# Backport

This will backport the following commits from `main` to `8.11`:
- [Remove details from migrations logging
(#172732)](#172732)

<!--- Backport version: 8.9.7 -->

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

<!--BACKPORT [{"author":{"name":"Larry
Gregory","email":"larry.gregory@elastic.co"},"sourceCommit":{"committedDate":"2023-12-06T22:37:49Z","message":"Remove
details from migrations logging (#172732)\n\n## Summary\r\n\r\nBluntly
removes details from a debug log
message.","sha":"f5d1e45e5923d68eec2fe87319b07fceb3767ad9","branchLabelMapping":{"^v8.12.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["chore","release_note:skip","backport:all-open","v8.12.0"],"number":172732,"url":"#172732
details from migrations logging (#172732)\n\n## Summary\r\n\r\nBluntly
removes details from a debug log
message.","sha":"f5d1e45e5923d68eec2fe87319b07fceb3767ad9"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.12.0","labelRegex":"^v8.12.0$","isSourceBranch":true,"state":"MERGED","url":"#172732
details from migrations logging (#172732)\n\n## Summary\r\n\r\nBluntly
removes details from a debug log
message.","sha":"f5d1e45e5923d68eec2fe87319b07fceb3767ad9"}}]}]
BACKPORT-->

Co-authored-by: Larry Gregory <larry.gregory@elastic.co>
TinaHeiligers added a commit that referenced this pull request Dec 7, 2023
@mistic
Copy link
Member

mistic commented Dec 7, 2023

This PR didn't make it on time for the latest 8.11.2 BC. Updating the labels.

@mistic mistic added v8.11.3 and removed v8.11.2 labels Dec 7, 2023
TinaHeiligers added a commit that referenced this pull request Dec 8, 2023
code cleanup from #172732

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Dec 8, 2023
code cleanup from elastic#172732

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
(cherry picked from commit 22df919)
kibanamachine added a commit that referenced this pull request Dec 8, 2023
# Backport

This will backport the following commits from `main` to `8.12`:
- [[Tech debt] Removes commented out code
(#172858)](#172858)

<!--- Backport version: 8.9.7 -->

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

<!--BACKPORT [{"author":{"name":"Christiane (Tina)
Heiligers","email":"christiane.heiligers@elastic.co"},"sourceCommit":{"committedDate":"2023-12-08T07:31:17Z","message":"[Tech
debt] Removes commented out code (#172858)\n\ncode cleanup from
#172732:
Kibana Machine
<42973632+kibanamachine@users.noreply.github.com>","sha":"22df91900bcd436d32d029e58bca829c767143bb","branchLabelMapping":{"^v8.13.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["chore","release_note:skip","Feature:Migrations","backport:all-open","v8.13.0"],"number":172858,"url":"#172858
debt] Removes commented out code (#172858)\n\ncode cleanup from
#172732:
Kibana Machine
<42973632+kibanamachine@users.noreply.github.com>","sha":"22df91900bcd436d32d029e58bca829c767143bb"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.13.0","labelRegex":"^v8.13.0$","isSourceBranch":true,"state":"MERGED","url":"#172858
debt] Removes commented out code (#172858)\n\ncode cleanup from
#172732:
Kibana Machine
<42973632+kibanamachine@users.noreply.github.com>","sha":"22df91900bcd436d32d029e58bca829c767143bb"}}]}]
BACKPORT-->

Co-authored-by: Christiane (Tina) Heiligers <christiane.heiligers@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport:all-open Backport to all branches that could still receive a release chore release_note:skip Skip the PR/issue when compiling release notes v8.11.3 v8.12.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants