Merge branch 'collectd-5.7'

Conflicts:
	contrib/redhat/collectd.spec

diff --combined contrib/redhat/collectd.spec
index faf7ced,abad290..451589d
--- 1/contrib/redhat/collectd.spec
--- 2/contrib/redhat/collectd.spec
+++ b/contrib/redhat/collectd.spec
@@@ -88,7 -88,6 +88,7 @@@
  %define with_lvm 0%{!?_without_lvm:1}
  %define with_madwifi 0%{!?_without_madwifi:1}
  %define with_mbmon 0%{!?_without_mbmon:1}
 +%define with_mcelog 0%{!?_without_mcelog:1}
  %define with_md 0%{!?_without_md:1}
  %define with_memcachec 0%{!?_without_memcachec:1}
  %define with_memcached 0%{!?_without_memcached:1}
@@@ -110,7 -109,6 +110,7 @@@
  %define with_olsrd 0%{!?_without_olsrd:1}
  %define with_openldap 0%{!?_without_openldap:1}
  %define with_openvpn 0%{!?_without_openvpn:1}
 +%define with_ovs_events 0%{!?_without_ovs_events:1}
  %define with_perl 0%{!?_without_perl:1}
  %define with_pinba 0%{!?_without_pinba:1}
  %define with_ping 0%{!?_without_ping:1}
@@@ -229,7 -227,6 +229,7 @@@
  %define with_cpusleep 0
  %define with_gps 0
  %define with_mqtt 0
 +%define with_ovs_events 0
  %define with_redis 0
  %define with_rrdcached 0
  %define with_write_redis 0
@@@ -240,13 -237,13 +240,13 @@@
  Summary:      Statistics collection and monitoring daemon
  Name:         collectd
  Version:      5.7.1
- Release:      1%{?dist}
+ Release:      2%{?dist}
  URL:          https://collectd.org
  Source:               https://collectd.org/files/%{name}-%{version}.tar.bz2
  License:      GPLv2
  Group:                System Environment/Daemons
  BuildRoot:    %{_tmppath}/%{name}-%{version}-root
- BuildRequires:        libgcrypt-devel, kernel-headers, libcap-devel, which
 -BuildRequires:        libgcrypt-devel, kernel-headers, libtool-ltdl-devel, libcap-devel, which, xfsprogs-devel
++BuildRequires:        libgcrypt-devel, kernel-headers, libcap-devel, which, xfsprogs-devel
  Vendor:               collectd development team <collectd@verplant.org>
  
  %if 0%{?fedora} || 0%{?rhel} >= 7
@@@ -542,16 -539,6 +542,16 @@@ This plugin collects size of “Logica
  of Linux' “Logical Volume Manager” (LVM).
  %endif
  
 +%if %{with_mcelog}
 +%package mcelog
 +Summary:      Mcelog plugin for collectd
 +Group:                System Environment/Daemons
 +Requires:     %{name}%{?_isa} = %{version}-%{release}
 +%description mcelog
 +This plugin monitors machine check exceptions reported by mcelog and generates
 +appropriate notifications when machine check exceptions are detected.
 +%endif
 +
  %if %{with_memcachec}
  %package memcachec
  Summary:      Memcachec plugin for collectd
@@@ -667,18 -654,6 +667,18 @@@ BuildRequires: openldap-deve
  This plugin reads monitoring information from OpenLDAP's cn=Monitor subtree.
  %endif
  
 +%if %{with_ovs_events}
 +%package ovs_events
 +Summary:       Open vSwitch events plugin for collectd
 +Group:         System Environment/Daemons
 +Requires:      %{name}%{?_isa} = %{version}-%{release}
 +BuildRequires: yajl-devel
 +%description ovs_events
 +This plugin monitors the link status of Open vSwitch (OVS) connected
 +interfaces, dispatches the values to collectd and sends notifications
 +whenever a link state change occurs in the OVS database.
 +%endif
 +
  %if %{with_perl}
  %package perl
  Summary:      Perl plugin for collectd
@@@ -1305,12 -1280,6 +1305,12 @@@ Collectd utilitie
  %define _with_mbmon --disable-mbmon
  %endif
  
 +%if %{with_mcelog}
 +%define _with_mcelog --enable-mcelog
 +%else
 +%define _with_mbmon --disable-mcelog
 +%endif
 +
  %if %{with_md}
  %define _with_md --enable-md
  %else
@@@ -1461,12 -1430,6 +1461,12 @@@
  %define _with_oracle --disable-oracle
  %endif
  
 +%if %{with_ovs_events}
 +%define _with_ovs_events --enable-ovs_events
 +%else
 +%define _with_ovs_events --disable-ovs_events
 +%endif
 +
  %if %{with_perl}
  %define _with_perl --enable-perl --with-perl-bindings="INSTALLDIRS=vendor"
  %else
@@@ -1805,6 -1768,7 +1805,6 @@@
  %configure CFLAGS="%{optflags} -DLT_LAZY_OR_NOW=\"RTLD_LAZY|RTLD_GLOBAL\"" \
        %{?_python_config} \
        --disable-static \
 -      --without-included-ltdl \
        --enable-all-plugins=yes \
        --enable-match_empty_counter \
        --enable-match_hashed \
@@@ -1872,7 -1836,6 +1872,7 @@@
        %{?_with_lvm} \
        %{?_with_madwifi} \
        %{?_with_mbmon} \
 +      %{?_with_mcelog} \
        %{?_with_md} \
        %{?_with_memcachec} \
        %{?_with_memcached} \
@@@ -1898,7 -1861,6 +1898,7 @@@
        %{?_with_openldap} \
        %{?_with_openvpn} \
        %{?_with_oracle} \
 +      %{?_with_ovs_events} \
        %{?_with_perl} \
        %{?_with_pf} \
        %{?_with_pinba} \
@@@ -2173,9 -2135,6 +2173,9 @@@ f
  %if %{with_mbmon}
  %{_libdir}/%{name}/mbmon.so
  %endif
 +%if %{with_mcelog}
 +%{_libdir}/%{name}/mcelog.so
 +%endif
  %if %{with_md}
  %{_libdir}/%{name}/md.so
  %endif
@@@ -2209,9 -2168,6 +2209,9 @@@
  %if %{with_olsrd}
  %{_libdir}/%{name}/olsrd.so
  %endif
 +%if %{with_ovs_events}
 +%{_libdir}/%{name}/ovs_events.so
 +%endif
  %if %{with_powerdns}
  %{_libdir}/%{name}/powerdns.so
  %endif
@@@ -2632,15 -2588,13 +2632,19 @@@
  %doc contrib/
  
  %changelog
- * Tue Jan 01 2017 Marc Fournier <marc.fournier@camptocamp.com> - 5.7.1-1
+ * Wed Feb 22 2017 Ruben Kerkhof <ruben@rubenkerkhof.com> - 5.7.1-2
+ - Enable XFS support in df plugin
+ - Fix bogus date in changelog
+ 
+ * Sun Jan 01 2017 Marc Fournier <marc.fournier@camptocamp.com> - 5.7.1-1
  - New upstream version
  
 +* Sat Dec 31 2016 Ruben Kerkhof <ruben@rubenkerkhof.com> - 5.7.0-4
 +- Add new ovs_events plugin
 +
 +* Sat Dec 31 2016 Ruben Kerkhof <ruben@rubenkerkhof.com> - 5.7.0-3
 +- Add new mcelog plugin
 +
  * Tue Nov 29 2016 Ruben Kerkhof <ruben@rubenkerkhof.com> - 5.7.0-2
  - Disable redis plugin on RHEL 6, hiredis has been retired from EPEL6