Skip to content

Commit f53bc19

Browse files
committed
cmk-flow: add ntopng-based network flow collector OMD package
- Add omd/non-free/packages/cmk-flow: OMD package bundling ntopng (binary, libs, share tree) - Add init script (daemon "flow"): ntopng as ZMQ collector on 5556, redis @1, web UI 3001 - Off by default: not auto-started with the site; controlled via omd start/stop flow - Add MODULE.bazel http_file for the prebuilt (trimmed + RUNPATH'd) ntopng bundle - Register cmk-flow in omd/BUILD (ultimate/ultimatemt) - Declare ntopng's runtime OS libs in omd/distros/UBUNTU_24.04.mk (other distros TODO) - Add .f12 to build and install the package into a running site - Pass //omd:validate_deb: OS-provided libs trimmed from the bundle + allow-listed CMK-36025 Change-Id: I8ec8c9257e716d84424e0c243513ece451a3a4b3
1 parent 4852f6e commit f53bc19

5 files changed

Lines changed: 40 additions & 0 deletions

File tree

MODULE.bazel

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,18 @@ http_file(
382382
],
383383
)
384384

385+
# cmk-flow payload: a prebuilt ntopng bundle (binary + private libs + share/
386+
# tree), snapshotted from ntop's rolling apt-stable build. Consumed by
387+
# omd/non-free/packages/cmk-flow/BUILD.
388+
http_file(
389+
name = "cmk_flow_bundle",
390+
downloaded_file_path = "cmk-flow-bundle.tar.gz",
391+
sha256 = "28c31fbdf150227ca4be6bde78487daab6b6604734d8deae48ba29f8db2f1dee",
392+
urls = [
393+
UPSTREAM_MIRROR_URL + "flow-bundle-6.6.260622-slim.tar.gz",
394+
],
395+
)
396+
385397
http_archive(
386398
name = "nrpe",
387399
build_file = "//omd/packages/nrpe:BUILD.nrpe.bazel",

omd/BUILD

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ edition_deps = select({
123123
"//omd/non-free/packages/saml2:pkg_tar",
124124
"//non-free/packages/cmk-relay-engine:relay_install_pkg",
125125
"//omd/packages/jaeger:pkg_tar",
126+
"//omd/non-free/packages/cmk-flow:pkg_tar",
126127
"//omd/packages/nagvis:pkg_tar",
127128
"//non-free/packages/otel-collector",
128129
],
@@ -162,6 +163,7 @@ edition_deps = select({
162163
"//omd/non-free/packages/saml2:pkg_tar",
163164
"//non-free/packages/cmk-relay-engine:relay_install_pkg",
164165
"//omd/packages/jaeger:pkg_tar",
166+
"//omd/non-free/packages/cmk-flow:pkg_tar",
165167
"//omd/packages/nagvis:pkg_tar",
166168
"//non-free/packages/otel-collector",
167169
],
@@ -245,6 +247,7 @@ edition_skel_permissions = select({
245247
"//omd/non-free/packages/saml2:skel.permissions",
246248
"//omd/packages/check_mk:skel.permissions",
247249
"//omd/packages/jaeger:skel.permissions",
250+
"//omd/non-free/packages/cmk-flow:skel.permissions",
248251
"//omd/packages/maintenance:skel.permissions",
249252
"//omd/packages/nagios:skel.permissions",
250253
"//omd/packages/nagvis:skel.permissions",
@@ -272,6 +275,7 @@ edition_skel_permissions = select({
272275
"//omd/non-free/packages/saml2:skel.permissions",
273276
"//omd/packages/check_mk:skel.permissions",
274277
"//omd/packages/jaeger:skel.permissions",
278+
"//omd/non-free/packages/cmk-flow:skel.permissions",
275279
"//omd/packages/maintenance:skel.permissions",
276280
"//omd/packages/nagios:skel.permissions",
277281
"//omd/packages/nagvis:skel.permissions",

omd/distros/UBUNTU_24.04.mk

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,23 @@ OS_PACKAGES += libfl2 # needed by heirloom-pkgtools
4949
OS_PACKAGES += poppler-utils # needed for preview of PDF in reporting
5050
OS_PACKAGES += libffi8ubuntu1 # needed for pyOpenSSL and dependant
5151
OS_PACKAGES += libpq5
52+
# needed by cmk-flow (ntopng); OS libs trimmed from the bundle (Enterprise editions)
53+
OS_PACKAGES += libbz2-1.0
54+
OS_PACKAGES += libcairo2
55+
OS_PACKAGES += libexpat1
56+
OS_PACKAGES += libfreetype6
57+
OS_PACKAGES += libgnutls30t64
58+
OS_PACKAGES += libgssapi-krb5-2
59+
OS_PACKAGES += libkrb5-3
60+
OS_PACKAGES += libldap2
61+
OS_PACKAGES += liblz4-1
62+
OS_PACKAGES += liblzma5
63+
OS_PACKAGES += libpangocairo-1.0-0
64+
OS_PACKAGES += libpng16-16t64
65+
OS_PACKAGES += libsqlite3-0
66+
OS_PACKAGES += libxcb1
67+
OS_PACKAGES += libzstd1
68+
OS_PACKAGES += zlib1g
5269
USERADD_OPTIONS =
5370
ADD_USER_TO_GROUP = gpasswd -a %(user)s %(group)s
5471
APACHE_CONF_DIR = /etc/apache2/conf.d

tests/packaging/package_validator/system-dependencies.debian.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# System dependencies for Checkmk application (Agents should be excluded with ignore-files.txt).
22
libgnutls.so
33
libgsf-1.so
4+
liblber.so
5+
libldap.so
6+
liblz4.so
47
libnspr4.so
58
libnss3.so
69
libnssutil3.so
@@ -13,3 +16,4 @@ libtk8.6.so
1316
libwebp.so
1417
libwebpdemux.so
1518
libwebpmux.so
19+
libzstd.so

tests/packaging/package_validator/system-dependencies.ubuntu.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# System dependencies for Checkmk application (Agents should be excluded with ignore-files.txt).
22
libgnutls.so
33
libgsf-1.so
4+
liblber.so
5+
libldap.so
6+
liblz4.so
47
libnspr4.so
58
libnss3.so
69
libnssutil3.so

0 commit comments

Comments
 (0)