Skip to content

Use logstash-versions.yml for observabilitySRE stack versions #18375

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

Merged
merged 4 commits into from
Nov 4, 2025
+31 −7
Merged

Use logstash-versions.yml for observabilitySRE stack versions #18375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b3c9cd2
Use logstash-versions.yml for observabilitySRE stack versions
donoghuc Oct 27, 2025
fda69b9
track stream in versions.yml
donoghuc Oct 29, 2025
3001241
Finalize name/location for versions.yml mapping
donoghuc Oct 31, 2025
9ec398c
better comment
donoghuc Nov 4, 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
10 changes: 10 additions & 0 deletions .ci/updatecli/bump-logstash-version.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,16 @@ targets:
key: $.logstash-core
value: '{{ requiredEnv "LOGSTASH_VERSION" }}'

update_release_track:
name: Update logstash-release-track in versions.yml
kind: yaml
disablesourceinput: true
scmid: default
spec:
file: versions.yml
key: $.logstash-release-track
value: '{{ requiredEnv "LOGSTASH_RELEASE_TRACK" }}'

update_gemfile_lock_dependency:
name: Update logstash-core dependency in lockfile
kind: file
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/bump-logstash.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ on:
description: 'Logstash branch (example: 9.1)'
required: true
type: string

logstash_release_track:
description: 'Release track (example: 9.current, 9.previous, main)'
required: true
type: string
jobs:
bump:
permissions:
Expand All @@ -29,3 +32,4 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
LOGSTASH_BRANCH: "${{ github.event.inputs.logstash_branch }}"
LOGSTASH_VERSION: "${{ github.event.inputs.logstash_version }}"
LOGSTASH_RELEASE_TRACK: "${{ github.event.inputs.logstash_release_track }}"
11 changes: 7 additions & 4 deletions ci/observabilitySREacceptance_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@

set -e

QUALIFIED_VERSION="$(.buildkite/scripts/common/qualified-version.sh)"
export OBSERVABILITY_SRE_IMAGE_VERSION="${OBSERVABILITY_SRE_IMAGE_VERSION:-$QUALIFIED_VERSION}"
export ELASTICSEARCH_IMAGE_VERSION="${ELASTICSEARCH_IMAGE_VERSION:-$QUALIFIED_VERSION}"
export FILEBEAT_IMAGE_VERSION="${FILEBEAT_IMAGE_VERSION:-$QUALIFIED_VERSION}"
# Look up corresponding LOGSTASH_RELEASE_TRACK from versions.yml
LOGSTASH_RELEASE_TRACK=$(ruby -ryaml -e "puts YAML.load_file('versions.yml')['logstash-release-track']")
# Use logstash stream to find the corresponding stack verstion from logstash-versions.yml
STACK_VERSION=$(ruby -ryaml -ropen-uri -e "puts YAML.load(URI.open('https://raw.githubusercontent.com/logstash-plugins/.ci/1.x/logstash-versions.yml'))['snapshots']['${LOGSTASH_RELEASE_TRACK}']")
export OBSERVABILITY_SRE_IMAGE_VERSION="${OBSERVABILITY_SRE_IMAGE_VERSION:-$STACK_VERSION}"
export ELASTICSEARCH_IMAGE_VERSION="${ELASTICSEARCH_IMAGE_VERSION:-$STACK_VERSION}"
export FILEBEAT_IMAGE_VERSION="${FILEBEAT_IMAGE_VERSION:-$STACK_VERSION}"

./gradlew observabilitySREacceptanceTests --stacktrace
8 changes: 6 additions & 2 deletions ci/observabilitySREsmoke_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@
set -e

QUALIFIED_VERSION="$(.buildkite/scripts/common/qualified-version.sh)"
export ELASTICSEARCH_IMAGE_VERSION="${ELASTICSEARCH_IMAGE_VERSION:-$QUALIFIED_VERSION}"
export FILEBEAT_IMAGE_VERSION="${FILEBEAT_IMAGE_VERSION:-$QUALIFIED_VERSION}"
# Look up corresponding LOGSTASH_RELEASE_TRACK from versions.yml
LOGSTASH_RELEASE_TRACK=$(ruby -ryaml -e "puts YAML.load_file('versions.yml')['logstash-release-track']")
# Use logstash stream to find the corresponding stack verstion from logstash-versions.yml
STACK_VERSION=$(ruby -ryaml -ropen-uri -e "puts YAML.load(URI.open('https://raw.githubusercontent.com/logstash-plugins/.ci/1.x/logstash-versions.yml'))['snapshots']['${LOGSTASH_RELEASE_TRACK}']")
export ELASTICSEARCH_IMAGE_VERSION="${ELASTICSEARCH_IMAGE_VERSION:-$STACK_VERSION}"
export FILEBEAT_IMAGE_VERSION="${FILEBEAT_IMAGE_VERSION:-$STACK_VERSION}"

./gradlew --stacktrace artifactDockerObservabilitySRE -PfedrampHighMode=true

Expand Down
3 changes: 3 additions & 0 deletions versions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
logstash: 9.3.0
logstash-core: 9.3.0
logstash-core-plugin-api: 2.1.16
# Logstash release track corresponding to keys in https://github.com/logstash-plugins/.ci/blob/1.x/logstash-versions.yml
# For example 9.current, 9.previous, etc
logstash-release-track: main

bundled_jdk:
# for AdoptOpenJDK/OpenJDK jdk-14.0.1+7.1, the revision is 14.0.1 while the build is 7.1
Expand Down