Checkmk git commits September 2016

checkmk-commits@lists.checkmk.com

9 participants
301 discussions

smart: Supressing error message when calling manually and no megacli present

by Lars Michelsen

Module: check_mk Branch: master Commit: a8e8a676a5662bab2806890b59f76be3fa22f762 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8e8a676a5662b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 15 10:01:45 2016 +0200 smart: Supressing error message when calling manually and no megacli present --- agents/plugins/smart | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/agents/plugins/smart b/agents/plugins/smart index 0d02572..e8141e7 100755 --- a/agents/plugins/smart +++ b/agents/plugins/smart @@ -159,11 +159,11 @@ if which smartctl > /dev/null 2>&1 ; then # Call MegaRaid submodule if conditions are met - if type MegaCli >/dev/null ; then + if type MegaCli >/dev/null 2>&1; then MegaCli_bin="MegaCli" - elif type MegaCli64 >/dev/null ; then + elif type MegaCli64 >/dev/null 2>&1; then MegaCli_bin="MegaCli64" - elif type megacli >/dev/null ; then + elif type megacli >/dev/null 2>&1; then MegaCli_bin="megacli" else MegaCli_bin="unknown"

8 years

mssql_blocked_sessions: Reporting no blocked sessions in case of empty section

by Lars Michelsen

Module: check_mk Branch: master Commit: 76efa9bc7ae38cdd6f1f7f4d7281c02bc1d43c9c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76efa9bc7ae38c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 15 10:04:35 2016 +0200 mssql_blocked_sessions: Reporting no blocked sessions in case of empty section --- checks/mssql_blocked_sessions | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/checks/mssql_blocked_sessions b/checks/mssql_blocked_sessions index 224bfdc..e874081 100644 --- a/checks/mssql_blocked_sessions +++ b/checks/mssql_blocked_sessions @@ -30,15 +30,17 @@ # 119 232292187 LCK_M_U 75 # 76 221526672 LCK_M_U 115 +# TODO: Make this check aware of multiple instances! Don't handle the blocked +# sessions independent of instances anymore. Use same service description +# schema as "mssql_instance". def inventory_mssql_blocked_sessions(info): return [(None, None)] def check_mssql_blocked_sessions(_no_item, params, info): if not info: - # Assume general connection problem to the database, which is reported - # by the "X Instance" service and skip this check. - raise MKCounterWrapped("Failed to connect to database") + yield 0, "No blocked sessions" + return state = 2 if params:

8 years

EC: The SNMP engine ID is now optional for SNMP credentials

by Lars Michelsen

Module: check_mk Branch: master Commit: 5487329ba22700fd5c2a478d68be5336051d0bce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5487329ba22700… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 15 09:14:37 2016 +0200 EC: The SNMP engine ID is now optional for SNMP credentials --- bin/mkeventd | 9 +++++---- web/plugins/wato/mkeventd.py | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index a9662c4..e541678 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -26,6 +26,7 @@ import socket, os, time, sys, getopt, signal, thread, pprint, re, \ select, subprocess, stat, string +import traceback from cmk.regex import regex, is_regex import cmk.daemon @@ -355,7 +356,7 @@ def replace_groups(text, origtext, groups): def format_exception(): - import StringIO, traceback + import StringIO txt = StringIO.StringIO() t, v, tb = sys.exc_info() traceback.print_exception(t, v, tb, None, txt) @@ -375,7 +376,7 @@ class VerboseLock: log("LOCK %s: %d -> %d" % (self._name, self._depth-1, self._depth)) return self - def __exit__(self, type, value, traceback): + def __exit__(self, type, value, tb): self._depth -= 1 if opt_debug: log("LOCK %s: %d -> %d" % (self._name, self._depth+1, self._depth)) @@ -463,7 +464,7 @@ def initialize_snmp_credentials(): # SNMPv1/v2 if type(credentials) != tuple: - snmp_config.addV1System(g_snmp_engine, 'snmpv2-' % user_num, credentials) + snmp_config.addV1System(g_snmp_engine, 'snmpv2-%d' % user_num, credentials) continue # SNMPv3 @@ -4242,4 +4243,4 @@ try: except Exception, e: if opt_debug: raise - bail_out(e) + bail_out(traceback.format_exc()) diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index ab666d8..0f77a74 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -2592,7 +2592,7 @@ if mkeventd_enabled: allow_empty = False, )), ], - optional_keys = [], + optional_keys = ["engine_ids"], ), title = _("Credentials for processing SNMP traps"), help = _("When you want to process SNMP traps with the Event Console it is "

8 years

update for wk3802

by Andreas Boesl

Module: check_mk Branch: master Commit: 4e962120ad4f5f62dd3d22d7d898fd8205d81bfd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e962120ad4f5f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Sep 14 17:21:04 2016 +0200 update for wk3802 --- modules/check_mk_base.py | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index ea690fb..ae574a6 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -756,6 +756,7 @@ def get_agent_info_program(commandline): exepath = commandline.split()[0] # for error message, hide options! vverbose("Calling external program %s\n" % commandline) + p = None try: if monitoring_core == "cmc": p = subprocess.Popen(commandline, shell=True, stdin=open(os.devnull),

8 years

3803 netapp_api_connection: reports any errors happened during the collection of data

by Andreas Boesl

Module: check_mk Branch: master Commit: 374a33569b77f5e3d5d12180861f8b3df572fdf2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=374a33569b77f5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Sep 14 17:11:41 2016 +0200 3803 netapp_api_connection: reports any errors happened during the collection of data This check shows insufficient user permissions or invalid user credentials as warnings. You can setup a WATO rule which can change the warning message(s) to an other state. --- .werks/3803 | 10 ++++++ ChangeLog | 1 + agents/special/agent_netapp | 46 +++++++++++++------------- checkman/netapp_api_connection | 14 ++++++++ checks/netapp_api_connection | 64 ++++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 19 +++++++++++ 6 files changed, 132 insertions(+), 22 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=374a33569b…

8 years

EC: Improved some texts of SNMP trap credential rule

by Lars Michelsen

Module: check_mk Branch: master Commit: 890412f1a79e11a4970e48f888d69a69b5cf7a32 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=890412f1a79e11… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 14 16:17:43 2016 +0200 EC: Improved some texts of SNMP trap credential rule --- web/plugins/wato/mkeventd.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index f127d79..ab666d8 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -2581,7 +2581,7 @@ if mkeventd_enabled: regex_error = _("The engine IDs have to be configured as hex strings " "like <tt>8000000001020304</tt>."), ), - title = _("Engine ID"), + title = _("Engine IDs (only needed for SNMPv3)"), help = _("Each SNMPv3 device has it's own engine ID. This is normally " "automatically generated, but can also be configured manually " "for some devices. As the engine ID is used for the encryption " @@ -2594,10 +2594,10 @@ if mkeventd_enabled: ], optional_keys = [], ), - title = _("Credentials for processing SNMPv3 traps"), - help = _("When you want to process SNMPv3 traps with the Event Console it is " + title = _("Credentials for processing SNMP traps"), + help = _("When you want to process SNMP traps with the Event Console it is " "necessary to configure the credentials to decrypt the incoming traps."), - text_if_empty = _("SNMPv3 traps not configured"), + text_if_empty = _("SNMP traps not configured"), ), domain = "mkeventd", )

8 years

3874 FIX fixed graphs displaying wrong labels

by Simon Betz

Module: check_mk Branch: master Commit: c565f636bd96305f43bd05526ccf3325fa395d34 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c565f636bd9630… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Sep 14 14:16:30 2016 +0200 3874 FIX fixed graphs displaying wrong labels --- .werks/3874 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/lib.py | 15 ++++++--------- web/plugins/metrics/check_mk.py | 6 ++++++ 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/.werks/3874 b/.werks/3874 new file mode 100644 index 0000000..4f0d816 --- /dev/null +++ b/.werks/3874 @@ -0,0 +1,10 @@ +Title: fixed graphs displaying wrong labels +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1473855295 + + diff --git a/ChangeLog b/ChangeLog index 5210c40..db7bf5a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -495,6 +495,7 @@ * 3767 FIX: Fixed possible UnicodeDecodeError when having users with umlauts in the user ID * 3850 FIX: Fixed JS error when quicksearch snapin not in sidebar * 3871 FIX: stale services view: excluded services in downtime per default + * 3874 FIX: fixed graphs displaying wrong labels WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 148697c..dfaf6b1 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -560,7 +560,7 @@ def nic_speed_human_readable(bits_per_second): # and drop useless zeroes at the end of the fraction # 45.1 -> "45.1" # 45.0 -> "45" -def drop_dotzero(v, digits=1): +def drop_dotzero(v, digits=2): t = "%%.%df" % digits % v if "." in t: return t.rstrip("0").rstrip(".") @@ -700,7 +700,6 @@ def date_month_human_readable(timestamp): def calculate_scaled_number(v, base=1024.0, precision=1): base = float(base) - digits = 1 if v >= base ** 4: symbol = "T" scale = base ** 4 @@ -725,14 +724,9 @@ def calculate_scaled_number(v, base=1024.0, precision=1): def calculate_scaled_bytes(v, base=1024.0, bytefrac=True): + digits = 2 if not bytefrac: digits = 0 - elif v >= 100: - digits = 0 - elif v >= 10: - digits = 1 - else: - digits = 2 return calculate_scaled_number(v, base, precision=digits) @@ -749,7 +743,10 @@ def bytes_human_readable(b, *args, **kwargs): scale_symbol, places_after_comma, scale_factor = calculate_scaled_bytes(b, *args, **kwargs) scaled_value = float(b) / scale_factor - return (u"%%.%df %%s%%s" % places_after_comma) % (scaled_value, scale_symbol, unit) + if scale_symbol == "" and unit == "B": + return u"%.0f %s%s" % (scaled_value, scale_symbol, unit) + else: + return (u"%%.%df %%s%%s" % places_after_comma) % (scaled_value, scale_symbol, unit) def bytes_human_readable_list(values, *args, **kwargs): diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 2cac0b9..51739e4 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -512,6 +512,12 @@ metric_info["mem_used"] = { "unit" : "bytes", } +metric_info["mem_available"] = { + "color" : "21/a", + "title" : _("RAM available"), + "unit" : "bytes", +} + metric_info["pagefile_used"] = { "color": "#408f20", "title" : _("Commit Charge"),

8 years

Fixed possible exception during discovery when having a management board configured

by Lars Michelsen

Module: check_mk Branch: master Commit: 20ca34d70341702e2be27d79f6931803cb024df6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20ca34d7034170… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 14 13:55:23 2016 +0200 Fixed possible exception during discovery when having a management board configured --- modules/discovery.py | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/discovery.py b/modules/discovery.py index add7672..6bb1d36 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -692,6 +692,7 @@ def discover_services(hostname, check_types, use_caches, do_snmp_scan, on_error, address = cached_dns_lookup(address, family) if protocol == "snmp": + management_check_types = [] try: management_check_types = snmp_scan(hostname, address, on_error) except Exception, e:

8 years

fixed invalid indentation

by Andreas Boesl

Module: check_mk Branch: master Commit: f6c974dc2e349ab7e029079742b67bd27ad83ee8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6c974dc2e349a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Sep 14 13:30:14 2016 +0200 fixed invalid indentation --- agents/special/agent_netapp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index 03f245f..ab66b14 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -1121,18 +1121,18 @@ try: server.set_vfiler("") # revert back to default (no) vfiler - # Snapmirror - for vfiler in vfiler_names + [""]: - server.set_vfiler(vfiler) - response = server.invoke("snapmirror-get-status") - data = response.children_get() - if not data: - continue - data = data[1] - print format_config(data, "snapvault", "source-location", - config_report = ["lag-time", "state", "status", "source-location", "destination-location"], - config_rename = {"source-location": "source-system", "destination-location": "destination-system"}) - server.set_vfiler("") + # Snapmirror + for vfiler in vfiler_names + [""]: + server.set_vfiler(vfiler) + response = server.invoke("snapmirror-get-status") + data = response.children_get() + if not data: + continue + data = data[1] + print format_config(data, "snapvault", "source-location", + config_report = ["lag-time", "state", "status", "source-location", "destination-location"], + config_rename = {"source-location": "source-system", "destination-location": "destination-system"}) + server.set_vfiler("") # VFiler Counters

8 years

3802 FIX Fixed excess Check Helper PIPEs when a datasource program runs into a timeout

by Andreas Boesl

Module: check_mk Branch: master Commit: 87e8ede5e797ee1d85cd78e61292dc27a06f90ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87e8ede5e797ee… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Sep 14 11:53:56 2016 +0200 3802 FIX Fixed excess Check Helper PIPEs when a datasource program runs into a timeout A timeout during the execution of a datasource program could cause leftover stderr/stderr pipes for the Check_MK Helper process. --- .werks/3802 | 11 +++++++++++ ChangeLog | 1 + modules/check_mk_base.py | 8 +++++++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.werks/3802 b/.werks/3802 new file mode 100644 index 0000000..a7bae20 --- /dev/null +++ b/.werks/3802 @@ -0,0 +1,11 @@ +Title: Fixed excess Check Helper PIPEs when a datasource program runs into a timeout +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1473846635 +Class: fix + +A timeout during the execution of a datasource program could cause +leftover stderr/stderr pipes for the Check_MK Helper process. + diff --git a/ChangeLog b/ChangeLog index ef36208..5210c40 100644 --- a/ChangeLog +++ b/ChangeLog @@ -387,6 +387,7 @@ * 3801 FIX: Fixed race condition with persisted data... * 3854 FIX: juniper_bgp_state: Fixed service descriptions in some cases... * 3837 FIX: Fixed empty check if lnx_if info contains additional line... + * 3802 FIX: Fixed excess Check Helper PIPEs when a datasource program runs into a timeout... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 48b385a..ea690fb 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -775,9 +775,15 @@ def get_agent_info_program(commandline): if p: os.killpg(os.getpgid(p.pid), signal.SIGTERM) raise - except Exception, e: raise MKAgentError("Could not execute '%s': %s" % (exepath, e)) + finally: + # The stdout and stderr pipe are not closed correctly on a MKTimeout + # Normally these pipes getting closed after p.communicate finishes + # Closing them a second time in a OK scenario won't hurt neither.. + if p: + p.stdout.close() + p.stderr.close() if exitstatus: if exitstatus == 127:

8 years

← Newer
1
...
15
16
17
18
19
20
21
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2016