Checkmk git commits February 2016

checkmk-commits@lists.checkmk.com

7 participants
402 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: f9a123c93cec9cb5b515e7951fca4072569381da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9a123c93cec9c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 12 09:29:15 2016 +0100 Fixed wrong identation --- checks/apc_rackpdu_power | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/apc_rackpdu_power b/checks/apc_rackpdu_power index ad3eee6..094f385 100644 --- a/checks/apc_rackpdu_power +++ b/checks/apc_rackpdu_power @@ -43,7 +43,7 @@ def check_apc_rackpdu_power(item, _no_params, info): if amperage >= max: return (2, "Amperage: %f - Overload possible" % amperage, perfdata) else: - return (0, "Amperage: %f" % amperage, perfdata) + return (0, "Amperage: %f" % amperage, perfdata)

8 years, 7 months

apc_rackpdu_power: Fixed identation, minor formating cleanup

by Lars Michelsen

Module: check_mk Branch: master Commit: 87de3f32be832bf8496c1ee2c7670d6ed60bce80 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87de3f32be832b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 12 09:18:01 2016 +0100 apc_rackpdu_power: Fixed identation, minor formating cleanup --- checks/apc_rackpdu_power | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/checks/apc_rackpdu_power b/checks/apc_rackpdu_power index f174725..ad3eee6 100644 --- a/checks/apc_rackpdu_power +++ b/checks/apc_rackpdu_power @@ -29,33 +29,36 @@ def inventory_apc_rackpdu_power(checkname, info): - inventory = [] - # What is the "host" here? - for host, amperage, min, max in info: - inventory.append( (host, None) ) - return inventory + inventory = [] + for host, amperage, min, max in info: + inventory.append((host, None)) + return inventory + def check_apc_rackpdu_power(item, _no_params, info): - for host, raw_amperage, min, max in info: - amperage = float(raw_amperage) / 10 - if host == item: - perfdata = [ ( "amperage", amperage, max ) ] - if amperage >= max: - return (2, "Amperage: %f - Overload possible" % amperage, perfdata) - else: + for host, raw_amperage, min, max in info: + amperage = float(raw_amperage) / 10 + if host == item: + perfdata = [ ( "amperage", amperage, max ) ] + if amperage >= max: + return (2, "Amperage: %f - Overload possible" % amperage, perfdata) + else: return (0, "Amperage: %f" % amperage, perfdata) - return (3, "Something went wrong") # Look for the APC management module and then dive into it's rackpdu tree - check_info["apc_rackpdu_power"] = { 'check_function': check_apc_rackpdu_power, 'inventory_function': inventory_apc_rackpdu_power, 'service_description': 'PDU %s', 'has_perfdata': True, - 'snmp_info': ('.1.3.6.1.4.1.318.1.1.12', ['1.1.0', '2.3.1.1.2.1', '2.2.1.1.3.1', '2.2.1.1.4.1']), + 'snmp_info': ('.1.3.6.1.4.1.318.1.1.12', [ + '1.1.0', + '2.3.1.1.2.1', + '2.2.1.1.3.1', + '2.2.1.1.4.1' + ]), 'snmp_scan_function': lambda oid: \ oid(".1.3.6.1.2.1.1.1.0").lower().startswith("apc web/snmp") \ and oid(".1.3.6.1.4.1.318.1.1.12.1.1.0"),

8 years, 7 months

#3055 FIX ibm_svc_mdiskgrp

by Lars Michelsen

Module: check_mk Branch: master Commit: 60e080ff30647df1c0b629b8aa69a12c798cd947 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60e080ff30647d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 12 09:29:37 2016 +0100 #3055 FIX ibm_svc_mdiskgrp Fixed exception in case of configured thresholds. --- .werks/3055 | 9 +++++++++ ChangeLog | 1 + checks/ibm_svc_mdiskgrp | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3055 b/.werks/3055 new file mode 100644 index 0000000..694a94a --- /dev/null +++ b/.werks/3055 @@ -0,0 +1,9 @@ +Title: ibm_svc_mdiskgrp +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1455265758 +Class: fix + +Fixed exception in case of configured thresholds. diff --git a/ChangeLog b/ChangeLog index 633b151..91de52c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -270,6 +270,7 @@ * 3049 FIX: esx_vsphere_hostsystem.mem_usage_cluster: Fixed exception when no thresholds configured * 3052 FIX: domino_mailqueues: Fixed exception when receiving empty data from SNMP * 3054 FIX: ups_modulys_battery: Fixed wrong remaining minutes in some cases + * 3055 FIX: ibm_svc_mdiskgrp... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/ibm_svc_mdiskgrp b/checks/ibm_svc_mdiskgrp index 9640cb8..5e74171 100644 --- a/checks/ibm_svc_mdiskgrp +++ b/checks/ibm_svc_mdiskgrp @@ -93,6 +93,8 @@ def check_ibm_svc_mdiskgrp(item, params, info): status, message, perfdata = df_check_filesystem_list(item, params, fslist) yield status, message, perfdata + mb = 1024 * 1024 + # Compute provisioning if not capacity: return # provisioning does not make sense when capacity is 0 @@ -113,7 +115,6 @@ def check_ibm_svc_mdiskgrp(item, params, info): # Note: Performance data is now (with new metric system) normed to # canonical units - i.e. 1 byte in this case. - mb = 1024 * 1024 yield 0, "Provisioning: %s" % get_percent_human_readable(provisioning), \ [ ( "fs_provisioning", virtual_capacity*mb, warn_mb, crit_mb, 0, capacity * mb) ]

8 years, 7 months

#3056 FIX vms_cpu: Fixed exception when having thresholds configured

by Lars Michelsen

Module: check_mk Branch: master Commit: 8a87d571dc9e265cf4c91ce467e4fbd6fbae8a02 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a87d571dc9e26… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 12 09:47:26 2016 +0100 #3056 FIX vms_cpu: Fixed exception when having thresholds configured --- .werks/3055 | 2 +- .werks/3056 | 9 +++++++++ ChangeLog | 3 ++- checks/vms_cpu | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.werks/3055 b/.werks/3055 index 694a94a..e0e4d75 100644 --- a/.werks/3055 +++ b/.werks/3055 @@ -1,4 +1,4 @@ -Title: ibm_svc_mdiskgrp +Title: ibm_svc_mdiskgrp: Fixed exception in case of configured thresholds Level: 1 Component: checks Compatible: compat diff --git a/.werks/3056 b/.werks/3056 new file mode 100644 index 0000000..421c029 --- /dev/null +++ b/.werks/3056 @@ -0,0 +1,9 @@ +Title: vms_cpu: Fixed exception when having thresholds configured +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1455266828 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 91de52c..02ac762 100644 --- a/ChangeLog +++ b/ChangeLog @@ -270,7 +270,8 @@ * 3049 FIX: esx_vsphere_hostsystem.mem_usage_cluster: Fixed exception when no thresholds configured * 3052 FIX: domino_mailqueues: Fixed exception when receiving empty data from SNMP * 3054 FIX: ups_modulys_battery: Fixed wrong remaining minutes in some cases - * 3055 FIX: ibm_svc_mdiskgrp... + * 3055 FIX: ibm_svc_mdiskgrp: Fixed exception in case of configured thresholds... + * 3056 FIX: vms_cpu: Fixed exception when having thresholds configured Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/vms_cpu b/checks/vms_cpu index 88184da..64ec2de 100644 --- a/checks/vms_cpu +++ b/checks/vms_cpu @@ -47,11 +47,11 @@ def check_vms_cpu(item, params, info): ( "system", system ), ( "wait", wait, 0, 0 ) ] if params: + warn, crit = params perfdata = [ ( "user", user ), ( "system", system ), ( "wait", wait, warn, crit ) ] - warn, crit = params if wait >= crit: state = 2 infotext += '(!!)'

8 years, 7 months

#2981 isc_dhcpd: added leases path /var/lib/dhcpd/dhcpd.leases for CentOS

by Simon Betz

Module: check_mk Branch: master Commit: 4d366fdb36d8510710f0c85b3981cc97a412d025 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d366fdb36d851… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Feb 12 08:33:31 2016 +0100 #2981 isc_dhcpd: added leases path /var/lib/dhcpd/dhcpd.leases for CentOS --- .werks/2981 | 9 +++++++++ ChangeLog | 1 + agents/plugins/isc_dhcpd | 6 +++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/2981 b/.werks/2981 new file mode 100644 index 0000000..658ef11 --- /dev/null +++ b/.werks/2981 @@ -0,0 +1,9 @@ +Title: isc_dhcpd: added leases path /var/lib/dhcpd/dhcpd.leases for CentOS +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1455262300 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 8b2f8ab..633b151 100644 --- a/ChangeLog +++ b/ChangeLog @@ -116,6 +116,7 @@ * 3173 datapower_cpu datapower_fan datapower_fs datapower_ldrive datapower_mem datapower_pdrive datapower_raid_bat datapower_tcp datapower_temp: Detect XI52 Model * 2979 aruba_wlc_aps: new inventory plugin for Aruba Networks WLAN Controller which displays name, group name, model, serial number and system location of all access points of this WLC * 2980 agent_ipmi_sensors: new special agent to monitor IPMI data via ipmi-sensors (of freeipmi)... + * 2981 isc_dhcpd: added leases path /var/lib/dhcpd/dhcpd.leases for CentOS * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list... diff --git a/agents/plugins/isc_dhcpd b/agents/plugins/isc_dhcpd index 22482d6..297d328 100755 --- a/agents/plugins/isc_dhcpd +++ b/agents/plugins/isc_dhcpd @@ -9,7 +9,11 @@ for path in [ '/etc/dhcpd.conf', '/etc/dhcp/dhcpd.conf' ]: break leases_file = None -for path in [ '/var/lib/dhcp/db/dhcpd.leases', '/var/lib/dhcp/dhcpd.leases' ]: +for path in [ + '/var/lib/dhcp/db/dhcpd.leases', + '/var/lib/dhcp/dhcpd.leases', + '/var/lib/dhcpd/dhcpd.leases', # CentOS + ]: if os.path.exists(path): leases_file = path break

8 years, 7 months

CSV import: Fixed non working tag import

by Lars Michelsen

Module: check_mk Branch: master Commit: 740eacfc807e449f9d6314002f6ea6be829d07ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=740eacfc807e44… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 12 08:25:40 2016 +0100 CSV import: Fixed non working tag import --- 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 1aefb28..5125fe3 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3251,7 +3251,7 @@ class ModeBulkImport(WatoMode): # Add tag groups for entry in configured_host_tags(): - attributes.append((entry[0], _("Tag: %s") % entry[1])) + attributes.append(("tag_"+entry[0], _("Tag: %s") % entry[1])) return attributes

8 years, 7 months

HW/SW-Inventory: Fixed rendering of hz between 10 and 100

by Lars Michelsen

Module: check_mk Branch: master Commit: 520e40e3e03b0d6dac2363b25050ed68c68f9249 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=520e40e3e03b0d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 11 09:54:15 2016 +0100 HW/SW-Inventory: Fixed rendering of hz between 10 and 100 --- mkeventd/web/plugins/sidebar/mkeventd.py | 1 - modules/discovery.py | 1 - web/plugins/views/inventory.py | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/mkeventd/web/plugins/sidebar/mkeventd.py b/mkeventd/web/plugins/sidebar/mkeventd.py index f8529b3..49de079 100644 --- a/mkeventd/web/plugins/sidebar/mkeventd.py +++ b/mkeventd/web/plugins/sidebar/mkeventd.py @@ -63,7 +63,6 @@ def render_mkeventd_performance(): data["status_average_rule_trie_rate"] * 100)) except: # division by zero write_line(_("Rule hit ratio"), _("-.-- %")) - pass # Time columns time_columns = [ diff --git a/modules/discovery.py b/modules/discovery.py index 60cf4ce..f498930 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -711,7 +711,6 @@ def snmp_scan(hostname, ipaddress, on_error = "ignore", for_inv=False): warning(" Exception in SNMP scan function of %s" % check_type) elif on_error == "raise": raise - pass else: found.append(check_type) default_found.append(check_type) diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index de41272..93e57b3 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -381,7 +381,7 @@ def inv_paint_hz(hz): if hz < 10: return "number", "%.2f" % hz elif hz < 100: - return "number", "%.11" % hz + return "number", "%.1f" % hz elif hz < 1500: return "number", "%.0f" % hz elif hz < 1000000:

8 years, 7 months

Updated bug entries #2328

by Lars Michelsen

Module: check_mk Branch: master Commit: 68bca6399085ea7c00f6d0f6c09709fcd94ddd18 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68bca6399085ea… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 11 09:07:41 2016 +0100 Updated bug entries #2328 --- .bugs/2328 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.bugs/2328 b/.bugs/2328 new file mode 100644 index 0000000..4419080 --- /dev/null +++ b/.bugs/2328 @@ -0,0 +1,16 @@ +Title: Disable SNMP checks for SNMP disabled hosts +Component: core +State: open +Date: 2016-02-11 09:07:20 +Targetversion: 1.2.8 +Class: bug + +aktuell ist es so, dass - wenn SNMP checks mal da sind (autochecks, explizit), +der Host auch SNMP machen wird, selbst wenn das per Tag ausgeschaltet ist. +Beispiel: + +1. Host ist TCP+SNMP -> Discovery -> schöne Services kommen +2. Jetzt SNMP wegnehmen und activate Changes -> Services bleiben da! + +Man könnte das in get_check_table() geradeziehen. Dann werden auch die +"no agent" hosts so behandelt, dass dann alle Check_MK-Checks wegfallen.

8 years, 7 months

#3050 FIX Fixed broken "Host state (first character)" painter

by Lars Michelsen

Module: check_mk Branch: master Commit: 9257949669700a88834e390f5f2299d1a14a4dfa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9257949669700a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 11 09:47:31 2016 +0100 #3050 FIX Fixed broken "Host state (first character)" painter --- .werks/3050 | 9 +++++++++ ChangeLog | 1 + web/plugins/views/painters.py | 10 ++++++++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.werks/3050 b/.werks/3050 new file mode 100644 index 0000000..d8a907b --- /dev/null +++ b/.werks/3050 @@ -0,0 +1,9 @@ +Title: Fixed broken "Host state (first character)" painter +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i4 +Date: 1455180428 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index da12669..8f85c07 100644 --- a/ChangeLog +++ b/ChangeLog @@ -323,6 +323,7 @@ * 2931 FIX: Do not load bookmarks, reports, view, etc. of non-existing users anymore * 3171 FIX: Logout in one site will log out of all sites sharing the same auth.secret... * 3048 FIX: It is now possible to add a context filter right after removing it from a view again... + * 3050 FIX: Fixed broken "Host state (first character)" painter WATO: * 2442 WATO remove host: improved cleanup of obsolete host files... diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index bb93b2e..67664c4 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -516,8 +516,8 @@ def paint_service_state_short(row): state = str(state) + " stale" return "state svcstate state%s" % state, name -def paint_host_state_short(row): -# return None, str(row) + +def paint_host_state_short(row, short=False): if row["host_has_been_checked"] == 1: state = row["host_state"] # A state of 3 is sent by livestatus in cases where no normal state @@ -526,10 +526,16 @@ def paint_host_state_short(row): else: state = "p" name = _("PEND") + if is_stale(row): state = str(state) + " stale" + + if short: + name = name[0] + return "state hstate hstate%s" % state, name + multisite_painters["service_nagios_link"] = { "title" : _("Icon with link to service in Nagios GUI"), "short" : "",

8 years, 7 months

Fixed attributes shadowing method names - should be cleaned up more

by Lars Michelsen

Module: check_mk Branch: master Commit: 2375aa6d25dd01b4969c3103111e1f95b2dface9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2375aa6d25dd01… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 11 10:04:49 2016 +0100 Fixed attributes shadowing method names - should be cleaned up more --- web/plugins/wato/bi.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index c1cde4a..1129311 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -359,11 +359,12 @@ class ModeBI(WatoMode): # | Valuespecs | # '--------------------------------------------------------------------' + # FIXME TODO self._vs_call_rule etc. refactor to properties def _create_valuespecs(self): - self._vs_call_rule = self._vs_call_rule() - self._vs_host_re = self._vs_host_re() - self._vs_node = self._vs_node() - self._vs_aggregation = self._vs_aggregation() + self._vs_call_rule = self._get_vs_call_rule() + self._vs_host_re = self._get_vs_host_re() + self._vs_node = self._get_vs_node() + self._vs_aggregation = self._get_vs_aggregation() def _allowed_rule_choices(self): @@ -408,7 +409,7 @@ class ModeBI(WatoMode): (len(rule_params), ', '.join(rule_params), len(arguments))) - def _vs_call_rule(self): + def _get_vs_call_rule(self): return Tuple( elements = [ DropdownChoice( @@ -426,7 +427,7 @@ class ModeBI(WatoMode): ) - def _vs_host_re(self): + def _get_vs_host_re(self): host_re_help = _("Either an exact host name or a regular expression exactly matching the host " "name. Example: <tt>srv.*p</tt> will match <tt>srv4711p</tt> but not <tt>xsrv4711p2</tt>. ") return TextUnicode( @@ -541,7 +542,7 @@ class ModeBI(WatoMode): ] - def _vs_node(self): + def _get_vs_node(self): # Configuration of leaf nodes vs_node_simplechoices = [ ( "host", _("State of a host"), @@ -592,7 +593,7 @@ class ModeBI(WatoMode): return choices - def _vs_aggregation(self): + def _get_vs_aggregation(self): return Dictionary( title = _("Aggregation Properties"), optional_keys = False,

8 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2016