Skip to content

Commit

Permalink
updated module_changeset.go
Browse files Browse the repository at this point in the history
  • Loading branch information
oakrizan committed Jul 22, 2024
1 parent 5d2348d commit 377a692
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .buildkite/heartbeat/heartbeat-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ steps:
- github_commit_status:
context: "heartbeat: Go Integration Tests"

# Heartbeat has no modules
# Heartbeat has no modules yet
- label: ":ubuntu: Heartbeat: Python Integration Tests"
command: |
cd heartbeat
Expand Down
2 changes: 0 additions & 2 deletions .buildkite/x-pack/pipeline.xpack.auditbeat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ steps:
- github_commit_status:
context: "x-pack/dockerlogbeat: Ubuntu x86_64 Unit Tests"

# x-pack/dockerlogbeat has no modules
# x-pack/dockerlogbeat has no modules yet
- label: ":ubuntu: x-pack/dockerlogbeat: Go Integration Tests"
key: "mandatory-int-test"
command: |
Expand Down
8 changes: 1 addition & 7 deletions dev-tools/mage/module_changeset.go
Original file line number Diff line number Diff line change
Expand Up @@ -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

Check failure on line 35 in dev-tools/mage/module_changeset.go

View workflow job for this annotation

GitHub Actions / lint (windows)

S1021: should merge variable declaration with assignment on next line (gosimple)
//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)
Expand Down
8 changes: 4 additions & 4 deletions x-pack/auditbeat/auditbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -1422,15 +1422,15 @@ 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.
#setup.dsl.enabled: true

# 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]}"

Expand Down
2 changes: 1 addition & 1 deletion x-pack/packetbeat/module/amqp/ingest/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ on_failure:
- append:
field: error.message
value: |-
Processor "{{ _ingest.on_failure_processor_type }}" with tag "{{ _ingest.on_failure_processor_tag }}" in pipeline "{{ _ingest.on_failure_pipeline }}" failed with message "{{ _ingest.on_failure_message }}"
Processor "{{ _ingest.on_failure_processor_type }}" with tag "{{ _ingest.on_failure_processor_tag }}" in pipeline "{{ _ingest.on_failure_pipeline }}" failed with message "{{ _ingest.on_failure_message }} - DELETEME"
- set:
field: event.kind
value: pipeline_error

0 comments on commit 377a692

Please sign in to comment.