Skip to content

Limit backports to 8.3+ #2450

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

Merged
merged 19 commits into from
Jun 12, 2023
Merged

Limit backports to 8.3+ #2450

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
42ea8c1
Drop Rule Support for Outdated Stack Versions Less Than 8.3
terrancedejesus Jan 5, 2023
0dccfd6
changed version lock key assignment logic and updated version lock file
terrancedejesus Jan 9, 2023
a9ce8ee
Merge branch 'main' into drop-support-before-8.3
terrancedejesus Jan 9, 2023
ca29a09
added comment to stack-schema-map file
terrancedejesus Jan 9, 2023
8242c8a
Merge branch 'main' into drop-support-before-8.3
terrancedejesus Jan 9, 2023
7fd8998
changed version lock key assignment logic to use custom Version method)
terrancedejesus Jan 9, 2023
8274cf5
Update detection_rules/devtools.py
terrancedejesus Jan 9, 2023
d67d09a
Merge branch 'main' into drop-support-before-8.3
Mikaayenson Jan 25, 2023
91becd7
Merge branch 'main' into drop-support-before-8.3
Mikaayenson Jan 25, 2023
9fef877
reverting version lock file to original
terrancedejesus Jan 25, 2023
752330a
updated version lock from adjusted comparison logic of stack versions
terrancedejesus Jan 25, 2023
2e58b99
Merge branch 'main' into drop-support-before-8.3
terrancedejesus Jan 25, 2023
31169b8
Merge branch 'main' into drop-support-before-8.3
Mikaayenson Jan 27, 2023
39c5f5e
Merge branch 'main' into drop-support-before-8.3
Mikaayenson Jan 30, 2023
2a820aa
Merge branch 'main' into drop-support-before-8.3
terrancedejesus May 31, 2023
85618a7
updated logic in devtools; removed < 8.3.0 in version lock file
terrancedejesus May 31, 2023
e495d3d
Merge branch 'main' into drop-support-before-8.3
Mikaayenson Jun 2, 2023
03e1bb4
Merge branch 'main' into drop-support-before-8.3
terrancedejesus Jun 8, 2023
57cf12b
trimmed lock version before merge
terrancedejesus Jun 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/lock-versions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,8.4,8.5,8.6'
default: '8.3,8.4,8.5,8.6'

jobs:
pr:
Expand Down
3 changes: 2 additions & 1 deletion detection_rules/devtools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -918,7 +918,8 @@ def trim_version_lock(min_version: str, dry_run: bool):
for outdated in outdated_vers:
popped = lock['previous'].pop(str(outdated))
if outdated == latest_version:
lock['previous'][str(min_version)] = popped
version_key = ".".join(map(str, min_version[:2]))
lock['previous'][version_key] = popped

# remove the whole previous entry if it is now blank
if not lock['previous']:
Expand Down
35 changes: 18 additions & 17 deletions detection_rules/etc/stack-schema-map.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
## Updates:
## 7.17 was intentionally skipped because it was added late and was bug fix only
## 06/2022 - dropped backport support for 7.13.0, 7.14.0, 7.15.0 as of 8.4 branch creation
## 01/2023 - dropped backport support for 7.16.0, 8.0.0, 8.1.0, 8.2.0 - https://github.com/elastic/detection-rules/pull/2450

## Unsupported
#"7.13.0":
Expand All @@ -22,27 +23,27 @@
# beats: "7.15.1"
# ecs: "1.11.0"

## Supported
# "7.16.0":
# beats: "7.16.2"
# ecs: "1.12.2"
# endgame: "1.9.0"

"7.16.0":
beats: "7.16.2"
ecs: "1.12.2"
endgame: "1.9.0"
# "8.0.0":
# beats: "8.0.1"
# ecs: "8.0.1"
# endgame: "1.9.0"

"8.0.0":
beats: "8.0.1"
ecs: "8.0.1"
endgame: "1.9.0"
# "8.1.0":
# beats: "8.1.2"
# ecs: "8.1.0"
# endgame: "1.9.0"

"8.1.0":
beats: "8.1.2"
ecs: "8.1.0"
endgame: "1.9.0"
# "8.2.0":
# beats: "8.2.1"
# ecs: "8.2.1"
# endgame: "1.9.0"

"8.2.0":
beats: "8.2.1"
ecs: "8.2.1"
endgame: "1.9.0"
## Supported

"8.3.0":
beats: "8.3.3"
Expand Down
Loading