Skip to content

Restore code review changes #17539

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

Open
wants to merge 3 commits into
base: old-8.x
Choose a base branch
from
Open

Restore code review changes #17539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
95eae53
Comment to clarify why FIPS flag is not needed for smoke tests
donoghuc Apr 9, 2025
be46c88
Use full versions of docker commands for readability
donoghuc Apr 9, 2025
74fe4d3
Simplify grock pattern match
donoghuc Apr 9, 2025
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: 2 additions & 0 deletions .buildkite/pull_request_pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,8 @@ steps:
# Run the smoke tests on the PR code
docker tag docker.elastic.co/logstash/logstash-observability-sre:$${QUALIFIED_VERSION} \
pr-built-observability-sre-image
# observabilitySREsmokeTests orchestrates FIPS-mode docker images
# and validates assertions separately, so it does not need FIPS flag.
./gradlew observabilitySREsmokeTests --stacktrace

- label: ":lab_coat: Integration Tests - FIPS mode / part 1-of-3"
Expand Down
4 changes: 2 additions & 2 deletions x-pack/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ tasks.register("observabilitySREsmokeTests", Test) {
}
def result = exec {
workingDir file("distributions/internal/observabilitySRE/qa/smoke/docker")
commandLine 'docker-compose', 'up', '-d'
commandLine 'docker-compose', 'up', '--detach'
ignoreExitValue = true
}
if (result.exitValue != 0) {
Expand All @@ -107,7 +107,7 @@ tasks.register("observabilitySREsmokeTests", Test) {
doLast {
exec {
workingDir file("distributions/internal/observabilitySRE/qa/smoke/docker")
commandLine 'docker-compose', 'down', '-v'
commandLine 'docker-compose', 'down', '--volumes'
ignoreExitValue = true
}
// Clean up the generated certificates
Expand Down
2 changes: 1 addition & 1 deletion ...k/distributions/internal/observabilitySRE/qa/smoke/docker/logstash/pipeline/logstash.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ filter {

if [log_content] =~ /json=/ {
grok {
match => { "log_content" => ".*json=%{GREEDYDATA:json_string}.*" }
match => { "log_content" => "json=%{GREEDYDATA:json_string}" }
}
json {
source => "json_string"
Expand Down