Checkmk git commits May 2016

checkmk-commits@lists.checkmk.com

6 participants
231 discussions

by Mathias Kettner

Module: check_mk Branch: master Commit: e01adb1c1cbb5cd6d85c2709e6928c3dbce99856 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e01adb1c1cbb5c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 27 12:13:50 2016 +0200 Updated bug entries #2495 --- .bugs/2495 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/2495 b/.bugs/2495 new file mode 100644 index 0000000..c1d1676 --- /dev/null +++ b/.bugs/2495 @@ -0,0 +1,8 @@ +Title: --cache not working on -I with explicity hosts +Component: core +State: open +Date: 2016-05-27 12:13:19 +Targetversion: 1.2.8 +Class: bug + +This option seems to be without function.

8 years, 6 months

fixed typo

by Simon Betz

Module: check_mk Branch: master Commit: 2511f85383e182ba7cdc23aa05cb3445149ea05e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2511f85383e182… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri May 27 11:16:07 2016 +0200 fixed typo --- .werks/3623 | 2 +- ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/3623 b/.werks/3623 index d11b018..4345f88 100644 --- a/.werks/3623 +++ b/.werks/3623 @@ -1,4 +1,4 @@ -Title: ipmi: fixed discrete sensor discovery if sensor is disable +Title: ipmi: fixed discrete sensor discovery if sensor is disabled Level: 1 Component: checks Class: fix diff --git a/ChangeLog b/ChangeLog index 11bbc76..bd45b15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -236,7 +236,7 @@ * 3607 FIX: wut_webtherm: fixed missing sensor data if only decimal comma marked values are available * 3613 FIX: Fix vertical scaling of graph for disk utilization from 0...1% to 0...100% * 3577 FIX: Solaris agent: Fixed performance issue introduced with #3389 - * 3623 FIX: ipmi: fixed discrete sensor discovery if sensor is disable + * 3623 FIX: ipmi: fixed discrete sensor discovery if sensor is disabled Multisite: * 3187 notification view: new filter for log command via regex

8 years, 6 months

3623 FIX ipmi: fixed discrete sensor discovery if sensor is disable

by Simon Betz

Module: check_mk Branch: master Commit: 1693fdf77bb6cd239b66ba15c0a08c5e8c72bfd0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1693fdf77bb6cd… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri May 27 10:41:16 2016 +0200 3623 FIX ipmi: fixed discrete sensor discovery if sensor is disable --- .werks/3623 | 10 ++++++++++ ChangeLog | 1 + checks/ipmi | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3623 b/.werks/3623 new file mode 100644 index 0000000..d11b018 --- /dev/null +++ b/.werks/3623 @@ -0,0 +1,10 @@ +Title: ipmi: fixed discrete sensor discovery if sensor is disable +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1464338418 + + diff --git a/ChangeLog b/ChangeLog index fe219ae..11bbc76 100644 --- a/ChangeLog +++ b/ChangeLog @@ -236,6 +236,7 @@ * 3607 FIX: wut_webtherm: fixed missing sensor data if only decimal comma marked values are available * 3613 FIX: Fix vertical scaling of graph for disk utilization from 0...1% to 0...100% * 3577 FIX: Solaris agent: Fixed performance issue introduced with #3389 + * 3623 FIX: ipmi: fixed discrete sensor discovery if sensor is disable Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/ipmi b/checks/ipmi index dd82c50..3c574c8 100644 --- a/checks/ipmi +++ b/checks/ipmi @@ -128,7 +128,7 @@ def ipmi_get_ignored_sensors(hostname): def ipmi_ignore_entry(name, state, ignored_sensors): - if ipmi_ignore_nr and state.startswith('nr'): + if ipmi_ignore_nr and (state.startswith('nr') or state.startswith('ns')): return True for e in ignored_sensors:

8 years, 6 months

Reserved 10 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: 17d71f4b2f2b2fa58af2685d92f69e4004733655 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=17d71f4b2f2b2f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri May 27 10:39:55 2016 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 8643b83..00987dc 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3623 +3633

8 years, 6 months

3612 nfsmounts: now has performance data

by Simon Betz

Module: check_mk Branch: master Commit: 98b2ea52436f2ad7cad71463b9fbfb7475dd8f4c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=98b2ea52436f2a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri May 27 09:51:32 2016 +0200 3612 nfsmounts: now has performance data --- .werks/3612 | 9 +++++++++ ChangeLog | 1 + checks/network_fs.include | 35 ++++++++++++++++++++--------------- checks/nfsexports | 19 +++++++++++-------- checks/nfsmounts | 13 +++++++------ 5 files changed, 48 insertions(+), 29 deletions(-) diff --git a/.werks/3612 b/.werks/3612 new file mode 100644 index 0000000..750a21e --- /dev/null +++ b/.werks/3612 @@ -0,0 +1,9 @@ +Title: nfsmounts: now has performance data +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1464335441 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 4f71cbf..fe219ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -87,6 +87,7 @@ * 3137 linux and solaris agent: mrpe checks now support option to append the cache age to cached results... * 3610 mk_oracle: linux plugin now available for solaris * 3611 websphere_mq_queues: now age of messages not processed is configurable... + * 3612 nfsmounts: now has performance data * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/checks/network_fs.include b/checks/network_fs.include index c25f2f4..0dde3c1 100644 --- a/checks/network_fs.include +++ b/checks/network_fs.include @@ -24,45 +24,50 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# Example out from agent: + # <<<...mounts>>> # /foobar hanging 0 0 0 0 # /with spaces ok 217492 123563 112515 524288 + def inventory_network_fs_mounts(info): return [ (" ".join(line[:-5]), None) for line in info ] + def check_network_fs_mounts(item, _no_params, info): for line in info: mountpoint = " ".join(line[:-5]) if mountpoint == item: # On some operating systems there is no information about - # used and free space, but just dahshes (e.g. AIX) + # used and free space, but just dashes (e.g. AIX) if line[-4] == '-': if line[-5] == 'ok': return 0, "mount seems OK" else: return 2, "Server not responding" - size_blocks = int(line[-4]) free_blocks = int(line[-2]) # for non-root user - blocksize = int(line[-1]) + blocksize = int(line[-1]) if size_blocks <= 0 or free_blocks < 0 or blocksize > 1024*1024: - return (2, "Stale fs handle") + return 2, "Stale fs handle" + + size_bytes = size_blocks * blocksize + free_bytes = free_blocks * blocksize + used_bytes = size_bytes - free_bytes + used_perc = 100.0 * used_bytes / size_bytes + perfdata = [("fs_size", size_bytes), ("fs_used", used_bytes)] if line[-5] == 'ok': - gb = 1024 * 1024 * 1024.0 - size_gb = (size_blocks * blocksize) / gb - if size_gb == 0: - return (0, "server is responding") + if size_bytes == 0: + return 0, "server is responding", perfdata + + return 0, "%.1f%% used (%s of %s)" % \ + (used_perc, get_bytes_human_readable(used_bytes), + get_bytes_human_readable(size_bytes)), perfdata - free_gb = (free_blocks * blocksize) / gb - used_gb = size_gb - free_gb - used_perc = 100.0 * used_gb / size_gb - return (0, "%.1f%% used (%.1f of %.1f GB)" % (used_perc, used_gb, size_gb)) else: - return (2, "server not responding") - return (3, "not mounted") + return 2, "server not responding", perfdata + return 3, "not mounted" diff --git a/checks/nfsexports b/checks/nfsexports index 8203c35..4ac1874 100644 --- a/checks/nfsexports +++ b/checks/nfsexports @@ -24,12 +24,14 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + # This check verifies a given NFS export is registered with mountd. # Optionally we can add tracking of allowed clients and filesystem ID. # Agent info # [['/mirrored/data/recording', '172.0.0.0/255.0.0.0']] + def inventory_nfsexports(checkname, info): # reminder to self: inventorize the exported fs, and maybe even the fs id. # but do not inventorize the allowed clients unless i'm really sure that @@ -48,17 +50,18 @@ def check_nfsexports(item, _no_params, info): # if the agent returned an empty list then it found entries in /etc/exports # but apparently no daemons were running. if len(info) == 0: - return (2, "exports defined but no exports found in export list. Daemons might not be working") + return 2, "exports defined but no exports found in export list. Daemons might not be working" # otherwise lets see if our export exists. for line in info: - exported_path = line[0] - if exported_path == item: - return (0, "export is active") - return (2, "export not found in export list") + if item == line[0]: + return 0, "export is active" + + return 2, "export not found in export list" + check_info["nfsexports"] = { - 'check_function': check_nfsexports, - 'inventory_function': inventory_nfsexports, - 'service_description': 'NFS export %s', + 'check_function' : check_nfsexports, + 'inventory_function' : inventory_nfsexports, + 'service_description' : 'NFS export %s', } diff --git a/checks/nfsmounts b/checks/nfsmounts index 7ed4f64..a9cc3eb 100644 --- a/checks/nfsmounts +++ b/checks/nfsmounts @@ -24,16 +24,17 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# Example out from agent: + # <<<nfsmounts>>> # /foobar hanging 0 0 0 0 # /with spaces ok 217492 123563 112515 524288 check_info["nfsmounts"] = { - 'check_function': check_network_fs_mounts, - 'inventory_function': inventory_network_fs_mounts, - 'service_description': 'NFS mount %s', - 'group': 'network_fs', - 'includes': [ 'network_fs.include' ], + 'check_function' : check_network_fs_mounts, + 'inventory_function' : inventory_network_fs_mounts, + 'service_description' : 'NFS mount %s', + 'has_perfdata' : True, + 'group' : 'network_fs', + 'includes' : [ 'network_fs.include' ], }

8 years, 6 months

Moved common cmk regex handling code to cmk.regex module

by Lars Michelsen

Module: check_mk Branch: master Commit: 70cf435ea3399702c43cb503a8ec47e758c5fda4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70cf435ea33997… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 25 15:23:25 2016 +0200 Moved common cmk regex handling code to cmk.regex module --- bin/mkeventd | 22 ++---------- checks/ps.include | 10 +----- lib/regex.py | 74 ++++++++++++++++++++++++++++++++++++++++ modules/check_mk.py | 8 +---- modules/check_mk_base.py | 15 +------- modules/discovery.py | 1 + modules/events.py | 1 + modules/notify.py | 2 ++ web/htdocs/bi.py | 1 + web/htdocs/lib.py | 23 +------------ web/htdocs/metrics.py | 1 + web/htdocs/wato.py | 1 + web/plugins/views/inventory.py | 1 + web/plugins/views/painters.py | 2 ++ 14 files changed, 90 insertions(+), 72 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=70cf435ea3…

8 years, 6 months

3242 FIX Fixed hostname translation for empty optional groups

by Sven Panne

Module: check_mk Branch: master Commit: 17a1373947fda31798a2e524be270b1ceeb21634 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=17a1373947fda3… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 25 14:55:29 2016 +0200 3242 FIX Fixed hostname translation for empty optional groups --- .werks/3242 | 10 ++++++++++ ChangeLog | 1 + modules/check_mk_base.py | 3 ++- web/htdocs/wato.py | 3 ++- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/3242 b/.werks/3242 new file mode 100644 index 0000000..1bb1b70 --- /dev/null +++ b/.werks/3242 @@ -0,0 +1,10 @@ +Title: Fixed hostname translation for empty optional groups +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1464180857 + + diff --git a/ChangeLog b/ChangeLog index 7c31a51..4f71cbf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -389,6 +389,7 @@ * 3461 FIX: Fixed exception in case manpage for non existant check is accessed * 3527 FIX: WATO service discovery: fixed warning with locked hosts... * 3534 FIX: Fixed exception with upload of interlaced PNG files... + * 3242 FIX: Fixed hostname translation for empty optional groups Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 564f0af..2327d0c 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -648,10 +648,11 @@ def do_hostname_translation(translation, hostname): if not expr.endswith('$'): expr += '$' rcomp = regex(expr) + # re.RegexObject.sub() by hand to handle non-existing references mo = rcomp.match(hostname) if mo: hostname = subst - for nr, text in enumerate(mo.groups()): + for nr, text in enumerate(mo.groups("")): hostname = hostname.replace("\\%d" % (nr+1), text) # 4. Explicity mapping diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4a76689..b6da6a8 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -13750,10 +13750,11 @@ def do_hostname_translation(translation, hostname): if not expr.endswith('$'): expr += '$' rcomp = regex(expr) + # re.RegexObject.sub() by hand to handle non-existing references mo = rcomp.match(hostname) if mo: hostname = subst - for nr, text in enumerate(mo.groups()): + for nr, text in enumerate(mo.groups("")): hostname = hostname.replace("\\%d" % (nr+1), text) # 4. Explicit mapping

8 years, 6 months

fixed incorrect function

by Andreas Boesl

Module: check_mk Branch: master Commit: 0ecac68ccd5996785c5399cebcea3289ef9614dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ecac68ccd5996… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed May 25 14:49:18 2016 +0200 fixed incorrect function --- modules/automation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/automation.py b/modules/automation.py index f3d467a..8ad0d59 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -460,7 +460,7 @@ def automation_restart(job = "restart"): try: backup_path = None - if another_activation_is_in_progress(): + if try_get_activation_lock(): raise MKAutomationError("Cannot activate changes. " "Another activation process is currently in progresss")

8 years, 6 months

3611 websphere_mq_queues: now age of messages not processed is configurable

by Simon Betz

Module: check_mk Branch: master Commit: 47c0c9171dd2c6551e2d6bd105d9705ca713311b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47c0c9171dd2c6… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed May 25 14:47:43 2016 +0200 3611 websphere_mq_queues: now age of messages not processed is configurable To make this check work you have to install the <tt>websphere_mq</tt> plugin. --- .werks/3611 | 9 ++ ChangeLog | 1 + agents/plugins/websphere_mq | 187 ++++++++++++++++++++-------------- checks/websphere_mq_channels | 25 +++-- checks/websphere_mq_queues | 160 +++++++++++++++++++++-------- web/plugins/wato/check_parameters.py | 55 +++++++--- 6 files changed, 293 insertions(+), 144 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=47c0c9171d…

8 years, 6 months

3539 Event console: The EC notifications are now also controlled through the master control snapin

by Andreas Boesl

Module: check_mk Branch: master Commit: ec10e72525b8a48d1bf548dd33f61e0aa8f07b97 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec10e72525b8a4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed May 25 14:46:13 2016 +0200 3539 Event console: The EC notifications are now also controlled through the master control snapin In previous versions, the event console always sent notifications, hereby ignoring the <i>Notifications</i> switch in the master control plugin. This has been fixed. --- .werks/3539 | 12 ++++++++++++ ChangeLog | 1 + bin/mkeventd | 43 +++++++++++++++++++++++++++++++++++++------ 3 files changed, 50 insertions(+), 6 deletions(-) diff --git a/.werks/3539 b/.werks/3539 new file mode 100644 index 0000000..55ae0c8 --- /dev/null +++ b/.werks/3539 @@ -0,0 +1,12 @@ +Title: Event console: The EC notifications are now also controlled through the master control snapin +Level: 1 +Component: ec +Compatible: compat +Version: 1.2.9i1 +Date: 1464179953 +Class: feature + +In previous versions, the event console always sent notifications, hereby +ignoring the <i>Notifications</i> switch in the master control plugin. + +This has been fixed. diff --git a/ChangeLog b/ChangeLog index 0094e6e..bbf2916 100644 --- a/ChangeLog +++ b/ChangeLog @@ -428,6 +428,7 @@ * 3262 Event Console: bulk delete button for custom MIBs now available * 3388 Event Console can now process SNMPv3 traps... * 3390 Events can now be cancelled by the syslog application... + * 3539 Event console: The EC notifications are now also controlled through the master control snapin... * 3058 FIX: Event Console is now allowing non loadable MIB modules on startup... * 3097 FIX: mkeventd: fixed crash with non-descriptive error message if mibs couldn't be loaded * 3335 FIX: Improved error handling when requested rule pack does not exist diff --git a/bin/mkeventd b/bin/mkeventd index 59c56f9..385043c 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -475,6 +475,30 @@ def initialize_snmp_credentials(): securityEngineId=snmp_v2c.OctetString(hexValue=engine_id) ) +#. +# .--Livestatus----------------------------------------------------------. +# | _ _ _ _ | +# | | | (_)_ _____ ___| |_ __ _| |_ _ _ ___ | +# | | | | \ \ / / _ \/ __| __/ _` | __| | | / __| | +# | | |___| |\ V / __/\__ \ || (_| | |_| |_| \__ \ | +# | |_____|_| \_/ \___||___/\__\__,_|\__|\__,_|___/ | +# | | +# +----------------------------------------------------------------------+ +# | Livestatus connection | +# '----------------------------------------------------------------------' + +def livestatus_query(query): + try: + livesock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + livesock.connect(g_livestatus_socket) + livesock.send(query) + livesock.shutdown(socket.SHUT_WR) + return livesock.recv(10000000) + except Exception, e: + log("Unable to contact monitoring core") + if opt_debug: + raise + #. # .--Timeperiods---------------------------------------------------------. @@ -498,13 +522,8 @@ def update_timeperiods(): if g_timeperiods != None and int(time.time()) / 60 == g_last_timeperiod_update: return # only update once a minute log("Updating timeperiod information") - try: - livesock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) - livesock.connect(g_livestatus_socket) - livesock.send("GET timeperiods\nColumns: name alias in\n") - livesock.shutdown(socket.SHUT_WR) - answer = livesock.recv(10000000) + answer = livestatus_query("GET timeperiods\nColumns: name alias in\n") table = [ line.split(';') for line in answer.split('\n')[:-1] ] new_timeperiods = {} for tpname, alias, isin in table: @@ -3411,6 +3430,18 @@ def do_event_action(action, event, user=""): monitoring_state_names = [ "OK", "WARN", "CRIT", "UNKNOWN" ] def do_notify(event, username, is_cancelling): + # Check if notifications are enabled at all + try: + answer = livestatus_query("GET status\nColumns: enable_notifications\nOutputFormat: python\n") + if answer: + notifications_enabled = eval(answer) + if not notifications_enabled[0][0]: + log("Notifications are currently disabled. Skipped notification for event %d" % event["id"]) + return + except: + # On any error, assume that notifications are enabled + pass + # Create notification context based on event # If the host name is the IP address, then use that. Otherwise let

8 years, 6 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2016