Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
e7e1218
updated pull-request.json
oakrizan Sep 23, 2025
4b19fe5
restored the qa/acceptance/fixtures/logstash-filter-acceptance_test.g…
oakrizan Sep 23, 2025
eb8c8e4
cleaned always_require_ci_on_changed values after testing
oakrizan Sep 23, 2025
53323ab
updated the trigger comment
oakrizan Sep 23, 2025
e7b622b
updated the trigger comment
oakrizan Sep 23, 2025
6836cbe
testing comments
oakrizan Sep 24, 2025
5f31a13
testing comments
oakrizan Sep 24, 2025
66f5eba
testing comments
oakrizan Sep 24, 2025
8060880
updated pull-request.json
oakrizan Sep 25, 2025
d2bde74
enable changed files
v1v Oct 21, 2025
b5ff323
support changed files and github comment
v1v Oct 21, 2025
c8268e9
Update .buildkite/smart_exhaustive_tests_pipeline.yml
v1v Oct 21, 2025
51f0f43
same pattern done at logstash-pull-request-pipeline
v1v Oct 21, 2025
0b8bd3f
Update catalog-info.yaml
v1v Oct 21, 2025
748774d
Measure average batch byte size and event count (#18000)
andsel Sep 23, 2025
6803cc3
Remove uncommented line erroneously committed. (#18204)
andsel Sep 23, 2025
9554ec4
Update logstash_project_board.yml (#18116)
robbavey Sep 23, 2025
9f9ee56
GH action for updating logstash version (#18035)
donoghuc Sep 23, 2025
50fde26
Cover the warn password policy usage of ValidatedPassword setting (#1…
andsel Sep 24, 2025
62bf9b3
Replace buildkite jdk version check w/GH action (#17945)
donoghuc Sep 24, 2025
21ec30c
Implements current batch event count and byte size metrics (#18160)
andsel Sep 26, 2025
4532054
[Docs] Add hyphen to the pipeline ID restriction description. (#18216)
mashhurs Sep 26, 2025
7c7504e
[DOCS] Fix substitution variables (#18224)
lcawl Sep 26, 2025
dd371da
PQ: Add support for event-level compression using ZStandard (ZSTD) (#…
yaauie Sep 29, 2025
9e80765
metrics: add support for user-defined metrics (#18218)
yaauie Sep 29, 2025
0d4ff1c
metric: improve accuracy of timer metric under contention (#18219)
yaauie Sep 29, 2025
4ed0658
Pq compression user metrics (#18227)
yaauie Sep 29, 2025
2c09f4c
metrics: add gauge with compression goal if enabled (#18230)
yaauie Sep 30, 2025
ba7420c
Documentation for batch's event metrics (current and average) (#18017)
andsel Sep 30, 2025
9f0df4b
Fix heading (#18237)
karenzone Sep 30, 2025
75b50e9
Remove redundant testing and circular dependency from docker acceptan…
donoghuc Oct 1, 2025
128ac9c
Rewrite Password setting class in Java (second attempt) (#18231)
andsel Oct 2, 2025
4ed4600
Ensure docs gen inserts at correct place in file (#18250)
donoghuc Oct 2, 2025
2940069
Bump logstash version 9.3.0 (#18241)
github-actions[bot] Oct 2, 2025
804dc36
Downgrade gradle to coninute testing on windows server 2016 (#18263)
donoghuc Oct 6, 2025
07a231b
Release notes for 9.1.5 (#18248) (#18267)
mergify[bot] Oct 6, 2025
35fd6ec
[main] (backport #18247) Release notes for 9.0.8 (#18270)
mergify[bot] Oct 6, 2025
db594c0
ci: remove sonarqube (#18273)
v1v Oct 7, 2025
64bc382
Doc: Update docs for testing for boolean fields (#18271)
karenzone Oct 7, 2025
2d8c3cc
Move invokedynamic and log4j isThreadContextMapInheritable from jvm.o…
estolfo Oct 15, 2025
155b4ca
Adds integration test for the `_health_report` and `_node/plugins` AP…
mashhurs Oct 15, 2025
50d6b3d
Handle GH org for elastic_integration plugin (#18315)
donoghuc Oct 17, 2025
31a643c
Bump the github-actions group across 1 directory with 2 updates (#18320)
dependabot[bot] Oct 20, 2025
50ee5c6
Add encoded/non-encoded auth method to x-pack unit tests (#18307)
alexcams Oct 21, 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
3 changes: 0 additions & 3 deletions .buildkite/aarch64_pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ steps:

- label: ":java: Java unit tests"
key: "java-unit-tests"
env:
# https://github.com/elastic/logstash/pull/15486 for background
ENABLE_SONARQUBE: "false"
command: |
set -euo pipefail

Expand Down
14 changes: 0 additions & 14 deletions .buildkite/jdk_availability_check_pipeline.yml

This file was deleted.

89 changes: 64 additions & 25 deletions .buildkite/pull-requests.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,65 @@
{
"jobs": [
{
"enabled": true,
"pipeline_slug": "logstash-pull-request-pipeline",
"allow_org_users": true,
"allowed_repo_permissions": ["admin", "write"],
"allowed_list": ["dependabot[bot]", "mergify[bot]", "github-actions[bot]", "elastic-vault-github-plugin-prod[bot]"],
"set_commit_status": true,
"build_on_commit": true,
"build_on_comment": true,
"trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))",
"always_trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))",
"skip_ci_labels": [ ],
"skip_target_branches": [ ],
"skip_ci_on_only_changed": [
"^.github/",
"^docs/",
"^.mergify.yml$",
"^.pre-commit-config.yaml",
"\\.md$"
],
"always_require_ci_on_changed": [ ]
}
]
}
"jobs": [
{
"enabled": true,
"pipeline_slug": "logstash-pull-request-pipeline",
"allow_org_users": true,
"allowed_repo_permissions": [
"admin",
"write"
],
"allowed_list": [
"dependabot[bot]",
"mergify[bot]",
"github-actions[bot]",
"elastic-vault-github-plugin-prod[bot]"
],
"set_commit_status": true,
"build_on_commit": true,
"build_on_comment": true,
"trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))",
"always_trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))",
"skip_ci_labels": [],
"skip_target_branches": [],
"skip_ci_on_only_changed": [
"^.github/",
"^docs/",
"^.mergify.yml$",
"^.pre-commit-config.yaml",
"\\.md$"
],
"always_require_ci_on_changed": []
},
{
"enabled": true,
"pipeline_slug": "logstash-smart-exhaustive-tests-pipeline",
"allow_org_users": true,
"allowed_repo_permissions": [
"admin",
"write"
],
"allowed_list": [
"dependabot[bot]",
"mergify[bot]",
"github-actions[bot]"
],
Comment thread
v1v marked this conversation as resolved.
"set_commit_status": true,
"build_on_commit": true,
"build_on_comment": true,
"trigger_comment_regex": "^(?:(?:/run\\W+)?(?:exhaustive)\\W+(?:tests))",
"always_trigger_comment_regex": "^(?:(?:/run\\W+)(?:exhaustive)\\W+(?:tests))",
"skip_ci_labels": [],
"skip_target_branches": [],
"skip_ci_on_only_changed": [
"^.github/",
"^docs/",
"^.mergify.yml$",
"^.pre-commit-config.yaml",
"\\.md$"
Comment thread
v1v marked this conversation as resolved.
],
"always_require_ci_on_changed": [
"^qa/acceptance/"
]
}
]
}
25 changes: 0 additions & 25 deletions .buildkite/pull_request_pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,6 @@ steps:
retry:
automatic:
- limit: 3
env:
ENABLE_SONARQUBE: true
command: |
set -euo pipefail
source .buildkite/scripts/common/container-agent.sh
Expand All @@ -110,8 +108,6 @@ steps:
retry:
automatic:
- limit: 3
env:
ENABLE_SONARQUBE: true
command: |
set -euo pipefail

Expand All @@ -122,27 +118,6 @@ steps:
- "**/jacocoTestReport.xml"
- "**/build/classes/**/*.*"

- label: ":sonarqube: Continuous Code Inspection"
if: |
build.pull_request.id != null ||
build.branch == "main" ||
build.branch =~ /^[0-9]+\.[0-9]+\$/
env:
VAULT_SONAR_TOKEN_PATH: "kv/ci-shared/platform-ingest/elastic/logstash/sonar-analyze-token"
agents:
image: "docker.elastic.co/cloud-ci/sonarqube/buildkite-scanner:latest"
command:
- "buildkite-agent artifact download --step ruby-unit-tests coverage/coverage.json ."
- "buildkite-agent artifact download --step java-unit-tests **/jacocoTestReport.xml ."
- "buildkite-agent artifact download --step java-unit-tests **/build/classes/**/*.* ."
- "/scan-source-code.sh"
depends_on:
- "ruby-unit-tests"
- "java-unit-tests"
retry:
manual:
allowed: true

- label: "Observability SRE container smoke test"
key: "observability-sre-container-smoke-test"
agents:
Expand Down
3 changes: 3 additions & 0 deletions .buildkite/scripts/dra/build_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ esac
rake artifact:docker || error "artifact:docker build failed."
rake artifact:docker_oss || error "artifact:docker_oss build failed."
rake artifact:docker_wolfi || error "artifact:docker_wolfi build failed."

# Generating public dockerfiles is the primary use case for NOT using local artifacts
export LOCAL_ARTIFACTS=false
rake artifact:dockerfiles || error "artifact:dockerfiles build failed."

STACK_VERSION="$(./$(dirname "$0")/../common/qualified-version.sh)"
Expand Down
1 change: 0 additions & 1 deletion .buildkite/scripts/jdk-matrix-tests/generate-steps.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,6 @@ def java_unit_test(self) -> JobRetValues:
step_name_human = "Java Unit Test"
step_key = f"{self.group_key}-java-unit-test"
test_command = '''
export ENABLE_SONARQUBE="false"
ci/unit_tests.sh java
'''

Expand Down
33 changes: 33 additions & 0 deletions .buildkite/smart_exhaustive_tests_pipeline.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
steps:
- label: "Trigger logstash-exhaustive-tests-pipeline for PRs with qa/acceptance/ changes"
if: build.pull_request.id != null
plugins:
- monorepo-diff#v1.0.1:
diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
interpolation: false
watch:
- path:
- ^qa/acceptance/
- .buildkite/smart_exhaustive_tests_pipeline.yml
config:
trigger: "logstash-exhaustive-tests-pipeline"
build:
commit: "${BUILDKITE_COMMIT}"
branch: "${BUILDKITE_BRANCH}"
env:
- BUILDKITE_PULL_REQUEST=${BUILDKITE_PULL_REQUEST}
- BUILDKITE_PULL_REQUEST_BASE_BRANCH=${BUILDKITE_PULL_REQUEST_BASE_BRANCH}
- GITHUB_PR_LABELS=${GITHUB_PR_LABELS}
- ELASTIC_SLACK_NOTIFICATIONS_ENABLE=false
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

avoid slack notifications when using the smart pipeline, it runs only for PRs.


- label: "Trigger logstash-exhaustive-tests-pipeline for GitHub comments"
if: build.env("GITHUB_PR_TRIGGER_COMMENT") != ""
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume GITHUB_PR_TRIGGER_COMMENT is set if it matches the regex set in the pull0-request.json hence I don't think we need to actually look for its value but when it's not empty

trigger: "logstash-exhaustive-tests-pipeline"
build:
commit: "${BUILDKITE_COMMIT}"
branch: "${BUILDKITE_BRANCH}"
env:
- BUILDKITE_PULL_REQUEST=${BUILDKITE_PULL_REQUEST}
- BUILDKITE_PULL_REQUEST_BASE_BRANCH=${BUILDKITE_PULL_REQUEST_BASE_BRANCH}
- GITHUB_PR_LABELS=${GITHUB_PR_LABELS}
Comment thread
v1v marked this conversation as resolved.
- ELASTIC_SLACK_NOTIFICATIONS_ENABLE=false
56 changes: 56 additions & 0 deletions .ci/updatecli/bump-java-version.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
---
name: Update java version file
pipelineid: "logstash/jdk-version-updates-{{ requiredEnv "LOGSTASH_BRANCH" }}"

scms:
default:
kind: github
spec:
user: '{{ requiredEnv "GITHUB_ACTOR" }}'
username: '{{ requiredEnv "GITHUB_ACTOR" }}'
owner: '{{ .scm.owner }}'
repository: '{{ .scm.repository }}'
token: '{{ requiredEnv "GITHUB_TOKEN" }}'
branch: '{{ requiredEnv "LOGSTASH_BRANCH" }}'
commitusingapi: true
force: false

sources:
jdk_major:
kind: yaml
spec:
file: "versions.yml"
key: "$.bundled_jdk.revision"
transformers:
- findsubmatch:
pattern: '^(\d+)\.\d+\.\d+$'
captureindex: 1

latest_jdk_version:
kind: json
spec:
file: 'https://jvm-catalog.elastic.co/jdk/latest_adoptiumjdk_{{ source "jdk_major" }}_linux'
key: 'version'

latest_jdk_build:
kind: json
spec:
file: 'https://jvm-catalog.elastic.co/jdk/latest_adoptiumjdk_{{ source "jdk_major" }}_linux'
key: 'revision'

targets:
update_jdk_revision:
name: "Update JDK revision"
kind: yaml
sourceid: latest_jdk_version
spec:
file: versions.yml
key: $.bundled_jdk.revision

update_jdk_build:
name: "Update JDK build"
kind: yaml
sourceid: latest_jdk_build
spec:
file: versions.yml
key: $.bundled_jdk.build
81 changes: 81 additions & 0 deletions .ci/updatecli/bump-logstash-version.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
---
name: Update logstash version files
pipelineid: "logstash/version-updates-{{ requiredEnv "LOGSTASH_BRANCH" }}"

scms:
default:
kind: github
spec:
user: '{{ requiredEnv "GITHUB_ACTOR" }}'
username: '{{ requiredEnv "GITHUB_ACTOR" }}'
owner: '{{ .scm.owner }}'
repository: '{{ .scm.repository }}'
token: '{{ requiredEnv "GITHUB_TOKEN" }}'
branch: '{{ requiredEnv "LOGSTASH_BRANCH" }}'
commitusingapi: true
force: false

actions:
default:
title: 'Bump logstash version {{ requiredEnv "LOGSTASH_VERSION" }}'
kind: github/pullrequest
scmid: default
spec:
automerge: false
labels:
- automation
description: |-
### What
Update logstash version

sources:
lock_file_exists:
kind: shell
scmid: default
spec:
command: test -f Gemfile.jruby-3.1.lock.release

targets:
update_logstash_version:
name: Update logstash version in versions.yml
kind: yaml
disablesourceinput: true
scmid: default
spec:
file: versions.yml
key: $.logstash
value: '{{ requiredEnv "LOGSTASH_VERSION" }}'

update_logstash_core_version:
name: Update logstash-core version in versions.yml
kind: yaml
disablesourceinput: true
scmid: default
spec:
file: versions.yml
key: $.logstash-core
value: '{{ requiredEnv "LOGSTASH_VERSION" }}'

update_gemfile_lock_dependency:
name: Update logstash-core dependency in lockfile
kind: file
disablesourceinput: true
scmid: default
dependson:
- 'source#lock_file_exists'
spec:
file: Gemfile.jruby-3.1.lock.release
matchpattern: 'logstash-core \(= [0-9]+\.[0-9]+\.[0-9]+'
replacepattern: 'logstash-core (= {{ requiredEnv "LOGSTASH_VERSION" }}'

update_gemfile_lock_spec:
name: Update logstash-core spec in lockfile
kind: file
disablesourceinput: true
scmid: default
dependson:
- 'source#lock_file_exists'
spec:
file: Gemfile.jruby-3.1.lock.release
matchpattern: 'logstash-core \([0-9]+\.[0-9]+\.[0-9]+-java\)'
replacepattern: 'logstash-core ({{ requiredEnv "LOGSTASH_VERSION" }}-java)'
3 changes: 3 additions & 0 deletions .ci/updatecli/values.d/scm.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
scm:
owner: elastic
repository: logstash
30 changes: 18 additions & 12 deletions .github/workflows/bump-java-version.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
name: Stub GH action for devoping new workflows [STUB]
name: bump-java-version

on:
schedule:
# Run weekly on Mondays at midnight UTC
- cron: '0 0 * * 1'
workflow_dispatch:
pull_request:
types: [opened, synchronize, reopened]

permissions:
pull-requests: write
contents: write

jobs:
stub_job_name:
name: Stub Job
bump:
permissions:
contents: write
pull-requests: write
runs-on: ubuntu-latest
steps:
- name: Stub step
run: |
echo "Stub to iterate via PR"

- uses: actions/checkout@v5

- uses: elastic/oblt-actions/updatecli/run@v1
with:
command: apply --config .ci/updatecli/bump-java-version.yml --values .ci/updatecli/values.d/scm.yml
version-file: .updatecli-version
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
LOGSTASH_BRANCH: ${{ github.ref_name }}
Loading
Loading