[checkmk-commits] Check_MK Git: check_mk: FIX solaris agent: ntp now able to work with ntpd and xntpd

Module: check_mk Branch: master Commit: be90aafd909e1a912334a2f73458cccc4cb6aba0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be90aafd909e1a… Author: Andreas Boesl &lt;ab(a)mathias-kettner.de&gt; Date: Mon Feb 10 13:11:33 2014 +0100 FIX solaris agent: ntp now able to work with ntpd and xntpd The previous version always looked for the xntpd. If it wasn't present, no <<<ntp>>> section got created. --- .werks/277 | 9 +++++++++ ChangeLog | 7 ++++--- agents/check_mk_agent.solaris | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.werks/277 b/.werks/277 new file mode 100644 index 0000000..ba6fb6f --- /dev/null +++ b/.werks/277 @@ -0,0 +1,9 @@ +Title: solaris agent: ntp now able to work with ntpd and xntpd +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1392034080 +Class: fix + +The previous version always looked for the xntpd. +If it wasn't present, no <<<ntp>>> section got created. diff --git a/ChangeLog b/ChangeLog index e5a9ce6..01e95e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -81,13 +81,13 @@ * 0699 emc_isilon_iops: New check for Disk Operations per Second (IOPS) in EMC Isilon Storage * 0132 New checks fjdarye101_disks fjdarye101_rluns: Fujitsu Storage Systems with 2013 Firmware * 0697 check_dns: allow to specify multiple expected answers + * 0700 arcserve_backup: new check for status of backups in an Arcserve Backup Server * 0580 emc_datadomain_fans, emc_datadomain_nvbat, emc_datadomain_power, emc_datadomain_temps: new hardware checks for EMC Datadomain - * 0581 emc_datadomain_disks emc_datadomain_fs: new checks to monitor disks and filesystems of EMC Datadomain * 0691 Solaris agent: include lofs in list of monitored filesystem types * 0694 wut_webtherm: Support new versions of WUT-Thermometer... - * 0701 emc_isilon_diskstatus: new check for Status of Disks in EMC Isilon Storage Systems * 0135 apc_inputs: New Check for APC Input Contacts - * 0700 arcserve_backup: new check for status of backups in an Arcserve Backup Server + * 0701 emc_isilon_diskstatus: new check for Status of Disks in EMC Isilon Storage Systems + * 0581 emc_datadomain_disks emc_datadomain_fs: new checks to monitor disks and filesystems of EMC Datadomain * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... @@ -168,6 +168,7 @@ * 0692 FIX: fileinfo: Avoid duplicate entries in Solaris agent... * 0693 FIX: hpux_lvm: avoid problem when alternative vgdisplay is installed... * 0708 FIX: ntp.time, ntp: avoid DNS lookups in NTP queries and avoid timeouts... + * 0277 FIX: solaris agent: ntp now able to work with ntpd and xntpd... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 5ef0e78..f054e29 100644 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -191,7 +191,7 @@ echo $(($ctime - $btime)) # NTP -ps -o comm $pszone | grep -w xntpd &>/dev/null +ps -o comm $pszone | grep -w .*ntpd &>/dev/null if [ $? -eq 0 ] then echo '<<<ntp>>>'