Merging upstream version 1.47.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 5 insertions, 37 deletions

diff --git a/netdata.spec.in b/netdata.spec.in
index 5b488fcbf..67d7de4a0 100644
--- a/netdata.spec.in
+++ b/netdata.spec.in
@@ -227,6 +227,7 @@ Requires: %{name}-plugin-systemd-journal = %{version}
 Requires: %{name}-plugin-network-viewer = %{version}
 %endif
 
+Obsoletes: %{name}-plugin-logs-management
 
 # #####################################################################
 # Functionality-dependent package dependencies
@@ -399,7 +400,6 @@ happened, on your systems and applications.
 	-DENABLE_PLUGIN_PERF=On \
 	-DENABLE_PLUGIN_SLABINFO=On \
 	-DENABLE_PLUGIN_SYSTEMD_JOURNAL=On \
-	-DENABLE_PLUGIN_LOGS_MANAGEMENT=On \
 	-DENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE=On \
 	-DENABLE_BUNDLED_JSONC=Off \
 	-DENABLE_BUNDLED_YAML=Off
@@ -527,22 +527,14 @@ rm -rf "${RPM_BUILD_ROOT}"
 %{_libexecdir}/%{name}/install-service.sh
 %{_libexecdir}/%{name}/%{name}-updater.sh
 %{_libexecdir}/%{name}/%{name}-uninstaller.sh
-%{_libexecdir}/%{name}/plugins.d/acl.sh
-%{_libexecdir}/%{name}/plugins.d/alarm.sh
-%{_libexecdir}/%{name}/plugins.d/alarm-email.sh
 %{_libexecdir}/%{name}/plugins.d/alarm-notify.sh
-%{_libexecdir}/%{name}/plugins.d/alarm-test.sh
 %{_libexecdir}/%{name}/plugins.d/anonymous-statistics.sh
 %{_libexecdir}/%{name}/plugins.d/cgroup-name.sh
 %{_libexecdir}/%{name}/plugins.d/get-kubernetes-labels.sh
-%{_libexecdir}/%{name}/plugins.d/health-cmdapi-test.sh
 %{_libexecdir}/%{name}/plugins.d/ioping.plugin
 %{_libexecdir}/%{name}/plugins.d/loopsleepms.sh.inc
-%{_libexecdir}/%{name}/plugins.d/request.sh
 %{_libexecdir}/%{name}/plugins.d/system-info.sh
 %{_libexecdir}/%{name}/plugins.d/tc-qos-helper.sh
-%{_libexecdir}/%{name}/plugins.d/template_dim.sh
-%{_libexecdir}/%{name}/plugins.d/ebpf_thread_function.sh
 
 # cgroup-network detects the network interfaces of CGROUPs
 # it must be able to use setns() and run cgroup-network-helper.sh as root
@@ -625,11 +617,6 @@ rm -rf "${RPM_BUILD_ROOT}"
 # xenstat belongs to a different sub-package
 %exclude %{_libexecdir}/%{name}/plugins.d/xenstat.plugin
 
-# logs management belongs to a different sub-package
-%exclude %{_libexecdir}/%{name}/plugins.d/logs-management.plugin
-%exclude %{_libdir}/%{name}/conf.d/logsmanagement.d.conf
-%exclude %{_libdir}/%{name}/conf.d/logsmanagement.d
-
 # Network viewer belongs to a different sub-package
 %exclude %{_libexecdir}/%{name}/plugins.d/network-viewer.plugin
 
@@ -973,29 +960,6 @@ fi
 %attr(4750,root,netdata) %{_libexecdir}/%{name}/plugins.d/xenstat.plugin
 %endif
 
-%package plugin-logs-management
-Summary: The logs-management plugin for the Netdata Agent
-Group: Applications/System
-Requires: %{name} = %{version}
-Conflicts: %{name} < %{version}
-
-%description plugin-logs-management
- This plugin allows the Netdata Agent to collect logs from the system
- and parse them to extract metrics.
-
-%pre plugin-logs-management
-if ! getent group %{name} > /dev/null; then
-  groupadd --system %{name}
-fi
-
-%files plugin-logs-management
-%defattr(0644,root,netdata,0755)
-%{_libdir}/%{name}/conf.d/logsmanagement.d.conf
-%{_libdir}/%{name}/conf.d/logsmanagement.d
-%defattr(0750,root,netdata,0750)
-# CAP_DAC_READ_SEARCH and CAP_SYSLOG needed for data collection.
-%caps(cap_dac_read_search,cap_syslog=ep) %attr(0750,root,netdata) %{_libexecdir}/%{name}/plugins.d/logs-management.plugin
-
 %package plugin-network-viewer
 Summary: The network viewer plugin for the Netdata Agent
 Group: Applications/System
@@ -1024,6 +988,10 @@ fi
 %caps(cap_sys_admin,cap_sys_ptrace,cap_dac_read_search=ep) %attr(0750,root,netdata) %{_libexecdir}/%{name}/plugins.d/network-viewer.plugin
 
 %changelog
+* Fri Jul 19 2024 Austin Hemmelgarn <austin@netdata.cloud>
+- Fix dependency issues with old logs-management plugin
+* Tue Jul 16 2024 Austin Hemmelgarn <austin@netdata.cloud>
+- Removed logs-management plugin
 * Wed Jul 03 2024 Konstantin Shalygin <k0ste@k0ste.ru> 0.0.0-26
 - Added lm_sensors as weak dependency for plugin-go package
 * Tue Feb 06 2024 Austin Hemmelgarn <austin@netdata.cloud> 0.0.0-25