From 763a61e5513faeecdfc48c3084e20a47c44c570c Mon Sep 17 00:00:00 2001 From: Patryk Matuszak Date: Thu, 8 May 2025 16:43:00 +0200 Subject: [PATCH] Include OpenTelemetry configuration examples in the RPM --- .../observability/microshift-observability.service | 2 +- packaging/rpm/microshift.spec | 14 +++++++++++--- test/suites/optional/observability.robot | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/packaging/observability/microshift-observability.service b/packaging/observability/microshift-observability.service index fb7ea5baa9..2fc2e984dc 100644 --- a/packaging/observability/microshift-observability.service +++ b/packaging/observability/microshift-observability.service @@ -8,7 +8,7 @@ ConditionPathExists=/var/lib/microshift/resources/observability-client/kubeconfi Environment=KUBECONFIG=/var/lib/microshift/resources/observability-client/kubeconfig Environment=K8S_NODE_NAME="%l" ExecStartPre=/usr/bin/mkdir -p /var/lib/microshift-observability -ExecStart=/usr/bin/opentelemetry-collector --config=/etc/microshift/opentelemetry-collector.yaml +ExecStart=/usr/bin/opentelemetry-collector --config=/etc/microshift/observability/opentelemetry-collector.yaml Restart=always User=root diff --git a/packaging/rpm/microshift.spec b/packaging/rpm/microshift.spec index c9daf798d1..eea99e66d4 100644 --- a/packaging/rpm/microshift.spec +++ b/packaging/rpm/microshift.spec @@ -568,8 +568,8 @@ mkdir -p -m755 %{buildroot}%{_datadir}/microshift/release install -p -m644 assets/optional/ai-model-serving/release-ai-model-serving-x86_64.json %{buildroot}%{_datadir}/microshift/release/ # observability -install -d -m755 %{buildroot}%{_presetdir} -install -p -m644 packaging/observability/opentelemetry-collector.yaml -D %{buildroot}%{_sysconfdir}/microshift/opentelemetry-collector.yaml +install -d -m755 %{buildroot}/%{_sysconfdir}/microshift/observability +install -p -m644 packaging/observability/*.yaml -D %{buildroot}%{_sysconfdir}/microshift/observability/ install -p -m644 packaging/observability/microshift-observability.service %{buildroot}%{_unitdir}/ install -d -m755 %{buildroot}/%{_prefix}/lib/microshift/manifests.d/003-microshift-observability/ install -p -m644 assets/optional/observability/*.yaml %{buildroot}/%{_prefix}/lib/microshift/manifests.d/003-microshift-observability/ @@ -763,14 +763,22 @@ fi %files observability %dir %{_prefix}/lib/microshift/manifests.d/003-microshift-observability +%dir %{_sysconfdir}/microshift/observability/ %{_unitdir}/microshift-observability.service -%{_sysconfdir}/microshift/opentelemetry-collector.yaml +%config(noreplace) %{_sysconfdir}/microshift/observability/opentelemetry-collector.yaml +%{_sysconfdir}/microshift/observability/opentelemetry-collector-*.yaml %{_prefix}/lib/microshift/manifests.d/003-microshift-observability/* # Use Git command to generate the log and replace the VERSION string # LANG=C git log --date="format:%a %b %d %Y" --pretty="tformat:* %cd %an <%ae> VERSION%n- %s%n" packaging/rpm/microshift.spec %changelog +* Thu May 08 2025 Patryk Matuszak 4.19.0 +- Include OpenTelemetry configuration examples in the RPM + +* Wed Apr 16 2025 vanhalenar 4.19.0 +- Remove observability preset that enables the service automatically + * Wed Apr 09 2025 Patryk Matuszak 4.19.0 - Split AIMS manifest into two: kserve and manifests diff --git a/test/suites/optional/observability.robot b/test/suites/optional/observability.robot index 8c24e30c3a..8703c0ad48 100644 --- a/test/suites/optional/observability.robot +++ b/test/suites/optional/observability.robot @@ -18,7 +18,7 @@ Suite Teardown Teardown Suite And Revert Test Host *** Variables *** ${JOURNAL_CUR} ${EMPTY} ${DEFAULT_CONFIG_PATH} ../packaging/observability/opentelemetry-collector.yaml -${OTEL_CONFIG_PATH} /etc/microshift/opentelemetry-collector.yaml +${OTEL_CONFIG_PATH} /etc/microshift/observability/opentelemetry-collector.yaml ${TEST_CONFIG_PATH} assets/observability/otel_config.yaml