do not attempt to find cgroup-network on older distros; fixes #3169
Costa Tsaousis (ktsaou) committed
Jan 3, 2018 at 16:42 UTC
deb4b2518e55ca3550dcffccf5af4f1bdc2b264d
1 file changed
+6
-2
netdata.spec.in
+6
-2
@@ -10,10 +10,12 @@
10
%bcond_without systemd # systemd
11
%bcond_with nfacct # build with nfacct plugin
12
%bcond_with freeipmi # build with freeipmi plugin
13
+%bcond_with netns # build with netns support (cgroup-network)
14
15
%if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1140
16
%else
17
%undefine with_systemd
18
+%undefine with_netns
19
%endif
20
21
%if %{with systemd}
@@ -194,11 +196,13 @@ rm -rf "${RPM_BUILD_ROOT}"
196
197
%caps(cap_dac_read_search,cap_sys_ptrace=ep) %attr(0555,root,root) %{_libexecdir}/%{name}/plugins.d/apps.plugin
198
199
+%if %{with netns}
200
# cgroup-network detects the network interfaces of CGROUPs
201
# it must be able to use setns() and run cgroup-network-helper.sh as root
202
# the helper script reads /proc/PID/fdinfo/* files, runs virsh, etc.
203
%caps(cap_setuid=ep) %attr(4555,root,root) %{_libexecdir}/%{name}/plugins.d/cgroup-network
204
%attr(0555,root,root) %{_libexecdir}/%{name}/plugins.d/cgroup-network-helper.sh
205
+%endif
206
207
%if %{with freeipmi}
208
%caps(cap_setuid=ep) %attr(4555,root,root) %{_libexecdir}/%{name}/plugins.d/freeipmi.plugin
@@ -227,10 +231,10 @@ rm -rf "${RPM_BUILD_ROOT}"
231
* Sun Dec 17 2017 Costa Tsaousis <costa@tsaousis.gr> - 1.9.0-1
232
Please check full changelog at github.
233
https://github.com/firehol/netdata/releases
230
-* Mon Sep 17 2017 Costa Tsaousis <costa@tsaousis.gr> - 1.8.0-1
234
+* Sun Sep 17 2017 Costa Tsaousis <costa@tsaousis.gr> - 1.8.0-1
235
This is mainly a bugfix release.
236
Please check full changelog at github.
233
-* Mon Jul 16 2017 Costa Tsaousis <costa@tsaousis.gr> - 1.7.0-1
237
+* Sun Jul 16 2017 Costa Tsaousis <costa@tsaousis.gr> - 1.7.0-1
238
- netdata is now a fully featured statsd server
239
- new installation options
240
- metrics streaming and replication improvements