Skip to content

Bump fb version to 3.2.10 #209

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.

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 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion ansible/build-fb-suse/aws_ec2.yml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ compose:
ansible_aws_ssm_bucket_name: '"logging-e2e-testing-ssm-transfers-logint"'
ansible_aws_ssm_bucket_sse_mode: '"AES256"'
ansible_aws_ssm_region: '"us-east-2"'
ansible_aws_ssm_retries : 20
ansible_aws_ssm_retries : 40
6 changes: 3 additions & 3 deletions ansible/build-fb-suse/playbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
until: install_status is success
# Retry up to 5 minutes, because at startup the zypper command might temporarily hold a lock that prevents installing packages
delay: 15
retries: 20
retries: 40

- name: Download and extract Bison {{ bison_version }}
unarchive:
Expand Down Expand Up @@ -138,8 +138,8 @@
cmd: "{{ cmake_path }}/bin/cpack -G RPM"
chdir: "{{ fluent_bit_path }}/build"
creates: "{{ fluent_bit_path }}/build/fluent-bit-{{ fluent_bit_version }}-1.x86_64.rpm"
async: 420 # timeout 7m
poll: 30 # poll every 30s
async: 1200 # timeout 7m
poll: 60 # poll every 30s

- name: Rename binary for the specific OS type, version and arch
# Not actually renaming but copying, so that the previous step nor this one won't be re-executed thanks to "creates"
Expand Down
2 changes: 1 addition & 1 deletion ansible/provision-and-execute-tests/aws_ec2.yml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ compose:
ansible_aws_ssm_bucket_name: '"logging-e2e-testing-ssm-transfers-logint"'
ansible_aws_ssm_bucket_sse_mode: '"AES256"'
ansible_aws_ssm_region: '"us-east-2"'
ansible_aws_ssm_retries : 20
ansible_aws_ssm_retries : 40
2 changes: 1 addition & 1 deletion ansible/provision-and-execute-tests/playbook-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
any_errors_fatal: true
strategy: free
vars:
ansible_win_async_startup_timeout: 180
ansible_win_async_startup_timeout: 300
node_version: 21.6.0
# The following information is populated using the gathered inventory variables
fluent_bit_package_name: "{{ tags.fb_package_name }}"
Expand Down
3 changes: 2 additions & 1 deletion integration-tests/test-suite/winlog.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ describe('WINLOG & WINEVTLOG inputs', () => {
// NOTE: this may take a while, since unlike winevtlog (which just reads
// new events by default), winlog will read all events in the monitored log
await waitForLogMessageContaining(nrdb, message);
});
},30000
);

testOnlyIfSet('MONITORED_WINDOWS_LOG_NAME_USING_WINEVTLOG')('detects a Windows event using "winevtlog" input plugin', async () => {
// Create a unique string so that we can find the log message later
Expand Down
2 changes: 1 addition & 1 deletion versions/common.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
fbVersion: 3.2.7
fbVersion: 3.2.10

# This file, together with each distro file are processed and merged incrementally to
# build all the information required to download and test each package. Each package ends
Expand Down
5 changes: 0 additions & 5 deletions versions/ubuntu_16_xenial.yml

This file was deleted.

5 changes: 5 additions & 0 deletions versions/ubuntu_16_xenial.ymlx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
osDistro: ubuntu
osVersion: xenial
packages:
# - arch: amd64
# ami: ami-01e7407a20284c7ff
4 changes: 2 additions & 2 deletions versions/windows-server-2022.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ osDistro: windows-server
osVersion: 2022
packages:
- arch: win64
ami: ami-00087f5bc76de01b4
ami: ami-06fbbb433da1a5bf7
- arch: win32
ami: ami-00087f5bc76de01b4
ami: ami-06fbbb433da1a5bf7
Loading