Skip to content

Commit 4a457ab

Browse files
committed
Revert "cmk-flow: add ntopng-based network flow collector OMD package"
This reverts commit f53bc19. Reason for revert: failing heavy chain Change-Id: Ie64709401355b558fed42aed9376177a9c046ffd
1 parent f53bc19 commit 4a457ab

5 files changed

Lines changed: 0 additions & 40 deletions

File tree

MODULE.bazel

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -382,18 +382,6 @@ 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-
397385
http_archive(
398386
name = "nrpe",
399387
build_file = "//omd/packages/nrpe:BUILD.nrpe.bazel",

omd/BUILD

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ 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",
127126
"//omd/packages/nagvis:pkg_tar",
128127
"//non-free/packages/otel-collector",
129128
],
@@ -163,7 +162,6 @@ edition_deps = select({
163162
"//omd/non-free/packages/saml2:pkg_tar",
164163
"//non-free/packages/cmk-relay-engine:relay_install_pkg",
165164
"//omd/packages/jaeger:pkg_tar",
166-
"//omd/non-free/packages/cmk-flow:pkg_tar",
167165
"//omd/packages/nagvis:pkg_tar",
168166
"//non-free/packages/otel-collector",
169167
],
@@ -247,7 +245,6 @@ edition_skel_permissions = select({
247245
"//omd/non-free/packages/saml2:skel.permissions",
248246
"//omd/packages/check_mk:skel.permissions",
249247
"//omd/packages/jaeger:skel.permissions",
250-
"//omd/non-free/packages/cmk-flow:skel.permissions",
251248
"//omd/packages/maintenance:skel.permissions",
252249
"//omd/packages/nagios:skel.permissions",
253250
"//omd/packages/nagvis:skel.permissions",
@@ -275,7 +272,6 @@ edition_skel_permissions = select({
275272
"//omd/non-free/packages/saml2:skel.permissions",
276273
"//omd/packages/check_mk:skel.permissions",
277274
"//omd/packages/jaeger:skel.permissions",
278-
"//omd/non-free/packages/cmk-flow:skel.permissions",
279275
"//omd/packages/maintenance:skel.permissions",
280276
"//omd/packages/nagios:skel.permissions",
281277
"//omd/packages/nagvis:skel.permissions",

omd/distros/UBUNTU_24.04.mk

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -49,23 +49,6 @@ 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
6952
USERADD_OPTIONS =
7053
ADD_USER_TO_GROUP = gpasswd -a %(user)s %(group)s
7154
APACHE_CONF_DIR = /etc/apache2/conf.d

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
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
74
libnspr4.so
85
libnss3.so
96
libnssutil3.so
@@ -16,4 +13,3 @@ libtk8.6.so
1613
libwebp.so
1714
libwebpdemux.so
1815
libwebpmux.so
19-
libzstd.so

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
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
74
libnspr4.so
85
libnss3.so
96
libnssutil3.so

0 commit comments

Comments
 (0)