From 45740306aa2dd427e66c0258226ead29136f5dce Mon Sep 17 00:00:00 2001 From: Olga Naidjonoka Date: Mon, 22 Jul 2024 12:15:26 +0300 Subject: [PATCH] updated module_changeset.go --- .buildkite/x-pack/pipeline.xpack.auditbeat.yml | 2 -- dev-tools/mage/module_changeset.go | 8 +------- x-pack/auditbeat/auditbeat.reference.yml | 8 ++++---- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/.buildkite/x-pack/pipeline.xpack.auditbeat.yml b/.buildkite/x-pack/pipeline.xpack.auditbeat.yml index 4e4ddde7fe25..40ff383bb83e 100644 --- a/.buildkite/x-pack/pipeline.xpack.auditbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.auditbeat.yml @@ -64,8 +64,6 @@ steps: steps: - label: ":ubuntu: x-pack/auditbeat: Build Tests (Module)" key: "mandatory-linux-unit-test" - env: - MAGEFILE_VERBOSE: true command: | cd x-pack/auditbeat mage update build test diff --git a/dev-tools/mage/module_changeset.go b/dev-tools/mage/module_changeset.go index fc41af1935b4..5eef73ec5d65 100644 --- a/dev-tools/mage/module_changeset.go +++ b/dev-tools/mage/module_changeset.go @@ -29,16 +29,10 @@ import ( func DefineModules() { beatPath := os.Getenv("BEAT_PATH") if beatPath == "" { - fmt.Errorf("argument required: beatPath") - os.Exit(1) + panic(fmt.Errorf("argument required: beatPath")) } var modulePattern string - //if strings.Contains(beatPath, "x-pack") { - // modulePattern = "^x-pack\\/[a-z0-9]+beat\\/module\\/([^\\/]+)\\/.*" - //} else { - // modulePattern = "^[a-z0-9]+beat\\/module\\/([^\\/]+)\\/.*" - //} modulePattern = fmt.Sprintf("^%s\\/module\\/([^\\/]+)\\/.*", beatPath) moduleRegex, err := regexp.Compile(modulePattern) diff --git a/x-pack/auditbeat/auditbeat.reference.yml b/x-pack/auditbeat/auditbeat.reference.yml index ed82005f0ebf..438ae307b80d 100644 --- a/x-pack/auditbeat/auditbeat.reference.yml +++ b/x-pack/auditbeat/auditbeat.reference.yml @@ -174,7 +174,7 @@ auditbeat.modules: # - file.pe.go_imports_names_entropy # - file.pe.go_imports_names_var_entropy # - file.pe.go_stripped - + # The system module collects security related information about a host. # All datasets send both periodic state information (e.g. all currently # running processes) and real-time changes (e.g. when a new process starts @@ -1245,7 +1245,7 @@ output.elasticsearch: # Permissions to use for file creation. The default is 0600. #permissions: 0600 - + # Configure automatic file rotation on every startup. The default is true. #rotate_on_startup: true @@ -1422,7 +1422,7 @@ setup.template.settings: # ======================== Data Stream Lifecycle (DSL) ========================= -# Configure Data Stream Lifecycle to manage data streams while connected to Serverless elasticsearch. +# Configure Data Stream Lifecycle to manage data streams while connected to Serverless elasticsearch. # These settings are mutually exclusive with ILM settings which are not supported in Serverless projects. # Enable DSL support. Valid values are true, or false. @@ -1430,7 +1430,7 @@ setup.template.settings: # Set the lifecycle policy name or pattern. For DSL, this name must match the data stream that the lifecycle is for. # The default data stream pattern is auditbeat-%{[agent.version]}" -# The template string `%{[agent.version]}` will resolve to the current stack version. +# The template string `%{[agent.version]}` will resolve to the current stack version. # The other possible template value is `%{[beat.name]}`. #setup.dsl.data_stream_pattern: "auditbeat-%{[agent.version]}"