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

[Bug] Adjust Kibana Path for File System Rules #2397

Merged
merged 8 commits into from
Jan 3, 2023
Merged

[Bug] Adjust Kibana Path for File System Rules #2397

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b79300b
adjusted kibana rules path
terrancedejesus Nov 15, 2022
0bfe27f
Merge branch 'main' into bug-kibana-rules-path-reference
terrancedejesus Nov 15, 2022
f5df994
addressed flake errors for long string
terrancedejesus Nov 15, 2022
9bf5aff
Merge branch 'main' into bug-kibana-rules-path-reference
terrancedejesus Nov 15, 2022
2d2be81
added missing / to directory path
terrancedejesus Nov 28, 2022
1b78fb9
Merge branch 'main' into bug-kibana-rules-path-reference
terrancedejesus Nov 28, 2022
18609ba
Merge branch 'main' into bug-kibana-rules-path-reference
terrancedejesus Nov 29, 2022
bb0e37e
Merge branch 'main' into bug-kibana-rules-path-reference
terrancedejesus Jan 3, 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
9 changes: 5 additions & 4 deletions detection_rules/devtools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,10 +353,11 @@ def kibana_diff(rule_id, repo, branch, threads):
return diff


def add_git_args(f):
def add_kibana_git_args(f):
@click.argument("local-repo", default=get_path("..", "kibana"))
@click.option("--kibana-directory", "-d", help="Directory to overwrite in Kibana",
default="x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules")
default="x-pack/plugins/security_solution/server/lib/detection_engine/"
"prebuilt_rules/content/prepackaged_rules")
@click.option("--base-branch", "-b", help="Base branch in Kibana", default="main")
@click.option("--branch-name", "-n", help="New branch for the rules commit")
@click.option("--ssh/--http", is_flag=True, help="Method to use for cloning")
Expand All @@ -370,7 +371,7 @@ def decorated(*args, **kwargs):


@dev_group.command("kibana-commit")
@add_git_args
@add_kibana_git_args
@click.option("--push", "-p", is_flag=True, help="Push the commit to the remote")
@click.pass_context
def kibana_commit(ctx, local_repo: str, github_repo: str, ssh: bool, kibana_directory: str, base_branch: str,
Expand Down Expand Up @@ -441,7 +442,7 @@ def kibana_commit(ctx, local_repo: str, github_repo: str, ssh: bool, kibana_dire
@click.option("--fork-owner", "-f", help="Owner of forked branch (ex: elastic)")
# Pending an official GitHub API
# @click.option("--automerge", is_flag=True, help="Enable auto-merge on the PR")
@add_git_args
@add_kibana_git_args
@click.pass_context
def kibana_pr(ctx: click.Context, label: Tuple[str, ...], assign: Tuple[str, ...], draft: bool, fork_owner: str,
token: str, **kwargs):
Expand Down