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

Upgrade @elastic/makelogs from v6.0.0 to v6.1.1 #144231

Merged
merged 1 commit into from
Oct 31, 2022
Merged

Upgrade @elastic/makelogs from v6.0.0 to v6.1.1 #144231

merged 1 commit into from
Oct 31, 2022

Conversation

watson
Copy link
Contributor

@watson watson commented Oct 31, 2022 •
edited by kibanamachine
Loading

The @elastic/makelogs dependency is only used in development.

@watson watson added release_note:skip Skip the PR/issue when compiling release notes backport:prev-major Backport to (8.x, 8.17, 8.16) the previous major branch and other branches in development labels Oct 31, 2022
@watson watson requested a review from a team October 31, 2022 12:21
@watson watson self-assigned this Oct 31, 2022
@watson
Copy link
Contributor Author

watson commented Oct 31, 2022

Sorry, I missed that @spalger already opened a PR to do this upgrade. I'll close this one in favour of his: #144194

@watson watson closed this Oct 31, 2022
@watson
Copy link
Contributor Author

watson commented Oct 31, 2022

Ok, I'll reopen. I messed up the other PR so badly that I had to close it 🫣

@watson watson reopened this Oct 31, 2022
@watson watson enabled auto-merge (squash) October 31, 2022 12:57
@watson watson added backport:all-open Backport to all branches that could still receive a release and removed backport:prev-major Backport to (8.x, 8.17, 8.16) the previous major branch and other branches in development labels Oct 31, 2022
@kibana-ci
Copy link
Collaborator

💛 Build succeeded, but was flaky

Failed CI Steps

Test Failures

  • [job] [logs] FTR Configs #21 / dashboard drilldowns Dashboard to dashboard drilldown Create & use drilldowns test dashboard to dashboard drilldown with controls "after all" hook for "use dashboard to dashboard drilldown via getHref action"

Metrics [docs]

Unknown metric groups

ESLint disabled in files

id before after diff
osquery 1 2 +1

ESLint disabled line counts

id before after diff
enterpriseSearch 19 21 +2
fleet 57 63 +6
osquery 103 108 +5
securitySolution 439 443 +4
total +17

Total ESLint disabled count

id before after diff
enterpriseSearch 20 22 +2
fleet 65 71 +6
osquery 104 110 +6
securitySolution 516 520 +4
total +18

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

cc @watson

@watson watson merged commit 91f5453 into elastic:main Oct 31, 2022
@kibanamachine
Copy link
Contributor

💔 All backports failed

Status Branch Result
❌ 7.17 Backport failed because of merge conflicts
❌ 8.5 Backport failed because of merge conflicts

Manual backport

To create the backport manually run:

node scripts/backport --pr 144231

Questions ?

Please refer to the Backport tool documentation

jloleysens added a commit to jloleysens/kibana that referenced this pull request Oct 31, 2022
@jloleysens
Merge branch 'main' into files-record-created-by
0c910e7 
* main:
  Upgrade @elastic/makelogs from v6.0.0 to v6.1.1 (elastic#144231)
  [Files] move to src (elastic#144044)
  [Synthetics UI] Add pagination and date filtering to test runs table (elastic#144029)
  Update time range when opening timeline from Entity Analytics page (elastic#144024)
  [Security Solution] Added guided onboarding for the rules area (elastic#144016)
jloleysens added a commit to jloleysens/kibana that referenced this pull request Oct 31, 2022
@jloleysens
Merge branch 'main' into files-make-files-namespace-agnostic
5aa9510 
* main:
  [Fleet] Add the @Custom pipeline only to the main datastream ingest pipelines (elastic#144150)
  Upgrade @elastic/makelogs from v6.0.0 to v6.1.1 (elastic#144231)
  [Files] move to src (elastic#144044)
  [Synthetics UI] Add pagination and date filtering to test runs table (elastic#144029)
@watson watson mentioned this pull request Oct 31, 2022
Merged
watson pushed a commit to watson/kibana that referenced this pull request Oct 31, 2022
Upgrade @elastic/makelogs from v6.0.0 to v6.1.1 (elastic#144231)
e2ec430 
(cherry picked from commit 91f5453)

# Conflicts:
#	package.json
#	yarn.lock
watson pushed a commit to watson/kibana that referenced this pull request Oct 31, 2022
Upgrade @elastic/makelogs from v6.0.0 to v6.1.1 (elastic#144231)
6b45b44
@watson watson mentioned this pull request Oct 31, 2022
Merged
@watson
Copy link
Contributor Author

watson commented Oct 31, 2022

💚 All backports created successfully

Status Branch Result
✅ 8.5
✅ 7.17

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

Questions ?

Please refer to the Backport tool documentation

watson pushed a commit that referenced this pull request Oct 31, 2022
Upgrade @elastic/makelogs from v6.0.0 to v6.1.1 (#144231) (#144237)
b30a046 
(cherry picked from commit 91f5453)

# Conflicts:
#	package.json
#	yarn.lock
watson pushed a commit that referenced this pull request Nov 1, 2022
[7.17] Upgrade @elastic/makelogs from v6.0.0 to v6.1.1 (#144231) (#14…
e5e2b65 
…4238)

* Upgrade @elastic/makelogs from v6.0.0 to v6.1.1 (#144231)

* fix
@mistic mistic added v8.5.1 and removed v8.5.0 labels Nov 1, 2022
@mistic
Copy link
Member

mistic commented Nov 1, 2022

Added v8.5.1 tag has the backport for 8.5 didn't make the v8.5.0 release.

@watson watson deleted the bump-makelogs branch November 1, 2022 16:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@legrego legrego legrego approved these changes

Assignees

@watson watson

Labels
backport:all-open Backport to all branches that could still receive a release release_note:skip Skip the PR/issue when compiling release notes v7.17.8 v8.5.1 v8.6.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@watson @kibana-ci @kibanamachine @mistic @legrego