Skip to contentSkip to conversation

package/netdata: new package

PATCH New Marcin Niestroj 2 participants 4 messages Mar 20, 2020 – Mar 24, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v6 1/2 package/netdata: new package

Always provide --disable-dbengine configuration option, because we do not support libjudy dependency that is required otherwise.

---
changes v5 -> v6:
- rework S60netdata init script to match package/sysklogd/S01syslogd template (suggested by Carlos)

changes v4 -> v5:
- use 1.20.0 instead of 1.19.0 version
- libuv is hard requirement now, so it was added to dependencies
- zlib is hard requirement as well, because it is needed to properly compile project (missing uLong typedef otherwise)
- patch solving race condition during installation has been dropped, because it is already part of 1.20.0

changes v3 -> v4:
- use 1.19.0 instead of 1.18.1 version
- drop musl fix, which is now part of 1.19.0 netdata version
- use patch from upstream netdata (which will be part of next release) that removes use of .keep files
- rebase on Builroot master

changes v2 -> v3:
- add patch that removes installation of .keep files for /var/cache/netdata and /var/log/netdata directories; this solves a race condition when installing .keep file to the same directory (/tmp/netdata with default skeleton) from multiple threads
- add S60netdata sysv-init script, which creates needed directories (/var/cache/netdata and /var/log/netdata) (suggested by Matt)

changes v1 -> v2:
- squash DEVELOPERS update (suggested by Arnout),
- reduce number of required dependencies and support them as optional:
- json-c: there are few custom JSON handling function if json-c library is not provided,
- openssl: enable or disable https support based on its availability (and solve openssl not being in netdata.mk file - suggested by Matt),
- add optional dependencies on cups, nfacct and zlib,
- enable or disable -flto based on BR2_GCC_ENABLE_LTO
- drop libuv and lz4 dependencies, because it is not required with --disable-dbengine option,
- add comment about NETDATA_AUTORECONF (suggested by Matt),
- apply upstreamed patch to fix musl build (musl build was not failing with v1 patch but did with v2).

 DEVELOPERS                   |  1 +
 package/Config.in            |  1 +
 package/netdata/Config.in    | 22 ++++++++++++++
 package/netdata/S60netdata   | 57 ++++++++++++++++++++++++++++++++++++
 package/netdata/netdata.hash |  3 ++
 package/netdata/netdata.mk   | 55 ++++++++++++++++++++++++++++++++++
 6 files changed, 139 insertions(+)
 create mode 100644 package/netdata/Config.in
 create mode 100644 package/netdata/S60netdata
 create mode 100644 package/netdata/netdata.hash
 create mode 100644 package/netdata/netdata.mk
DEVELOPERS +1 -0
index 98220a961b..1a39112386 100644
@@ -1555,6 +1555,7 @@ F:	package/lua-flu/
 F:	package/lua-stdlib/
 F:	package/luaossl/
 F:	package/murata-cyw-fw/
+F:	package/netdata/
 F:	package/rs485conf/
 F:	package/turbolua/
 
package/Config.in +1 -0
index afe32f52b4..85cc4a44f8 100644
@@ -1942,6 +1942,7 @@ menu "Miscellaneous"
 	source "package/linux-syscall-support/Config.in"
 	source "package/mcrypt/Config.in"
 	source "package/mobile-broadband-provider-info/Config.in"
+	source "package/netdata/Config.in"
 	source "package/proj/Config.in"
 	source "package/qemu/Config.in"
 	source "package/qpdf/Config.in"
package/netdata/Config.in new file +22 -0
new file mode 100644
index 0000000000..88f88cb7ed
@@ -0,0 +1,22 @@
+config BR2_PACKAGE_NETDATA
+	bool "netdata"
+	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
+	depends on BR2_USE_MMU # fork()
+	depends on !BR2_STATIC_LIBS # libuv
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv
+	select BR2_PACKAGE_LIBUV
+	select BR2_PACKAGE_UTIL_LINUX
+	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
+	select BR2_PACKAGE_ZLIB
+	help
+	  Netdata is distributed, real-time, performance and health
+	  monitoring for systems and applications. It is a highly
+	  optimized monitoring agent you install on all your systems and
+	  containers.
+
+	  https://github.com/netdata/netdata
+
+comment "netdata needs a toolchain w/ NPTL, dynamic library"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS
+	depends on BR2_USE_MMU
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4
package/netdata/S60netdata new file +57 -0

57 lines not on this page · raw message

package/netdata/netdata.hash new file +3 -0
new file mode 100644
index 0000000000..6c79e97017
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 c739e0fa8d6d7f433c0c7c8016b763e8f70519d67f0b5e7eca9ee5318f210d90  netdata-1.20.0.tar.gz
+sha256 0e5fd9d833efe9b79f784d1903281554af82d1b4261af67d35455728e5572aa6  LICENSE
package/netdata/netdata.mk new file +55 -0

55 lines not on this page · raw message

Signature · 1 line
2.25.0
#1 lore raw

PATCH v6 2/2 support/testing: add netdata test

---
changes v4 -> v6: none

changes v3 -> v4:
- do not launch netdata explicitly, but rely on init script to run netdata on default port

changes v2 -> v3: none

changes v1 -> v2:
- squash DEVELOPERS entry from another commit (suggested by Arnout)

 .gitlab-ci.yml                                |  1 +
 DEVELOPERS                                    |  1 +
 support/testing/tests/package/test_netdata.py | 23 +++++++++++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 support/testing/tests/package/test_netdata.py
.gitlab-ci.yml +1 -0
index 4b84a5b709..0b8050a7fe 100644
@@ -421,6 +421,7 @@ tests.package.test_luasyslog.TestLuajitLuasyslog: { extends: .runtime_test }
 tests.package.test_luvi.TestLuvi: { extends: .runtime_test }
 tests.package.test_lxc.TestLxc: { extends: .runtime_test }
 tests.package.test_lzlib.TestLuaLzlib: { extends: .runtime_test }
+tests.package.test_netdata.TestNetdata: { extends: .runtime_test }
 tests.package.test_openjdk.TestOpenJdk: { extends: .runtime_test }
 tests.package.test_opkg.TestOpkg: { extends: .runtime_test }
 tests.package.test_perl.TestPerl: { extends: .runtime_test }
DEVELOPERS +1 -0
index 1a39112386..dcd4c75be0 100644
@@ -1558,6 +1558,7 @@ F:	package/murata-cyw-fw/
 F:	package/netdata/
 F:	package/rs485conf/
 F:	package/turbolua/
+F:	support/testing/tests/package/test_netdata.py
 
 N:	Marcus Folkesson <[email protected]>
 F:	package/libostree/
support/testing/tests/package/test_netdata.py new file +23 -0
new file mode 100644
index 0000000000..7418b762a4
@@ -0,0 +1,23 @@
+import os
+
+import infra.basetest
+
+
+class TestNetdata(infra.basetest.BRTest):
+    config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \
+        """
+        BR2_PACKAGE_NETDATA=y
+        BR2_TARGET_ROOTFS_CPIO=y
+        # BR2_TARGET_ROOTFS_TAR is not set
+        """
+
+    def test_run(self):
+        cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio")
+        self.emulator.boot(arch="armv5",
+                           kernel="builtin",
+                           options=["-initrd", cpio_file])
+        self.emulator.login()
+
+        cmd = "wget localhost:19999 -O - | grep '<title>netdata dashboard</title>'"
+        _, exit_code = self.emulator.run(cmd)
+        self.assertEqual(exit_code, 0)
Signature · 1 line
2.25.0
#2 lore raw

PATCH v6 2/2 support/testing: add netdata test

Quoted 3 lines · On Fri, 20 Mar 2020 16:25:17 +0100 Marcin Niestroj…

---
changes v4 -> v6: none

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH v6 1/2 package/netdata: new package

In reply to Marcin Niestroj

Hello Marcin,

Quoted 4 lines · On Fri, 20 Mar 2020 16:25:16 +0100 Marcin Niestroj…

Always provide --disable-dbengine configuration option, because we do not support libjudy dependency that is required otherwise.

Thanks, I've applied to master, with some small changes. See below.

Quoted 4 lines

+# Create needed directories.
+[ -d "/var/cache/$DAEMON" ] || mkdir -p "/var/cache/$DAEMON"

+[ -d "/var/lib/$DAEMON" ] || mkdir -p "/var/lib/$DAEMON"
+[ -d "/var/log/$DAEMON" ] || mkdir -p "/var/log/$DAEMON"

I've simplified to just

mkdir -p /var/cache/$DAEMON /var/lib/$DAEMON /var/log/$DAEMON

indeed, there's no need to test before doing mkdir -p, mkdir -p will exit successfully if the folder already exists.

package/netdata/netdata.mk line 9

Quoted 3 lines
package/netdata/netdata.mk new file +3 -0
+NETDATA_VERSION = 1.20.0
+NETDATA_SITE = $(call github,netdata,netdata,v$(NETDATA_VERSION))
+NETDATA_LICENSE = GPL-3.0

The license really is GPL-3.0+.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com