Skip to content

Commit 8c35c60

Browse files
tomekwilktomekwilk
authored
Merge branch 'fluent:master' into master
2 parents 3234daf + 09214eb commit 8c35c60

File tree

18 files changed

+1677
-63
lines changed

18 files changed

+1677
-63
lines changed

‎.github/workflows/call-build-linux-packages.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
call-build-capture-source:
5555
# Capture source tarball and generate checksum for it
5656
name: Extract any supporting metadata
57-
runs-on: ubuntu-latest
57+
runs-on: ubuntu-22.04
5858
environment: ${{ inputs.environment }}
5959
permissions:
6060
contents: read
@@ -105,8 +105,8 @@ jobs:
105105
call-build-linux-packages:
106106
name: ${{ matrix.distro }} package build and stage to S3
107107
environment: ${{ inputs.environment }}
108-
# Ensure for OSS Fluent Bit repo we enable usage of Actuated runners for ARM builds, for forks it should keep existing ubuntu-latest usage.
109-
runs-on: ${{ (contains(matrix.distro, 'arm' ) && (github.repository == 'fluent/fluent-bit') && 'actuated-arm64-8cpu-16gb') || 'ubuntu-latest' }}
108+
# Ensure for OSS Fluent Bit repo we enable usage of Actuated runners for ARM builds, for forks it should keep existing ubuntu-22.04 usage.
109+
runs-on: ${{ (contains(matrix.distro, 'arm' ) && (github.repository == 'fluent/fluent-bit') && 'actuated-arm64-8cpu-16gb') || 'ubuntu-22.04' }}
110110
permissions:
111111
contents: read
112112
strategy:

‎.github/workflows/call-build-macos.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@ jobs:
7474
fail-fast: false
7575
matrix:
7676
config:
77-
- name: "Normal macOS-latest runner (Intel)"
78-
runner: macos-12
7977
- name: "Apple Silicon macOS runner"
8078
runner: macos-14
8179

@@ -121,8 +119,6 @@ jobs:
121119
fail-fast: false
122120
matrix:
123121
config:
124-
- name: "Normal macOS-latest package (Intel)"
125-
os: macos-12
126122
- name: "Apple Silicon macOS package"
127123
os: macos-14
128124

‎.github/workflows/call-run-integration-test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ jobs:
192192
bats-version: 1.9.0
193193

194194
- name: Create k8s Kind Cluster
195-
uses: helm/kind-action@v1.11.0
195+
uses: helm/kind-action@v1.12.0
196196
with:
197197
node_image: kindest/node:${{ matrix.k8s-release }}
198198
cluster_name: kind

‎.github/workflows/call-test-images.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ jobs:
184184
ref: ${{ inputs.ref }}
185185

186186
- name: Create k8s Kind Cluster
187-
uses: helm/kind-action@v1.11.0
187+
uses: helm/kind-action@v1.12.0
188188

189189
- name: Set up Helm
190190
uses: azure/setup-helm@v4

‎.github/workflows/staging-release.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ jobs:
172172

173173
staging-release-apt-packages:
174174
name: S3 - update APT packages bucket
175-
runs-on: ubuntu-latest
175+
runs-on: ubuntu-22.04
176176
environment: release
177177
needs:
178178
- staging-release-version-check
@@ -327,7 +327,7 @@ jobs:
327327

328328
staging-release-source-s3:
329329
name: S3 - update source bucket
330-
runs-on: ubuntu-latest
330+
runs-on: ubuntu-22.04
331331
environment: release
332332
needs:
333333
- staging-release-version-check

‎CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ cmake_policy(SET CMP0069 NEW)
66
set(CMAKE_POLICY_DEFAULT_CMP0069 NEW)
77

88
# Fluent Bit Version
9-
set(FLB_VERSION_MAJOR 3)
10-
set(FLB_VERSION_MINOR 2)
11-
set(FLB_VERSION_PATCH 3)
9+
set(FLB_VERSION_MAJOR 4)
10+
set(FLB_VERSION_MINOR 0)
11+
set(FLB_VERSION_PATCH 0)
1212
set(FLB_VERSION_STR "${FLB_VERSION_MAJOR}.${FLB_VERSION_MINOR}.${FLB_VERSION_PATCH}")
1313

1414
set(CMAKE_POSITION_INDEPENDENT_CODE ON)

‎dockerfiles/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# docker buildx build --platform "linux/amd64,linux/arm64,linux/arm/v7,linux/s390x" -f ./dockerfiles/Dockerfile.multiarch --build-arg FLB_TARBALL=https://github.com/fluent/fluent-bit/archive/v1.8.11.tar.gz ./dockerfiles/
1414

1515
# Set this to the current release version: it gets done so as part of the release.
16-
ARG RELEASE_VERSION=3.2.3
16+
ARG RELEASE_VERSION=3.2.4
1717

1818
# For multi-arch builds - assumption is running on an AMD64 host
1919
FROM multiarch/qemu-user-static:x86_64-arm AS qemu-arm32

‎fluent-bit-3.2.3.bb‎ renamed to ‎fluent-bit-4.0.0.bb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
1616
SECTION = "net"
1717

1818
PR = "r0"
19-
PV = "3.2.3"
19+
PV = "4.0.0"
2020

2121
SRCREV = "v${PV}"
2222
SRC_URI = "git://github.com/fluent/fluent-bit.git;nobranch=1"

‎include/fluent-bit/flb_conditionals.h‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
2+
3+
/* Fluent Bit
4+
* ==========
5+
* Copyright (C) 2015-2024 The Fluent Bit Authors
6+
*
7+
* Licensed under the Apache License, Version 2.0 (the "License");
8+
* you may not use this file except in compliance with the License.
9+
* You may obtain a copy of the License at
10+
*
11+
* http://www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing, software
14+
* distributed under the License is distributed on an "AS IS" BASIS,
15+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
* See the License for the specific language governing permissions and
17+
* limitations under the License.
18+
*/
19+
20+
#ifndef FLB_CONDITIONS_H
21+
#define FLB_CONDITIONS_H
22+
23+
#include <fluent-bit/flb_info.h>
24+
#include <fluent-bit/flb_sds.h>
25+
#include <fluent-bit/flb_regex.h>
26+
#include <fluent-bit/flb_mp.h>
27+
#include <fluent-bit/flb_cfl_record_accessor.h>
28+
#include <monkey/mk_core.h>
29+
#include <fluent-bit/flb_mp_chunk.h>
30+
31+
/* Context types enum */
32+
enum record_context_type {
33+
RECORD_CONTEXT_BODY = 0,
34+
RECORD_CONTEXT_METADATA = 1
35+
};
36+
37+
struct flb_condition;
38+
39+
enum flb_condition_operator {
40+
FLB_COND_OP_AND,
41+
FLB_COND_OP_OR
42+
};
43+
44+
enum flb_rule_operator {
45+
FLB_RULE_OP_EQ,
46+
FLB_RULE_OP_NEQ,
47+
FLB_RULE_OP_GT,
48+
FLB_RULE_OP_LT,
49+
FLB_RULE_OP_REGEX,
50+
FLB_RULE_OP_IN,
51+
FLB_RULE_OP_NOT_IN
52+
};
53+
54+
struct flb_condition_rule {
55+
struct flb_cfl_record_accessor *ra; /* Record accessor for the field */
56+
enum record_context_type context; /* Whether rule applies to body or metadata */
57+
enum flb_rule_operator op;
58+
union {
59+
flb_sds_t str_val;
60+
double num_val;
61+
struct {
62+
flb_sds_t *values;
63+
int count;
64+
} array;
65+
} value;
66+
struct flb_regex *regex;
67+
struct mk_list _head;
68+
};
69+
70+
struct flb_condition {
71+
enum flb_condition_operator op;
72+
struct mk_list rules;
73+
};
74+
75+
/* Core condition functions */
76+
struct flb_condition *flb_condition_create(enum flb_condition_operator op);
77+
78+
int flb_condition_add_rule(struct flb_condition *cond,
79+
const char *field,
80+
enum flb_rule_operator op,
81+
void *value,
82+
int value_count,
83+
enum record_context_type context);
84+
85+
void flb_condition_destroy(struct flb_condition *cond);
86+
87+
/* Evaluation function */
88+
int flb_condition_evaluate(struct flb_condition *cond,
89+
struct flb_mp_chunk_record *record);
90+
91+
#endif /* FLB_CONDITIONS_H */

‎include/fluent-bit/flb_motd.h‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,35 +25,35 @@ static unsigned char flb_motd_text[] = {
2525
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
2626
0x20, 0x20, 0x5f, 0x20, 0x20, 0x20, 0x20, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
2727
0x5f, 0x20, 0x5f, 0x20, 0x5f, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
28-
0x20, 0x20, 0x20, 0x20, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x20, 0x20, 0x5f,
28+
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x5f, 0x5f, 0x5f, 0x20, 0x20, 0x5f,
2929
0x5f, 0x5f, 0x5f, 0x5f, 0x20, 0x0a, 0x7c, 0x20, 0x20, 0x5f, 0x5f, 0x5f,
3030
0x7c, 0x20, 0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
3131
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x20, 0x7c, 0x20, 0x20,
3232
0x20, 0x7c, 0x20, 0x5f, 0x5f, 0x5f, 0x20, 0x28, 0x5f, 0x29, 0x20, 0x7c,
33-
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x5f, 0x5f,
34-
0x5f, 0x5f, 0x20, 0x7c, 0x2f, 0x20, 0x5f, 0x5f, 0x20, 0x20, 0x5c, 0x0a,
33+
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x2f,
34+
0x20, 0x20, 0x20, 0x7c, 0x7c, 0x20, 0x20, 0x5f, 0x20, 0x20, 0x7c, 0x0a,
3535
0x7c, 0x20, 0x7c, 0x5f, 0x20, 0x20, 0x7c, 0x20, 0x7c, 0x5f, 0x20, 0x20,
3636
0x20, 0x5f, 0x20, 0x20, 0x5f, 0x5f, 0x5f, 0x20, 0x5f, 0x20, 0x5f, 0x5f,
3737
0x20, 0x7c, 0x20, 0x7c, 0x5f, 0x20, 0x20, 0x7c, 0x20, 0x7c, 0x5f, 0x2f,
3838
0x20, 0x2f, 0x5f, 0x7c, 0x20, 0x7c, 0x5f, 0x20, 0x20, 0x5f, 0x5f, 0x20,
39-
0x20, 0x20, 0x5f, 0x5f, 0x20, 0x20, 0x20, 0x2f, 0x20, 0x2f, 0x60, 0x27,
40-
0x20, 0x2f, 0x20, 0x2f, 0x27, 0x0a, 0x7c, 0x20, 0x20, 0x5f, 0x7c, 0x20,
39+
0x20, 0x20, 0x5f, 0x5f, 0x2f, 0x20, 0x2f, 0x7c, 0x20, 0x7c, 0x7c, 0x20,
40+
0x7c, 0x2f, 0x27, 0x20, 0x7c, 0x0a, 0x7c, 0x20, 0x20, 0x5f, 0x7c, 0x20,
4141
0x7c, 0x20, 0x7c, 0x20, 0x7c, 0x20, 0x7c, 0x20, 0x7c, 0x2f, 0x20, 0x5f,
4242
0x20, 0x5c, 0x20, 0x27, 0x5f, 0x20, 0x5c, 0x7c, 0x20, 0x5f, 0x5f, 0x7c,
4343
0x20, 0x7c, 0x20, 0x5f, 0x5f, 0x5f, 0x20, 0x5c, 0x20, 0x7c, 0x20, 0x5f,
44-
0x5f, 0x7c, 0x20, 0x5c, 0x20, 0x5c, 0x20, 0x2f, 0x20, 0x2f, 0x20, 0x20,
45-
0x20, 0x5c, 0x20, 0x5c, 0x20, 0x20, 0x2f, 0x20, 0x2f, 0x20, 0x20, 0x0a,
44+
0x5f, 0x7c, 0x20, 0x5c, 0x20, 0x5c, 0x20, 0x2f, 0x20, 0x2f, 0x20, 0x2f,
45+
0x5f, 0x7c, 0x20, 0x7c, 0x7c, 0x20, 0x20, 0x2f, 0x7c, 0x20, 0x7c, 0x0a,
4646
0x7c, 0x20, 0x7c, 0x20, 0x20, 0x20, 0x7c, 0x20, 0x7c, 0x20, 0x7c, 0x5f,
4747
0x7c, 0x20, 0x7c, 0x20, 0x20, 0x5f, 0x5f, 0x2f, 0x20, 0x7c, 0x20, 0x7c,
4848
0x20, 0x7c, 0x20, 0x7c, 0x5f, 0x20, 0x20, 0x7c, 0x20, 0x7c, 0x5f, 0x2f,
4949
0x20, 0x2f, 0x20, 0x7c, 0x20, 0x7c, 0x5f, 0x20, 0x20, 0x20, 0x5c, 0x20,
50-
0x56, 0x20, 0x2f, 0x2e, 0x5f, 0x5f, 0x5f, 0x2f, 0x20, 0x2f, 0x2e, 0x2f,
51-
0x20, 0x2f, 0x5f, 0x5f, 0x5f, 0x0a, 0x5c, 0x5f, 0x7c, 0x20, 0x20, 0x20,
50+
0x56, 0x20, 0x2f, 0x5c, 0x5f, 0x5f, 0x5f, 0x20, 0x20, 0x7c, 0x5c, 0x20,
51+
0x7c, 0x5f, 0x2f, 0x20, 0x2f, 0x0a, 0x5c, 0x5f, 0x7c, 0x20, 0x20, 0x20,
5252
0x7c, 0x5f, 0x7c, 0x5c, 0x5f, 0x5f, 0x2c, 0x5f, 0x7c, 0x5c, 0x5f, 0x5f,
5353
0x5f, 0x7c, 0x5f, 0x7c, 0x20, 0x7c, 0x5f, 0x7c, 0x5c, 0x5f, 0x5f, 0x7c,
5454
0x20, 0x5c, 0x5f, 0x5f, 0x5f, 0x5f, 0x2f, 0x7c, 0x5f, 0x7c, 0x5c, 0x5f,
55-
0x5f, 0x7c, 0x20, 0x20, 0x20, 0x5c, 0x5f, 0x2f, 0x20, 0x5c, 0x5f, 0x5f,
56-
0x5f, 0x5f, 0x28, 0x5f, 0x29, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x2f, 0x0a,
55+
0x5f, 0x7c, 0x20, 0x20, 0x20, 0x5c, 0x5f, 0x2f, 0x20, 0x20, 0x20, 0x20,
56+
0x20, 0x7c, 0x5f, 0x28, 0x5f, 0x29, 0x5f, 0x5f, 0x5f, 0x2f, 0x20, 0x0a,
5757
0x0a, 0x0a, 0x00,
5858
};
5959

0 commit comments

Comments
 (0)