diff --git a/packages/n/netdata/.files b/packages/n/netdata/.files index 7319bace440..b61c59236a5 100644 Binary files a/packages/n/netdata/.files and b/packages/n/netdata/.files differ diff --git a/packages/n/netdata/.rev b/packages/n/netdata/.rev index 8c92d3fc94e..b53c49a5893 100644 --- a/packages/n/netdata/.rev +++ b/packages/n/netdata/.rev @@ -4302,4 +4302,40 @@ Other Notable Changes and https://github.com/netdata/go.d.plugin/releases/tag/v0.53.0 1088133 + + 4fdb1932e13a141773e956ed959e1dd0 + 1.43.2 + + anag+factory + - Update to v1.43.2 + See https://github.com/netdata/netdata/releases/tag/v1.43.2 + +- Update to v1.43.1 (go.d.plugin 0.56.4) + See https://github.com/netdata/netdata/releases/tag/v1.43.1 + and https://github.com/netdata/go.d.plugin/releases/tag/v0.56.4 +- Required golang bumped to 1.21 +- Remove suid bits from freeipmi and nfacct plugins + +- Update to v1.43.0 (go.d.plugin 0.56.3) + See https://github.com/netdata/netdata/releases/tag/v1.43.0 + and https://github.com/netdata/go.d.plugin/releases/tag/v0.56.3 + https://github.com/netdata/go.d.plugin/releases/tag/v0.56.2 + https://github.com/netdata/go.d.plugin/releases/tag/v0.56.1 + https://github.com/netdata/go.d.plugin/releases/tag/v0.56.0 + +- Update to v1.42.4 (go.d.plugin 0.55.0) + See https://github.com/netdata/netdata/releases/tag/v1.42.4 + and https://github.com/netdata/go.d.plugin/releases/tag/v0.55.0 + Also https://github.com/netdata/netdata/releases/tag/v1.42.3 + +- Update to v1.42.2 (go.d.plugin 0.54.1) + See https://github.com/netdata/netdata/releases/tag/v1.42.2 + and https://github.com/netdata/go.d.plugin/releases/tag/v0.54.1 + Also https://github.com/netdata/netdata/releases/tag/v1.42.1 + and https://github.com/netdata/netdata/releases/tag/v1.42.0 + and https://github.com/netdata/netdata/releases/tag/v1.41.0 +- Switch Leap to python311 and remove python2 completely. +- Extended rpmlintrc to build also under Leap. + 1123694 + diff --git a/packages/n/netdata/_service b/packages/n/netdata/_service index 8da2ee3247c..65406f1fd7f 100644 --- a/packages/n/netdata/_service +++ b/packages/n/netdata/_service @@ -1,6 +1,6 @@ - - - go.d.plugin-v0.53.0.tar.gz + + + go.d.plugin-v0.56.4.tar.gz diff --git a/packages/n/netdata/go.d.plugin-v0.53.0.tar.gz b/packages/n/netdata/go.d.plugin-v0.53.0.tar.gz deleted file mode 120000 index db665ac6627..00000000000 --- a/packages/n/netdata/go.d.plugin-v0.53.0.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeiamfiyx3uvcbwty6aizjqgihp7xctoxoznpcf6boswict3ezlzfee \ No newline at end of file diff --git a/packages/n/netdata/go.d.plugin-v0.56.4.tar.gz b/packages/n/netdata/go.d.plugin-v0.56.4.tar.gz new file mode 120000 index 00000000000..02c292e169c --- /dev/null +++ b/packages/n/netdata/go.d.plugin-v0.56.4.tar.gz @@ -0,0 +1 @@ +/ipfs/bafybeihq7xmk5tnkkcqq7pjjkyp6ysnyoyubyznrrrqxhtcpq3oojlwvci \ No newline at end of file diff --git a/packages/n/netdata/netdata-rpmlintrc b/packages/n/netdata/netdata-rpmlintrc index 7a973c03d8a..410d40e22b8 100644 --- a/packages/n/netdata/netdata-rpmlintrc +++ b/packages/n/netdata/netdata-rpmlintrc @@ -1 +1,3 @@ addFilter("script-without-shebang") +addFilter("env-script-interpreter") +addFilter("files-duplicated-waste") diff --git a/packages/n/netdata/netdata-v1.39.1.tar.gz b/packages/n/netdata/netdata-v1.39.1.tar.gz deleted file mode 120000 index 115ae4c2dd9..00000000000 --- a/packages/n/netdata/netdata-v1.39.1.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeief7yqjefa26qkdxqsken37p4ti4ckhmzlyksdgkwhnjppgpgyavm \ No newline at end of file diff --git a/packages/n/netdata/netdata-v1.43.2.tar.gz b/packages/n/netdata/netdata-v1.43.2.tar.gz new file mode 120000 index 00000000000..b428c0dcc63 --- /dev/null +++ b/packages/n/netdata/netdata-v1.43.2.tar.gz @@ -0,0 +1 @@ +/ipfs/bafybeiaendvfrbf4tkzvrwzegboothxnx7xyj5m6w32vntr5pharn2njby \ No newline at end of file diff --git a/packages/n/netdata/netdata.changes b/packages/n/netdata/netdata.changes index 8a3125e6cf3..6c8a357e101 100644 --- a/packages/n/netdata/netdata.changes +++ b/packages/n/netdata/netdata.changes @@ -1,3 +1,61 @@ +------------------------------------------------------------------- +Mon Nov 6 23:02:13 UTC 2023 - Mia Herkt + +- Update to v1.43.2 + See https://github.com/netdata/netdata/releases/tag/v1.43.2 + +------------------------------------------------------------------- +Mon Nov 6 20:02:42 UTC 2023 - Mia Herkt + +- Update to v1.43.1 (go.d.plugin 0.56.4) + See https://github.com/netdata/netdata/releases/tag/v1.43.1 + and https://github.com/netdata/go.d.plugin/releases/tag/v0.56.4 +- Required golang bumped to 1.21 +- Remove suid bits from freeipmi and nfacct plugins + +------------------------------------------------------------------- +Mon Oct 23 00:44:32 UTC 2023 - Mia Herkt + +- Update to v1.43.0 (go.d.plugin 0.56.3) + See https://github.com/netdata/netdata/releases/tag/v1.43.0 + and https://github.com/netdata/go.d.plugin/releases/tag/v0.56.3 + https://github.com/netdata/go.d.plugin/releases/tag/v0.56.2 + https://github.com/netdata/go.d.plugin/releases/tag/v0.56.1 + https://github.com/netdata/go.d.plugin/releases/tag/v0.56.0 + +------------------------------------------------------------------- +Sat Sep 23 15:05:20 UTC 2023 - ecsos + +- Update to v1.42.4 (go.d.plugin 0.55.0) + See https://github.com/netdata/netdata/releases/tag/v1.42.4 + and https://github.com/netdata/go.d.plugin/releases/tag/v0.55.0 + + Also https://github.com/netdata/netdata/releases/tag/v1.42.3 + +------------------------------------------------------------------- +Sat Sep 9 10:25:01 UTC 2023 - ecsos + +- Update to v1.42.2 (go.d.plugin 0.54.1) + See https://github.com/netdata/netdata/releases/tag/v1.42.2 + and https://github.com/netdata/go.d.plugin/releases/tag/v0.54.1 + + Also https://github.com/netdata/netdata/releases/tag/v1.42.1 + and https://github.com/netdata/netdata/releases/tag/v1.42.0 + and https://github.com/netdata/netdata/releases/tag/v1.41.0 +- Switch Leap to python311 and remove python2 completely. +- Extended rpmlintrc to build also under Leap. + +------------------------------------------------------------------- +Thu Jun 15 07:11:29 UTC 2023 - Mia Herkt + +- Update to v1.40.1 (go.d.plugin 0.54.0) + See https://github.com/netdata/netdata/releases/tag/v1.40.1 + and https://github.com/netdata/go.d.plugin/releases/tag/v0.54.0 + + Also https://github.com/netdata/netdata/releases/tag/v1.40.0 + and https://github.com/netdata/go.d.plugin/releases/tag/v0.53.2 +- Split off plugin packages + ------------------------------------------------------------------- Sun May 21 13:09:11 UTC 2023 - Mia Herkt diff --git a/packages/n/netdata/netdata.spec b/packages/n/netdata/netdata.spec index 9292f3270eb..9f0b04813f8 100644 --- a/packages/n/netdata/netdata.spec +++ b/packages/n/netdata/netdata.spec @@ -18,9 +18,9 @@ %define netdata_user netdata %define netdata_group netdata -%define godplugin_version 0.53.0 +%define godplugin_version 0.56.4 Name: netdata -Version: 1.39.1 +Version: 1.43.2 Release: 0 Summary: A system for distributed real-time performance and health monitoring # netdata is GPL-3.0+, other licenses refer to included third-party software (see REDISTRIBUTED.md) @@ -32,6 +32,7 @@ Source1: https://github.com/netdata/go.d.plugin/archive/v%{godplugin_vers Source2: vendor.tar.gz Source3: netdata-rpmlintrc Patch0: netdata-logrotate-su.patch +BuildRequires: c++_compiler BuildRequires: cups-devel BuildRequires: dos2unix BuildRequires: fdupes @@ -40,6 +41,7 @@ BuildRequires: judy-devel BuildRequires: m4 BuildRequires: pkgconfig BuildRequires: snappy-devel +BuildRequires: golang(API) >= 1.21 BuildRequires: pkgconfig(grpc) BuildRequires: pkgconfig(json) BuildRequires: pkgconfig(libcap) @@ -52,12 +54,13 @@ BuildRequires: pkgconfig(libnetfilter_acct) BuildRequires: pkgconfig(libuv) BuildRequires: pkgconfig(libwebsockets) BuildRequires: pkgconfig(openssl) -BuildRequires: pkgconfig(protobuf) +# Broken with current upstream protobuf - uses bundled copy +# BuildRequires: pkgconfig(protobuf) BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(yajl) BuildRequires: pkgconfig(yaml-0.1) BuildRequires: pkgconfig(zlib) -Requires(pre): shadow +Requires(pre): shadow permissions Recommends: PyYAML Recommends: curl Recommends: iproute-tc @@ -66,34 +69,231 @@ Recommends: nmap-ncat Recommends: openssl(cli) Suggests: logrotate Suggests: nodejs -# suse_version is set to 1500 even for 15.2 -%if 0%{?sle_version} >= 150200 || 0%{?suse_version} > 1500 -BuildRequires: go >= 1.20 +%if 0%{?suse_version} > 1550 BuildRequires: python3 %else -BuildRequires: python2 +BuildRequires: python311 %endif %ifnarch ppc64 ppc64le armv7l s390x BuildRequires: pkgconfig(xenstat) %endif -%if 0%{?sle_version} >= 150200 || 0%{?suse_version} > 1500 +%if 0%{?suse_version} > 1550 Recommends: python3 Recommends: python3-PyMySQL Recommends: python3-psycopg2 %else -Recommends: python -Recommends: python2-PyMySQL -Recommends: python2-psycopg2 +Recommends: python311 +Recommends: python311-PyMySQL +Recommends: python311-psycopg2 %endif %ifarch i586 x86_64 BuildRequires: pkgconfig(libipmimonitoring) %endif %description -netdata is a system for distributed real-time performance and health monitoring. -It provides insights, in real-time, of everything happening on the system it -runs on (including applications such as web and database servers), -using interactive web dashboards. +Netdata is a system for distributed real-time performance and +health monitoring. +It provides insights, in real-time, of everything happening on the +system it runs on (including applications such as web and database +servers), using interactive web dashboards. + +%package plugin-cups +Summary: The CUPS metrics collection plugin for the Netdata Agent +Enhances: cups +Requires: netdata = %{version} +Supplements: netdata +Provides: netdata:%{_libexecdir}/%{name}/plugins.d/cups.plugin + +%description plugin-cups +This plugin allows the Netdata Agent to collect metrics from the +Common UNIX Printing System. + +%files plugin-cups +%attr(0750,root,%{netdata_user}) %{_libexecdir}/%{name}/plugins.d/cups.plugin + +%ifarch i586 x86_64 +%package plugin-freeipmi +Summary: The FreeIPMI metrics collection plugin for the Netdata Agent +Enhances: freeipmi +Requires: netdata = %{version} +Enhances: netdata +Provides: netdata:%{_libexecdir}/%{name}/plugins.d/freeipmi.plugin + +%description plugin-freeipmi +This plugin allows the Netdata Agent to collect metrics from +hardware using FreeIPMI. + +%post plugin-freeipmi +%set_permissions + +%files plugin-freeipmi +%attr(0750,root,%{netdata_user}) %{_libexecdir}/%{name}/plugins.d/freeipmi.plugin +%endif + +%package plugin-nfacct +Summary: The NFACCT metrics collection plugin for the Netdata Agent +Requires: netdata = %{version} +Enhances: netdata +Provides: netdata:%{_libexecdir}/%{name}/plugins.d/nfacct.plugin + +%description plugin-nfacct +This plugin allows the Netdata Agent to collect metrics from the +firewall using NFACCT objects. + +%post plugin-nfacct +%set_permissions + +%files plugin-nfacct +%attr(0750,root,%{netdata_user}) %{_libexecdir}/%{name}/plugins.d/nfacct.plugin + +%package plugin-chartsd +Summary: The charts.d metrics collection plugin for the Netdata Agent +Requires: bash +Requires: netdata = %{version} +Enhances: nut +Enhances: apcupsd +Enhances: iw +Suggests: sudo +Enhances: netdata +Provides: netdata:%{_libexecdir}/%{name}/plugins.d/charts.d.plugin + +%description plugin-chartsd +This plugin adds a selection of additional collectors written in +shell script to the Netdata Agent. +It includes collectors for NUT, APCUPSD, LibreSWAN, OpenSIPS, and +Wireless access point statistics. + +%files plugin-chartsd +%defattr(0750,root,%{netdata_user},0750) +%{_libexecdir}/%{name}/plugins.d/charts.d.plugin +%{_libexecdir}/%{name}/plugins.d/charts.d.dryrun-helper.sh +%{_libexecdir}/%{name}/charts.d/ +%defattr(0644,root,%{netdata_user},0644) +%{_libdir}/%{name}/conf.d/charts.d.conf +%{_libdir}/%{name}/conf.d/charts.d/ + +%package plugin-pythond +Summary: The python.d metrics collection plugin for the Netdata Agent +Requires: netdata = %{version} +Enhances: netdata +Requires: python3 +Suggests: sudo +Provides: netdata:%{_libexecdir}/%{name}/plugins.d/python.d.plugin + +%description plugin-pythond +This plugin adds a selection of additional collectors written in +Python to the Netdata Agent. +Many of the collectors provided by this package are also available +in netdata-plugin-go. In msot cases, you probably want to use those +versions instead of the Python versions. + +%files plugin-pythond +%defattr(0750,root,%{netdata_user},0750) +%{_libexecdir}/%{name}/plugins.d/python.d.plugin +%{_libexecdir}/%{name}/python.d +%defattr(0640,root,%{netdata_user},0640) +%{_libdir}/%{name}/conf.d/python.d.conf +%{_libdir}/%{name}/conf.d/python.d + +%package plugin-go +Summary: The go.d metrics collection plugin for the Netdata Agent +Requires: netdata = %{version} +Suggests: nvme-cli +Suggests: sudo +Supplements: netdata +Provides: netdata:%{_libexecdir}/%{name}/plugins.d/go.d.plugin + +%description plugin-go +This plugin adds a selection of additional collectors written in Go +to the Netdata Agent. +A significant percentage of the application specific collectors +provided by Netdata are part of this plugin, so most users will +want it installed. + +%post plugin-go +%set_permissions + +%files plugin-go +%defattr(0750,root,%{netdata_user},0750) +# CAP_NET_ADMIN needed for WireGuard collector +# CAP_NET_RAW needed for ping collector +%caps(cap_net_admin,cap_net_raw=eip) %{_libexecdir}/%{name}/plugins.d/go.d.plugin +%defattr(0644,root,%{netdata_user},0644) +%{_libdir}/%{name}/conf.d/go.d.conf +%{_libdir}/%{name}/conf.d/go.d + +%package plugin-apps +Summary: The per-application metrics collection plugin for the Netdata Agent +Requires: netdata = %{version} +Enhances: netdata +Provides: netdata:%{_libexecdir}/%{name}/plugins.d/apps.plugin + +%description plugin-apps +This plugin allows the Netdata Agent to collect per-application and +per-user metrics without using cgroups. + +%post plugin-apps +%set_permissions + +%files plugin-apps +%defattr(0750,root,%{netdata_user},0750) +# CAP_DAC_READ_SEARCH and CAP_SYS_PTRACE needed for data collection by the plugin. +%caps(cap_dac_read_search,cap_sys_ptrace=ep) %{_libexecdir}/%{name}/plugins.d/apps.plugin +%defattr(0644,root,%{netdata_user},0644) +%{_libdir}/%{name}/conf.d/apps_groups.conf + +%package plugin-slabinfo +Summary: The slabinfo metrics collector for the Netdata Agent +Requires: netdata = %{version} +Enhances: netdata +Provides: netdata:%{_libexecdir}/%{name}/plugins.d/slabinfo.plugin + +%description plugin-slabinfo +This plugin allows the Netdata Agent to collect perfromance and +utilization metrics for the Linux kernel’s SLAB allocator. + +%post plugin-slabinfo +%set_permissions + +%files plugin-slabinfo +%defattr(0750,root,%{netdata_user},0750) +# CAP_DAC_READ_SEARCH needed to access the files the plugin reads to collect data. +%caps(cap_dac_read_search=ep) %{_libexecdir}/%{name}/plugins.d/slabinfo.plugin + +%package plugin-perf +Summary: The perf metrics collector for the Netdata Agent +Requires: netdata = %{version} +Enhances: netdata +Provides: netdata:%{_libexecdir}/%{name}/plugins.d/perf.plugin + +%description plugin-perf +This plugin allows the Netdata to collect metrics from the Linux +perf subsystem. + +%post plugin-perf +%set_permissions + +%files plugin-perf +%defattr(0750,root,%{netdata_user},0750) +# Either CAP_SYS_ADMIN or CAP_PERFMON needed for data collection +%caps(cap_perfmon=ep) %{_libexecdir}/%{name}/plugins.d/perf.plugin + +%package plugin-debugfs +Summary: The debugfs metrics collector for the Netdata Agent +Requires: netdata = %{version} +Enhances: netdata +Provides: netdata:%{_libexecdir}/%{name}/plugins.d/debugfs.plugin + +%description plugin-debugfs +This plugin allows the Netdata Agent to collect Linux kernel +metrics exposed through debugfs. + +%post plugin-debugfs +%set_permissions + +%files plugin-debugfs +# CAP_DAC_READ_SEARCH required for data collection. +%caps(cap_dac_read_search=ep) %attr(0750,root,%{netdata_user}) %{_libexecdir}/%{name}/plugins.d/debugfs.plugin %prep %autosetup -n %{name}-v%{version} -p1 @@ -102,9 +302,8 @@ sed -i 's,%{_bindir}/env bash,/bin/bash,' claim/%{name}-claim.sh.in %if 0%{?sle_version} >= 150200 || 0%{?suse_version} > 1500 sed -i 's,^pybinary=.*,pybinary=%{_bindir}/python3,' collectors/python.d.plugin/python.d.plugin.in -tar xf %{SOURCE1} -cd go.d.plugin-%{godplugin_version} -tar xf %{SOURCE2} +tar -xf %{SOURCE1} +tar -xf %{SOURCE2} -C go.d.plugin-%{godplugin_version} %endif %build @@ -116,7 +315,6 @@ export GOFLAGS=-mod=vendor --enable-plugin-freeipmi \ %endif --enable-plugin-cups \ - --with-zlib \ --with-math \ --with-user=%{netdata_user} \ %{?conf} @@ -197,8 +395,31 @@ getent passwd %{netdata_user} >/dev/null || \ %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} -%{_libexecdir}/%{name} -%{_libdir}/%{name} +%dir %{_libexecdir}/%{name} +%dir %{_libexecdir}/%{name}/plugins.d +%{_libexecdir}/%{name}/plugins.d/*.sh +%exclude %{_libexecdir}/%{name}/plugins.d/charts.d.dryrun-helper.sh +%{_libexecdir}/%{name}/plugins.d/cgroup-network +%{_libexecdir}/%{name}/plugins.d/ioping.plugin +%{_libexecdir}/%{name}/plugins.d/local-listeners +%{_libexecdir}/%{name}/plugins.d/loopsleepms.sh.inc +%ifnarch ppc64 ppc64le armv7l s390x +%{_libexecdir}/%{name}/plugins.d/xenstat.plugin +%endif + +%dir %{_libdir}/%{name} +%dir %{_libdir}/%{name}/conf.d +%{_libdir}/%{name}/conf.d/ebpf.d +%{_libdir}/%{name}/conf.d/health.d +%{_libdir}/%{name}/conf.d/statsd.d +%{_libdir}/%{name}/conf.d/vnodes + +%{_libdir}/%{name}/conf.d/ebpf.d.conf +%{_libdir}/%{name}/conf.d/exporting.conf +%{_libdir}/%{name}/conf.d/health_alarm_notify.conf +%{_libdir}/%{name}/conf.d/health_email_recipients.conf +%{_libdir}/%{name}/conf.d/ioping.conf +%{_libdir}/%{name}/conf.d/stream.conf %{_sbindir}/%{name} %{_sbindir}/%{name}-claim.sh diff --git a/packages/n/netdata/vendor.tar.gz b/packages/n/netdata/vendor.tar.gz index 8816becae96..7bbf125472b 120000 --- a/packages/n/netdata/vendor.tar.gz +++ b/packages/n/netdata/vendor.tar.gz @@ -1 +1 @@ -/ipfs/bafybeiamm7inlwqme2drxmfkyxqlcbqnkul5nzhpi7nb5dmz2flqojx6py \ No newline at end of file +/ipfs/bafybeiccz7xkweehefdjdwzxvwnfufacxfiqezi2vf335czklha3illhaq \ No newline at end of file