summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAustin S. Hemmelgarn <austin@netdata.cloud>2023-08-22 06:45:04 -0400
committerAustin S. Hemmelgarn <austin@netdata.cloud>2023-08-22 09:57:30 -0400
commit4246ff576881e676760bc302d1ac9d89aa05d720 (patch)
treebcd9ae518bbeb27b550d2ddf92dd3fa3b66dfacd
parent39ce49cbec762c96edd7a4c226151a0086d8a91b (diff)
Explicitly depend on version-matched plugins in native packages. (#15861)
* Explicitly depend on version-matched plugins in native packages. This should allow in-place downgrades of our native packages, starting from versions after this change is introduced. * Fix deps in Debian control file.
-rw-r--r--contrib/debian/control24
-rw-r--r--netdata.spec.in27
2 files changed, 26 insertions, 25 deletions
diff --git a/contrib/debian/control b/contrib/debian/control
index 262a93a6cb..4f819ac180 100644
--- a/contrib/debian/control
+++ b/contrib/debian/control
@@ -36,15 +36,15 @@ Architecture: any
Depends: openssl,
${misc:Depends},
${shlibs:Depends},
- netdata-plugin-ebpf [amd64],
- netdata-plugin-apps,
- netdata-plugin-pythond,
- netdata-plugin-go,
- netdata-plugin-debugfs,
- netdata-plugin-nfacct,
- netdata-plugin-chartsd,
- netdata-plugin-slabinfo,
- netdata-plugin-perf
+ netdata-plugin-ebpf (= ${source:Version}) [amd64],
+ netdata-plugin-apps (= ${source:Version}),
+ netdata-plugin-pythond (= ${source:Version}),
+ netdata-plugin-go (= ${source:Version}),
+ netdata-plugin-debugfs (= ${source:Version}),
+ netdata-plugin-nfacct (= ${source:Version}),
+ netdata-plugin-chartsd (= ${source:Version}),
+ netdata-plugin-slabinfo (= ${source:Version}),
+ netdata-plugin-perf (= ${source:Version})
Pre-Depends: adduser,
dpkg (>= 1.17.14),
libcap2-bin (>=1:2.0),
@@ -53,9 +53,9 @@ Conflicts: netdata-core,
netdata-plugins-bash,
netdata-plugins-python,
netdata-web
-Suggests: netdata-plugin-cups,
- netdata-plugin-freeipmi
-Recommends: netdata-plugin-systemd-journal
+Suggests: netdata-plugin-cups (= ${source:Version}),
+ netdata-plugin-freeipmi (= ${source:Version})
+Recommends: netdata-plugin-systemd-journal (= ${source:Version})
Description: real-time charts for system monitoring
Netdata is a daemon that collects data in realtime (per second)
and presents a web site to view and analyze them. The presentation
diff --git a/netdata.spec.in b/netdata.spec.in
index d0d2ff0393..c31a8bb1fe 100644
--- a/netdata.spec.in
+++ b/netdata.spec.in
@@ -136,24 +136,24 @@ Requires(pre): /usr/sbin/useradd
# makes it impossible to properly test the packages prior to upload,
# so we just skip depending on them on CentOS 7.
%if 0%{?_have_ebpf}
-Requires: netdata-plugin-ebpf
-%endif
-Requires: netdata-plugin-apps
-Requires: netdata-plugin-pythond
-Requires: netdata-plugin-go
-Requires: netdata-plugin-debugfs
-Requires: netdata-plugin-chartsd
-Requires: netdata-plugin-slabinfo
-Requires: netdata-plugin-perf
+Requires: netdata-plugin-ebpf = %{version}
+%endif
+Requires: netdata-plugin-apps = %{version}
+Requires: netdata-plugin-pythond = %{version}
+Requires: netdata-plugin-go = %{version}
+Requires: netdata-plugin-debugfs = %{version}
+Requires: netdata-plugin-chartsd = %{version}
+Requires: netdata-plugin-slabinfo = %{version}
+Requires: netdata-plugin-perf = %{version}
%if 0%{?_have_nfacct}
-Requires: netdata-plugin-nfacct
+Requires: netdata-plugin-nfacct = %{version}
%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 = %{version}
%endif
%if 0%{?centos_ver} != 6 && 0%{?centos_ver} != 7 && 0%{?amazon_linux} != 2
-Suggests: netdata-plugin-cups
-Recommends: netdata-plugin-systemd-journal
+Suggests: netdata-plugin-cups = %{version}
+Recommends: netdata-plugin-systemd-journal = %{version}
%endif
@@ -919,6 +919,7 @@ fi
%caps(cap_dac_read_search=ep) %attr(0750,root,netdata) %{_libexecdir}/%{name}/plugins.d/systemd-journal.plugin
%changelog
+* Mon Aug 21 2023 Austin Hemmelgarn <austin@netdata.cloud> 0.0.0-22
* 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