X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=dsa-nagios-checks%2Fchecks%2Fdsa-check-timedatectl;h=bc978621023197833816f3bce2df76fc0b40d5bf;hb=3cd0bd007702d89084e437a9f4fc4e81a66ce8c5;hp=3711fc149ee34af25c5411eea1271ef4614ebbcb;hpb=cea5e8bf3275a6077d24d146b0aa4fb729af0538;p=mirror%2Fdsa-nagios.git

diff --git a/dsa-nagios-checks/checks/dsa-check-timedatectl b/dsa-nagios-checks/checks/dsa-check-timedatectl
index 3711fc1..bc97862 100755
--- a/dsa-nagios-checks/checks/dsa-check-timedatectl
+++ b/dsa-nagios-checks/checks/dsa-check-timedatectl
@@ -61,11 +61,32 @@ fi
 temp="$(mktemp)"
 trap "rm -f '$temp'" EXIT
 
-timedatectl > "$temp"
-ut=$(sed '/Universal time:/ { s/^[^:]*: *//; p}; d' "$temp")
-rtc=$(sed '/RTC time:/ { s/^[^:]*: *//; p}; d' "$temp")
-ntpenabled=$(sed '/\(NTP enabled\|Network time on\):/ { s/^[^:]*: *//; p}; d' "$temp")
-ntpsynced=$(sed '/NTP synchronized:/ { s/^[^:]*: *//; p}; d' "$temp")
+systemdversion="$(timedatectl --version | head -n1 | awk '{print $2}')"
+if [ -z "$systemdversion" ]; then
+	echo "Unknown: Cannot get systemd version"
+	exit 3
+fi
+if [ "$systemdversion" -lt 241 ] ; then # before buster (Debian 10)
+	LC_ALL=C timedatectl > "$temp"
+	ut=$(sed '/Universal time:/ { s/^[^:]*: *//; p}; d' "$temp")
+	rtc=$(sed '/RTC time:/ { s/^[^:]*: *//; p}; d' "$temp")
+	ntpenabled=$(sed '/\(NTP enabled\|Network time on\|NTP service\):/ { s/^[^:]*: *//; p}; d' "$temp")
+	ntpsynced=$(sed '/\(NTP synchronized\|System clock synchronized\):/ { s/^[^:]*: *//; p}; d' "$temp")
+else
+	LC_ALL=C timedatectl show > "$temp"
+	ut=$(sed '/^TimeUSec=/ { s/^[^=]*=//; p}; d' "$temp")
+	rtc=$(sed '/^RTCTimeUSec=/ { s/^[^=]*=//; p}; d' "$temp")
+	ntpenabled=$(sed '/^NTP=/ { s/^[^=]*=//; p}; d' "$temp")
+	ntpsynced=$(sed '/^NTPSynchronized=/ { s/^[^=]*=//; p}; d' "$temp")
+	if [ "$ntpenabled" = "no" ]; then # in buster (Debian 10) ntpenabled no longer also considers the ntp service
+		ntp_status=$(systemctl is-enabled 'ntp.service' 2>/dev/null) && rc=$? || rc=$?
+		if [ "$rc" = 0 ] && [ "$ntp_status" = "enabled" ] ; then
+			if systemctl --quiet is-active ntp.service; then
+				ntpenabled=yes
+			fi
+		fi
+	fi
+fi
 
 uts=$(TZ=UTC date -d "$ut" +%s)
 rtcs=$(TZ=UTC date -d "$rtc" +%s 2>/dev/null || echo "N/A")
@@ -90,7 +111,7 @@ else
 		exit 1
 	fi
 
-	if [ "$ntpenabled" != "yes" ]; then
+	if [ "$ntpenabled" != "yes" -a "$ntpenabled" != "active"  ]; then
 		echo "Warning: NTP not enabled!"
 		exit 1
 	fi