Checkmk git commits April 2013

checkmk-commits@lists.checkmk.com

3 participants
237 discussions

Check_MK Git: check_mk: Linux agent: cups_queues: do not monitor non-local queues (thanks to Olaf Morgenstern)

by Mathias Kettner

Module: check_mk Branch: master Commit: ea941369a518787ec4ba0a62de718fc451465114 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea941369a51878… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 30 10:03:16 2013 +0200 Linux agent: cups_queues: do not monitor non-local queues (thanks to Olaf Morgenstern) --- ChangeLog | 1 + agents/check_mk_agent.linux | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index e9999ee..e771335 100644 --- a/ChangeLog +++ b/ChangeLog @@ -80,6 +80,7 @@ new global config option: timeout_plugins_total * lnx_if in Linux agent: force deterministical order of network devices * Linux agent: remove obsolete old <<<netif>>> and <<<netctr>>> sections + * Linux agent: cups_queues: do not monitor non-local queues (thanks to Olaf Morgenstern) Notifications: * notify.py: unique spoolfiles name no longer created with uuid diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 86fc62e..c9f38ef 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -350,10 +350,19 @@ fi # Status of CUPS printer queues if type lpstat > /dev/null 2>&1; then if pgrep cups > /dev/null 2>&1; then - echo '<<<cups_queues>>>' - waitmax 3 lpstat -p - echo '---' - waitmax 3 lpstat -o|sort + WAITMAX="waitmax 3" + CPRINTCONF=/etc/cups/printers.conf + if [ -r "$CPRINTCONF" ] ; then + for PQ in $(lpstat -a | awk '{print $1}') ; do + grep -q -x -F "<Printer $PQ>" $CPRINTCONF && $WAITMAX lpstat -p $PQ + done + echo '---' + for PQ in $(lpstat -a | awk '{print $1}') ; do + grep -q -x -F "<Printer $PQ>" $CPRINTCONF && $WAITMAX lpstat -o $PQ + done + else + $WAITMAX lpstat -p ; echo '---' ; $WAITMAX lpstat -o | sort + fi fi fi

11 years, 5 months

Check_MK Git: check_mk: Fix WATO inventory for piggy-only-hosts

by Mathias Kettner

Module: check_mk Branch: master Commit: b899713716e426fb156e0ee31299e80e07f38c39 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b899713716e426… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 30 09:47:46 2013 +0200 Fix WATO inventory for piggy-only-hosts --- modules/automation.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/automation.py b/modules/automation.py index 3a2ce91..fb52e11 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -205,7 +205,9 @@ def automation_try_inventory_node(hostname): snmp_error = str(e) tcp_error = None - if is_tcp_host(hostname): + # Honor piggy_back data, even if host is not declared as TCP host + if is_tcp_host(hostname) or \ + get_piggyback_info(hostname) or get_piggyback_info(ipaddress): try: for cn in inventorable_checktypes("tcp"): found_services += make_inventory(cn, [hostname], True, True)

11 years, 5 months

Check_MK Git: check_mk: set always_cleanup_autochecks to True per default now

by Mathias Kettner

Module: check_mk Branch: master Commit: 9fdf3ebc337985eb50c25d18dbb3b2439975cdd2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9fdf3ebc337985… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 30 09:38:31 2013 +0200 set always_cleanup_autochecks to True per default now --- ChangeLog | 1 + modules/check_mk.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 24fa977..e9999ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ * setup: Added missing vars rrd_path and rrdcached_sock * new variable check_mk_exit_status: allows to make Check_MK service OK, even if host in not reachable. + * set always_cleanup_autochecks to True per default now Multisite: * New availability view for arbitrary host/service collections diff --git a/modules/check_mk.py b/modules/check_mk.py index f5483df..2d807c4 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -240,7 +240,7 @@ snmp_character_encodings = [] inventory_check_interval = None # Nagios intervals (4h = 240) inventory_check_severity = 1 # warning inventory_max_cachefile_age = 120 # secs. -always_cleanup_autochecks = False +always_cleanup_autochecks = True # Nagios templates and other settings concerning generation # of Nagios configuration files. No need to change these values.

11 years, 5 months

Check_MK Git: check_mk: FIX: HTML mails: remove undefinded placeholders like $GRAPH_CODE$

by Mathias Kettner

Module: check_mk Branch: master Commit: 2cb867245d1ffbb702f4d86d10e717cd7f8a5e58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2cb867245d1ffb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 30 08:56:37 2013 +0200 FIX: HTML mails: remove undefinded placeholders like $GRAPH_CODE$ --- ChangeLog | 1 + notifications/mail | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d260bdc..24fa977 100644 --- a/ChangeLog +++ b/ChangeLog @@ -131,6 +131,7 @@ Notifications: * FIX: HTML mails: Handle the case where plugin argument is not set + * FIX: HTML mails: remove undefinded placeholders like $GRAPH_CODE$ WATO: * Improved handling of valuespec validations in WATO rule editor. Displaying a diff --git a/notifications/mail b/notifications/mail index 223e794..a96f434 100755 --- a/notifications/mail +++ b/notifications/mail @@ -263,7 +263,7 @@ def substitute_context(template, context): template = template.replace('$'+varname+'$', value) # Remove the rest of the variables and make them empty - template = re.sub("\$[A-Z]+\$", "", template) + template = re.sub("\$[A-Z_][A-Z_0-9]*\$", "", template) return template def prepare_contents(context):

11 years, 5 months

Check_MK Git: check_mk: Linux agent: remove obsolete old <<<netif>>> and << <netctr>>> sections

by Mathias Kettner

Module: check_mk Branch: master Commit: 828cda62b449f2c048ffa13083954c8685e32e93 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=828cda62b449f2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 29 18:08:04 2013 +0200 Linux agent: remove obsolete old <<<netif>>> and <<<netctr>>> sections --- ChangeLog | 1 + agents/check_mk_agent.linux | 17 ----------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9c031fb..d260bdc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -78,6 +78,7 @@ * windows agent: new config section plugins, now able to set timeouts for specific plugins new global config option: timeout_plugins_total * lnx_if in Linux agent: force deterministical order of network devices + * Linux agent: remove obsolete old <<<netif>>> and <<<netctr>>> sections Notifications: * notify.py: unique spoolfiles name no longer created with uuid diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index dc137a1..86fc62e 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -158,16 +158,6 @@ echo "$(cat /proc/loadavg) $(grep -E '^CPU|^processor' < /proc/cpuinfo | wc -l)" echo '<<<uptime>>>' cat /proc/uptime -# Network interfaces (Link, Autoneg, Speed) -# This requires ethtool -if type ethtool > /dev/null -then - echo '<<<netif>>>' - for eth in $(cat /proc/net/dev | sed -rn -e 's/[[:space:]]*//g' -e '/ *([^:]):.*/s//\1/p' | egrep -vx '(lo|sit.*)') - do - echo $eth $(ethtool $eth | egrep '(Speed|Duplex|Link detected|Auto-negotiation):' | cut -d: -f2 | sed 's/ *//g') - done -fi # New variant: Information about speed and state in one section echo '<<<lnx_if:sep(58)>>>' @@ -239,13 +229,6 @@ echo '<<<kernel>>>' date +%s cat /proc/vmstat /proc/stat -# Statistik der Netzwerkgeraete (Pakete, Kollisionen, etc) -echo '<<<netctr>>>' -# Genauen Zeitstempel einfuegen, da Counter von Zeit abhaengen -date +%s -sed -e 1,2d -e 's/:/ /g' < /proc/net/dev - - # Hardware sensors via IPMI (need ipmitool) if type ipmitool > /dev/null then

11 years, 5 months

Check_MK Git: check_mk: check_mk_agent.linux: lnx_if: make order deterministical

by Mathias Kettner

Module: check_mk Branch: master Commit: 2fde6d98fd6ac55c56d8348bed4bb9d5d8a562d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2fde6d98fd6ac5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 29 18:06:28 2013 +0200 check_mk_agent.linux: lnx_if: make order deterministical --- ChangeLog | 1 + agents/check_mk_agent.linux | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bf1fd74..9c031fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -77,6 +77,7 @@ * winperf_if: hell has frozen over: a new check for network adapters on Windows * windows agent: new config section plugins, now able to set timeouts for specific plugins new global config option: timeout_plugins_total + * lnx_if in Linux agent: force deterministical order of network devices Notifications: * notify.py: unique spoolfiles name no longer created with uuid diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index b4b267d..dc137a1 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -174,7 +174,7 @@ echo '<<<lnx_if:sep(58)>>>' sed 1,2d /proc/net/dev if type ethtool > /dev/null then - for eth in $(sed -e 1,2d < /proc/net/dev | cut -d':' -f1) + for eth in $(sed -e 1,2d < /proc/net/dev | cut -d':' -f1 | sort) do echo "[$eth]" ethtool $eth | egrep '(Speed|Duplex|Link detected|Auto-negotiation):'

11 years, 5 months

Check_MK Git: check_mk: Activate Perfdata for job check

by Mathias Kettner

Module: check_mk Branch: master Commit: 3a3107b199084f1b00c042db5419c900819e70fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a3107b199084f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 29 15:28:42 2013 +0200 Activate Perfdata for job check --- checks/job | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/job b/checks/job index d86d78a..1082dbc 100644 --- a/checks/job +++ b/checks/job @@ -133,5 +133,5 @@ check_info["job"] = { 'inventory_function': inventory_job, 'service_description': 'Job %s', 'group': 'job', - 'perfdata': True, + 'has_perfdata': True, }

11 years, 5 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Mathias Kettner

Module: check_mk Branch: master Commit: 989352e49b7248b9345b86d6375f4f2b1d181d3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=989352e49b7248… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 29 15:12:23 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 5 months

Check_MK Git: check_mk: esx_vsphere_vm: skip CPU check if VM is powered off

by Mathias Kettner

Module: check_mk Branch: master Commit: df527c33c484b5b952fa644ce639c8033be503c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df527c33c484b5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 29 15:12:21 2013 +0200 esx_vsphere_vm: skip CPU check if VM is powered off --- checks/esx_vsphere_vm | 6 +++++- modules/check_mk_base.py | 7 +++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/checks/esx_vsphere_vm b/checks/esx_vsphere_vm index 8c9df6f..59e4bef 100644 --- a/checks/esx_vsphere_vm +++ b/checks/esx_vsphere_vm @@ -179,7 +179,11 @@ def inventory_esx_vsphere_vm_cpu(info): return [(None, None)] def check_esx_vsphere_vm_cpu(_no_item, _no_params, info): - data = esx_vsphere_vm_convert(info) + data = esx_vsphere_vm_convert(info) + # VMs that are currently down do not have this entry + if 'summary.quickStats.overallCpuUsage' not in data: + raise MKCounterWrapped("", "No information about CPU usage. VM is probably powered off.") + usage_mhz = int(data['summary.quickStats.overallCpuUsage'][0]) cpus = int(data['config.hardware.numCPU'][0]) return 0, "demand is %.3f Ghz, %d virtual CPUs" % (usage_mhz / 1000.0, cpus), [ ("demand", usage_mhz) ] diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 4bcb900..6bd27d6 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -121,7 +121,10 @@ class MKCounterWrapped(Exception): self.name = countername self.reason = reason def __str__(self): - return '%s: %s' % (self.name, self.reason) + if self.name: + return '%s: %s' % (self.name, self.reason) + else: + return self.reason class MKAgentError(Exception): def __init__(self, reason): @@ -1063,7 +1066,7 @@ def do_all_checks_on_host(hostname, ipaddress, only_check_types = None): # any check result in that case: except MKCounterWrapped, e: if opt_verbose: - print "Counter wrapped, not handled by check, ignoring this check result: %s" % e + print "Cannot compute check result: %s" % e dont_submit = True except Exception, e: result = (3, "invalid output from agent, invalid check parameters or error in implementation of check %s. Please set <tt>debug_log</tt> to a filename in <tt>main.mk</tt> for enabling exception logging." % checkname)

11 years, 5 months

Check_MK Git: check_mk: Added missing pnp template

by Lars Michelsen

Module: check_mk Branch: master Commit: 9d0b6d1286e54cd1d3c9471be696de1675442aab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d0b6d1286e54c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 29 15:00:59 2013 +0200 Added missing pnp template --- pnp-templates/check_mk-esx_vsphere_counters.ramdisk.php | 1 + 1 file changed, 1 insertion(+) diff --git a/pnp-templates/check_mk-esx_vsphere_counters.ramdisk.php b/pnp-templates/check_mk-esx_vsphere_counters.ramdisk.php new file mode 120000 index 0000000..28b85a4 --- /dev/null +++ b/pnp-templates/check_mk-esx_vsphere_counters.ramdisk.php @@ -0,0 +1 @@ +check_mk-df.php \ No newline at end of file diff --git a/pnp-templates/check_mk-winperf_processor.util.php b/pnp-templates/check_mk-winperf_processor.util.php old mode 100755 new mode 100644

11 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2013