Skip to content

[release-4.19] OCPBUGS-55984: Include OpenTelemetry configuration examples in the RPM #4888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 9, 2025
Merged

[release-4.19] OCPBUGS-55984: Include OpenTelemetry configuration examples in the RPM #4888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packaging/observability/microshift-observability.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
14 changes: 11 additions & 3 deletions packaging/rpm/microshift.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down Expand Up @@ -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 <[email protected]> 4.19.0
- Include OpenTelemetry configuration examples in the RPM

* Wed Apr 16 2025 vanhalenar <[email protected]> 4.19.0
- Remove observability preset that enables the service automatically

* Wed Apr 09 2025 Patryk Matuszak <[email protected]> 4.19.0
- Split AIMS manifest into two: kserve and manifests

Expand Down
2 changes: 1 addition & 1 deletion test/suites/optional/observability.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down