docs: add packaging documentation about Ubuntu 24.04

.github/workflows/cron-scorecards-analysis.yaml

@@ -29,7 +29,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736
+        uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534
         with:
           results_file: scorecard-results.sarif
           results_format: sarif

.github/workflows/staging-release.yaml

@@ -793,6 +793,7 @@ jobs:
           name: "Fluent Bit ${{ inputs.version }}"
           tag_name: v${{ inputs.version }}
           target_commitish: '2.0'
+          make_latest: false
 
       - name: Release 2.1 - not latest
         uses: softprops/action-gh-release@v2
@@ -804,6 +805,7 @@ jobs:
           name: "Fluent Bit ${{ inputs.version }}"
           tag_name: v${{ inputs.version }}
           target_commitish: '2.1'
+          make_latest: false
 
       - name: Release 2.2 - not latest
         uses: softprops/action-gh-release@v2
@@ -815,6 +817,7 @@ jobs:
           name: "Fluent Bit ${{ inputs.version }}"
           tag_name: v${{ inputs.version }}
           target_commitish: '2.2'
+          make_latest: false
 
       - name: Release 3.0 and latest
         uses: softprops/action-gh-release@v2
@@ -825,6 +828,7 @@ jobs:
           generate_release_notes: true
           name: "Fluent Bit ${{ inputs.version }}"
           tag_name: v${{ inputs.version }}
+          make_latest: true
 
   staging-release-windows-checksums:
     name: Get Windows checksums for new release

CMakeLists.txt

@@ -8,7 +8,7 @@ set(CMAKE_POLICY_DEFAULT_CMP0069 NEW)
 # Fluent Bit Version
 set(FLB_VERSION_MAJOR  3)
 set(FLB_VERSION_MINOR  0)
-set(FLB_VERSION_PATCH  4)
+set(FLB_VERSION_PATCH  7)
 set(FLB_VERSION_STR "${FLB_VERSION_MAJOR}.${FLB_VERSION_MINOR}.${FLB_VERSION_PATCH}")
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
@@ -209,6 +209,7 @@ option(FLB_IN_ELASTICSEARCH            "Enable Elasticsearch (Bulk API) input pl
 option(FLB_IN_CALYPTIA_FLEET           "Enable Calyptia Fleet input plugin"           Yes)
 option(FLB_IN_SPLUNK                   "Enable Splunk HTTP HEC input plugin"          Yes)
 option(FLB_IN_PROCESS_EXPORTER_METRICS "Enable process exporter metrics input plugin" Yes)
+option(FLB_IN_PROMETHEUS_REMOTE_WRITE  "Enable prometheus remote write input plugin"  Yes)
 option(FLB_OUT_AZURE                   "Enable Azure output plugin"                   Yes)
 option(FLB_OUT_AZURE_BLOB              "Enable Azure output plugin"                   Yes)
 option(FLB_OUT_AZURE_LOGS_INGESTION    "Enable Azure Logs Ingestion output plugin"    Yes)

cmake/windows-setup.cmake

@@ -61,6 +61,7 @@ if(FLB_WINDOWS_DEFAULTS)
   set(FLB_IN_PODMAN_METRICS      No)
   set(FLB_IN_ELASTICSEARCH      Yes)
   set(FLB_IN_SPLUNK             Yes)
+  set(FLB_IN_PROMETHEUS_REMOTE_WRITE Yes)
 
   # OUTPUT plugins
   # ==============

dockerfiles/Dockerfile

@@ -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.4
+ARG RELEASE_VERSION=3.0.7
 
 # For multi-arch builds - assumption is running on an AMD64 host
 FROM multiarch/qemu-user-static:x86_64-arm as qemu-arm32

fluent-bit-3.0.4.bb → fluent-bit-3.0.7.bb

@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
 SECTION = "net"
 
 PR = "r0"
-PV = "3.0.4"
+PV = "3.0.7"
 
 SRCREV = "v${PV}"
 SRC_URI = "git://github.com/fluent/fluent-bit.git;nobranch=1"

include/fluent-bit/flb_output.h

@@ -627,6 +627,7 @@ struct flb_output_flush *flb_output_flush_create(struct flb_task *task,
     struct cmt *metrics_context;
     struct ctrace *trace_context;
     size_t chunk_offset;
+    struct cmt *cmt_out_context = NULL;
 
     /* Custom output coroutine info */
     out_flush = (struct flb_output_flush *) flb_calloc(1, sizeof(struct flb_output_flush));
@@ -715,13 +716,25 @@ struct flb_output_flush *flb_output_flush_create(struct flb_task *task,
                                         flb_sds_len(evc->tag),
                                         (char *) metrics_context,
                                         0,
-                                        NULL,
+                                        (void **)&cmt_out_context,
                                         NULL);
 
                 if (ret == 0) {
-                    ret = cmt_encode_msgpack_create(metrics_context,
-                                                    &serialized_context_buffer,
-                                                    &serialized_context_size);
+                    if (cmt_out_context != NULL) {
+                        ret = cmt_encode_msgpack_create(cmt_out_context,
+                                                        &serialized_context_buffer,
+                                                        &serialized_context_size);
+
+                        if (cmt_out_context != metrics_context) {
+                            cmt_destroy(cmt_out_context);
+                        }
+
+                    }
+                    else {
+                        ret = cmt_encode_msgpack_create(metrics_context,
+                                                        &serialized_context_buffer,
+                                                        &serialized_context_size);
+                    }
 
                     cmt_destroy(metrics_context);
 

packaging/README.md

@@ -27,6 +27,8 @@ The [`distros`](./distros/) directory contains OCI container definitions used to
 | Debian        |   11                      | arm64v8 | debian/bullseye.arm64v8  |
 | Debian        |   10                      | x86_64  | debian/buster            |
 | Debian        |   10                      | arm64v8 | debian/buster.arm64v8    |
+| Ubuntu        |   24.04 / Noble Numbat    | x86_64  | ubuntu/24.04             |
+| Ubuntu        |   24.04 / Noble Numbat    | arm64v8 | ubuntu/24.04.arm64v8     |
 | Ubuntu        |   22.04 / Jammy Jellyfish | x86_64  | ubuntu/22.04             |
 | Ubuntu        |   22.04 / Jammy Jellyfish | arm64v8 | ubuntu/22.04.arm64v8     |
 | Ubuntu        |   20.04 / Focal Fossa     | x86_64  | ubuntu/20.04             |

packaging/build-config.json

@@ -92,6 +92,14 @@
           "target": "ubuntu/22.04.arm64v8",
           "type": "deb"
         },
+        {
+          "target": "ubuntu/24.04",
+          "type": "deb"
+        },
+        {
+          "target": "ubuntu/24.04.arm64v8",
+          "type": "deb"
+        },
         {
           "target": "raspbian/buster",
           "type": "deb"

packaging/distros/ubuntu/Dockerfile

@@ -114,6 +114,32 @@ ENV DEBIAN_FRONTEND noninteractive
 
 COPY --from=multiarch-aarch64 /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static
 
+# hadolint ignore=DL3008,DL3015
+RUN apt-get update && \
+    apt-get install -y curl ca-certificates build-essential libsystemd-dev \
+    cmake make bash wget unzip nano vim valgrind dh-make flex bison \
+    libpq-dev postgresql-server-dev-all libpq5 \
+    libsasl2-2 libsasl2-dev openssl libssl-dev libssl3 libyaml-dev pkg-config zlib1g-dev && \
+    apt-get install -y --reinstall lsb-base lsb-release
+
+    # ubuntu/24.04 base image
+FROM ubuntu:24.04 as ubuntu-24.04-base
+ENV DEBIAN_FRONTEND noninteractive
+
+# hadolint ignore=DL3008,DL3015
+RUN apt-get update && \
+    apt-get install -y curl ca-certificates build-essential libsystemd-dev \
+    cmake make bash wget unzip nano vim valgrind dh-make flex bison \
+    libpq-dev postgresql-server-dev-all libpq5 \
+    libsasl2-2 libsasl2-dev openssl libssl-dev libssl3 libyaml-dev pkg-config zlib1g-dev && \
+    apt-get install -y --reinstall lsb-base lsb-release
+
+# ubuntu/24.04.arm64v8 base image
+FROM arm64v8/ubuntu:24.04 as ubuntu-24.04.arm64v8-base
+ENV DEBIAN_FRONTEND noninteractive
+
+COPY --from=multiarch-aarch64 /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static
+
 # hadolint ignore=DL3008,DL3015
 RUN apt-get update && \
     apt-get install -y curl ca-certificates build-essential libsystemd-dev \

packaging/update-repos.sh

@@ -54,6 +54,7 @@ DEB_REPO_PATHS=( "debian/bookworm"
                  "ubuntu/bionic"
                  "ubuntu/focal"
                  "ubuntu/jammy"
+                 "ubuntu/noble"
                  "raspbian/buster"
                  "raspbian/bullseye" )
 

plugins/CMakeLists.txt

@@ -229,6 +229,7 @@ REGISTER_IN_PLUGIN("in_opentelemetry")
 REGISTER_IN_PLUGIN("in_elasticsearch")
 REGISTER_IN_PLUGIN("in_calyptia_fleet")
 REGISTER_IN_PLUGIN("in_splunk")
+REGISTER_IN_PLUGIN("in_prometheus_remote_write")
 
 # Test the event loop messaging when used in threaded mode
 REGISTER_IN_PLUGIN("in_event_test")

plugins/filter_aws/aws.c

@@ -921,7 +921,7 @@ static int get_ec2_metadata(struct flb_filter_aws *ctx)
         metadata_fetched = FLB_FALSE;
     }
 
-    if (metadata_fetched) {
+    if (metadata_fetched == FLB_TRUE) {
         ctx->metadata_retrieved = FLB_TRUE;
     }
 

plugins/in_prometheus_remote_write/CMakeLists.txt

@@ -0,0 +1,12 @@
+if(NOT FLB_METRICS)
+  message(FATAL_ERROR "Prometheus remote write input plugin requires FLB_HTTP_SERVER=On.")
+endif()
+
+set(src
+  prom_rw.c
+  prom_rw_prot.c
+  prom_rw_conn.c
+  prom_rw_config.c
+  )
+
+FLB_PLUGIN(in_prometheus_remote_write "${src}" "monkey-core-static")