From cea5e8bf3275a6077d24d146b0aa4fb729af0538 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Mon, 23 Jan 2017 14:14:37 +0100 Subject: [PATCH] dsa-check-timedatectl: handle n/a in timedatectl output for RTC. --- dsa-nagios-checks/checks/dsa-check-timedatectl | 11 +++++++++-- dsa-nagios-checks/debian/changelog | 6 ++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dsa-nagios-checks/checks/dsa-check-timedatectl b/dsa-nagios-checks/checks/dsa-check-timedatectl index 4294ed8..3711fc1 100755 --- a/dsa-nagios-checks/checks/dsa-check-timedatectl +++ b/dsa-nagios-checks/checks/dsa-check-timedatectl @@ -68,8 +68,10 @@ ntpenabled=$(sed '/\(NTP enabled\|Network time on\):/ { s/^[^:]*: *//; p}; d' "$ ntpsynced=$(sed '/NTP synchronized:/ { s/^[^:]*: *//; p}; d' "$temp") uts=$(TZ=UTC date -d "$ut" +%s) -rtcs=$(TZ=UTC date -d "$rtc" +%s) -delta=$((uts - rtcs)) +rtcs=$(TZ=UTC date -d "$rtc" +%s 2>/dev/null || echo "N/A") +if [ "$rtcs" != "N/A" ]; then + delta=$((uts - rtcs)) +fi if [ "$SYNSTATUSONLY" -ge 1 ]; then if [ "$ntpsynced" != "yes" ]; then @@ -77,6 +79,11 @@ if [ "$SYNSTATUSONLY" -ge 1 ]; then exit 1 fi else + if [ "$rtcs" = "N/A" ]; then + echo "Warning: Cannot parse RTC $rtc." + exit 1 + fi + if [ "$delta" -lt "-$MAX" ] || [ "$delta" -gt "$MAX" ]; then echo "Warning: time desync $delta: RTC vs. system time: $rtc vs. $ut" diff --git a/dsa-nagios-checks/debian/changelog b/dsa-nagios-checks/debian/changelog index c2bbbb5..ce5abd2 100644 --- a/dsa-nagios-checks/debian/changelog +++ b/dsa-nagios-checks/debian/changelog @@ -1,3 +1,9 @@ +dsa-nagios-checks (110) UNRELEASED; urgency=medium + + * dsa-check-timedatectl: handle n/a in timedatectl output for RTC. + + -- Peter Palfrader Mon, 23 Jan 2017 14:14:06 +0100 + dsa-nagios-checks (109) unstable; urgency=medium [ Peter Palfrader ] -- 2.20.1