Skip to content

Commit

Permalink
Merge branch 'fluent:master' into system-luajit-for-s390x
Browse files Browse the repository at this point in the history
  • Loading branch information
rightblank authored Aug 7, 2024
2 parents ba124d9 + 7256406 commit eb0d7dd
Show file tree
Hide file tree
Showing 589 changed files with 4,057 additions and 1,747 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cron-scorecards-analysis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
persist-credentials: false

- name: "Run analysis"
uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534
uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46
with:
results_file: scorecard-results.sarif
results_format: sarif
Expand Down
13 changes: 3 additions & 10 deletions .github/workflows/cron-unstable-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ on:
# Run nightly build at this time, bit of trial and error but this seems good.
schedule:
- cron: "0 6 * * *" # master build
- cron: "0 12 * * *" # 2.2 build
- cron: "0 18 * * *" # 2.1 build
- cron: "0 12 * * *" # 3.0 build

# We do not want a new unstable build to run whilst we are releasing the current unstable build.
concurrency: unstable-build-release
Expand Down Expand Up @@ -52,16 +51,10 @@ jobs:
echo "cron_branch=master" >> $GITHUB_ENV
shell: bash

- name: 2.2 run
- name: 3.0 run
if: github.event_name == 'schedule' && github.event.schedule=='0 12 * * *'
run: |
echo "cron_branch=2.2" >> $GITHUB_ENV
shell: bash

- name: 2.1 run
if: github.event_name == 'schedule' && github.event.schedule=='0 18 * * *'
run: |
echo "cron_branch=2.1" >> $GITHUB_ENV
echo "cron_branch=3.0" >> $GITHUB_ENV
shell: bash

- name: Output the branch to use
Expand Down
21 changes: 19 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ set(CMAKE_POLICY_DEFAULT_CMP0069 NEW)
# Fluent Bit Version
set(FLB_VERSION_MAJOR 3)
set(FLB_VERSION_MINOR 1)
set(FLB_VERSION_PATCH 0)
set(FLB_VERSION_PATCH 5)
set(FLB_VERSION_STR "${FLB_VERSION_MAJOR}.${FLB_VERSION_MINOR}.${FLB_VERSION_PATCH}")

set(CMAKE_POSITION_INDEPENDENT_CODE ON)
Expand Down Expand Up @@ -110,6 +110,8 @@ option(FLB_RELEASE "Build with release mode (-O2 -g -DNDEBUG)" No)
set(FLB_IPO "ReleaseOnly" CACHE STRING "Build with interprocedural optimization")
set_property(CACHE FLB_IPO PROPERTY STRINGS "On;Off;ReleaseOnly")
option(FLB_SMALL "Optimise for small size" No)
set(FLB_SECURITY "ReleaseOnly" CACHE STRING "Build with security optimizations")
set_property(CACHE FLB_SECURITY PROPERTY STRINGS "On;Off;ReleaseOnly")
option(FLB_COVERAGE "Build with code-coverage" No)
option(FLB_JEMALLOC "Build with Jemalloc support" No)
option(FLB_REGEX "Build with Regex support" Yes)
Expand Down Expand Up @@ -287,7 +289,7 @@ endif ()
find_package(Git)
# If we do not have Git or this is not a Git repo or another error this just is ignored and we have no output at runtime.
execute_process(COMMAND
"${GIT_EXECUTABLE}" log -1 --format=%H
"${GIT_EXECUTABLE}" -c log.showSignature=false log -1 --format=%H
WORKING_DIRECTORY "${FLB_ROOT}"
OUTPUT_VARIABLE FLB_GIT_HASH
ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
Expand Down Expand Up @@ -336,6 +338,21 @@ if(FLB_IPO STREQUAL "On" OR (FLB_IPO STREQUAL "ReleaseOnly" AND FLB_RELEASE))
endif()
endif()

# Harden release binary against security vulnerabilities
if(FLB_SECURITY STREQUAL "On" OR (FLB_SECURITY STREQUAL "ReleaseOnly" AND FLB_RELEASE))
if (NOT MSVC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,-z,relro,-z,now")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,-z,noexecstack")
if(NOT FLB_SMALL)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector")
# Fortify requires optimization
if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FORTIFY_SOURCE=1")
endif()
endif()
endif()
endif()

if(FLB_PARSER)
FLB_DEFINITION(FLB_HAVE_PARSER)
message(STATUS "Enabling FLB_REGEX since FLB_PARSER requires")
Expand Down
2 changes: 1 addition & 1 deletion cmake/libraries.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ set(FLB_PATH_LIB_ONIGMO "lib/onigmo")
set(FLB_PATH_LIB_MPACK "lib/mpack-amalgamation-1.1.1")
set(FLB_PATH_LIB_MINIZ "lib/miniz")
set(FLB_PATH_LIB_TUTF8E "lib/tutf8e")
set(FLB_PATH_LIB_CARES "lib/c-ares-1.32.0")
set(FLB_PATH_LIB_CARES "lib/c-ares-1.32.3")
set(FLB_PATH_LIB_SNAPPY "lib/snappy-fef67ac")
set(FLB_PATH_LIB_RDKAFKA "lib/librdkafka-2.4.0")
set(FLB_PATH_LIB_RING_BUFFER "lib/lwrb")
Expand Down
6 changes: 6 additions & 0 deletions cmake/plugins_options.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ DEFINE_OPTION(FLB_IN_PROMETHEUS_SCRAPE "Enable Prometheus Scrape input pl
DEFINE_OPTION(FLB_IN_RANDOM "Enable random input plugin" ON)
DEFINE_OPTION(FLB_IN_SERIAL "Enable Serial input plugin" ON)
DEFINE_OPTION(FLB_IN_SPLUNK "Enable Splunk HTTP HEC input plugin" ON)
DEFINE_OPTION(FLB_IN_STATSD "Enable StatsD input plugin" ON)
DEFINE_OPTION(FLB_IN_STDIN "Enable Standard input plugin" ON)
DEFINE_OPTION(FLB_IN_STORAGE_BACKLOG "Enable storage backlog input plugin" ON)
DEFINE_OPTION(FLB_IN_SYSLOG "Enable Syslog input plugin" ON)
Expand Down Expand Up @@ -87,12 +88,14 @@ DEFINE_OPTION(FLB_FILTER_MULTILINE "Enable multiline filter"
DEFINE_OPTION(FLB_FILTER_NEST "Enable nest filter" ON)
DEFINE_OPTION(FLB_FILTER_NIGHTFALL "Enable Nightfall filter" ON)
DEFINE_OPTION(FLB_FILTER_PARSER "Enable parser filter" ON)
DEFINE_OPTION(FLB_FILTER_RECORD_MODIFIER "Enable record_modifier filter" ON)
DEFINE_OPTION(FLB_FILTER_REWRITE_TAG "Enable tag rewrite filter" ON)
DEFINE_OPTION(FLB_FILTER_STDOUT "Enable stdout filter" ON)
DEFINE_OPTION(FLB_FILTER_SYSINFO "Enable sysinfo filter" ON)
DEFINE_OPTION(FLB_FILTER_THROTTLE "Enable throttle filter" ON)
DEFINE_OPTION(FLB_FILTER_THROTTLE_SIZE "Enable throttle size filter" OFF)
DEFINE_OPTION(FLB_FILTER_TYPE_CONVERTER "Enable type converter filter" ON)
DEFINE_OPTION(FLB_FILTER_TENSORFLOW "Enable tensorflow filter" OFF)
DEFINE_OPTION(FLB_FILTER_WASM "Enable WASM filter" ON)

# Outputs (destinations)
Expand All @@ -119,8 +122,11 @@ DEFINE_OPTION(FLB_OUT_KAFKA "Enable Kafka output plugin"
DEFINE_OPTION(FLB_OUT_KAFKA_REST "Enable Kafka Rest output plugin" ON)
DEFINE_OPTION(FLB_OUT_KINESIS_FIREHOSE "Enable AWS Firehose output plugin" ON)
DEFINE_OPTION(FLB_OUT_KINESIS_STREAMS "Enable AWS Kinesis output plugin" ON)
DEFINE_OPTION(FLB_OUT_LIB "Enable library mode output plugin" ON)
DEFINE_OPTION(FLB_OUT_LOGDNA "Enable LogDNA output plugin" ON)
DEFINE_OPTION(FLB_OUT_LOKI "Enable Loki output plugin" ON)
DEFINE_OPTION(FLB_OUT_NATS "Enable NATS output plugin" ON)
DEFINE_OPTION(FLB_OUT_NRLOGS "Enable New Relic output plugin" ON)
DEFINE_OPTION(FLB_OUT_NULL "Enable dev null output plugin" ON)
DEFINE_OPTION(FLB_OUT_OPENSEARCH "Enable OpenSearch output plugin" ON)
DEFINE_OPTION(FLB_OUT_OPENTELEMETRY "Enable OpenTelemetry plugin" ON)
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# 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/

# Set this to the current release version: it gets done so as part of the release.
ARG RELEASE_VERSION=3.0.7
ARG RELEASE_VERSION=3.1.5

# For multi-arch builds - assumption is running on an AMD64 host
FROM multiarch/qemu-user-static:x86_64-arm as qemu-arm32
Expand Down
3 changes: 1 addition & 2 deletions dockerfiles/Dockerfile.centos7
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ RUN sed -i -e "s/^mirrorlist=http:\/\/mirrorlist.centos.org/#mirrorlist=http:\/\
wget unzip systemd-devel wget flex bison \
cyrus-sasl-lib cyrus-sasl-devel openssl openss-libs openssl-devel \
postgresql-libs postgresql-devel postgresql-server postgresql libyaml-devel && \
wget -q http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \
rpm -ivh epel-release-latest-7.noarch.rpm && \
yum install -y epel-release && \
yum install -y cmake3

COPY . /src/
Expand Down
Binary file modified documentation/fluentbit_users.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion fluent-bit-3.0.7.bb → fluent-bit-3.1.5.bb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
SECTION = "net"

PR = "r0"
PV = "3.0.7"
PV = "3.1.5"

SRCREV = "v${PV}"
SRC_URI = "git://github.com/fluent/fluent-bit.git;nobranch=1"
Expand Down
4 changes: 4 additions & 0 deletions include/fluent-bit/flb_config_map.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <fluent-bit/flb_slist.h>
#include <fluent-bit/flb_sds.h>
#include <monkey/mk_core.h>
#include <cfl/cfl.h>

/* Configuration types */
#define FLB_CONFIG_MAP_STR 0 /* string */
Expand All @@ -47,6 +48,8 @@
#define FLB_CONFIG_MAP_SLIST_3 43 /* split up to 3 nodes + remaining data */
#define FLB_CONFIG_MAP_SLIST_4 44 /* split up to 4 nodes + remaining data */

#define FLB_CONFIG_MAP_VARIANT 50 /* variant that wraps a kvlist or array */

#define FLB_CONFIG_MAP_MULT 1

struct flb_config_map_val {
Expand All @@ -57,6 +60,7 @@ struct flb_config_map_val {
size_t s_num; /* FLB_CONFIG_MAP_SIZE */
flb_sds_t str; /* FLB_CONFIG_MAP_STR */
struct mk_list *list; /* FLB_CONFIG_MAP_CLIST and FLB_CONFIG_MAP_SLIST */
struct cfl_variant *variant; /* FLB_CONFIG_MAP_VARIANT */
} val;
struct mk_list *mult;
struct mk_list _head; /* Link to list if this entry is a 'multiple' entry */
Expand Down
1 change: 1 addition & 0 deletions include/fluent-bit/flb_gzip.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,6 @@ int flb_gzip_decompressor_dispatch(struct flb_decompression_context *context,
void *out_data, size_t *out_size);

int flb_is_http_session_gzip_compressed(struct mk_http_session *session);
size_t flb_gzip_count(const char *data, size_t len, size_t **out_borders, size_t border_count);

#endif
6 changes: 2 additions & 4 deletions include/fluent-bit/flb_metrics.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,14 @@

struct flb_metric {
int id;
int title_len;
char *title;
flb_sds_t title;
size_t val;
struct mk_list _head;
};

struct flb_metrics {
int title_len; /* Title string length */
char *title; /* Title or id for this metrics context */
int count; /* Total count of metrics registered */
flb_sds_t title;
struct mk_list list; /* Head of metrics list */
};

Expand Down
71 changes: 31 additions & 40 deletions include/fluent-bit/flb_motd.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,47 +21,38 @@
#define FLB_MOTD_H

static unsigned char flb_motd_text[] = {
0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x2e,
0x5f, 0x5f, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x20, 0x5f, 0x20, 0x20, 0x20, 0x20,
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x20, 0x20, 0x5f, 0x5f, 0x20, 0x20, 0x20, 0x20, 0x5f, 0x5f, 0x5f, 0x5f,
0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x2e, 0x5f, 0x5f, 0x20, 0x20, 0x5f,
0x5f, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x5f,
0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x20, 0x20, 0x0a, 0x5c, 0x5f,
0x20, 0x20, 0x20, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x2f, 0x7c, 0x20, 0x20,
0x7c, 0x20, 0x20, 0x5f, 0x5f, 0x20, 0x5f, 0x5f, 0x20, 0x20, 0x20, 0x5f,
0x5f, 0x5f, 0x5f, 0x20, 0x20, 0x20, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x2f,
0x20, 0x20, 0x7c, 0x5f, 0x20, 0x20, 0x5c, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
0x5f, 0x20, 0x20, 0x20, 0x5c, 0x5f, 0x5f, 0x7c, 0x2f, 0x20, 0x20, 0x7c,
0x5f, 0x20, 0x20, 0x5f, 0x5f, 0x5f, 0x20, 0x20, 0x5f, 0x5c, 0x5f, 0x5f,
0x5f, 0x5f, 0x5f, 0x20, 0x20, 0x5c, 0x20, 0x0a, 0x20, 0x7c, 0x20, 0x20,
0x20, 0x20, 0x5f, 0x5f, 0x29, 0x20, 0x20, 0x7c, 0x20, 0x20, 0x7c, 0x20,
0x7c, 0x20, 0x20, 0x7c, 0x20, 0x20, 0x5c, 0x5f, 0x2f, 0x20, 0x5f, 0x5f,
0x20, 0x5c, 0x20, 0x2f, 0x20, 0x20, 0x20, 0x20, 0x5c, 0x20, 0x20, 0x20,
0x5f, 0x5f, 0x5c, 0x20, 0x20, 0x7c, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x20,
0x20, 0x5f, 0x2f, 0x20, 0x20, 0x5c, 0x20, 0x20, 0x20, 0x5f, 0x5f, 0x5c,
0x20, 0x5c, 0x20, 0x20, 0x5c, 0x2f, 0x20, 0x2f, 0x20, 0x5f, 0x28, 0x5f,
0x5f, 0x20, 0x20, 0x3c, 0x20, 0x0a, 0x20, 0x7c, 0x20, 0x20, 0x20, 0x20,
0x20, 0x5c, 0x20, 0x20, 0x20, 0x7c, 0x20, 0x20, 0x7c, 0x5f, 0x7c, 0x20,
0x20, 0x7c, 0x20, 0x20, 0x2f, 0x5c, 0x20, 0x20, 0x5f, 0x5f, 0x5f, 0x2f,
0x7c, 0x20, 0x20, 0x20, 0x7c, 0x20, 0x20, 0x5c, 0x20, 0x20, 0x7c, 0x20,
0x20, 0x20, 0x20, 0x7c, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x20, 0x20, 0x20,
0x5c, 0x20, 0x20, 0x7c, 0x7c, 0x20, 0x20, 0x7c, 0x20, 0x20, 0x20, 0x20,
0x5c, 0x20, 0x20, 0x20, 0x2f, 0x20, 0x2f, 0x20, 0x20, 0x20, 0x20, 0x20,
0x20, 0x20, 0x5c, 0x0a, 0x20, 0x5c, 0x5f, 0x5f, 0x5f, 0x20, 0x20, 0x2f,
0x20, 0x20, 0x20, 0x7c, 0x5f, 0x5f, 0x5f, 0x5f, 0x2f, 0x5f, 0x5f, 0x5f,
0x5f, 0x2f, 0x20, 0x20, 0x5c, 0x5f, 0x5f, 0x5f, 0x20, 0x20, 0x3e, 0x5f,
0x5f, 0x5f, 0x7c, 0x20, 0x20, 0x2f, 0x5f, 0x5f, 0x7c, 0x20, 0x20, 0x20,
0x20, 0x7c, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x20, 0x20, 0x2f, 0x5f,
0x5f, 0x7c, 0x7c, 0x5f, 0x5f, 0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x5c,
0x5f, 0x2f, 0x20, 0x2f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x20, 0x20,
0x2f, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x5c, 0x2f, 0x20, 0x20, 0x20,
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x5c, 0x2f, 0x20, 0x20, 0x20, 0x20,
0x20, 0x5c, 0x2f, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x5c, 0x2f, 0x20, 0x20, 0x20, 0x20,
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x5c, 0x2f, 0x20, 0x0a,
0x20, 0x20, 0x5f, 0x20, 0x20, 0x20, 0x20, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f,
0x5f, 0x20, 0x5f, 0x20, 0x5f, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x20, 0x20, 0x20, 0x20, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x20, 0x20, 0x5f,
0x5f, 0x20, 0x20, 0x0a, 0x7c, 0x20, 0x20, 0x5f, 0x5f, 0x5f, 0x7c, 0x20,
0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x20, 0x7c, 0x20, 0x20, 0x20, 0x7c,
0x20, 0x5f, 0x5f, 0x5f, 0x20, 0x28, 0x5f, 0x29, 0x20, 0x7c, 0x20, 0x20,
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x5f, 0x5f, 0x5f, 0x5f,
0x20, 0x7c, 0x2f, 0x20, 0x20, 0x7c, 0x20, 0x0a, 0x7c, 0x20, 0x7c, 0x5f,
0x20, 0x20, 0x7c, 0x20, 0x7c, 0x5f, 0x20, 0x20, 0x20, 0x5f, 0x20, 0x20,
0x5f, 0x5f, 0x5f, 0x20, 0x5f, 0x20, 0x5f, 0x5f, 0x20, 0x7c, 0x20, 0x7c,
0x5f, 0x20, 0x20, 0x7c, 0x20, 0x7c, 0x5f, 0x2f, 0x20, 0x2f, 0x5f, 0x7c,
0x20, 0x7c, 0x5f, 0x20, 0x20, 0x5f, 0x5f, 0x20, 0x20, 0x20, 0x5f, 0x5f,
0x20, 0x20, 0x20, 0x2f, 0x20, 0x2f, 0x60, 0x7c, 0x20, 0x7c, 0x20, 0x0a,
0x7c, 0x20, 0x20, 0x5f, 0x7c, 0x20, 0x7c, 0x20, 0x7c, 0x20, 0x7c, 0x20,
0x7c, 0x20, 0x7c, 0x2f, 0x20, 0x5f, 0x20, 0x5c, 0x20, 0x27, 0x5f, 0x20,
0x5c, 0x7c, 0x20, 0x5f, 0x5f, 0x7c, 0x20, 0x7c, 0x20, 0x5f, 0x5f, 0x5f,
0x20, 0x5c, 0x20, 0x7c, 0x20, 0x5f, 0x5f, 0x7c, 0x20, 0x5c, 0x20, 0x5c,
0x20, 0x2f, 0x20, 0x2f, 0x20, 0x20, 0x20, 0x5c, 0x20, 0x5c, 0x20, 0x7c,
0x20, 0x7c, 0x20, 0x0a, 0x7c, 0x20, 0x7c, 0x20, 0x20, 0x20, 0x7c, 0x20,
0x7c, 0x20, 0x7c, 0x5f, 0x7c, 0x20, 0x7c, 0x20, 0x20, 0x5f, 0x5f, 0x2f,
0x20, 0x7c, 0x20, 0x7c, 0x20, 0x7c, 0x20, 0x7c, 0x5f, 0x20, 0x20, 0x7c,
0x20, 0x7c, 0x5f, 0x2f, 0x20, 0x2f, 0x20, 0x7c, 0x20, 0x7c, 0x5f, 0x20,
0x20, 0x20, 0x5c, 0x20, 0x56, 0x20, 0x2f, 0x2e, 0x5f, 0x5f, 0x5f, 0x2f,
0x20, 0x2f, 0x5f, 0x7c, 0x20, 0x7c, 0x5f, 0x0a, 0x5c, 0x5f, 0x7c, 0x20,
0x20, 0x20, 0x7c, 0x5f, 0x7c, 0x5c, 0x5f, 0x5f, 0x2c, 0x5f, 0x7c, 0x5c,
0x5f, 0x5f, 0x5f, 0x7c, 0x5f, 0x7c, 0x20, 0x7c, 0x5f, 0x7c, 0x5c, 0x5f,
0x5f, 0x7c, 0x20, 0x5c, 0x5f, 0x5f, 0x5f, 0x5f, 0x2f, 0x7c, 0x5f, 0x7c,
0x5c, 0x5f, 0x5f, 0x7c, 0x20, 0x20, 0x20, 0x5c, 0x5f, 0x2f, 0x20, 0x5c,
0x5f, 0x5f, 0x5f, 0x5f, 0x28, 0x5f, 0x29, 0x5f, 0x5f, 0x5f, 0x2f, 0x0a,
0x0a, 0x00
};

Expand Down
2 changes: 1 addition & 1 deletion include/fluent-bit/flb_processor.h
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ int flb_processor_instance_check_properties(

int flb_processor_instance_set_property(
struct flb_processor_instance *ins,
const char *k, const char *v);
const char *k, struct cfl_variant *v);

const char *flb_processor_instance_get_property(
const char *key,
Expand Down
38 changes: 0 additions & 38 deletions lib/c-ares-1.32.0/RELEASE-NOTES.md

This file was deleted.

Loading

0 comments on commit eb0d7dd

Please sign in to comment.