Merge pull request #78 from radiorabe/quickfix/timedatectl

[timedatectl] Fix typo in userparam
radiorabe · Feb 10, 2019 · 61099b9 · 61099b9
2 parents 5b357ea + 9c44be1
commit 61099b9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/app/timedatectl/README.md b/app/timedatectl/README.md
@@ -18,15 +18,15 @@ collection](https://github.com/radiorabe/rabe-zabbix).
 ### Macros
 * `{$TIMEDATECTL_MAX_NO_SYNC_TIME}` (default: 60m)
 ### Triggers
-* Warning: NTP not enabled
+* Warning: NTP not enabled on {HOST.NAME}
   ```
   {Template App timedatectl active:rabe.timedatectl.ntp.enabled.last()}=0
   ```
-* Information: NTP not synchronized
+* Information: NTP not synchronized on {HOST.NAME}
   ```
   {Template App timedatectl active:rabe.timedatectl.ntp.synchronized.last()}=0
   ```
-* Warning: NTP not synchronized for more than {$TIMEDATECTL_MAX_NO_SYNC_TIME}
+* Warning: NTP not synchronized for more than {$TIMEDATECTL_MAX_NO_SYNC_TIME} on {HOST.NAME}
   ```
   {Template App timedatectl active:rabe.timedatectl.ntp.synchronized.last(,{$TIMEDATECTL_MAX_NO_SYNC_TIME})}<1
   ```

diff --git a/app/timedatectl/userparameters/timedatectl.conf b/app/timedatectl/userparameters/timedatectl.conf
@@ -11,9 +11,9 @@
 #
 # We support both the legacy (ie. CentOS 7) "NTP enabled" and the modern (ie. Fedora) "Network time on" string.
 #
-UserParameter=rabe.timedatectl.ntp.enabled,/bin/timedatectl --no-pager status | /bin/awk -F ': ' '/* ^[[:space:]]*(Network time on|NTP enabled):/ { if ($2 == "yes") { print 1; } else { print 0; } }'
+UserParameter=rabe.timedatectl.ntp.enabled,/bin/timedatectl --no-pager status | /bin/awk -F ': ' '/^[[:space:]]*(Network time on|NTP enabled):/ { if ($2 == "yes") { print 1; } else { print 0; } }'
 
 #
 # "NTP synchonized" yes/no value from timedatectl output
 #
-UserParameter=rabe.timedatectl.ntp.synchronized,/bin/timedatectl --no-pager status | /bin/awk -F ': ' '/* ^[[:space:]]*NTP synchronized:/ { if ($2 == "yes") { print 1; } else { print 0; } }'
+UserParameter=rabe.timedatectl.ntp.synchronized,/bin/timedatectl --no-pager status | /bin/awk -F ': ' '/^[[:space:]]*NTP synchronized:/ { if ($2 == "yes") { print 1; } else { print 0; } }'