Reland "Include otel-collector in CME"

1684ed4 Change-Id: I28ed3bd6c8d4e269c61bc202a7580c3fe7d7668e
Checkmk · Nov 15, 2024 · 0df41be · 0df41be
1 parent a3e7f1c
commit 0df41be
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/omd/Makefile b/omd/Makefile
@@ -76,6 +76,7 @@ ifeq ($(EDITION),managed)
 PACKAGES += enterprise
 PACKAGES += cloud
 PACKAGES += managed
+PACKAGES += otel-collector
 endif
 ifeq ($(EDITION),cloud)
 PACKAGES += enterprise

diff --git a/omd/packages/packages.make b/omd/packages/packages.make
@@ -228,7 +228,8 @@ ifeq ($(EDITION),managed)
 include \
     packages/enterprise/enterprise.make \
     packages/cloud/cloud.make \
-    packages/managed/managed.make
+    packages/managed/managed.make \
+    $(REPO_PATH)/non-free/packages/otel-collector/otel-collector.make
 endif
 ifeq ($(EDITION),cloud)
 include \

diff --git a/tests/integration/omd/test_init_scripts.py b/tests/integration/omd/test_init_scripts.py
@@ -33,7 +33,7 @@ def test_init_scripts(site: Site) -> None:
             "liveproxyd",
             "mknotifyd",
         }
-    if site.version.is_cloud_edition():
+    if site.version.is_cloud_edition() or site.version.is_managed_edition():
         scripts |= {"otel-collector"}
 
     installed_scripts = set(site.listdir("etc/init.d"))