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

Prep for 8.5 branch #2220

Merged
merged 8 commits into from
Aug 9, 2022
Merged

Prep for 8.5 branch #2220

merged 8 commits into from
Aug 9, 2022

Conversation

terrancedejesus
Copy link
Contributor

@terrancedejesus terrancedejesus commented Aug 2, 2022

Related

Summary

  • update packages.yml
  • update integrations manifest
  • update lock-versions.yml
  • update workflows
  • lock api_schemas
  • add migrate function
  • update stack-schema-map

merged after 8.4 branch creation

@terrancedejesus terrancedejesus self-assigned this Aug 2, 2022
@botelastic botelastic bot added python Internal python for the repository schema labels Aug 2, 2022
@terrancedejesus
Copy link
Contributor Author

Dropping backport support

@brokensound77 From telemetry for the last 3 months, versions 8.0 and 8.1 account for ~21% of cloud stacks. Based on our agreement to only support -2 besides the 7.16 series we would support 8.2-8.4 for this release. Compared to our dropped support for 7.12-7.15 which accounts for ~16% of the cloud stack versions within the same time period.

If we move forward with -2, then our support would be for ~63% of all customer cloud stacks. If we just drop support for 8.0 then ~80% coverage.

@terrancedejesus
Copy link
Contributor Author

8.4 branch status check is failing because it is added within this preparation PR but does not actually exist in the repository yet. Once @brokensound77 and @Mikaayenson approve, the branch will be created, checks will be re-ran and then the merge will take place.

@terrancedejesus terrancedejesus added the trade-artifacts Issues related to TRADE artifact building and releasing label Aug 9, 2022
ecs: "8.2.1"

"8.5.0":
beats: "main"
Copy link
Contributor

Choose a reason for hiding this comment

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

Shouldn't beats be updated for the 8.3.0 ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good catch, I think this may be 8.3.3 then if we are looking at tag releases from github.com/elastic/beats.

@brokensound77 -> Where should this information be pulled from, the repo itself? I'll update the documentation if so.

Copy link
Contributor

Choose a reason for hiding this comment

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

similar to #1995 - so just point to the latest 8.3.x for beats and ecs. Then you can update 8.5 and main to use them until 8.4 is cut

@@ -6,7 +6,7 @@ on:
description: 'List of branches to lock versions (ordered, comma separated)'
required: true
# 7.17 was intentionally skipped because it was added late and was bug fix only
default: '7.16,8.0,8.1,8.2,8.3'
default: '7.16,8.0,8.1,8.2,8.3,8.4'
Copy link
Contributor

Choose a reason for hiding this comment

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

in a separate PR: we still need to consolidate this off the stack-schema-map

Copy link
Contributor

@brokensound77 brokensound77 left a comment

Choose a reason for hiding this comment

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

LGTM 👍 - branch 8.4 from main then immediately merge

@terrancedejesus terrancedejesus merged commit 2a3b584 into main Aug 9, 2022
@terrancedejesus terrancedejesus deleted the prep-for-8.5-branch branch August 9, 2022 21:14
protectionsmachine pushed a commit that referenced this pull request Aug 9, 2022
* adding first commit

* renamed branch

* adjusted packages, stack schema and updated schemas

* updated integrations manifest

* adjusted comments to be a little more organized

* adjusted stack-schema-map

* refreshed ecs and beats schema, adjusted stack schema map accordingly

Removed changes from:
- detection_rules/etc/packages.yml

(selectively cherry picked from commit 2a3b584)
protectionsmachine pushed a commit that referenced this pull request Aug 9, 2022
* adding first commit

* renamed branch

* adjusted packages, stack schema and updated schemas

* updated integrations manifest

* adjusted comments to be a little more organized

* adjusted stack-schema-map

* refreshed ecs and beats schema, adjusted stack schema map accordingly

Removed changes from:
- detection_rules/etc/packages.yml

(selectively cherry picked from commit 2a3b584)
protectionsmachine pushed a commit that referenced this pull request Aug 9, 2022
* adding first commit

* renamed branch

* adjusted packages, stack schema and updated schemas

* updated integrations manifest

* adjusted comments to be a little more organized

* adjusted stack-schema-map

* refreshed ecs and beats schema, adjusted stack schema map accordingly

Removed changes from:
- detection_rules/etc/packages.yml

(selectively cherry picked from commit 2a3b584)
protectionsmachine pushed a commit that referenced this pull request Aug 9, 2022
* adding first commit

* renamed branch

* adjusted packages, stack schema and updated schemas

* updated integrations manifest

* adjusted comments to be a little more organized

* adjusted stack-schema-map

* refreshed ecs and beats schema, adjusted stack schema map accordingly

Removed changes from:
- detection_rules/etc/packages.yml

(selectively cherry picked from commit 2a3b584)
protectionsmachine pushed a commit that referenced this pull request Aug 9, 2022
* adding first commit

* renamed branch

* adjusted packages, stack schema and updated schemas

* updated integrations manifest

* adjusted comments to be a little more organized

* adjusted stack-schema-map

* refreshed ecs and beats schema, adjusted stack schema map accordingly

Removed changes from:
- detection_rules/etc/packages.yml

(selectively cherry picked from commit 2a3b584)
protectionsmachine pushed a commit that referenced this pull request Aug 9, 2022
* adding first commit

* renamed branch

* adjusted packages, stack schema and updated schemas

* updated integrations manifest

* adjusted comments to be a little more organized

* adjusted stack-schema-map

* refreshed ecs and beats schema, adjusted stack schema map accordingly

Removed changes from:
- detection_rules/etc/packages.yml

(selectively cherry picked from commit 2a3b584)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport: auto python Internal python for the repository schema trade-artifacts Issues related to TRADE artifact building and releasing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants