From 5ac897fae9b09ff607ee37a1b0e0cee08988a83b Mon Sep 17 00:00:00 2001 From: Enguerrand de Ribaucourt Date: Tue, 1 Oct 2024 13:49:20 +0200 Subject: [PATCH] netdata: add docker PACKAGECONFIG Some netdata plugins like cgroups or docker require permissions to access the docker socket in order to label data properly. Signed-off-by: Enguerrand de Ribaucourt Signed-off-by: Khem Raj --- meta-webserver/recipes-webadmin/netdata/netdata_1.47.1.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-webserver/recipes-webadmin/netdata/netdata_1.47.1.bb b/meta-webserver/recipes-webadmin/netdata/netdata_1.47.1.bb index 5b38d401cd..4138614597 100644 --- a/meta-webserver/recipes-webadmin/netdata/netdata_1.47.1.bb +++ b/meta-webserver/recipes-webadmin/netdata/netdata_1.47.1.bb @@ -41,7 +41,8 @@ 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" +USERADD_PARAM:${PN} = "--system --no-create-home --home-dir ${localstatedir}/run/netdata \ + ${@bb.utils.contains('PACKAGECONFIG','docker','--groups docker','',d)} --user-group netdata" PACKAGECONFIG ??= "openssl freeipmi ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[brotli] = ",,brotli" @@ -53,6 +54,7 @@ PACKAGECONFIG[nfacct] = "-DENABLE_PLUGIN_NFACCT=ON,-DENABLE_PLUGIN_NFACCT=OFF,li PACKAGECONFIG[xenstat] = "-DENABLE_PLUGIN_XENSTAT=ON,-DENABLE_PLUGIN_XENSTAT=OFF,xen-tools" PACKAGECONFIG[cups] = "-DENABLE_PLUGIN_CUPS=ON,-DENABLE_PLUGIN_CUPS=OFF,cups" PACKAGECONFIG[systemd] = "-DENABLE_PLUGIN_SYSTEMD_JOURNAL=ON,-DENABLE_PLUGIN_SYSTEMD_JOURNAL=OFF,systemd" +PACKAGECONFIG[docker] = ",,virtual/docker," # ebpf doesn't compile (or detect) the cross compilation well EXTRA_OECMAKE += "-DENABLE_PLUGIN_EBPF=OFF -DENABLE_PLUGIN_GO=OFF \