diff options
author | Austin S. Hemmelgarn <austin@netdata.cloud> | 2023-08-04 12:22:53 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-04 12:22:53 -0400 |
commit | ca1b3eebb21b8ed8510b738c7ace780b38023efe (patch) | |
tree | 57441836fcb8ea04d9e356d0ac65e2ee3537e805 /netdata.spec.in | |
parent | 15ee2e7af12f68eec295a2acc9893303cbd2ce72 (diff) |
Add netdata-plugin-systemd-journal package. (#15733)
* Add netdata-plugin-systemd-journal package.
* Fix suggests usage in spec file.
* Skip systemd journal on old platforms in native packages.
* Actually build systemd-journal plugin everywhere.
* Fix spec file syntax.
* Install systemd-journal plugin by default on supported systems.
* Update packaging/installer/netdata-updater.sh
Co-authored-by: Ilya Mashchenko <ilya@netdata.cloud>
* Explicitly mark optional plugins as auto-installed when possible.
---------
Co-authored-by: Ilya Mashchenko <ilya@netdata.cloud>
Diffstat (limited to 'netdata.spec.in')
-rw-r--r-- | netdata.spec.in | 47 |
1 files changed, 41 insertions, 6 deletions
diff --git a/netdata.spec.in b/netdata.spec.in index 0a9957ccfe..146ee43492 100644 --- a/netdata.spec.in +++ b/netdata.spec.in @@ -158,13 +158,14 @@ Requires: netdata-plugin-chartsd Requires: netdata-plugin-slabinfo Requires: netdata-plugin-perf %if 0%{?_have_nfacct} -Requires: netdata-plugin-nfacct +Requires: netdata-plugin-nfacct %endif %if 0%{?_have_freeipmi} && 0%{?centos_ver} != 6 && 0%{?centos_ver} != 7 && 0%{?amazon_linux} != 2 -Suggests: netdata-plugin-freeipmi +Suggests: netdata-plugin-freeipmi %endif %if 0%{?centos_ver} != 6 && 0%{?centos_ver} != 7 && 0%{?amazon_linux} != 2 -Suggests: netdata-plugin-cups +Suggests: netdata-plugin-cups +Recommends: netdata-plugin-systemd-journal %endif @@ -203,6 +204,10 @@ BuildRequires: cups-devel >= 1.7 %endif # end - cups plugin dependencies +# systemd-journal dependencies +BuildRequires: systemd-devel +# end - systemd-journal dependencies + # Prometheus remote write dependencies BuildRequires: snappy-devel # end - prometheus remote write dependencies @@ -248,13 +253,13 @@ export CFLAGS="${CFLAGS} -fPIC" && ${RPM_BUILD_DIR}/%{name}-%{version}/packaging autoreconf -ivf %configure \ %if 0%{!?_have_ebpf} - --disable-ebpf + --disable-ebpf \ %endif %if 0%{!?_have_freeipmi} - --disable-plugin-freeipmi + --disable-plugin-freeipmi \ %endif %if 0%{!?_have_nfacct} - --disable-plugin-nfacct + --disable-plugin-nfacct \ %endif %if 0%{?centos_ver:1} %if %{centos_ver} < 8 @@ -307,6 +312,10 @@ install -m 4750 -p apps.plugin "${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/plugins. install -m 0750 -p debugfs.plugin "${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/plugins.d/debugfs.plugin" # ########################################################### +# Install systemd-journal.plugin +install -m 4750 -p systemd-journal.plugin "${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/plugins.d/systemd-journal.plugin" + +# ########################################################### # Install perf.plugin install -m 4750 -p perf.plugin "${RPM_BUILD_ROOT}%{_libexecdir}/%{name}/plugins.d/perf.plugin" @@ -600,6 +609,9 @@ rm -rf "${RPM_BUILD_ROOT}" # perf belongs to a different sub-package %exclude %{_libexecdir}/%{name}/plugins.d/perf.plugin +# systemd-journal belongs to a different sub-package +%exclude %{_libexecdir}/%{name}/plugins.d/systemd-journal.plugin + # CUPS belongs to a different sub package %if 0%{?centos_ver} != 6 && 0%{?centos_ver} != 7 %exclude %{_libexecdir}/%{name}/plugins.d/cups.plugin @@ -901,7 +913,30 @@ fi # CAP_DAC_READ_SEARCH required for data collection. %caps(cap_dac_read_search=ep) %attr(0750,root,netdata) %{_libexecdir}/%{name}/plugins.d/debugfs.plugin +%package plugin-systemd-journal +Summary: The systemd-journal plugin for the Netdata Agent +Group: Applications/System +Requires: netdata = %{version} +Conflicts: netdata < %{version} + +%description plugin-systemd-journal + This plugin allows the Netdata Agent to present entries from the systemd + journal on Netdata Cloud or the local Agent Dashboard. + +%pre plugin-systemd-journal + +if ! getent group netdata > /dev/null; then + groupadd --system netdata +fi + +%files plugin-systemd-journal +%defattr(0750,root,netdata,0750) +# CAP_DAC_READ_SEARCH required for data collection. +%caps(cap_dac_read_search=ep) %attr(0750,root,netdata) %{_libexecdir}/%{name}/plugins.d/systemd-journal.plugin + %changelog +* Thu Aug 03 2023 Austin Hemmelgarn <austin@netdata.cloud> 0.0.0-21 +- Added systemd-journal plugin handling * Wed Jun 14 2023 Konstantin Shalygin <k0ste@k0ste.ru> 0.0.0-20 - Added eBPF build dependency (again) * Fri Apr 07 2023 Austin Hemmelgarn <austin@netdata.cloud> 0.0.0-19 |