Accepting request 750839 from home:cvoegl:branches:server:monitoring

- Update to 5.10.0:
 -Disabled Plugins due to missing dependencies:
  * lvm on Factory, Tumbleweed, Leap15.3 and SLES_15-SP3
  * gps and sigrok on SLES_15 and later
-Removed libstatgrab from buildrequires: only needed for non-Linux systems.
-Rebased patch 9e36cd85a2bb_sigrok_Update_to_support_libsigrok_0_4.patch
-Add new subpackages:
  * plugin-sysevent
  * plugin-procevent
  * plugin-uptime

OBS-URL: https://build.opensuse.org/request/show/750839
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/collectd?expand=0&rev=157

9e36cd85a2bb_sigrok_Update_to_support_libsigrok_0_4.patch

@@ -34,11 +34,11 @@ index 8a325fe..a44c95e 100644
 @@ -127,22 +127,22 @@ static int sigrok_config(oconfig_item_t *ci) {
    return 0;
  }
- 
+
 -static const char *sigrok_value_type(const struct sr_datafeed_analog *analog) {
 +static const char *sigrok_value_type(const struct sr_analog_meaning *meaning) {
    const char *s;
- 
+
 -  if (analog->mq == SR_MQ_VOLTAGE)
 +  if (meaning->mq == SR_MQ_VOLTAGE)
      s = "voltage";
@@ -70,9 +70,9 @@ index 8a325fe..a44c95e 100644
 +          sr_dev_inst_driver_get(sdi)->name);
      return;
    }
- 
+
 @@ -191,11 +191,11 @@ static void sigrok_feed_callback(const struct sr_dev_inst *sdi,
- 
+
    /* Ignore all but the first sample on the first probe. */
    analog = packet->payload;
 -  vl.values = &(value_t){.gauge = analog->data[0]};
@@ -82,39 +82,39 @@ index 8a325fe..a44c95e 100644
    sstrncpy(vl.plugin_instance, cfdev->name, sizeof(vl.plugin_instance));
 -  sstrncpy(vl.type, sigrok_value_type(analog), sizeof(vl.type));
 +  sstrncpy(vl.type, sigrok_value_type(&analog->meaning[0]), sizeof(vl.type));
- 
+
    plugin_dispatch_values(&vl);
    cfdev->last_dispatch = cdtime();
 @@ -207,6 +207,7 @@ static void sigrok_free_drvopts(struct sr_config *src) {
  }
- 
+
  static int sigrok_init_driver(struct config_device *cfdev,
 +                              struct sr_session *session,
                                struct sr_dev_driver *drv) {
    struct sr_config *src;
    GSList *devlist, *drvopts;
-@@ -248,21 +249,22 @@ static int sigrok_init_driver(struct config_device *cfdev,
+@@ -248,21 +249,22 @@
    cfdev->sdi = devlist->data;
    g_slist_free(devlist);
-   snprintf(hwident, sizeof(hwident), "%s %s %s",
+   ssnprintf(hwident, sizeof(hwident), "%s %s %s",
--           cfdev->sdi->vendor ? cfdev->sdi->vendor : "",
+-            cfdev->sdi->vendor ? cfdev->sdi->vendor : "",
--           cfdev->sdi->model ? cfdev->sdi->model : "",
+-            cfdev->sdi->model ? cfdev->sdi->model : "",
--           cfdev->sdi->version ? cfdev->sdi->version : "");
+-            cfdev->sdi->version ? cfdev->sdi->version : "");
-+           sr_dev_inst_vendor_get(cfdev->sdi),
++          sr_dev_inst_vendor_get(cfdev->sdi),
-+           sr_dev_inst_model_get(cfdev->sdi),
++          sr_dev_inst_model_get(cfdev->sdi),
-+           sr_dev_inst_version_get(cfdev->sdi));
++          sr_dev_inst_version_get(cfdev->sdi));
    INFO("sigrok plugin: Device \"%s\" is a %s", cfdev->name, hwident);
- 
+
    if (sr_dev_open(cfdev->sdi) != SR_OK)
      return -1;
- 
+
 -  if (sr_session_dev_add(cfdev->sdi) != SR_OK)
 +  if (sr_session_dev_add(session, cfdev->sdi) != SR_OK)
      return -1;
- 
+
    return 1;
  }
- 
+
  static void *sigrok_read_thread(void *arg __attribute__((unused))) {
 +  struct sr_session *session;
    struct sr_dev_driver *drv, **drvlist;
@@ -123,11 +123,11 @@ index 8a325fe..a44c95e 100644
 @@ -277,11 +279,11 @@ static void *sigrok_read_thread(void *arg __attribute__((unused))) {
      return NULL;
    }
- 
+
 -  if (!sr_session_new())
 +  if (!sr_session_new(sr_ctx, &session))
      return NULL;
- 
+
    num_devices = 0;
 -  drvlist = sr_driver_list();
 +  drvlist = sr_driver_list(sr_ctx);
@@ -137,38 +137,38 @@ index 8a325fe..a44c95e 100644
 @@ -296,7 +298,7 @@ static void *sigrok_read_thread(void *arg __attribute__((unused))) {
        return NULL;
      }
- 
+
 -    if ((ret = sigrok_init_driver(cfdev, drv)) < 0)
 +    if ((ret = sigrok_init_driver(cfdev, session, drv)) < 0)
        /* Error was already logged. */
        return NULL;
- 
+
 @@ -305,21 +307,22 @@ static void *sigrok_read_thread(void *arg __attribute__((unused))) {
- 
+
    if (num_devices > 0) {
      /* Do this only when we're sure there's hardware to talk to. */
 -    if (sr_session_datafeed_callback_add(sigrok_feed_callback, NULL) != SR_OK)
 +    if (sr_session_datafeed_callback_add(session, sigrok_feed_callback,
 +                                         NULL) != SR_OK)
        return NULL;
- 
+
      /* Start acquisition on all devices. */
 -    if (sr_session_start() != SR_OK)
 +    if (sr_session_start(session) != SR_OK)
        return NULL;
- 
+
      /* Main loop, runs forever. */
 -    sr_session_run();
 +    sr_session_run(session);
- 
+
 -    sr_session_stop();
 -    sr_session_dev_remove_all();
 +    sr_session_stop(session);
 +    sr_session_dev_remove_all(session);
    }
- 
+
 -  sr_session_destroy();
 +  sr_session_destroy(session);
- 
+
    sr_exit(sr_ctx);
- 
+

collectd-5.10.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a03359f563023e744c2dc743008a00a848f4cd506e072621d86b6d8313c0375b
+size 1856377

collectd-5.9.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7b220f8898a061f6e7f29a8c16697d1a198277f813da69474a67911097c0626b
-size 1899573

collectd.changes

@@ -1,4 +1,101 @@
 -------------------------------------------------------------------
+Mon Nov 25 14:02:12 UTC 2019 - Christian Vögl <cvoegl@suse.de>
+
+- Update to 5.10.0:
+  * turbostat plugin: Power metrics update for recent server CPUs. Thanks
+    to Chris MacNamara. #3276
+  * turbostat plugin: Fix warnings generated by the turbostat plugin.
+    Thanks to Ryan Mccabe. #3340
+  * ZFS ARC plugin: New cache values are now read on Linux. Thanks to
+    Jan-Philipp Litza. #3247, #2843
+  * connectivity plugin: monitor the network interface up/down status via
+    the netlink library. Thanks to Andrew Bays. #2622
+  * sysevent plugin: A new plugin that monitors rsyslog for system events.
+    Thanks to Andrew Bays. #2624
+  * procevent plugin: A new plugin that monitors process starts/stops via
+    netlink library. Thanks to Andrew Bays. #2623
+  * daemon: Check if plugin actually loaded before reporting configuration
+    issues. Thanks to Pavel Rochnyak. #3217
+  * daemon: Recover setlocale() call in src/daemon/collectd.c do_init().
+    Thanks to Pavel Rochnyak. #3181, #3214
+  * Build System: Only include <sys/sysctl.h> when needed. Thanks to Ruben
+    Kerkhof. #3298
+  * Build System: Link to libnsl.so if needed for inet_ntop(). Thanks to
+    Dagobert Michelsen. #3291
+  * Build System: Remove double "without" added by commit b781871. Thanks
+    to Fabrice Fontaine. #3261
+  * Build System: fix compile time issues. Thanks to Matthias Runge.
+    #3179, #3242, #3245
+  * Build System: Fix activation of snmp_agent. Thanks to Fabrice
+    Fontaine. #3241
+  * Build System: Fix bug that leads to CPPFLAGS gets overridden with
+    CFLAGS when libxmms is enabled. Thanks to Dagobert Michelsen. #3207
+  * perl module: Collectd::Plugins::Openvz: Fix indentation of some
+    closing curlies. Thanks to Christian Bartolomäus. #3239
+  * tree-wide: Fix a few issues found with LGTM. Thanks to Ruben Kerkhof.
+    #3252
+  * tree-wide: fix ssnprintf wrapper. Thanks to Fabien Wernli.
+    #3237, #3232, #3235, #3236
+  * tree-wide: Fix make check. Thanks to Ruben Kerkhof. #3306
+  * CI System: Travis: switch to Bionic. Thanks to Ruben Kerkhof. #3307
+  * CI System: Travis improvements for MacOS. Thanks to Ruben Kerkhof.
+    #3308
+  * MySQL plugin: Minor documentation improvements. Thanks to Christian
+    Bartolomäus. #3288
+  * Java plugin: Fix typo in an error message. Thanks to Matthias Runge.
+    #3285, #3286
+  * sysevent plugin: Add a few missing calloc result checks in the
+    sysevent_init function. Thanks to Andrew Bays. #3282
+  * ZFS ARC plugin: A bug that caused the first to values to be skipped
+    was fixed. Thanks to Jan-Philipp Litza. #3246
+  * SysLog plugin: restore previous behaviour: fallback to info for
+    unsupported level. Thanks to Fabien Wernli. #3236, #3238
+  * virt plugin: Fix memory leak with libvirt MetadataXPath enabled.
+    Thanks to Pavel Rochnyak. #3225, #3228
+  * GPU NVidia plugin: Fix build of the plugin. Thanks to Ruben Kerkhof.
+    #3320
+- Changes from 5.9.2:
+* syslog plugin: Don't fail if syslog loglevel doesn't match. Thanks to
+    Fabien Wernli. #3236 #3238
+  * collectd: Fix ssnprintf wrapper. Thanks to Fabien Wernli. #3237
+  * rdt plugin: Fix compile time issues. Thanks to Matthias Runge. #3245
+- Changes from 5.9.1:
+  * collectd: regex match: Fix unexpected match with empty meta data .
+    Thanks to Takuro Ashie. #3178
+  * collectd: Fix return value or loglevel for several plugins. Thanks to
+    Fabien Wernli. #3182
+  * collectd: Add standard include early or _FILE_OFFSET_BITS will have
+    definition … . Thanks to Dagobert Michelsen. #3193
+  * collectd: Use GCC-specific flags only when compiling with GCC. Thanks
+    to Dagobert Michelsen. #3195
+  * Use test_utils_proc_pids only when compiling the plugin that uses it.
+    Thanks to Dagobert Michelsen. #3197
+  * DNS plugin: Do not use headers from glibc. Thanks to Pavel Rochnyak.
+    #3156, #3145
+  * collectd: Add missing definitions for libnetsnmpagent. Thanks to
+    Dagobert Michelsen. #3203
+  * collectd: Move Makefile rules for pid_test inside conditional for
+    code. Thanks to Dagobert Michelsen. #3206
+  * collectd: Recover setlocale() call in src/daemon/collectd.c do_init().
+    Thanks to Pavel Rochnyak. #3214, #3181
+  * collectd: Add snprintf wrapper for GCC 8.2/3. Thanks to zebity. #3153,
+    #2895, #3038
+  * collectd: Fix bug that leads to CPPFLAGS gets overridden with CFLAGS
+    when libxmms is enabled. Thanks to Dagobert Michelsen. #3207
+  * Write_Riemann plugin: Copy MetaData to Riemann events in
+    write_riemann. Thanks to Romain Tartière. #3158
+  * virt plugin: Fix memory leak with libvirt MetadataXPath enabled.
+    Thanks to Pavel Rochnyak. #3225, #3230
+-Disabled Plugins due to missing dependencies:
+  * lvm on Factory, Tumbleweed, Leap15.3 and SLES_15-SP3
+  * gps and sigrok on SLES_15 and later
+-Removed libstatgrab from buildrequires: only needed for non-Linux systems.
+-Rebased patch 9e36cd85a2bb_sigrok_Update_to_support_libsigrok_0_4.patch
+-Add new subpackages:
+  * plugin-sysevent
+  * plugin-procevent
+  * plugin-uptime
+  -------------------------------------------------------------------
 Thu Jun 13 19:54:45 UTC 2019 - Martin Hauke <mardnh@gmx.de>
 
 - Update to 5.9.0:
@@ -756,7 +853,7 @@ Sat Aug 13 14:06:04 UTC 2016 - benoit.monin@gmx.fr
 -------------------------------------------------------------------
 Thu Jul  7 07:43:59 UTC 2016 - joop.boonen@opensuse.org
 
-- Use the correct contrib/systemd.collectd.service in stead of 
+- Use the correct contrib/systemd.collectd.service in stead of
   contrib/collectd.service this fixes, boo#987462
 
 -------------------------------------------------------------------
@@ -1064,7 +1161,7 @@ Thu Jan 14 10:53:13 UTC 2016 - aj@ajaissle.de
 Thu Dec 17 17:56:16 CET 2015 - ro@suse.de
 
 - add patch collectd-new_libstatgrab.patch:
-  fix build with recent libstatgrab (basically backport from git) 
+  fix build with recent libstatgrab (basically backport from git)
 - do not (build)require sensors on s390/s390x
 
 -------------------------------------------------------------------
@@ -1075,7 +1172,7 @@ Sat Sep 12 10:58:03 UTC 2015 - matwey.kornilov@gmail.com
 -------------------------------------------------------------------
 Fri Jun  5 06:49:33 UTC 2015 - mpluskal@suse.com
 
-- Change _service to mode='localonly' active services are not 
+- Change _service to mode='localonly' active services are not
   allowed in factory
 
 -------------------------------------------------------------------
@@ -1173,7 +1270,7 @@ Mon Mar  2 08:59:24 UTC 2015 - bruno@ioda-net.ch
 	  numbers being transmitted to Redis, was fixed. Thanks to Marc
 	  Fournier.
 	* write_riemann: Receive acknowledge message when using TCP. Thanks to
-	  John-John Tedro. 
+	  John-John Tedro.
 
 -------------------------------------------------------------------
 Sun Nov  9 08:38:16 UTC 2014 - seife+obs@b1-systems.com
@@ -1201,28 +1298,28 @@ Sat Mar 15 15:21:46 UTC 2014 - bruno@ioda-net.ch
 	  gcrypt initialization problems.
 	* Aquaero plugin: The type used to submit fan utilization was fixed. Thanks
 	  to Alex Deymo for the patch.
-	* cgroups plugin: A small memory leak was fixed. Checking the existence of a 
+	* cgroups plugin: A small memory leak was fixed. Checking the existence of a
-	  mount option without a value was fixed. More permissive parsing of the 
+	  mount option without a value was fixed. More permissive parsing of the
-	  cpuacct.stats file fixes support for some versions of Linux. Thanks to Marc 
+	  cpuacct.stats file fixes support for some versions of Linux. Thanks to Marc
 	  Fournier for bug reports and patches.
 	* cURL plugin: Fix <Match> blocks without an instance. Thanks to Alexander
 	  Golovko for reporting and Sebastian Harl for fixing this.
-	* cURL-JSON plugin: Potentially invalid memory access has been sanitized. 
+	* cURL-JSON plugin: Potentially invalid memory access has been sanitized.
 	  Thanks to Jim Radford for his patch.
 	* Interface plugin: Fix behavior under FreeBSD 10: Reporting of per-address
-	  statistics caused duplicate updates to the same metric. Thanks to demon 
+	  statistics caused duplicate updates to the same metric. Thanks to demon
 	  / @trtrmitya for the patch.
-	* Write Graphite plugin: Use TCP to connect to Graphite by default. The 
+	* Write Graphite plugin: Use TCP to connect to Graphite by default. The
-	  default changed from TCP to UDP between 5.3.1 and 5.4.0, which is a 
+	  default changed from TCP to UDP between 5.3.1 and 5.4.0, which is a
 	  regression. Thanks to Marc Fournier for fixing this. Reconnect behavior
 	   was improved. Thanks to Michael Hart for his patch.
-	* ZFS ARC plugin: Collect "allocated" and "stolen" on FreeBSD only. - 
+	* ZFS ARC plugin: Collect "allocated" and "stolen" on FreeBSD only. -
 
-- Packaging : 
+- Packaging :
 	* rework of patch collectd-version.patch against 5.4.1 source
 	* rework collectd-pkgconfig_libnotify_add_gtk.patch against 5.4.1
-	  As it should not be used since 2012. (gtk-2.0) if now only applied for 
+	  As it should not be used since 2012. (gtk-2.0) if now only applied for
-      11.4 Evergreen 
+      11.4 Evergreen
 
 -------------------------------------------------------------------
 Thu Sep  5 17:19:25 CEST 2013 - mls@suse.de
@@ -1348,7 +1445,7 @@ Fri Jun 28 07:25:05 UTC 2013 - coolo@suse.com
 -------------------------------------------------------------------
 Mon Aug 27 21:39:32 UTC 2012 - crrodriguez@opensuse.org
 
-- Add systemd rules. 
+- Add systemd rules.
 
 -------------------------------------------------------------------
 Mon Jul 30 14:09:52 UTC 2012 - chris@computersalat.de
@@ -1365,7 +1462,7 @@ Mon Jun 11 12:05:44 UTC 2012 - coolo@suse.com
 -------------------------------------------------------------------
 Mon Apr 23 10:56:57 UTC 2012 - aj@suse.de
 
-- Drop collectd-fix_new_yajl_lib.patch and collect-libnotify_070.patch 
+- Drop collectd-fix_new_yajl_lib.patch and collect-libnotify_070.patch
   both are handled in the new version.
 
 -------------------------------------------------------------------
@@ -1430,7 +1527,7 @@ Tue Aug  2 22:55:45 UTC 2011 - stefan.bruens@rwth-aachen.de
 Mon Aug  1 11:50:52 UTC 2011 - stefan.bruens@rwth-aachen.de
 
 - df plugin: skip duplicate entries, fixes "uc_update: Value too old"
-  error 
+  error
 
 -------------------------------------------------------------------
 Sat Apr 16 23:58:31 UTC 2011 - pascal.bleser@opensuse.org

collectd.spec

@@ -34,6 +34,20 @@
   wireless write_graphite write_http write_log write_sensu write_tsdb write_prometheus \\\
   zfs_arc zookeeper
 
+%if !0%{?is_opensuse}
+%if 0%{?sle_version} <= 150100
+%define lvm2app 1
+%else
+%define lvm2app 0
+%endif
+%else
+%if !0%{?suse_version} > 1500
+%define lvm2app 1
+%else
+%define lvm2app 0
+%endif
+%endif
+
 %ifnarch s390 s390x
 %define sensors    1
 %define sensors_plugin sensors
@@ -42,7 +56,7 @@
 %define sensors_plugin %{nil}
 %endif
 Name:           collectd
-Version:        5.9.0
+Version:        5.10.0
 Release:        0
 Summary:        Statistics Collection Daemon for filling RRD Files
 License:        GPL-2.0-only AND MIT
@@ -97,7 +111,11 @@ BuildRequires:  systemd-rpm-macros
 BuildRequires:  xfsprogs-devel
 BuildRequires:  pkgconfig(OpenIPMI)
 BuildRequires:  pkgconfig(OpenIPMIpthread)
+%if 0%{?sle_version} < 150000 || 0%{?is_opensuse}
 BuildRequires:  pkgconfig(Qgpsmm)
+BuildRequires:  pkgconfig(libgps)
+BuildRequires:  pkgconfig(libsigrok)
+%endif
 BuildRequires:  pkgconfig(dbi)
 BuildRequires:  pkgconfig(devmapper)
 BuildRequires:  pkgconfig(freetype2)
@@ -108,7 +126,6 @@ BuildRequires:  pkgconfig(libart-2.0)
 BuildRequires:  pkgconfig(libatasmart)
 BuildRequires:  pkgconfig(libcurl)
 BuildRequires:  pkgconfig(libevent)
-BuildRequires:  pkgconfig(libgps)
 BuildRequires:  pkgconfig(libiptc)
 BuildRequires:  pkgconfig(libmemcached)
 BuildRequires:  pkgconfig(libmicrohttpd)
@@ -117,14 +134,14 @@ BuildRequires:  pkgconfig(libnotify)
 BuildRequires:  pkgconfig(liboping)
 BuildRequires:  pkgconfig(libpq)
 BuildRequires:  pkgconfig(librrd)
-BuildRequires:  pkgconfig(libsigrok)
-BuildRequires:  pkgconfig(libstatgrab)
 BuildRequires:  pkgconfig(libudev)
 BuildRequires:  pkgconfig(libupsclient)
 BuildRequires:  pkgconfig(libvirt)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(lua)
+%if %{?lvm2app}
 BuildRequires:  pkgconfig(lvm2app)
+%endif
 BuildRequires:  pkgconfig(python3)
 BuildRequires:  pkgconfig(xtables)
 BuildRequires:  pkgconfig(zlib)
@@ -240,6 +257,7 @@ Requires:       %{name} = %{version}-%{release}
 This plugin for collectd provides Network UPS Tools support.
 %endif
 
+%if %{?lvm2app}
 %package plugin-lvm
 Summary:        LVM plugin for collectd
 Group:          System/Monitoring
@@ -247,6 +265,7 @@ Requires:       %{name} = %{version}-%{release}
 
 %description plugin-lvm
 This plugin collects information from lvm.
+%endif
 
 %package plugin-pcie
 Summary:        PCIe Monitoring Plugin for %{name}
@@ -317,6 +336,7 @@ Requires:       %{name} = %{version}-%{release}
 Optional %{name} plugin to receive and dispatch timing values from Pinba, a
 profiling extension for PHP.
 
+%if 0%{?sle_version} < 150000 || 0%{?is_opensuse}
 %package plugin-sigrok
 Summary:        Sigrok Monitoring Plugin for %{name}
 Group:          System/Monitoring
@@ -325,6 +345,7 @@ Requires:       %{name} = %{version}-%{release}
 %description plugin-sigrok
 Optional %{name} plugin to collect measurements from
 various devices supported by libsigrok.
+%endif
 
 %package plugin-smart
 Summary:        SMART Monitoring Plugin for %{name}
@@ -344,6 +365,7 @@ Requires:       lua
 %description plugin-lua
 Optional %{name} Lua API in order to write %{name} plugins in Lua.
 
+%if 0%{?sle_version} < 150000 || 0%{?is_opensuse}
 %package plugin-gps
 Summary:        GPSD monitoring plugin for %{name}
 Group:          System/Monitoring
@@ -351,6 +373,7 @@ Requires:       %{name} = %{version}-%{release}
 
 %description plugin-gps
 Optional %{name} plugin to monitor gpsd.
+%endif
 
 %package plugin-mcelog
 Summary:        Machine Check Exceptions plugin for %{name}
@@ -392,16 +415,56 @@ Requires:       %{name} = %{version}-%{release}
 %description plugin-write_syslog
 Optional %{name} plugin to write values lists as syslog messages.
 
+%package plugin-uptime
+Summary:        Uptime plugin for %{name}
+Group:          System/Monitoring
+Requires:       %{name} = %{version}-%{release}
+
+%description plugin-uptime
+Optional %{name} plugin to collect system uptime statistics.
+
+%package plugin-connectivity
+Summary:        Connectivity plugin for %{name}
+Group:          System/Monitoring
+Requires:       %{name} = %{version}-%{release}
+
+%description plugin-connectivity
+Optional %{name} plugin to collect Event-based interface status.
+
+
+%package plugin-procevent
+Summary:        Procevent plugin for %{name}
+Group:          System/Monitoring
+Requires:       %{name} = %{version}-%{release}
+
+%description plugin-procevent
+Optional %{name} plugin to listen for process starts and exits via netlink.
+
+
+%package plugin-sysevent
+Summary:        Sysevent plugin for %{name}
+Group:          System/Monitoring
+Requires:       %{name} = %{version}-%{release}
+
+%description plugin-sysevent
+Optional %{name} plugin to listen to rsyslog events and submit matched values.
+.
+
 %package plugins-all
 Summary:        All Monitoring Plugins for %{name}
 Group:          System/Monitoring
 Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}-plugin-connectivity = %{version}-%{release}
 Requires:       %{name}-plugin-dbi = %{version}-%{release}
+%if 0%{?sle_version} < 150000  || 0%{?is_opensuse}
 Requires:       %{name}-plugin-gps = %{version}-%{release}
+%endif
 Requires:       %{name}-plugin-ipmi = %{version}-%{release}
 Requires:       %{name}-plugin-java = %{version}-%{release}
 Requires:       %{name}-plugin-lua = %{version}-%{release}
+%if %{?lvm2app}
 Requires:       %{name}-plugin-lvm = %{version}-%{release}
+%endif
 Requires:       %{name}-plugin-mcelog = %{version}-%{release}
 Requires:       %{name}-plugin-memcachec = %{version}-%{release}
 Requires:       %{name}-plugin-mysql = %{version}-%{release}
@@ -411,11 +474,16 @@ Requires:       %{name}-plugin-ovs = %{version}-%{release}
 Requires:       %{name}-plugin-pcie = %{version}-%{release}
 Requires:       %{name}-plugin-pinba = %{version}-%{release}
 Requires:       %{name}-plugin-postgresql = %{version}-%{release}
+Requires:       %{name}-plugin-procevent = %{version}-%{release}
 Requires:       %{name}-plugin-python3 = %{version}-%{release}
+%if 0%{?sle_version} < 150000 || 0%{?is_opensuse}
 Requires:       %{name}-plugin-sigrok = %{version}-%{release}
+%endif
 Requires:       %{name}-plugin-smart = %{version}-%{release}
 Requires:       %{name}-plugin-snmp = %{version}-%{release}
 Requires:       %{name}-plugin-synproxy = %{version}-%{release}
+Requires:       %{name}-plugin-sysevent = %{version}-%{release}
+Requires:       %{name}-plugin-uptime = %{version}-%{release}
 Requires:       %{name}-plugin-virt = %{version}-%{release}
 Requires:       %{name}-plugin-write_stackdriver = %{version}-%{release}
 Requires:       %{name}-plugin-write_syslog = %{version}-%{release}
@@ -688,9 +756,11 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
 %{_libdir}/collectd/snmp*.la
 %{_mandir}/man5/collectd-snmp.5%{?ext_man}
 
+%if %{?lvm2app}
 %files plugin-lvm
 %{_libdir}/collectd/lvm.so
 %{_libdir}/collectd/lvm.la
+%endif
 
 %files plugin-pinba
 %{_libdir}/collectd/pinba.so
@@ -733,10 +803,18 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
 %{_libdir}/collectd/memcachec.so
 %{_libdir}/collectd/memcachec.la
 
+%if 0%{?sle_version} < 150000 || 0%{?is_opensuse}
+
 %files plugin-sigrok
 %{_libdir}/collectd/sigrok.so
 %{_libdir}/collectd/sigrok.la
 
+%files plugin-gps
+%{_libdir}/collectd/gps.so
+%{_libdir}/collectd/gps.la
+
+%endif
+
 %files plugin-smart
 %{_libdir}/collectd/smart.so
 %{_libdir}/collectd/smart.la
@@ -746,10 +824,6 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
 %{_libdir}/collectd/lua.la
 %{_mandir}/man5/collectd-lua.5%{?ext_man}
 
-%files plugin-gps
-%{_libdir}/collectd/gps.so
-%{_libdir}/collectd/gps.la
-
 %files plugin-openldap
 %{_libdir}/collectd/openldap.so
 %{_libdir}/collectd/openldap.la
@@ -774,6 +848,22 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
 %{_libdir}/collectd/write_syslog.so
 %{_libdir}/collectd/write_syslog.la
 
+%files plugin-uptime
+%{_libdir}/collectd/check_uptime.la
+%{_libdir}/collectd/check_uptime.so
+
+%files plugin-connectivity
+%{_libdir}/collectd/connectivity.la
+%{_libdir}/collectd/connectivity.so
+
+%files plugin-procevent
+%{_libdir}/collectd/procevent.la
+%{_libdir}/collectd/procevent.so
+
+%files plugin-sysevent
+%{_libdir}/collectd/sysevent.la
+%{_libdir}/collectd/sysevent.so
+
 %if 0%{?suse_version} >= 1330
 %files plugin-nut
 %{_libdir}/collectd/nut.so