From 717ddc8497be154c582940c53b4c2984b942b8df Mon Sep 17 00:00:00 2001 From: Hiroshi Hatake Date: Fri, 24 Oct 2025 19:34:26 +0900 Subject: [PATCH 1/3] snap: Bump up core20 from core18 Signed-off-by: Hiroshi Hatake --- snap/{ => gui}/fluent-bit.svg | 0 snap/snapcraft.yaml | 15 ++++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) rename snap/{ => gui}/fluent-bit.svg (100%) diff --git a/snap/fluent-bit.svg b/snap/gui/fluent-bit.svg similarity index 100% rename from snap/fluent-bit.svg rename to snap/gui/fluent-bit.svg diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index ad2066bc7e9..d1eeacf791a 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: fluent-bit -base: core18 +base: core20 version: '4.2.0' summary: High performance logs and stream processor description: | @@ -7,7 +7,7 @@ description: | It provides a flexible pluggable architecture to collect, enrich and deliver logs or metrics to multiple databases or cloud providers. license: 'Apache-2.0' -icon: ./fluent-bit.svg +icon: gui/fluent-bit.svg confinement: 'strict' grade: 'stable' @@ -19,14 +19,15 @@ plugs: apps: service: - command: fluent-bit -c $SNAP/etc/fluent-bit/fluent-bit.conf + command: usr/local/bin/fluent-bit -c $SNAP/usr/local/etc/fluent-bit/fluent-bit.conf daemon: simple plugs: - network - network-bind - read-config + fluent-bit: - command: fluent-bit + command: usr/local/bin/fluent-bit plugs: - network - network-bind @@ -35,6 +36,8 @@ parts: fluent-bit: source: https://github.com/fluent/fluent-bit source-type: git + build-snaps: + - cmake/latest/stable plugin: cmake stage-packages: - libsasl2-2 @@ -51,14 +54,16 @@ parts: - valgrind - libssl-dev - libpq5 + - libyaml-dev - postgresql-server-dev-all - configflags: + cmake-parameters: - -DFLB_DEBUG=On - -DFLB_OUT_KAFKA=On - -DFLB_JEMALLOC=On - -DFLB_EXAMPLES=OFF - -DFLB_SHARED_LIB=Off - -DFLB_OUT_PGSQL=On + build-attributes: [keep-execstack] layout: /etc/fluent-bit: From 4ea4df4ebdcd118733e645c4bf9a6590d0b37516 Mon Sep 17 00:00:00 2001 From: Hiroshi Hatake Date: Fri, 24 Oct 2025 20:16:18 +0900 Subject: [PATCH 2/3] snap: Install /usr prefix Signed-off-by: Hiroshi Hatake --- snap/snapcraft.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index d1eeacf791a..2b5c03a2196 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -19,7 +19,7 @@ plugs: apps: service: - command: usr/local/bin/fluent-bit -c $SNAP/usr/local/etc/fluent-bit/fluent-bit.conf + command: usr/bin/fluent-bit -c $SNAP/usr/etc/fluent-bit/fluent-bit.conf daemon: simple plugs: - network @@ -27,7 +27,7 @@ apps: - read-config fluent-bit: - command: usr/local/bin/fluent-bit + command: usr/bin/fluent-bit plugs: - network - network-bind @@ -57,6 +57,7 @@ parts: - libyaml-dev - postgresql-server-dev-all cmake-parameters: + - -DCMAKE_INSTALL_PREFIX=/usr - -DFLB_DEBUG=On - -DFLB_OUT_KAFKA=On - -DFLB_JEMALLOC=On From 16a6b97757fde792df1622977142591125be8fab Mon Sep 17 00:00:00 2001 From: Hiroshi Hatake Date: Mon, 27 Oct 2025 15:01:02 +0900 Subject: [PATCH 3/3] snap: Follow the layout change Signed-off-by: Hiroshi Hatake --- snap/snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 2b5c03a2196..87837ae78bf 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -68,4 +68,4 @@ parts: layout: /etc/fluent-bit: - bind: $SNAP/etc/fluent-bit + bind: $SNAP/usr/etc/fluent-bit