From d68d340d8c206863af11a684c15f36b63466e633 Mon Sep 17 00:00:00 2001 From: Jan Vermaete Date: Thu, 23 Dec 2021 19:51:32 +0100 Subject: netdata: fix for commit 8554624cc7f84e6b63b2ea4b94ee5fd2821021ca The previous commit was using a PACKAGECONFIG to enable or disable the sending of anonymous data to Google Analytics. This was giving QA issues. Now the variable 'NETDATA_ANONYMOUS' is used to enable or disable the opt-out. Signed-off-by: Jan Vermaete Signed-off-by: Khem Raj --- meta-webserver/recipes-webadmin/netdata/netdata_1.32.1.bb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'meta-webserver') diff --git a/meta-webserver/recipes-webadmin/netdata/netdata_1.32.1.bb b/meta-webserver/recipes-webadmin/netdata/netdata_1.32.1.bb index 6824dd7257..dbce1c432f 100644 --- a/meta-webserver/recipes-webadmin/netdata/netdata_1.32.1.bb +++ b/meta-webserver/recipes-webadmin/netdata/netdata_1.32.1.bb @@ -20,9 +20,8 @@ UPSTREAM_CHECK_URI = "https://github.com/netdata/netdata/releases" S = "${WORKDIR}/${BPN}-v${PV}" -PACKAGECONFIG ??= "\ - anonymous \ -" +# Stop sending anonymous statistics to Google Analytics +NETDATA_ANONYMOUS ??= "enabled" inherit pkgconfig autotools-brokensep useradd systemd @@ -62,8 +61,7 @@ do_install:append() { sed -i -e 's,@@libdir,${libexecdir},g' ${D}${sysconfdir}/netdata/netdata.conf sed -i -e 's,@@datadir,${datadir},g' ${D}${sysconfdir}/netdata/netdata.conf - # Stop sending anonymous statistics to Google Analytics - if ${@bb.utils.contains('PACKAGECONFIG', 'anonymous', 'true', 'false', d)}; then + if [ "${NETDATA_ANONYMOUS}" = "enabled" ]; then touch ${D}${sysconfdir}/netdata/.opt-out-from-anonymous-statistics fi -- cgit 1.2.3-korg