Merging upstream version 1.11.0+dfsg.

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

1 files changed, 22 insertions, 77 deletions

diff --git a/netdata.spec b/netdata.spec
index 98ba99c75..544a23f85 100644
--- a/netdata.spec
+++ b/netdata.spec
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
 %global contentdir %{_datadir}/netdata
 
 # This is temporary and should eventually be resolved. This bypasses
@@ -80,11 +81,11 @@ Recommends:	python2-psycopg2 \
 
 Summary:	Real-time performance monitoring, done right
 Name:		netdata
-Version:	1.10.0
+Version:	1.10.1
 Release:	1%{?dist}
 License:	GPLv3+
 Group:		Applications/System
-Source0:	https://github.com/firehol/%{name}/releases/download/v1.10.0/%{name}-1.10.0.tar.xz
+Source0:	https://github.com/netdata/%{name}/releases/download/v1.11.0_rolling/%{name}-1.11.0_rolling.tar.gz
 URL:		http://my-netdata.io
 BuildRequires:	pkgconfig
 BuildRequires:	xz
@@ -125,7 +126,7 @@ so that you can get insights of what is happening now and what just
 happened, on your systems and applications.
 
 %prep
-%setup -q -n netdata-1.10.0
+%setup -q -n netdata-1.11.0_rolling
 
 %build
 %configure \
@@ -180,19 +181,20 @@ rm -rf "${RPM_BUILD_ROOT}"
 %defattr(-,root,root)
 
 %dir %{_sysconfdir}/%{name}
+%dir %{_libdir}/%{name}
 
-%config(noreplace) %{_sysconfdir}/%{name}/*.conf
-%config(noreplace) %{_sysconfdir}/%{name}/charts.d/*.conf
-%config(noreplace) %{_sysconfdir}/%{name}/health.d/*.conf
-#%%config(noreplace) %{_sysconfdir}/%{name}/node.d/*.conf
-%config(noreplace) %{_sysconfdir}/%{name}/python.d/*.conf
-%config(noreplace) %{_sysconfdir}/%{name}/statsd.d/*.conf
-%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%config %{_sysconfdir}/%{name}/*.conf
+#%config %{_sysconfdir}/%{name}/charts.d/*.conf
+#%config %{_sysconfdir}/%{name}/health.d/*.conf
+#%config %{_sysconfdir}/%{name}/node.d/*.conf
+#%config %{_sysconfdir}/%{name}/python.d/*.conf
+#%config %{_sysconfdir}/%{name}/statsd.d/*.conf
+%config %{_sysconfdir}/logrotate.d/%{name}
 
-# To be eventually moved to %%_defaultdocdir
-%{_sysconfdir}/%{name}/node.d/*.md
+%{_libdir}/%{name}
 %{_libexecdir}/%{name}
 %{_sbindir}/%{name}
+%{_sysconfdir}/%{name}/edit-config
 
 %caps(cap_dac_read_search,cap_sys_ptrace=ep) %attr(0550,root,netdata) %{_libexecdir}/%{name}/plugins.d/apps.plugin
 
@@ -213,10 +215,18 @@ rm -rf "${RPM_BUILD_ROOT}"
 %attr(0770,netdata,netdata) %dir %{_localstatedir}/lib/%{name}
 
 %dir %{_datadir}/%{name}
+
 %dir %{_sysconfdir}/%{name}/health.d
 %dir %{_sysconfdir}/%{name}/python.d
 %dir %{_sysconfdir}/%{name}/charts.d
 %dir %{_sysconfdir}/%{name}/node.d
+%dir %{_sysconfdir}/%{name}/statsd.d
+
+%dir %{_libdir}/%{name}/conf.d/health.d
+%dir %{_libdir}/%{name}/conf.d/python.d
+%dir %{_libdir}/%{name}/conf.d/charts.d
+%dir %{_libdir}/%{name}/conf.d/node.d
+%dir %{_libdir}/%{name}/conf.d/statsd.d
 
 %if %{with systemd}
 %{_unitdir}/netdata.service
@@ -230,70 +240,5 @@ rm -rf "${RPM_BUILD_ROOT}"
 %{_datadir}/%{name}/web
 
 %changelog
-* Tue Mar 27 2018 Costa Tsaousis <costa@tsaousis.gr> - 1.10.0-1
-  Please check full changelog at github.
-  https://github.com/firehol/netdata/releases
-* Sun Dec 17 2017 Costa Tsaousis <costa@tsaousis.gr> - 1.9.0-1
-  Please check full changelog at github.
-  https://github.com/firehol/netdata/releases
-* Sun Sep 17 2017 Costa Tsaousis <costa@tsaousis.gr> - 1.8.0-1
-  This is mainly a bugfix release.
-  Please check full changelog at github.
-* Sun Jul 16 2017 Costa Tsaousis <costa@tsaousis.gr> - 1.7.0-1
-- netdata is now a fully featured statsd server
-- new installation options
-- metrics streaming and replication improvements
-- backends improvements - prometheus support rewritten
-- netdata now monitors ZFS (on Linux and FreeBSD)
-- netdata now monitors ElasticSearch
-- netdata now monitors RabbitMQ
-- netdata now monitors Go applications (via expvar)
-- netdata now monitors ipfw (on FreeBSD 11)
-- netdata now monitors samba
-- netdata now monitors squid logs
-- netdata dashboard loading times have been improved significantly
-- netdata alarms now support custom hooks
-- dozens more improvements and bug fixes
-* Mon Mar 20 2017 Costa Tsaousis <costa@tsaousis.gr> - 1.6.0-1
-- central netdata
-- monitoring ephemeral nodes
-- monitoring ephemeral containers and VM guests
-- apps.plugin ported for FreeBSD
-- web_log plugin
-- JSON backends
-- IPMI monitoring
-- several new and improved plugins
-- several new and improved alarms and notifications
-- dozens more improvements and bug fixes
-* Sun Jan 22 2017 Costa Tsaousis <costa@tsaousis.gr> - 1.5.0-1
-- FreeBSD, MacOS, FreeNAS
-- Backends support
-- dozens of new and improved plugins
-- dozens of new and improved alarms and notification methods
-* Tue Oct 4 2016 Costa Tsaousis <costa@tsaousis.gr> - 1.4.0-1
-- the fastest netdata ever (with a better look too)!
-- improved IoT and containers support!
-- alarms improved in almost every way!
-- Several more improvements, new features and bugfixes.
-* Sun Aug 28 2016 Costa Tsaousis <costa@tsaousis.gr> - 1.3.0-1
-- netdata now has health monitoring
-- netdata now generates badges
-- netdata now has python plugins
-- Several more improvements, new features and bugfixes.
-* Tue Jul 26 2016 Jason Barnett <J@sonBarnett.com> - 1.2.0-2
-- Added support for EL6
-- Corrected several Requires statements
-- Changed default to build without nfacct
-- Removed --docdir from configure
-* Mon May 16 2016 Costa Tsaousis <costa@tsaousis.gr> - 1.2.0-1
-- netdata is now 30% faster.
-- netdata now has a registry (my-netdata menu on the dashboard).
-- netdata now monitors Linux containers.
-- Several more improvements, new features and bugfixes.
-* Wed Apr 20 2016 Costa Tsaousis <costa@tsaousis.gr> - 1.1.0-1
-- Several new features (IPv6, SYNPROXY, Users, Users Groups).
-- A lot of bug fixes and optimizations.
-* Tue Mar 22 2016 Costa Tsaousis <costa@tsaousis.gr> - 1.0.0-1
-- First public release.
 * Sun Nov 15 2015 Alon Bar-Lev <alonbl@redhat.com> - 0.0.0-1
 - Initial add.