Checkmk git commits October 2014

checkmk-commits@lists.checkmk.com

6 participants
310 discussions

Check_MK Git: check_mk: ups_socomec_out_source: Changed interpretation of states to v6 MIB

by Konstantin Büttner

Module: check_mk Branch: master Commit: 206387b134c3a1db80716a980c3de61bb4317665 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=206387b134c3a1… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Oct 29 13:29:19 2014 +0100 ups_socomec_out_source: Changed interpretation of states to v6 MIB --- checkman/ups_socomec_out_source | 7 +++++-- checks/ups_socomec_out_source | 3 +-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/checkman/ups_socomec_out_source b/checkman/ups_socomec_out_source index 50acc2d..e15613e 100644 --- a/checkman/ups_socomec_out_source +++ b/checkman/ups_socomec_out_source @@ -5,8 +5,11 @@ license: GPL distribution: check_mk description: Checks by which source the output phase is powered. Warns if the device - reports internal maintenance bypass, goes critical during battery operation - or when offline. SNMP state "other" is treated as unknown. + reports internal maintenance bypass or bypass, goes critical during battery operation + ({"On inverter"}) or when offline. Caveat: Currently, states are interpreted according to + the NetVision-nv6 MIB. Other firmware versions might be incompatible. Please send us a + {cmk --snmpwalk} along with a description as to how the check behaves unexpectedly in + your setup. inventory: One check per Socomec UPS is created. diff --git a/checks/ups_socomec_out_source b/checks/ups_socomec_out_source index 3c3ea7b..c64e1ca 100644 --- a/checks/ups_socomec_out_source +++ b/checks/ups_socomec_out_source @@ -49,7 +49,6 @@ check_info['ups_socomec_out_source'] = { "inventory_function" : inventory_ups_socomec_out_source, "check_function" : check_ups_socomec_out_source, "service_description" : "Output Source", - "has_perfdata" : False, "snmp_info" : ( ".1.3.6.1.4.1.4555.1.1.1.1.4", ["1"] ), - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0").startswith("Net Vision"), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.4555.1.1.1", }

9 years, 8 months

Check_MK Git: check_mk: Tuned veeam_client perfometer

by Bastian Kuhn

Module: check_mk Branch: master Commit: 78794b77f1dc71d1dff37abacdf9a9fc61e2e540 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78794b77f1dc71… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Oct 29 11:33:59 2014 +0100 Tuned veeam_client perfometer --- web/plugins/perfometer/check_mk.py | 5 +++-- web/plugins/views/perfometer.py | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index efaf698..c97aa5b 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -1177,10 +1177,11 @@ perfometers["check_mk-docsis_channels_upstream"] = perfometer_docsis_snr def perfometer_veeam_client(row, check_command, perf_data): avgspeed_bytes = int(perf_data[4][1]) duration_secs = int(perf_data[3][1]) - h = perfometer_logarithmic_dual_independent(avgspeed_bytes, '#54b948', 10000000, 2, duration_secs, '#2098cb', 1000, 2) + h = perfometer_logarithmic_dual_independent(avgspeed_bytes, '#54b948', 10000000, 2, duration_secs, '#2098cb', 500, 2) avgspeed = bytes_human_readable(avgspeed_bytes) - duration = age_human_readable(duration_secs) + # Return Value always as minutes + duration = age_human_readable(duration_secs, True) return "%s/s   %s" % (avgspeed, duration), h diff --git a/web/plugins/views/perfometer.py b/web/plugins/views/perfometer.py index 47f179e..5ada1f2 100644 --- a/web/plugins/views/perfometer.py +++ b/web/plugins/views/perfometer.py @@ -132,7 +132,10 @@ def number_human_readable(n, precision=1, unit="B"): else: return (f + "%s") % (n, unit) -def age_human_readable(secs): +def age_human_readable(secs, min_only=False): + if min_only: + mins = secs / 60.0 + return "%.1f min" % mins if secs < 240: return "%d sec" % secs mins = secs / 60

9 years, 8 months

Check_MK Git: check_mk: #1196 apache_status: Added timeout

by Bastian Kuhn

Module: check_mk Branch: master Commit: b9ab41fc943cde29cd599afcb045d626860cb9b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9ab41fc943cde… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Oct 29 10:39:14 2014 +0100 #1196 apache_status: Added timeout The apache_status plugin now has a timeout for the urlopen operation. --- .werks/1196 | 10 ++++++++++ ChangeLog | 1 + agents/plugins/apache_status | 6 ++++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/1196 b/.werks/1196 new file mode 100644 index 0000000..2068bde --- /dev/null +++ b/.werks/1196 @@ -0,0 +1,10 @@ +Title: apache_status: Added timeout +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1414575509 +Class: feature + +The apache_status plugin now has a timeout for the urlopen operation. + diff --git a/ChangeLog b/ChangeLog index 2c9d4f0..84e5d6c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -85,6 +85,7 @@ * 1193 ps: Manual Checks can now use RegEx for user matching... * 1194 Linux Agent now supports monitoring of cifs mounts * 1195 AIX Agent now also supports monitoring of cifs mounts + * 1196 apache_status: Added timeout... * 1051 FIX: tcp_conn_stats: fix missing performance data... * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked * 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries diff --git a/agents/plugins/apache_status b/agents/plugins/apache_status index 8def826..de7b187 100755 --- a/agents/plugins/apache_status +++ b/agents/plugins/apache_status @@ -45,6 +45,8 @@ import os, sys, urllib2, re config_dir = os.getenv("MK_CONFDIR", "/etc/check_mk") config_file = config_dir + "/apache_status.conf" +timeout = 5 + if not os.path.exists(config_file): config_file = config_dir + "/apache_status.cfg" @@ -127,13 +129,13 @@ for server in servers: # Try to fetch the status page for each server try: request = urllib2.Request(url, headers={"Accept" : "text/plain"}) - fd = urllib2.urlopen(request) + fd = urllib2.urlopen(request, timeout=timeout) except urllib2.URLError, e: if 'SSL23_GET_SERVER_HELLO:unknown protocol' in str(e): # HACK: workaround misconfigurations where port 443 is used for # serving non ssl secured http url = 'http://%s:%s/server-status?auto' % (address, port) - fd = urllib2.urlopen(url) + fd = urllib2.urlopen(url, timeout=timeout) else: raise

9 years, 8 months

Check_MK Git: check_mk: werk 1429: done some formatting

by Andreas Boesl

Module: check_mk Branch: master Commit: 681a6ed95b651ee7e84d41dc2f5163e5d4c51c52 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=681a6ed95b651e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Oct 29 10:35:57 2014 +0100 werk 1429: done some formatting --- .werks/1429 | 1 + 1 file changed, 1 insertion(+) diff --git a/.werks/1429 b/.werks/1429 index d9470d5..9df5e81 100644 --- a/.werks/1429 +++ b/.werks/1429 @@ -11,6 +11,7 @@ with the full palette of all available snmp inventory functions. The filtering o was done afterwards. This caused needless snmp queries towards the snmp host. The filtering of unwanted checktypes is now done before the snmp host is contacted. + Note: This only applies to the WATO rule Disabled checktypes respectively the parameters <tt>ignored_checktypes</tt> and <tt>ignored_checks</tt>, but not to Disabled services. The latter one matches to service descriptions which are the result of a successful inventory.

9 years, 8 months

Check_MK Git: check_mk: Behaviour in the previous version: If a host should be inventorized it was checked

by Andreas Boesl

Module: check_mk Branch: master Commit: e1d5b5f3799d1cf44fa64d2e60e921df8e6b9dce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1d5b5f3799d1c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Oct 29 10:32:49 2014 +0100 Behaviour in the previous version: If a host should be inventorized it was checked with the full palette of all available snmp inventory functions. The filtering of unwanted checktypes was done afterwards. This caused needless snmp queries towards the snmp host. The filtering of unwanted checktypes is now done before the snmp host is contacted. Note: This only applies to the WATO rule Disabled checktypes respectively the parameters <tt>ignored_checktypes</tt> and <tt>ignored_checks</tt>, but not to Disabled services. The latter one matches to service descriptions which are the result of a successful inventory. --- .werks/1429 | 17 +++++++++++++++++ ChangeLog | 1 + modules/check_mk.py | 13 ++++++++----- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/.werks/1429 b/.werks/1429 new file mode 100644 index 0000000..d9470d5 --- /dev/null +++ b/.werks/1429 @@ -0,0 +1,17 @@ +Title: Disabled snmp checktypes are now sorted out before Check_MK contacts the snmp host +Level: 2 +Component: core +Compatible: compat +Version: 1.2.5i6 +Date: 1414574411 +Class: fix + +Behaviour in the previous version: If a snmp host should be inventorized it was checked +with the full palette of all available snmp inventory functions. The filtering of unwanted checktypes +was done afterwards. This caused needless snmp queries towards the snmp host. + +The filtering of unwanted checktypes is now done before the snmp host is contacted. +Note: This only applies to the WATO rule Disabled checktypes respectively the parameters +<tt>ignored_checktypes</tt> and <tt>ignored_checks</tt>, but not to Disabled services. +The latter one matches to service descriptions which are the result of a successful inventory. + diff --git a/ChangeLog b/ChangeLog index 43ccf0f..2c9d4f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ * 1425 New section header option "encoding" for agent output... * 1129 FIX: Windows MSI-Installer: some systems created corrupted check_mk_agent.msi files... * 1426 FIX: windows agent: logwatch: no longer reports incorrect formatted texts (japanese characters)... + * 1429 FIX: Disabled snmp checktypes are now sorted out before Check_MK contacts the snmp host... Checks & Agents: * 0185 knuerr_rms_humidity, knuerr_rms_temp: Two new Checks to Monitor the Temperature and the Humidity on Knürr RMS Devices diff --git a/modules/check_mk.py b/modules/check_mk.py index 1781abc..f6ba3c6 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2857,10 +2857,13 @@ def make_inventory(checkname, hostnamelist, check_only=False, include_state=Fals try: for host in hostnamelist: - - # Skip SNMP checks on non-SNMP hosts - if is_snmp_check and not is_snmp_host(host): - continue + if is_snmp_check: + # Skip SNMP check on non-SNMP hosts + if not is_snmp_host(host): + continue + # Skip SNMP check if this checktype is disabled + if service_ignored(host, checkname, None): + continue # The decision wether to contact the agent via TCP # is done in get_realhost_info(). This is due to @@ -3109,7 +3112,7 @@ def check_inventory(hostname): def service_ignored(hostname, checktype, service_description): if checktype and checktype in ignored_checktypes: return True - if in_boolean_serviceconf_list(hostname, service_description, ignored_services): + if service_description != None and in_boolean_serviceconf_list(hostname, service_description, ignored_services): return True if checktype and checktype_ignored_for_host(hostname, checktype): return True

9 years, 8 months

Check_MK Git: check_mk: Use other new icon for check parameters

by Mathias Kettner

Module: check_mk Branch: master Commit: 7cf3f02829fe18b3c56329652c2676b8ded964c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7cf3f02829fe18… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 29 10:22:48 2014 +0100 Use other new icon for check parameters --- web/htdocs/images/button_check_parameters_hi.png | Bin 0 -> 1166 bytes web/htdocs/images/button_check_parameters_lo.png | Bin 0 -> 1287 bytes web/htdocs/images/icon_check_parameters.png | Bin 0 -> 1287 bytes web/htdocs/wato.py | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/images/button_check_parameters_hi.png b/web/htdocs/images/button_check_parameters_hi.png new file mode 100644 index 0000000..b24d95d Binary files /dev/null and b/web/htdocs/images/button_check_parameters_hi.png differ diff --git a/web/htdocs/images/button_check_parameters_lo.png b/web/htdocs/images/button_check_parameters_lo.png new file mode 100644 index 0000000..e693211 Binary files /dev/null and b/web/htdocs/images/button_check_parameters_lo.png differ diff --git a/web/htdocs/images/icon_check_parameters.png b/web/htdocs/images/icon_check_parameters.png new file mode 100644 index 0000000..e693211 Binary files /dev/null and b/web/htdocs/images/icon_check_parameters.png differ diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 338a40f..76dac68 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3323,7 +3323,7 @@ def show_service_table(host, firsttime): ("varname", varname), ("host", hostname), ("item", mk_repr(item))]) - html.icon_button(url, _("Edit and analyze the check parameters of this services"), "diagnose") + html.icon_button(url, _("Edit and analyze the check parameters of this service"), "check_parameters") # Permanently disable icon if state_type in ['new', 'old']:

9 years, 8 months

Check_MK Git: check_mk: #1195 AIX Agent now also supports monitoring of cifs mounts

by Bastian Kuhn

Module: check_mk Branch: master Commit: e91ab4c155a8e190299baf734e3371f372290993 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e91ab4c155a8e1… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Oct 29 09:56:54 2014 +0100 #1195 AIX Agent now also supports monitoring of cifs mounts --- .werks/1195 | 9 +++++++++ ChangeLog | 1 + agents/check_mk_agent.aix | 7 +++++++ 3 files changed, 17 insertions(+) diff --git a/.werks/1195 b/.werks/1195 new file mode 100644 index 0000000..cc34016 --- /dev/null +++ b/.werks/1195 @@ -0,0 +1,9 @@ +Title: AIX Agent now also supports monitoring of cifs mounts +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1414572984 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index e6f674c..43ccf0f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -83,6 +83,7 @@ * 1191 Linux agent now also sends information about tmpfs... * 1193 ps: Manual Checks can now use RegEx for user matching... * 1194 Linux Agent now supports monitoring of cifs mounts + * 1195 AIX Agent now also supports monitoring of cifs mounts * 1051 FIX: tcp_conn_stats: fix missing performance data... * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked * 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index d5d3e11..92ec175 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -97,6 +97,13 @@ if type stat >/dev/null 2>&1 ; then waitmax 2 stat -f -c '"'$MP' ok - - - -"' "$MP" || \ echo "$MP hanging 0 0 0 0" done + echo '<<<cifsmounts>>>' + mount | grep ' cifs' | awk '{print $3;}' | \ + while read MP + do + waitmax 2 stat -f -c '"'$MP' ok - - - -"' "$MP" || \ + echo "$MP hanging 0 0 0 0" + done fi echo '<<<ps>>>'

9 years, 8 months

Check_MK Git: check_mk: #1428 Web-API: now able to add cluster hosts

by Andreas Boesl

Module: check_mk Branch: master Commit: eb504eee987f216f0583405f66c05f0a91ac4253 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb504eee987f21… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Oct 29 09:51:12 2014 +0100 #1428 Web-API: now able to add cluster hosts Its quite easy to accomplish. On your add host telegram simply add the new key <tt>{ ".nodes" = ["nodename1", "nodename2"] }</tt>. Please note that the existance of the nodes is not verified. So you might get an invalid host configuration and being unable to activate the changes. --- .werks/1428 | 14 ++++++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/1428 b/.werks/1428 new file mode 100644 index 0000000..f49c6c2 --- /dev/null +++ b/.werks/1428 @@ -0,0 +1,14 @@ +Title: Web-API: now able to add cluster hosts +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i6 +Date: 1414572424 +Class: feature + +Its quite easy to accomplish. On your add host telegram simply add +the new key <tt>{ ".nodes" = ["nodename1", "nodename2"] }</tt>. + +Please note that the existance of the nodes is not verified. +So you might get an invalid host configuration and being unable +to activate the changes. diff --git a/ChangeLog b/ChangeLog index c99ad78..e6f674c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -157,6 +157,7 @@ * 1404 Make title/help of custom user attributes localizable... * 1159 Remote BI Aggregations can now be configured to be checked as single services... * 1163 Service discovery: Added direct link to check parameter ruleset of services... + * 1428 Web-API: now able to add cluster hosts... * 1064 FIX: Fixed rare issue with WATO communication in distributed setups (different OS versions)... * 1089 FIX: Snapshot restore: fixed exception during exception handling...... * 1091 FIX: logwatch patterns: allow unicode text in pattern comment diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 18dfd15..338a40f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -17134,7 +17134,7 @@ class API: def __get_valid_api_host_attributes(self, attributes): result = {} - host_attribute_names = map(lambda (x, y): x.name(), host_attributes) + ["inventory_failed"] + host_attribute_names = map(lambda (x, y): x.name(), host_attributes) + ["inventory_failed", ".nodes"] for key, value in attributes.items(): if key in host_attribute_names:

9 years, 8 months

Check_MK Git: check_mk: #1194 Linux Agent now supports monitoring of cifs mounts

by Bastian Kuhn

Module: check_mk Branch: master Commit: cf626b6dceb5de85a4ef0eefa417abbae61a2798 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf626b6dceb5de… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Oct 29 09:41:07 2014 +0100 #1194 Linux Agent now supports monitoring of cifs mounts --- .werks/1194 | 9 +++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 14 ++++++++++++++ 3 files changed, 24 insertions(+) diff --git a/.werks/1194 b/.werks/1194 new file mode 100644 index 0000000..4217f9b --- /dev/null +++ b/.werks/1194 @@ -0,0 +1,9 @@ +Title: Linux Agent now supports monitoring of cifs mounts +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1414572031 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 777ff18..c99ad78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -82,6 +82,7 @@ * 1190 statgrab_cpu: Check can now handle parameters * 1191 Linux agent now also sends information about tmpfs... * 1193 ps: Manual Checks can now use RegEx for user matching... + * 1194 Linux Agent now supports monitoring of cifs mounts * 1051 FIX: tcp_conn_stats: fix missing performance data... * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked * 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index bc1c7df..248f2b4 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -166,6 +166,20 @@ then printf '\n'|| echo "$MP hanging 0 0 0 0" fi done + + echo '<<<cifsmounts>>>' + sed -n '/ cifs\? /s/[^ ]* $[^ ]*$ .*/\1/p' < /proc/mounts | + sed 's/\\040/ /g' | + while read MP + do + if [ $STAT_VERSION != $STAT_BROKE ]; then + waitmax -s 9 2 stat -f -c "$MP ok %b %f %a %s" "$MP" || \ + echo "$MP hanging 0 0 0 0" + else + waitmax -s 9 2 stat -f -c "$MP ok %b %f %a %s" "$MP" && \ + printf '\n'|| echo "$MP hanging 0 0 0 0" + fi + done fi # Check mount options. Filesystems may switch to 'ro' in case

9 years, 8 months

Check_MK Git: check_mk: Updated Werk description

by Mathias Kettner

Module: check_mk Branch: master Commit: 994aaa1258073fc09482d06cca42116e00194b91 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=994aaa1258073f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 29 09:32:13 2014 +0100 Updated Werk description --- .werks/1386 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/1386 b/.werks/1386 index e4f5a35..bc31fcf 100644 --- a/.werks/1386 +++ b/.werks/1386 @@ -1,5 +1,5 @@ Title: oracle_jobs: Bugfix for forever running jobs -Level: 3 +Level: 1 Component: checks Compatible: compat Version: 1.2.5i6

9 years, 8 months

← Newer
1
2
3
4
5
6
7
8
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2014