Checkmk git commits September 2016

checkmk-commits@lists.checkmk.com

9 participants
301 discussions

Cleaned up display options to be an object instead of a static class

by Lars Michelsen

Module: check_mk Branch: master Commit: 0537b09db3a4efadb6f92fc857e5e832f85b02a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0537b09db3a4ef… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 20 08:17:39 2016 +0200 Cleaned up display options to be an object instead of a static class --- web/htdocs/views.py | 156 +++++++++++++++++++------------------- web/plugins/icons/builtin.py | 6 +- web/plugins/icons/wato.py | 2 +- web/plugins/views/availability.py | 10 +-- web/plugins/views/inventory.py | 2 +- web/plugins/views/painters.py | 2 +- web/plugins/views/perfometer.py | 2 +- 7 files changed, 88 insertions(+), 92 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0537b09db3…

8 years

3875 tsm_stagingpools: check is now cluster aware

by Simon Betz

Module: check_mk Branch: master Commit: 36795d2ab81db994e19e5d83cfc00339bd186985 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36795d2ab81db9… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Sep 20 07:42:14 2016 +0200 3875 tsm_stagingpools: check is now cluster aware --- .werks/3875 | 9 ++++++ ChangeLog | 1 + checks/tsm_stagingpools | 82 +++++++++++++++++++++++++++++-------------------- 3 files changed, 59 insertions(+), 33 deletions(-) diff --git a/.werks/3875 b/.werks/3875 new file mode 100644 index 0000000..9c6f0fa --- /dev/null +++ b/.werks/3875 @@ -0,0 +1,9 @@ +Title: tsm_stagingpools: check is now cluster aware +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1474350106 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index bca09fc..8745e77 100644 --- a/ChangeLog +++ b/ChangeLog @@ -166,6 +166,7 @@ * 3859 check_mail_loop.vbs: New MRPE script to perform a mail loop check via Outlook MAPI... * 3838 hitachi_hus_dku & hitachi_hus_dkc: more detailed output even if everything is in state OK... * 3839 filehandler: added new plugin for monitoring file handles in linux... + * 3875 tsm_stagingpools: check is now cluster aware * 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/tsm_stagingpools b/checks/tsm_stagingpools index ed8d823..a2cbf93 100644 --- a/checks/tsm_stagingpools +++ b/checks/tsm_stagingpools @@ -42,45 +42,60 @@ factory_settings["tsm_stagingpools_default_levels"] = { "free_below" : 70, } -# The agent plugin sometimes seems to mix two lines together some times. -# detect and fix that. def parse_tsm_stagingpools(info): - parsed = [] - for line in info: - if len(line) == 6: - parsed.append(line[:3]) - parsed.append(line[3:]) + parsed = {} + def add_item(node, lineinfo): + inst, pool, util = lineinfo + if inst == "default": + item = pool else: - parsed.append(line) + item = inst + " / " + pool + parsed.setdefault( item, {} ) + parsed[item].setdefault( node, [] ) + parsed[item][node].append( util ) + + for line in info: + node = line[0] + add_item(node, line[1:4]) + # The agent plugin sometimes seems to mix two lines together some + # times. Detect and fix that. + if len(line) == 7: + add_item(node, line[4:]) + return parsed def inventory_tsm_stagingpools(parsed): - items = set([]) - for inst, pool, util in parsed: - if inst == "default": - items.add(pool) - else: - items.add(inst + " / " + pool) - return [ (item, "tsm_stagingpools_default_levels") for item in items ] + for item in parsed: + yield item, {} def check_tsm_stagingpools(item, params, parsed): - num_tapes = 0 + if item not in parsed: + return 3, "Item not found in agent output" + + datasets, nodeinfos = [], [] + for node, data in parsed[item].items(): + nodeinfos.append(node) + datasets.append( tuple(data) ) + + num_tapes = 0 num_free_tapes = 0 - utilization = 0.0 # in relation to one tape size - for inst, pool, util in parsed: - if inst + " / " + pool == item or pool == item: - util = float(util) / 100.0 - utilization += util - num_tapes += 1 - if util <= params["free_below"] / 100.0: - num_free_tapes += 1 + utilization = 0.0 # in relation to one tape size + for util in datasets[0]: + util = float(util) / 100.0 + utilization += util + num_tapes += 1 + if util <= params["free_below"] / 100.0: + num_free_tapes += 1 + if nodeinfos: + infotext = "%s: " % "/".join( nodeinfos ) + else: + infotext = "" + infotext += "Total tapes: %d, Tapes less then %d%% full: %d, Utilization: %.1f tapes" % \ + (num_tapes, params["free_below"], num_free_tapes, utilization) state = 0 - infotext = "total tapes: %d, tapes less then %d%% full: %d" % \ - (num_tapes, params["free_below"], num_free_tapes) - infotext += ', utilization: %.1f tapes' % utilization if "levels" in params: warn, crit = params["levels"] if num_free_tapes < crit: @@ -96,12 +111,13 @@ def check_tsm_stagingpools(item, params, parsed): state = 3 infotext = "no tapes in this pool or pool not existant" - perfdata = [ - ("tapes", num_tapes), - ("free", num_free_tapes, warn, crit), - ("util", utilization) ] + # In cluster mode we check if data sets are equal from all nodes + # else we have only one data set + if len(set( datasets )) > 1: + state = 3 + infotext += ", Cluster: data from nodes are not equal" - return (state, infotext, perfdata) + return state, infotext, [ ("tapes", num_tapes), ("free", num_free_tapes, warn, crit), ("util", utilization) ] check_info['tsm_stagingpools'] = { @@ -112,5 +128,5 @@ check_info['tsm_stagingpools'] = { "has_perfdata" : True, "group" : "tsm_stagingpools", "default_levels_variable" : "tsm_stagingpools_default_levels", + "node_info" : True, } -

8 years

New sites now have WATO replication for EC enabled per default

by Mathias Kettner

Module: check_mk Branch: master Commit: 19d95436cbbb73feaff89a25d0d43579441ef78c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=19d95436cbbb73… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 19 16:40:30 2016 +0200 New sites now have WATO replication for EC enabled per default --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d91fb91..eb25a2e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9599,7 +9599,7 @@ def mode_edit_site(phase): if config.mkeventd_enabled: forms.section(_('Event Console'), simple=True) - html.checkbox('replicate_ec', site.get("replicate_ec", False), label = _("Replicate Event Console configuration to this site")) + html.checkbox('replicate_ec', site.get("replicate_ec", True), label = _("Replicate Event Console configuration to this site")) html.help(_("This option enables the distribution of global settings and rules of the Event Console " "to the remote site. Any change in the local Event Console settings will mark the site " "as <i>need sync</i>. A synchronization will automatically reload the Event Console of "

8 years

Fixed branch check when having spaces in path

by Lars Michelsen

Module: check_mk Branch: master Commit: 68a8fab2e83b27f2f557ccf2ae3cdbe90d41d98f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68a8fab2e83b27… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 19 11:35:32 2016 +0200 Fixed branch check when having spaces in path --- tests/conftest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index bc8865b..47ca8f8 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -33,8 +33,8 @@ def add_python_paths(): # Some pre-testing to ensure the developer uses the correct branches in all involved repos def ensure_equal_branches(): - cmk_branch = os.popen("cd %s ; git rev-parse --abbrev-ref HEAD" % cmk_path()).read().strip() - cmc_branch = os.popen("cd %s ; git rev-parse --abbrev-ref HEAD" % cmc_path()).read().strip() + cmk_branch = os.popen("cd \"%s\" ; git rev-parse --abbrev-ref HEAD" % cmk_path()).read().strip() + cmc_branch = os.popen("cd \"%s\" ; git rev-parse --abbrev-ref HEAD" % cmc_path()).read().strip() assert cmk_branch == cmc_branch, "Different branches (%s != %s)\n" % (cmk_branch, cmc_branch)

8 years

added some comments to snmp info

by Simon Betz

Module: check_mk Branch: master Commit: d7479f957fbf2b3b585a555b7cabf1753422de8b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7479f957fbf2b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Sep 19 11:55:02 2016 +0200 added some comments to snmp info --- checks/apc_symmetra_power | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/checks/apc_symmetra_power b/checks/apc_symmetra_power index f12b8f8..53b8ab7 100644 --- a/checks/apc_symmetra_power +++ b/checks/apc_symmetra_power @@ -57,6 +57,9 @@ check_info["apc_symmetra_power"] = { 'service_description': 'Power phase %s', 'has_perfdata': True, 'group': 'apc_power', - 'snmp_info': ('.1.3.6.1.4.1.318.1.1.1.9.3.3.1', ['2.1.1', '7.1.1']), + 'snmp_info': ('.1.3.6.1.4.1.318.1.1.1.9.3.3.1', [ + '2.1.1', # PowerNet-MIB::upsPhaseOutputPhaseIndex + '7.1.1', # PowerNet-MIB::upsPhaseOutputLoad + ]), '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"), }

8 years

3806 Sped up "Activate changes"

by Andreas Boesl

Module: check_mk Branch: master Commit: 5180128047c96bd9b884bb3df9113ed3262981e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5180128047c96b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 19 13:39:18 2016 +0200 3806 Sped up "Activate changes" Introduced caching for many regularly called functions. As a result, the config generation for the core should be at least 2-3 times faster. Note: The computation time highly depends on the number of used rules and hosts. --- .werks/3806 | 11 +++ ChangeLog | 1 + modules/check_mk.py | 246 +++++++++++++++++++++++++++++++---------------- modules/check_mk_base.py | 32 +++++- 4 files changed, 206 insertions(+), 84 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5180128047…

8 years

Fixed test

by Lars Michelsen

Module: check_mk Branch: master Commit: e3ce47acbff651c1ac730cb44fe02ceb65038fba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3ce47acbff651… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 19 11:05:09 2016 +0200 Fixed test --- tests/testlib/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 558b7f8..16b2eff 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -710,7 +710,7 @@ class CMKEventConsole(CMKWebSession): # TODO: Test via self.status whether or not the reload has happened def activate_changes(self, web): - old_t = site.live.query_value("GET eventconsolestatus\nColumns: status_config_load_time\n") + old_t = web.site.live.query_value("GET eventconsolestatus\nColumns: status_config_load_time\n") assert old_t > time.time() - 86400 html = web.get("wato.py?mode=mkeventd_changes").text @@ -720,7 +720,7 @@ class CMKEventConsole(CMKWebSession): html = web.get("wato.py?_activate=now&mode=mkeventd_changes", add_transid=True).text assert "The new configuration has successfully been activated" in html - new_t = site.live.query_value("GET eventconsolestatus\nColumns: status_config_load_time\n") + new_t = web.site.live.query_value("GET eventconsolestatus\nColumns: status_config_load_time\n") assert new_t > old_t

8 years

3884 FIX: Notifications: Fixed wrong LASTSERVICESTATE and SERVICESTATE in EC notifications

by Lars Michelsen

Module: check_mk Branch: master Commit: a637737fdfa2f02759783ea47315b8fdd0fd6cbc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a637737fdfa2f0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 19 08:16:50 2016 +0200 3884 FIX: Notifications: Fixed wrong LASTSERVICESTATE and SERVICESTATE in EC notifications --- .werks/3884 | 10 ++++++++++ ChangeLog | 1 + 2 files changed, 11 insertions(+) diff --git a/.werks/3884 b/.werks/3884 new file mode 100644 index 0000000..0ed23b4 --- /dev/null +++ b/.werks/3884 @@ -0,0 +1,10 @@ +Title: Notifications: Fixed wrong LASTSERVICESTATE and SERVICESTATE in EC notifications +Level: 1 +Component: ec +Compatible: compat +Version: 1.4.0i1 +Date: 1474213972 +Class: fix + +The variables LASTSERVICESTATE had CRIT instead of CRITICAL and the SERVICESTATE +variable had WARN instead of WARNING and CRIT instead of CRITICAL values set. diff --git a/ChangeLog b/ChangeLog index 6f58861..cd85fd3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -688,6 +688,7 @@ * 3589 FIX: Fixed processing of RFC 5424 syslog messages * 3771 FIX: Fixed exception on edit rule page in case of special URLs * 3745 FIX: MIB uploads: Handle latin-1 encoded MIBs + * 3884 FIX: Notifications: Fixed wrong LASTSERVICESTATE and SERVICESTATE in EC notifications... Livestatus: * 3644 Fixed 'source' column in 'comments' table.

8 years

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 8da47c4fb2a0a063d5b7cb14f8710efee86817ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8da47c4fb2a0a0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 19 08:15:20 2016 +0200 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 65fdaa4..70f9b7b 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3884 +3904

8 years

3862 FIX mknotifyd mknotifyd.connection: New service description ( when enabled)

by Lars Michelsen

Module: check_mk Branch: master Commit: 701e6bfef568445c4157acfbae4f1d87c1e122a7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=701e6bfef56844… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 19 08:12:57 2016 +0200 3862 FIX mknotifyd mknotifyd.connection: New service description (when enabled) The checks were using an uncommon service description for their checks: Notification Spooler [site] ... Because those processes are logically tied to the OMD sites, it makes more sense to make them match the other OMD site check naming scheme: OMD [site] Notification Spooler This has now been changed. It will automatically be applied to new sites. Existing sites will only use this new description after enabling it via Global Settings and performing a rediscovery of the services on the affected hosts. --- .werks/3862 | 21 +++++++++++++++++++++ ChangeLog | 1 + checks/mknotifyd | 4 ++-- modules/check_mk.py | 2 ++ web/htdocs/wato.py | 2 ++ web/plugins/wato/check_mk_configuration.py | 2 ++ 6 files changed, 30 insertions(+), 2 deletions(-) diff --git a/.werks/3862 b/.werks/3862 new file mode 100644 index 0000000..0b5a5b4 --- /dev/null +++ b/.werks/3862 @@ -0,0 +1,21 @@ +Title: mknotifyd mknotifyd.connection: New service description (when enabled) +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1474206536 +Class: fix + +The checks were using an uncommon service description for their checks: + +Notification Spooler [site] ... + +Because those processes are logically tied to the OMD sites, it makes more +sense to make them match the other OMD site check naming scheme: + +OMD [site] Notification Spooler + +This has now been changed. It will automatically be applied to new sites. +Existing sites will only use this new description after enabling it via +Global Settings and performing a rediscovery of the services on the affected +hosts. diff --git a/ChangeLog b/ChangeLog index 62ecc55..6f58861 100644 --- a/ChangeLog +++ b/ChangeLog @@ -394,6 +394,7 @@ * 3802 FIX: Fixed excess Check Helper PIPEs when a datasource program runs into a timeout... * 3701 FIX: FIX ps.perf graph title for Memory and CPU Usage... * 3746 FIX: tinkerforge: Keep check from crashing in case of unconfigured params + * 3862 FIX: mknotifyd mknotifyd.connection: New service description (when enabled)... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/mknotifyd b/checks/mknotifyd index 3e06950..ec19381 100644 --- a/checks/mknotifyd +++ b/checks/mknotifyd @@ -174,7 +174,7 @@ check_info["mknotifyd"] = { "parse_function" : parse_mknotifyd, "inventory_function" : inventory_mknotifyd, "check_function" : check_mknotifyd, - "service_description" : "Notification Spooler %s", + "service_description" : "OMD %s Notification Spooler", } @@ -237,6 +237,6 @@ def check_mknotifyd_connection(item, _no_params, parsed): check_info["mknotifyd.connection"] = { "inventory_function" : inventory_mknotifyd_connection, "check_function" : check_mknotifyd_connection, - "service_description" : "Notification Connection %s", + "service_description" : "OMD %s Notify Connection", } diff --git a/modules/check_mk.py b/modules/check_mk.py index ba4657c..c4423ce 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -287,6 +287,8 @@ old_service_descriptions = { "ibm_svc_systemstats.iops" : "IBM SVC IOPS %s Total", "ibm_svc_systemstats.disk_latency" : "IBM SVC Latency %s Total", "ibm_svc_systemstats.cache" : "IBM SVC Cache Total", + "mknotifyd" : "Notification Spooler %s", + "mknotifyd.connection" : "Notification Connection %s", "casa_cpu_temp" : "Temperature %s", "cmciii.temp" : get_old_cmciii_temp_description, diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e4cfb42..d91fb91 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -14290,6 +14290,8 @@ def create_sample_config(): "ups_bat_temp", "innovaphone_temp", "enterasys_temp", + "mknotifyd", + "mknotifyd.connection", ], "inventory_check_interval": 120, "enable_rulebased_notifications": True, diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 9472072..ba1327b 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1066,6 +1066,8 @@ register_configvar(group, ( "enterasys_temp", _("Enterasys Switch: Temperature")), ( "raritan_emx", _("Raritan EMX Rack: Temperature")), ( "raritan_pdu_inlet", _("Raritan PDU: Input Phases")), + ( "mknotifyd", _("Notification Spooler")), + ( "mknotifyd.connection", _("Notification Spooler Connection")), ], render_orientation = "vertical", ),

8 years

← Newer
1
...
12
13
14
15
16
17
18
...
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