Hello community,
here is the log from the commit of package monitoring-plugins-mem for
openSUSE:Factory checked in at 2018-10-15 10:46:05
Comparing /work/SRC/openSUSE:Factory/monitoring-plugins-mem (Old)
and /work/SRC/openSUSE:Factory/.monitoring-plugins-mem.new (New)
Package is "monitoring-plugins-mem"
Mon Oct 15 10:46:05 2018 rev:2 rq:641145 version:20120618
Changes:
---
/work/SRC/openSUSE:Factory/monitoring-plugins-mem/monitoring-plugins-mem.changes
2016-02-11 12:36:40.0 +0100
+++
/work/SRC/openSUSE:Factory/.monitoring-plugins-mem.new/monitoring-plugins-mem.changes
2018-10-15 10:46:06.783218857 +0200
@@ -1,0 +2,11 @@
+Wed Oct 3 21:30:05 UTC 2018 - l...@linux-schulserver.de
+
+- add nrpe (example) snipplet in /etc/nrpe.d/
+
+---
+Thu Sep 27 14:48:20 CEST 2018 - r...@suse.de
+
+- add monitoring-plugins-mem-min_max_perfdata.patch
+ include warn/crit/min/max in perfdata
+
+---
New:
monitoring-plugins-mem-min_max_perfdata.patch
nrpe-check_mem
Other differences:
--
++ monitoring-plugins-mem.spec ++
--- /var/tmp/diff_new_pack.FIeyxU/_old 2018-10-15 10:46:10.415214975 +0200
+++ /var/tmp/diff_new_pack.FIeyxU/_new 2018-10-15 10:46:10.415214975 +0200
@@ -1,7 +1,7 @@
#
# spec file for package monitoring-plugins-mem
#
-# Copyright (c) 2013-2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,13 +12,13 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: monitoring-plugins-mem
Version:20120618
-Release:100
+Release:0
Summary:Check memory plugin for Nagios
License:MIT
Group: System/Monitoring
@@ -26,8 +26,10 @@
Source0:check_mem.tar.bz2
Source1:monitoring-plugins-mem-apparmor
Source2:monitoring-plugins-mem-rpmlintrc
+Source3:nrpe-check_mem
# PATCH-MISSING-TAG -- See
http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch0: monitoring-plugins-mem-add_php_to_pnp4nagios_template.patch
+Patch1: monitoring-plugins-mem-min_max_perfdata.patch
%if 0%{?suse_version} > 1010
# nagios can execute the script with embedded perl
Recommends: perl
@@ -48,6 +50,7 @@
%prep
%setup -q -n check_mem
%patch0 -p1
+%patch1 -p1
%build
@@ -58,6 +61,7 @@
install -D -m644 %{SOURCE1}
%{buildroot}%{_sysconfdir}/apparmor.d/usr.lib.nagios.plugins.check_mem.pl
sed -e
"s|/usr/lib/nagios/plugins/check_mem.pl|/usr/lib/nagios/plugins/check_mem|g" \
%{SOURCE1} >
%{buildroot}%{_sysconfdir}/apparmor.d/usr.lib.nagios.plugins.check_mem
+install -Dm644 %{SOURCE3} %{buildroot}%{nrpe_sysconfdir}/check_mem.cfg
%clean
rm -rf %{buildroot}
@@ -67,6 +71,7 @@
# avoid build dependecy of nagios - own the dirs
%dir %{nagios_libdir}
%dir %{_sysconfdir}/apparmor.d
+%dir %{nrpe_sysconfdir}
%attr(0644,root,root) %config(noreplace)
%{_sysconfdir}/apparmor.d/usr.lib.nagios.plugins.check_mem
%attr(0644,root,root) %config(noreplace)
%{_sysconfdir}/apparmor.d/usr.lib.nagios.plugins.check_mem.pl
%dir %{nagios_plugindir}
@@ -74,5 +79,6 @@
%dir %{pnp4nagios_datarootdir}
%dir %{pnp4nagios_templatedir}
%config(noreplace) %{pnp4nagios_templatedir}/check_mem.php
+%config(noreplace) %{nrpe_sysconfdir}/check_mem.cfg
%changelog
++ monitoring-plugins-mem-min_max_perfdata.patch ++
--- check_mem/check_mem.pl 2018/09/27 12:46:37 1.1
+++ check_mem/check_mem.pl 2018/09/27 12:47:20
@@ -67,7 +67,12 @@
my $total = $free + $used;
print "$total Total\n" if ($opt_v);
-my $perfdata = "|TOTAL=${total}KB USED=${used}KB
FREE=${free}KB CACHES=${caches}KB";
+my $wm = $total * $opt_w / 100;
+my $cm = $total * $opt_c / 100;
+my $perfdata = "|TOTAL=${total}KB USED=${used}KB
FREE=${free}KB;${wm};${cm};0.0;${total} CACHES=${caches}KB";
+if ($opt_u) {
+$perfdata = "|TOTAL=${total}KB
USED=${used}KB;${wm};${cm};0.0;${total} FREE=${free}KB
CACHES=${caches}KB";
+}
if ($opt_f) {
my $percent= sprintf "%.1f", ($free / $total * 100);
++ nrpe-check_mem ++
command[check_mem]=/usr/lib/nagios/plugins/check_mem.pl -f -C -w 10 -c 5