Skip to content

Commit 9fe163b

Browse files
Merge branch 'main' into issue-4539
2 parents 5210a6c + e8c5416 commit 9fe163b

File tree

425 files changed

+11770
-12070
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

425 files changed

+11770
-12070
lines changed

.github/workflows/lock-versions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
description: 'List of branches to lock versions (ordered, comma separated)'
77
required: true
88
# 7.17 was intentionally skipped because it was added late and was bug fix only
9-
default: '8.13,8.14,8.15,8.16,8.17,8.18'
9+
default: '8.14,8.15,8.16,8.17,8.18,9.0'
1010

1111
jobs:
1212
pr:

.github/workflows/pythonpackage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Unit Tests
22

33
on:
44
push:
5-
branches: [ "main", "7.*", "8.*" ]
5+
branches: [ "main", "7.*", "8.*", "9.*" ]
66
pull_request:
77
branches: [ "*" ]
88

CLI.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ Options:
481481

482482
### Exporting rules
483483

484-
This command should be run with the `CUSTOM_RULES_DIR` envvar set, that way proper validation is applied to versioning when the rules are downloaded. See the [custom rules docs](docs-dev/custom-rules.md) for more information.
484+
This command should be run with the `CUSTOM_RULES_DIR` envvar set, that way proper validation is applied to versioning when the rules are downloaded. See the [custom rules docs](docs-dev/custom-rules-management.md) for more information.
485485

486486
```
487487
python -m detection_rules kibana export-rules -h

detection_rules/custom_rules.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
from .utils import ROOT_DIR, get_etc_path, load_etc_dump
1616

1717
DEFAULT_CONFIG_PATH = Path(get_etc_path('_config.yaml'))
18-
CUSTOM_RULES_DOC_PATH = Path(ROOT_DIR).joinpath(REPO_DOCS_DIR, 'custom-rules.md')
18+
CUSTOM_RULES_DOC_PATH = Path(ROOT_DIR).joinpath(REPO_DOCS_DIR, 'custom-rules-management.md')
1919

2020

2121
@root.group('custom-rules')

0 commit comments

Comments
 (0)