From 32dd133a6bb193985f5214ee35ab9903305e8742 Mon Sep 17 00:00:00 2001 From: Jan Vermaete Date: Sun, 30 Jan 2022 19:09:34 +0100 Subject: netdata: upgrade 1.32.1 -> 1.33.0 Added the packageconfig to compress the data with lz4. But disabled it by default. Patch added to have it working without compression enabled. Signed-off-by: Jan Vermaete Signed-off-by: Khem Raj --- ...ression-Bug-fix-12043-lz4.h-compilation-e.patch | 26 +++++++ .../recipes-webadmin/netdata/netdata_1.32.1.bb | 76 -------------------- .../recipes-webadmin/netdata/netdata_1.33.0.bb | 82 ++++++++++++++++++++++ 3 files changed, 108 insertions(+), 76 deletions(-) create mode 100644 meta-webserver/recipes-webadmin/netdata/netdata/0001-Stream-Compression-Bug-fix-12043-lz4.h-compilation-e.patch delete mode 100644 meta-webserver/recipes-webadmin/netdata/netdata_1.32.1.bb create mode 100644 meta-webserver/recipes-webadmin/netdata/netdata_1.33.0.bb (limited to 'meta-webserver') diff --git a/meta-webserver/recipes-webadmin/netdata/netdata/0001-Stream-Compression-Bug-fix-12043-lz4.h-compilation-e.patch b/meta-webserver/recipes-webadmin/netdata/netdata/0001-Stream-Compression-Bug-fix-12043-lz4.h-compilation-e.patch new file mode 100644 index 0000000000..c699f956d6 --- /dev/null +++ b/meta-webserver/recipes-webadmin/netdata/netdata/0001-Stream-Compression-Bug-fix-12043-lz4.h-compilation-e.patch @@ -0,0 +1,26 @@ +From 85e59be1c656b946a1fcd19404cb0df6095e7dfb Mon Sep 17 00:00:00 2001 +From: odynik +Date: Fri, 28 Jan 2022 12:15:41 +0200 +Subject: [PATCH 1/4] [Stream Compression] - Bug fix #12043 - lz4.h compilation + error - compile from source (#12049) + +--- + streaming/compression.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/streaming/compression.c b/streaming/compression.c +index 917f05bd6..93810aaed 100644 +--- a/streaming/compression.c ++++ b/streaming/compression.c +@@ -1,7 +1,7 @@ + #include "rrdpush.h" +-#include "lz4.h" + + #ifdef ENABLE_COMPRESSION ++#include "lz4.h" + + #define LZ4_MAX_MSG_SIZE 0x4000 + #define LZ4_STREAM_BUFFER_SIZE (0x10000 + LZ4_MAX_MSG_SIZE) +-- +2.25.1 + diff --git a/meta-webserver/recipes-webadmin/netdata/netdata_1.32.1.bb b/meta-webserver/recipes-webadmin/netdata/netdata_1.32.1.bb deleted file mode 100644 index dbce1c432f..0000000000 --- a/meta-webserver/recipes-webadmin/netdata/netdata_1.32.1.bb +++ /dev/null @@ -1,76 +0,0 @@ -HOMEPAGE = "https://github.com/netdata/netdata/" -SUMMARY = "Real-time performance monitoring" -DESCRIPTION = "Netdata is high-fidelity infrastructure monitoring and troubleshooting. \ - Open-source, free, preconfigured, opinionated, and always real-time." -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE;md5=fc9b848046ef54b5eaee6071947abd24" - -DEPENDS += "libuv openssl util-linux zlib " - -SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BPN}-v${PV}.tar.gz" -SRC_URI[sha256sum] = "ac406513e86ad24976a66146702aeac960e43908abc51d70e4a073905275d13e" - -# default netdata.conf for netdata configuration -SRC_URI += "file://netdata.conf" - -# file for providing systemd service support -SRC_URI += "file://netdata.service" - -UPSTREAM_CHECK_URI = "https://github.com/netdata/netdata/releases" - -S = "${WORKDIR}/${BPN}-v${PV}" - -# Stop sending anonymous statistics to Google Analytics -NETDATA_ANONYMOUS ??= "enabled" - -inherit pkgconfig autotools-brokensep useradd systemd - -LIBS:toolchain-clang:x86 = "-latomic" -LIBS:riscv64 = "-latomic" -LIBS:riscv32 = "-latomic" -LIBS:mips = "-latomic" -export LIBS - -#systemd -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE:${PN} = "netdata.service" -SYSTEMD_AUTO_ENABLE:${PN} = "enable" - -#User specific -USERADD_PACKAGES = "${PN}" -USERADD_PARAM:${PN} = "--system --no-create-home --home-dir ${localstatedir}/run/netdata --user-group netdata" - -# ebpf doesn't compile (or detect) the cross compilation well -EXTRA_OECONF += "--disable-ebpf" - -do_install:append() { - #set S UID for plugins - chmod 4755 ${D}${libexecdir}/netdata/plugins.d/apps.plugin - - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - # Install systemd unit files - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/netdata.service ${D}${systemd_unitdir}/system - sed -i -e 's,@@datadir,${datadir_native},g' ${D}${systemd_unitdir}/system/netdata.service - fi - - # Install default netdata.conf - install -d ${D}${sysconfdir}/netdata - install -m 0644 ${WORKDIR}/netdata.conf ${D}${sysconfdir}/netdata/ - sed -i -e 's,@@sysconfdir,${sysconfdir},g' ${D}${sysconfdir}/netdata/netdata.conf - sed -i -e 's,@@libdir,${libexecdir},g' ${D}${sysconfdir}/netdata/netdata.conf - sed -i -e 's,@@datadir,${datadir},g' ${D}${sysconfdir}/netdata/netdata.conf - - if [ "${NETDATA_ANONYMOUS}" = "enabled" ]; then - touch ${D}${sysconfdir}/netdata/.opt-out-from-anonymous-statistics - fi - - install --group netdata --owner netdata --directory ${D}${localstatedir}/cache/netdata - install --group netdata --owner netdata --directory ${D}${localstatedir}/lib/netdata - - chown -R netdata:netdata ${D}${datadir}/netdata/web -} - -FILES_${PN} += "${localstatedir}/cache/netdata/ ${localstatedir}/lib/netdata/" - -RDEPENDS:${PN} = "bash zlib" diff --git a/meta-webserver/recipes-webadmin/netdata/netdata_1.33.0.bb b/meta-webserver/recipes-webadmin/netdata/netdata_1.33.0.bb new file mode 100644 index 0000000000..8b6432cec1 --- /dev/null +++ b/meta-webserver/recipes-webadmin/netdata/netdata_1.33.0.bb @@ -0,0 +1,82 @@ +HOMEPAGE = "https://github.com/netdata/netdata/" +SUMMARY = "Real-time performance monitoring" +DESCRIPTION = "Netdata is high-fidelity infrastructure monitoring and troubleshooting. \ + Open-source, free, preconfigured, opinionated, and always real-time." +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fc9b848046ef54b5eaee6071947abd24" + +DEPENDS += "libuv openssl util-linux zlib" + +SRC_URI = "\ + https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BPN}-v${PV}.tar.gz \ + file://0001-Stream-Compression-Bug-fix-12043-lz4.h-compilation-e.patch \ +" +SRC_URI[sha256sum] = "d167d4b2d8529119fa4047ae40d22833dac9d360a6ed07c314ba313807c027eb" + +# default netdata.conf for netdata configuration +SRC_URI += "file://netdata.conf" + +# file for providing systemd service support +SRC_URI += "file://netdata.service" + +UPSTREAM_CHECK_URI = "https://github.com/netdata/netdata/releases" + +S = "${WORKDIR}/${BPN}-v${PV}" + +# Stop sending anonymous statistics to Google Analytics +NETDATA_ANONYMOUS ??= "enabled" + +inherit pkgconfig autotools-brokensep useradd systemd + +LIBS:toolchain-clang:x86 = "-latomic" +LIBS:riscv64 = "-latomic" +LIBS:riscv32 = "-latomic" +LIBS:mips = "-latomic" +export LIBS + +#systemd +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN} = "netdata.service" +SYSTEMD_AUTO_ENABLE:${PN} = "enable" + +#User specific +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --no-create-home --home-dir ${localstatedir}/run/netdata --user-group netdata" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[compression] = "--enable-compression, --disable-compression, lz4" + +# ebpf doesn't compile (or detect) the cross compilation well +EXTRA_OECONF += "--disable-ebpf" + +do_install:append() { + #set S UID for plugins + chmod 4755 ${D}${libexecdir}/netdata/plugins.d/apps.plugin + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + # Install systemd unit files + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/netdata.service ${D}${systemd_unitdir}/system + sed -i -e 's,@@datadir,${datadir_native},g' ${D}${systemd_unitdir}/system/netdata.service + fi + + # Install default netdata.conf + install -d ${D}${sysconfdir}/netdata + install -m 0644 ${WORKDIR}/netdata.conf ${D}${sysconfdir}/netdata/ + sed -i -e 's,@@sysconfdir,${sysconfdir},g' ${D}${sysconfdir}/netdata/netdata.conf + sed -i -e 's,@@libdir,${libexecdir},g' ${D}${sysconfdir}/netdata/netdata.conf + sed -i -e 's,@@datadir,${datadir},g' ${D}${sysconfdir}/netdata/netdata.conf + + if [ "${NETDATA_ANONYMOUS}" = "enabled" ]; then + touch ${D}${sysconfdir}/netdata/.opt-out-from-anonymous-statistics + fi + + install --group netdata --owner netdata --directory ${D}${localstatedir}/cache/netdata + install --group netdata --owner netdata --directory ${D}${localstatedir}/lib/netdata + + chown -R netdata:netdata ${D}${datadir}/netdata/web +} + +FILES_${PN} += "${localstatedir}/cache/netdata/ ${localstatedir}/lib/netdata/" + +RDEPENDS:${PN} = "bash zlib" -- cgit 1.2.3-korg