commit monitoring-plugins-repomd for openSUSE:Factory
Hello community, here is the log from the commit of package monitoring-plugins-repomd for openSUSE:Factory checked in at 2019-04-30 13:05:21 Comparing /work/SRC/openSUSE:Factory/monitoring-plugins-repomd (Old) and /work/SRC/openSUSE:Factory/.monitoring-plugins-repomd.new.5536 (New) Package is "monitoring-plugins-repomd" Tue Apr 30 13:05:21 2019 rev:5 rq:698934 version:2.1 Changes: --- /work/SRC/openSUSE:Factory/monitoring-plugins-repomd/monitoring-plugins-repomd.changes 2019-04-22 12:26:47.392952478 +0200 +++ /work/SRC/openSUSE:Factory/.monitoring-plugins-repomd.new.5536/monitoring-plugins-repomd.changes 2019-04-30 13:05:23.429935115 +0200 @@ -1,0 +2,10 @@ +Sun Apr 28 15:27:58 UTC 2019 - l...@linux-schulserver.de - 2.1 + +- update to 2.1: + + be a bit more robust if curl fails or produces unknown output +- include abstractions/bash and abstractions/openssl in the apparmor + profile to avoid misleading DENIED messages in audit log +- path for grep, cat and mktemp were moved to /usr/bin - use sed + to adjust the script in spec + +--- Other differences: -- ++ monitoring-plugins-repomd.spec ++ --- /var/tmp/diff_new_pack.SrLvqG/_old 2019-04-30 13:05:24.105934503 +0200 +++ /var/tmp/diff_new_pack.SrLvqG/_new 2019-04-30 13:05:24.109934500 +0200 @@ -20,7 +20,7 @@ Summary:Plugin to check freshness of repomd.xml file License:BSD-3-Clause Group: System/Monitoring -Version:2.0 +Version:2.1 Release:0 Url:http://en.opensuse.org/%{name} Source0:check_repomd @@ -32,6 +32,9 @@ Recommends: apparmor-parser BuildRequires: monitoring-plugins-common BuildRequires: nagios-rpm-macros +%if 0%{?suse_version} >= 1500 +BuildRequires: sed +%endif Provides: nagios-plugins-repomd = %{version}-%{release} Obsoletes: nagios-plugins-repomd < %{version}-%{release} BuildArch: noarch @@ -52,6 +55,11 @@ %install install -D -m755 %{SOURCE0} %buildroot/%{nagios_plugindir}/check_repomd install -D -m644 %{SOURCE1} %buildroot/%{_sysconfdir}/apparmor.d/usr.lib.nagios.plugins.check_repomd +%if 0%{?suse_version} >= 1500 +sed -i "s|/bin/grep|%{_bindir}/grep|; \ + s|/bin/cat|%{_bindir}/cat|; \ + s|/bin/mktemp|%{_bindir}/mktemp|" %buildroot/%{nagios_plugindir}/check_repomd +%endif %clean rm -rf %buildroot ++ check_repomd ++ --- /var/tmp/diff_new_pack.SrLvqG/_old 2019-04-30 13:05:24.137934475 +0200 +++ /var/tmp/diff_new_pack.SrLvqG/_new 2019-04-30 13:05:24.137934475 +0200 @@ -31,7 +31,7 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -VERSION="2.0" +VERSION="2.1" DEBUG=0 DAYS=30 @@ -40,11 +40,12 @@ CAT='/bin/cat' CUT='/usr/bin/cut' MKTEMP='/bin/mktemp' +UTILS='/usr/lib/nagios/plugins/utils.sh' -if [ -r '/usr/lib/nagios/plugins/utils.sh' ]; then -. /usr/lib/nagios/plugins/utils.sh +if [ -r "$UTILS" ]; then +. "$UTILS" else -cleanup_and_exit "$STATE_UNKNOWN" "UNKOWN: could not read /usr/lib/nagios/plugins/utils.sh" +cleanup_and_exit "$STATE_UNKNOWN" "UNKOWN: could not read $UTILS" fi function print_help(){ @@ -104,9 +105,14 @@ RESULTFILE=$($MKTEMP /tmp/check_repomd-XX) $CURL -s $URL -o "$RESULTFILE" 2>&1 +CURL_EXIT="$?" -if $GREP -q "Error 404" "$RESULTFILE" ; then - cleanup_and_exit "$STATE_UNKNOWN" "UNKOWN: $URL not found" +if [ x"$CURL_EXIT" != "x0" ]; then + cleanup_and_exit "$STATE_UNKNOWN" "UNKOWN: curl returned with error code: $CURL_EXIT" +fi + +if ! $GREP -q "revision" "$RESULTFILE"; then + cleanup_and_exit "$STATE_UNKNOWN" "UNKOWN: needed tag 'revision' not found in output of $URL" fi REVISION=$($GREP revision "$RESULTFILE" | $CUT -d "<" -f2 | $CUT -d ">" -f2) ++ usr.lib.nagios.plugins.check_repomd ++ --- /var/tmp/diff_new_pack.SrLvqG/_old 2019-04-30 13:05:24.157934456 +0200 +++ /var/tmp/diff_new_pack.SrLvqG/_new 2019-04-30 13:05:24.157934456 +0200 @@ -2,8 +2,10 @@ /usr/lib/nagios/plugins/check_repomd { #include + #include #include #include + #include network inet,
commit monitoring-plugins-repomd for openSUSE:Factory
Hello community, here is the log from the commit of package monitoring-plugins-repomd for openSUSE:Factory checked in at 2019-04-22 12:26:44 Comparing /work/SRC/openSUSE:Factory/monitoring-plugins-repomd (Old) and /work/SRC/openSUSE:Factory/.monitoring-plugins-repomd.new.5536 (New) Package is "monitoring-plugins-repomd" Mon Apr 22 12:26:44 2019 rev:4 rq:696475 version:2.0 Changes: --- /work/SRC/openSUSE:Factory/monitoring-plugins-repomd/monitoring-plugins-repomd.changes 2019-04-17 10:08:02.770757666 +0200 +++ /work/SRC/openSUSE:Factory/.monitoring-plugins-repomd.new.5536/monitoring-plugins-repomd.changes 2019-04-22 12:26:47.392952478 +0200 @@ -1,0 +2,5 @@ +Mon Apr 15 18:54:54 UTC 2019 - Jan Engelhardt + +- Use noun phrase in summary. + +--- Other differences: -- ++ monitoring-plugins-repomd.spec ++ --- /var/tmp/diff_new_pack.3e0j0v/_old 2019-04-22 12:26:49.820951532 +0200 +++ /var/tmp/diff_new_pack.3e0j0v/_new 2019-04-22 12:26:49.844951523 +0200 @@ -17,7 +17,7 @@ Name: monitoring-plugins-repomd -Summary:Check freshness of repomd.xml file +Summary:Plugin to check freshness of repomd.xml file License:BSD-3-Clause Group: System/Monitoring Version:2.0
commit monitoring-plugins-repomd for openSUSE:Factory
Hello community, here is the log from the commit of package monitoring-plugins-repomd for openSUSE:Factory checked in at 2019-04-17 10:07:59 Comparing /work/SRC/openSUSE:Factory/monitoring-plugins-repomd (Old) and /work/SRC/openSUSE:Factory/.monitoring-plugins-repomd.new.17052 (New) Package is "monitoring-plugins-repomd" Wed Apr 17 10:07:59 2019 rev:3 rq:694437 version:2.0 Changes: --- /work/SRC/openSUSE:Factory/monitoring-plugins-repomd/monitoring-plugins-repomd.changes 2016-02-22 08:57:45.0 +0100 +++ /work/SRC/openSUSE:Factory/.monitoring-plugins-repomd.new.17052/monitoring-plugins-repomd.changes 2019-04-17 10:08:02.770757666 +0200 @@ -1,0 +2,5 @@ +Sun Apr 14 16:03:28 UTC 2019 - Christian Boltz + +- update AppArmor profile for usrMerge (boo#1132350) + +--- Other differences: -- ++ monitoring-plugins-repomd.spec ++ --- /var/tmp/diff_new_pack.xj1nQL/_old 2019-04-17 10:08:04.158759268 +0200 +++ /var/tmp/diff_new_pack.xj1nQL/_new 2019-04-17 10:08:04.158759268 +0200 @@ -1,7 +1,7 @@ # # spec file for package monitoring-plugins-repomd # -# Copyright (c) 2013-2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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,21 +12,22 @@ # 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-repomd Summary:Check freshness of repomd.xml file -Version:2.0 -Release:100 -Url:http://en.opensuse.org/%{name} License:BSD-3-Clause Group: System/Monitoring +Version:2.0 +Release:0 +Url:http://en.opensuse.org/%{name} Source0:check_repomd Source1:usr.lib.nagios.plugins.check_repomd Requires: bash -Requires: grep Requires: curl +Requires: grep Requires: monitoring-plugins-common Recommends: apparmor-parser BuildRequires: monitoring-plugins-common ++ usr.lib.nagios.plugins.check_repomd ++ --- /var/tmp/diff_new_pack.xj1nQL/_old 2019-04-17 10:08:04.190759305 +0200 +++ /var/tmp/diff_new_pack.xj1nQL/_new 2019-04-17 10:08:04.194759309 +0200 @@ -7,14 +7,14 @@ network inet, - /bin/bash rix, - /bin/grep rix, + /{usr/,}bin/bash rix, + /{usr/,}bin/grep rix, /usr/bin/curl rix, - /bin/cat rix, - /bin/mktemp rix, - /bin/rm rix, - /usr/bin/cut rix, - /bin/date rix, + /{usr/,}bin/cat rix, + /{usr/,}bin/mktemp rix, + /{usr/,}bin/rm rix, + /usr/bin/cut rix, + /{usr/,}bin/date rix, /usr/lib/nagios/plugins/utils.sh r, /proc/sys/crypto/fips_enabled r, owner /tmp/check_repomd* rw,
commit monitoring-plugins-repomd for openSUSE:Factory
Hello community, here is the log from the commit of package monitoring-plugins-repomd for openSUSE:Factory checked in at 2016-02-22 08:57:38 Comparing /work/SRC/openSUSE:Factory/monitoring-plugins-repomd (Old) and /work/SRC/openSUSE:Factory/.monitoring-plugins-repomd.new (New) Package is "monitoring-plugins-repomd" Changes: --- /work/SRC/openSUSE:Factory/monitoring-plugins-repomd/monitoring-plugins-repomd.changes 2016-02-11 12:37:14.0 +0100 +++ /work/SRC/openSUSE:Factory/.monitoring-plugins-repomd.new/monitoring-plugins-repomd.changes 2016-02-22 08:57:45.0 +0100 @@ -1,0 +2,6 @@ +Thu Jan 7 19:29:47 CET 2016 - r...@suse.de + +- only check for revision/date if there is a suseinfo entry + in the repomd.xml file + +--- Other differences: -- ++ check_repomd ++ --- /var/tmp/diff_new_pack.d58lxq/_old 2016-02-22 08:57:46.0 +0100 +++ /var/tmp/diff_new_pack.d58lxq/_new 2016-02-22 08:57:46.0 +0100 @@ -110,6 +110,7 @@ fi REVISION=$($GREP revision "$RESULTFILE" | $CUT -d "<" -f2 | $CUT -d ">" -f2) +HAS_INFO=$($GREP "type.*suseinfo" "$RESULTFILE") NOW=$(date +'%s') let DIFFERENCE=(${NOW}-${REVISION}) let SECONDS=${DAYS}*24*60*60 @@ -123,7 +124,7 @@ echo fi -if [[ $DIFFERENCE -gt $SECONDS ]]; then +if [[ -n "$HAS_INFO" && $DIFFERENCE -gt $SECONDS ]]; then cleanup_and_exit "$STATE_CRITICAL" "CRITICAL: repomd.xml from $URL is older than $DAYS days" else cleanup_and_exit "$STATE_OK" "OK: repomd.xml from $URL is younger than $DAYS days"