Checkmk git commits February 2014

checkmk-commits@lists.checkmk.com

6 participants
141 discussions

Check_MK Git: check_mk: emc_datadomain_disks emc_datadomain_fs: new checks to monitor disks and filesystems of EMC Datadomain

by Götz Golla

Module: check_mk Branch: master Commit: 37cb73d5fa77da033b9b69b03951e4a7f9607736 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37cb73d5fa77da… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Sun Feb 9 18:49:31 2014 +0100 emc_datadomain_disks emc_datadomain_fs: new checks to monitor disks and filesystems of EMC Datadomain --- .werks/581 | 8 ++++ ChangeLog | 3 +- agents/check_mk_agent.linux | 43 ++++++++++++-------- checkman/emc_datadomain_disks | 21 ++++++++++ checkman/emc_datadomain_fs | 89 +++++++++++++++++++++++++++++++++++++++++ checkman/stulz_pump | 5 ++- checks/emc_datadomain_disks | 82 +++++++++++++++++++++++++++++++++++++ checks/emc_datadomain_fs | 65 ++++++++++++++++++++++++++++++ checks/stulz_pump | 20 ++++++--- 9 files changed, 311 insertions(+), 25 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=37cb73d5fa…

10 years, 7 months

Check_MK Git: check_mk: manually resolved merge conflict in ChangeLog

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: de32aa1488333af866bfd3492a95ec1bb1768e34 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de32aa1488333a… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Feb 7 18:02:20 2014 +0100 manually resolved merge conflict in ChangeLog ---

10 years, 7 months

Check_MK Git: check_mk: emc_isilon_diskstatus: new check for Status of Disks in EMC Isilon Storage Systems

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 2e1fdd16014e8466fb1d33dc9191ddc7c541fe36 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e1fdd16014e84… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Feb 7 18:00:47 2014 +0100 emc_isilon_diskstatus: new check for Status of Disks in EMC Isilon Storage Systems --- .werks/701 | 8 ++++++ ChangeLog | 1 + checkman/emc_isilon_diskstatus | 16 ++++++++++++ checks/emc_isilon_diskstatus | 56 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 81 insertions(+) diff --git a/.werks/701 b/.werks/701 new file mode 100644 index 0000000..aafc175 --- /dev/null +++ b/.werks/701 @@ -0,0 +1,8 @@ +Title: emc_isilon_diskstatus: new check for Status of Disks in EMC Isilon Storage Systems +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1391792413 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index b064a55..e5c4848 100644 --- a/ChangeLog +++ b/ChangeLog @@ -85,6 +85,7 @@ * 0580 emc_datadomain_fans, emc_datadomain_nvbat, emc_datadomain_power, emc_datadomain_temps: new hardware checks for 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 * 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... diff --git a/checkman/emc_isilon_diskstatus b/checkman/emc_isilon_diskstatus new file mode 100644 index 0000000..a7bb370 --- /dev/null +++ b/checkman/emc_isilon_diskstatus @@ -0,0 +1,16 @@ +title: EMC Isilon: Disk Status +agents: snmp +catalog: hw/storagehw/emc +license: GPL +distribution: check_mk +description: + Checks the Status of Disks in EMC Isilon Storage Systems. + + Returns {OK} if the disk is HEALTHY and {CRIT} on every other status. + +item: + The ID of the disk bay. + +inventory: + Finds exactly one service per disk in an EMC Isilon Storage. + diff --git a/checks/emc_isilon_diskstatus b/checks/emc_isilon_diskstatus new file mode 100644 index 0000000..b1479f1 --- /dev/null +++ b/checks/emc_isilon_diskstatus @@ -0,0 +1,56 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +def inventory_emc_isilon_diskstatus(info): + inventory = [] + for disk_id, name, disk_status, serial in info: + inventory.append( (disk_id, None) ) + return inventory + +def check_emc_isilon_diskstatus(item, _no_params, info): + for disk_id, name, disk_status, serial in info: + if disk_id == item: + message = "Disk %s, serial number %s status is %s" % (name, serial, disk_status) + if disk_status == "HEALTHY": + status = 0 + else: + status = 2 + return status, message + return 3, "Disk %s not found" % item + +check_info["emc_isilon_diskstatus"] = { + "check_function" : check_emc_isilon_diskstatus, + "inventory_function" : inventory_emc_isilon_diskstatus, + "service_description" : "Disk bay %s Status", + "snmp_info" : (".1.3.6.1.4.1.12124.2.52.1", + [ 1, # diskBay + 4, # diskDeviceName + 5, # diskStatus + 7, # diskSerialNumber + ]), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.12124.1") +} +

10 years, 7 months

Check_MK Git: check_mk: moved arcserve_backup. ps1 agent plugin to the correct directory

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: c4a155fe9b19ac1aaa33e6becaee3e8d4de9a8df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4a155fe9b19ac… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Feb 7 14:07:29 2014 +0100 moved arcserve_backup.ps1 agent plugin to the correct directory --- agents/{ => windows}/plugins/arcserve_backup.ps1 | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/agents/plugins/arcserve_backup.ps1 b/agents/windows/plugins/arcserve_backup.ps1 similarity index 100% rename from agents/plugins/arcserve_backup.ps1 rename to agents/windows/plugins/arcserve_backup.ps1

10 years, 7 months

Check_MK Git: check_mk: apc_inputs: New Check for APC Input Contacts

by Bastian Kuhn

Module: check_mk Branch: master Commit: 2e983e1a14634ccff6c82058fb309688e7ea5e72 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e983e1a14634c… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Feb 7 14:55:15 2014 +0100 apc_inputs: New Check for APC Input Contacts --- .werks/135 | 8 +++++ ChangeLog | 1 + checkman/apc_inputs | 15 ++++++++++ checks/apc_inputs | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 106 insertions(+) diff --git a/.werks/135 b/.werks/135 new file mode 100644 index 0000000..d0f6e21 --- /dev/null +++ b/.werks/135 @@ -0,0 +1,8 @@ +Title: apc_inputs: New Check for APC Input Contacts +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1391781292 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index b064a55..d9538f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -85,6 +85,7 @@ * 0580 emc_datadomain_fans, emc_datadomain_nvbat, emc_datadomain_power, emc_datadomain_temps: new hardware checks for EMC Datadomain * 0691 Solaris agent: include lofs in list of monitored filesystem types * 0694 wut_webtherm: Support new versions of WUT-Thermometer... + * 0135 apc_inputs: New Check for APC Input Contacts * 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... diff --git a/checkman/apc_inputs b/checkman/apc_inputs new file mode 100644 index 0000000..ecfa2e8 --- /dev/null +++ b/checkman/apc_inputs @@ -0,0 +1,15 @@ +title: APC Input Contacts +agents: snmp +catalog: hw/power +license: GPL +distribution: check_mk +description: + This Check monitors the input contacts of a APC UPS. + It returns {WARN} in case of a state change, and also represents + the current alarm status. The Check has no configuration. + +inventory: + One service will be created for each contact + +item: + The Name of the contact diff --git a/checks/apc_inputs b/checks/apc_inputs new file mode 100644 index 0000000..de68c45 --- /dev/null +++ b/checks/apc_inputs @@ -0,0 +1,82 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +def inventory_apc_inputs(info): + if len(info) > 0: + inventory = [] + for line in info: + if line[2] not in [ "3", "4" ]: + inventory.append(( line[0], {"state" : line[2]} )) + return inventory + +def check_apc_inputs(item, params, info): + states = { + '1' : "closed", + '2' : "open", + '3' : "disabled", + '4' : "not applicable", + } + alarm_states = { + '1' : "normal", + '2' : "warning", + '3' : "cirtical", + '4' : "not applicable", + } + for name, location, state, alarm_status in info: + if name == item: + if alarm_status in [ "2", "4"]: + check_state = 1 + elif alarm_status == "3": + check_state = 2 + elif alarm_status == "1": + check_state = 0 + + messages = [ "State is %s" % alarm_states[alarm_status] ] + + if params['state'] != state: + check_state = max( check_state, 1 ) + messages.append("Port state Change from %s to %s(!)" % \ + ( states[params['state']], states[state] )) + + return check_state, ", ".join(messages) + return 3, "Sensor not found" + + + +check_info['apc_inputs'] = { + "inventory_function" : inventory_apc_inputs, + "check_function" : check_apc_inputs, + "service_description" : "Input %s", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.318.1.3"), + "snmp_info" : ( ".1.3.6.1.4.1.318.1.1.25.2.2.1", + [ + 3, # Port Name + 4, # Location + 5, # CurrentState + 6, # AlarmStatus + ] ) +} +

10 years, 7 months

Check_MK Git: check_mk: Fixed UnicodeDecodeError when using edit_dictionary in localized multisite

by Lars Michelsen

Module: check_mk Branch: master Commit: 9593a659f2e234e97d7839b3944a3e6b4d571184 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9593a659f2e234… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 7 08:44:54 2014 +0100 Fixed UnicodeDecodeError when using edit_dictionary in localized multisite --- web/htdocs/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index 4905d67..7065ee9 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -59,7 +59,7 @@ def edit_dictionary(entries, value, focus=None, hover_help=True, vs.validate_value(v, varprefix + name) new_value[name] = v except MKUserError, e: - messages.append(u"%s: %s" % (vs.title(), e.message)) + messages.append("%s: %s" % (vs.title(), e.message)) html.add_user_error(e.varname, e.message) if validate and not html.has_user_errors():

10 years, 7 months

Check_MK Git: check_mk: WK: 276, fixed formatting

by Andreas Boesl

Module: check_mk Branch: master Commit: 0027929ae238560a916bb9e69596993b610a5575 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0027929ae23856… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Feb 6 18:23:37 2014 +0100 WK: 276, fixed formatting --- .werks/276 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/276 b/.werks/276 index 891cecd..87b3a92 100644 --- a/.werks/276 +++ b/.werks/276 @@ -12,4 +12,4 @@ You can also choose the version manually (3 or 4). Depending on the chosen version livestatus includes the nagios headers from 3.2.0 or 4.0.2. If you just want to compile livestatus you can set the nagios version via an option in the configure script. -<tt>configure --with-nagios4<tt> +<tt>configure --with-nagios4</tt>

10 years, 7 months

Check_MK Git: check_mk: nagios4 livestatus support

by Andreas Boesl

Module: check_mk Branch: master Commit: bc2a9b336c675cfe2f82d6d32574a89cededb2e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc2a9b336c675c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Feb 6 16:02:53 2014 +0100 nagios4 livestatus support It is now possible to compile livestatus for nagios4. The <tt>setup.sh</tt> script from the check_mk tarball now autodetects the nagios version and proposes it during the setup process. You can also choose the version manually (3 or 4). Depending on the chosen version livestatus includes the nagios headers from 3.2.0 or 4.0.2. If you just want to compile livestatus you can set the nagios version via an option in the configure script. <tt>configure --with-nagios4<tt> --- .werks/276 | 15 + ChangeLog | 1 + Makefile | 4 +- agents/windows/check_mk_agent.exe | Bin 160768 -> 160768 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent.exe | Bin 151693 -> 151690 bytes agents/windows/nowin.exe | Bin 22511 -> 22511 bytes livestatus/configure.ac | 7 + livestatus/nagios4/README | 1 + livestatus/nagios4/bitmap.h | 156 ++++++ livestatus/nagios4/broker.h | 213 +++++++ livestatus/nagios4/cgiauth.h | 70 +++ livestatus/nagios4/cgiutils.h | 479 ++++++++++++++++ livestatus/nagios4/comments.h | 118 ++++ livestatus/nagios4/common.h | 531 ++++++++++++++++++ livestatus/nagios4/config.h | 344 ++++++++++++ livestatus/nagios4/defaults.h | 94 ++++ livestatus/nagios4/dkhash.h | 134 +++++ livestatus/nagios4/downtime.h | 112 ++++ livestatus/nagios4/fanout.h | 73 +++ livestatus/nagios4/iobroker.h | 175 ++++++ livestatus/nagios4/iocache.h | 181 ++++++ livestatus/nagios4/kvvec.h | 207 +++++++ livestatus/nagios4/libnagios.h | 25 + livestatus/nagios4/lnag-utils.h | 111 ++++ livestatus/nagios4/locations.h | 41 ++ livestatus/nagios4/logging.h | 90 +++ livestatus/nagios4/macros.h | 339 ++++++++++++ livestatus/nagios4/nagios.h | 756 +++++++++++++++++++++++++ livestatus/nagios4/nebcallbacks.h | 70 +++ livestatus/nagios4/neberrors.h | 67 +++ livestatus/nagios4/nebmods.h | 62 +++ livestatus/nagios4/nebmodules.h | 94 ++++ livestatus/nagios4/nebstructs.h | 525 ++++++++++++++++++ livestatus/nagios4/nsock.h | 76 +++ livestatus/nagios4/nspath.h | 91 +++ livestatus/nagios4/nsutils.h | 111 ++++ livestatus/nagios4/objects.h | 853 +++++++++++++++++++++++++++++ livestatus/nagios4/perfdata.h | 38 ++ livestatus/nagios4/pqueue.h | 185 +++++++ livestatus/nagios4/runcmd.h | 96 ++++ livestatus/nagios4/shared.h | 55 ++ livestatus/nagios4/skiplist.h | 162 ++++++ livestatus/nagios4/snprintf.h | 7 + livestatus/nagios4/squeue.h | 161 ++++++ livestatus/nagios4/sretention.h | 31 ++ livestatus/nagios4/statusdata.h | 199 +++++++ livestatus/nagios4/worker.h | 132 +++++ livestatus/src/DownCommColumn.cc | 4 +- livestatus/src/DownCommColumn.h | 1 + livestatus/src/Makefile.am | 2 +- livestatus/src/OffsetStringMacroColumn.cc | 10 + livestatus/src/Store.cc | 4 + livestatus/src/TableHosts.cc | 24 + livestatus/src/TableServices.cc | 17 + livestatus/src/TableStatus.cc | 24 + livestatus/src/TimeperiodsCache.cc | 3 + livestatus/src/logger.h | 3 + livestatus/src/module.c | 4 + livestatus/src/nagios.h | 29 +- scripts/autodetect.py | 7 + scripts/setup.sh | 14 +- 62 files changed, 7423 insertions(+), 15 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=bc2a9b336c…

10 years, 7 months

Check_MK Git: check_mk: Updated Werk 708

by Mathias Kettner

Module: check_mk Branch: master Commit: 40f5e8c069afe3502db29591c1d7e9c1a375d409 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=40f5e8c069afe3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 6 16:05:18 2014 +0100 Updated Werk 708 --- .werks/708 | 2 +- ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/708 b/.werks/708 index fec1b47..0b8bc10 100644 --- a/.werks/708 +++ b/.werks/708 @@ -1,4 +1,4 @@ -Title: ntp, ntp.peers: avoid DNS lookups in NTP queries and avoid timeouts +Title: ntp.time, ntp: avoid DNS lookups in NTP queries and avoid timeouts Level: 2 Component: checks Version: 1.2.5i1 diff --git a/ChangeLog b/ChangeLog index 547cd20..6d11bfd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -164,7 +164,7 @@ * 0579 FIX: veeam_client: fix for case when no StopTime section in agent output * 0692 FIX: fileinfo: Avoid duplicate entries in Solaris agent... * 0693 FIX: hpux_lvm: avoid problem when alternative vgdisplay is installed... - * 0708 FIX: ntp, ntp.peers: avoid DNS lookups in NTP queries and avoid timeouts... + * 0708 FIX: ntp.time, ntp: avoid DNS lookups in NTP queries and avoid timeouts... Multisite: * 0371 Added log class filter to hostsvcevents view

10 years, 7 months

Check_MK Git: check_mk: FIX ntp, ntp.peers: avoid DNS lookups in NTP queries and avoid timeouts

by Mathias Kettner

Module: check_mk Branch: master Commit: e9bf12f727bdc617efaaf3075d24e6f8623c12a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9bf12f727bdc6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 6 16:04:34 2014 +0100 FIX ntp, ntp.peers: avoid DNS lookups in NTP queries and avoid timeouts The ntpq queries in the various Unix agents now call ntpq with the option -n. This avoids DNS lookups. Note: the ntp.peers check will then display IP addresses instead of host names. That check will fail if you do not have fixed IP addresses. --- .werks/708 | 11 +++++++++++ ChangeLog | 1 + agents/check_mk_agent.aix | 2 +- agents/check_mk_agent.freebsd | 2 +- agents/check_mk_agent.hpux | 2 +- agents/check_mk_agent.linux | 2 +- agents/check_mk_agent.macosx | 2 +- agents/check_mk_agent.solaris | 2 +- 8 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.werks/708 b/.werks/708 new file mode 100644 index 0000000..fec1b47 --- /dev/null +++ b/.werks/708 @@ -0,0 +1,11 @@ +Title: ntp, ntp.peers: avoid DNS lookups in NTP queries and avoid timeouts +Level: 2 +Component: checks +Version: 1.2.5i1 +Date: 1391698980 +Class: fix + +The ntpq queries in the various Unix agents now call ntpq with the option +-n. This avoids DNS lookups. Note: the ntp.peers check will then display +IP addresses instead of host names. That check will fail if you do not +have fixed IP addresses. diff --git a/ChangeLog b/ChangeLog index 5a110a9..547cd20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -164,6 +164,7 @@ * 0579 FIX: veeam_client: fix for case when no StopTime section in agent output * 0692 FIX: fileinfo: Avoid duplicate entries in Solaris agent... * 0693 FIX: hpux_lvm: avoid problem when alternative vgdisplay is installed... + * 0708 FIX: ntp, ntp.peers: avoid DNS lookups in NTP queries and avoid timeouts... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index cc40d03..802f063 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -97,7 +97,7 @@ done if which ntpq > /dev/null 2>&1 ; then if [ $(lssrc -s xntpd|grep -c active) -gt 0 ] ; then echo '<<<ntp>>>' - ntpq -p | sed -e 1,2d -e 's/^$.$/\1 /' -e 's/^ /%/' + ntpq -np | sed -e 1,2d -e 's/^$.$/\1 /' -e 's/^ /%/' fi fi diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index b1627a0..f3398bb 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -229,7 +229,7 @@ fi if which ntpq > /dev/null 2>&1 ; then echo '<<<ntp>>>' # remote heading, make first column space separated - ntpq -p | sed -e 1,2d -e 's/^$.$/\1 /' -e 's/^ /%/' + ntpq -np | sed -e 1,2d -e 's/^$.$/\1 /' -e 's/^ /%/' fi diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index 9f49eaa..f303c7c 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -107,7 +107,7 @@ fi echo '<<<ntp>>>' # remove heading, make first column space separated -ntpq -p | sed -e 1,2d -e 's/^$.$/\1 /' -e 's/^ /%/' +ntpq -np | sed -e 1,2d -e 's/^$.$/\1 /' -e 's/^ /%/' # Kernel tunnables diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 241d01a..cf22b2e 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -346,7 +346,7 @@ fi if type ntpq > /dev/null 2>&1 ; then # remove heading, make first column space separated - run_cached -s ntp 30 "waitmax 5 ntpq -p | sed -e 1,2d -e 's/^$.$/\1 /' -e 's/^ /%/'" + run_cached -s ntp 30 "waitmax 5 ntpq -np | sed -e 1,2d -e 's/^$.$/\1 /' -e 's/^ /%/'" fi if type nvidia-settings >/dev/null && [ -S /tmp/.X11-unix/X0 ] diff --git a/agents/check_mk_agent.macosx b/agents/check_mk_agent.macosx index 9209244..070c659 100755 --- a/agents/check_mk_agent.macosx +++ b/agents/check_mk_agent.macosx @@ -74,7 +74,7 @@ ps ax -o user,vsz,rss,pcpu,command | sed -e 1d -e 's/ *$[^ ]*$ *$[^ ]*$ *$[ # NTP seems to be enabled as a default echo '<<<ntp>>>' - ntpq -pn | sed -e 1,2d -e 's/^\(.$/\1 /' -e 's/^ /%/' + ntpq -npn | sed -e 1,2d -e 's/^$.$/\1 /' -e 's/^ /%/' # TCP Conn stats echo '<<<tcp_conn_stats>>>' diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index ef03a60..5ef0e78 100644 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -195,7 +195,7 @@ ps -o comm $pszone | grep -w xntpd &>/dev/null if [ $? -eq 0 ] then echo '<<<ntp>>>' - ntpq -p | sed -e 1,2d -e 's/^$.$/\1 /' -e 's/^ /%/' + ntpq -np | sed -e 1,2d -e 's/^$.$/\1 /' -e 's/^ /%/' fi

10 years, 7 months

← Newer
1
...
8
9
10
11
12
13
14
15
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2014