Checkmk git commits March 2015

checkmk-commits@lists.checkmk.com

7 participants
320 discussions

Check_MK Git: check_mk: ibm_svc_mdiskgrp: try new style of Perf-O-Meter showing provisioning

by Mathias Kettner

Module: check_mk Branch: master Commit: 8a8bdbba1819b93c4ae45f603ac3574ade1795fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a8bdbba1819b9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Mar 7 13:05:28 2015 +0100 ibm_svc_mdiskgrp: try new style of Perf-O-Meter showing provisioning --- web/htdocs/metrics.py | 221 ++++++++++++++++++++++++++++----------- web/plugins/metrics/check_mk.py | 34 +++++- 2 files changed, 189 insertions(+), 66 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8a8bdbba18…

9 years, 6 months

Check_MK Git: check_mk: #2098 FIX ibm_svc_mdiskgrp: fix rounding bug, decimal digits of size (GB, TB) were always lost

by Mathias Kettner

Module: check_mk Branch: master Commit: 3c7f42872a8e12a485b8fec4b2d6e08f06312dfc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c7f42872a8e12… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 6 17:44:11 2015 +0100 #2098 FIX ibm_svc_mdiskgrp: fix rounding bug, decimal digits of size (GB, TB) were always lost --- .werks/2098 | 10 ++++++++++ ChangeLog | 1 + checks/ibm_svc_mdiskgrp | 12 ++++++------ 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.werks/2098 b/.werks/2098 new file mode 100644 index 0000000..2f6a0bf --- /dev/null +++ b/.werks/2098 @@ -0,0 +1,10 @@ +Title: ibm_svc_mdiskgrp: fix rounding bug, decimal digits of size (GB, TB) were always lost +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1425660216 + + diff --git a/ChangeLog b/ChangeLog index 4578bce..4ca21e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -235,6 +235,7 @@ * 2055 FIX: agent_vsphere, licenses check: now really configurable on / off... * 2091 FIX: The check-mk-agent RPM packages can now update the old check_mk-agent named RPMs... * 2046 FIX: Replace GBit with Gbit, MBit with Mbit, KBit with Kbit... + * 2098 FIX: ibm_svc_mdiskgrp: fix rounding bug, decimal digits of size (GB, TB) were always lost Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/ibm_svc_mdiskgrp b/checks/ibm_svc_mdiskgrp index f64d044..17856a4 100644 --- a/checks/ibm_svc_mdiskgrp +++ b/checks/ibm_svc_mdiskgrp @@ -42,17 +42,17 @@ def ibm_svc_mdiskgrp_to_mb(size): if size.endswith("MB"): - size = int(float(size.replace("MB", ""))) + size = float(size.replace("MB", "")) elif size.endswith("GB"): - size = int(float(size.replace("GB", ""))) * 1024 + size = float(size.replace("GB", "")) * 1024 elif size.endswith("TB"): - size = int(float(size.replace("TB", ""))) * 1024 * 1024 + size = float(size.replace("TB", "")) * 1024 * 1024 elif size.endswith("PB"): - size = int(float(size.replace("PB", ""))) * 1024 * 1024 * 1024 + size = float(size.replace("PB", "")) * 1024 * 1024 * 1024 elif size.endswith("EB"): - size = int(float(size.replace("EB", ""))) * 1024 * 1024 * 1024 * 1024 + size = float(size.replace("EB", "")) * 1024 * 1024 * 1024 * 1024 else: - size = int(float(size)) + size = float(size) return size def inventory_ibm_svc_mdiskgrp(info):

9 years, 6 months

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 8b32bbae1f7d389d0bcbf877a247c44910e04c63 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b32bbae1f7d38… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 6 17:43:24 2015 +0100 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 a0a31bc..9644fad 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2098 +2108

9 years, 6 months

Check_MK Git: check_mk: #2047 FIX Allow overriding existing WATO rules by own files in local/ hierarchy

by Mathias Kettner

Module: check_mk Branch: master Commit: d64c844e038cdb5effdcd8431e54a184ec9e772a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d64c844e038cdb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 6 17:30:45 2015 +0100 #2047 FIX Allow overriding existing WATO rules by own files in local/ hierarchy If you would define your own version of a check parameter rule set in a file in <tt>local/share/check_mk/web/plugin/wato/myfile.py</tt>, then the rule would appear twice in the rule search. This has been fixed. You can now safely override rules in your own extensions. --- .werks/2047 | 13 +++++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 7 +++++++ 3 files changed, 21 insertions(+) diff --git a/.werks/2047 b/.werks/2047 new file mode 100644 index 0000000..6628bf0 --- /dev/null +++ b/.werks/2047 @@ -0,0 +1,13 @@ +Title: Allow overriding existing WATO rules by own files in local/ hierarchy +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1425659357 + +If you would define your own version of a check parameter rule set in a +file in <tt>local/share/check_mk/web/plugin/wato/myfile.py</tt>, then the +rule would appear twice in the rule search. This has been fixed. You +can now safely override rules in your own extensions. diff --git a/ChangeLog b/ChangeLog index a198637..4578bce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -329,6 +329,7 @@ * 2080 FIX: Fixed UnicodeDecodeError when using a localized GUI on notification configuration page * 2084 FIX: Disabled notification for a user is now shown on profile page even when not permitted to edit... * 2045 FIX: Avoid fetching SNMP data when showing service list in WATO - unless Full Scan is pressed + * 2047 FIX: Allow overriding existing WATO rules by own files in local/ hierarchy... Notifications: * 1662 notification plugin spectrum: finalized script. now able to handle host notications diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 6c7f747..9019f4e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15317,6 +15317,13 @@ def register_rule(group, varname, valuespec = None, title = None, g_rulespec_groups.append((group, rulesets)) g_rulespec_group[group] = rulesets else: + # If a ruleset for this variable already exist, then we need to replace + # it. How can this happen? If a user puts his own copy of the definition + # into some file below local/. + for nr, rs in enumerate(g_rulespec_group[group]): + if rs["varname"] == varname: + del g_rulespec_group[group][nr] + break # There cannot be two duplicates! g_rulespec_group[group].append(ruleset) g_rulespecs[varname] = ruleset

9 years, 6 months

Check_MK Git: check_mk: #2046 FIX Replace GBit with Gbit, MBit with Mbit, KBit with Kbit

by Mathias Kettner

Module: check_mk Branch: master Commit: 20de7ae62c7091f9b9138d222367b78be5f3c3f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20de7ae62c7091… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 6 16:24:15 2015 +0100 #2046 FIX Replace GBit with Gbit, MBit with Mbit, KBit with Kbit This should be the correct spelling --- .werks/2046 | 10 ++++++++++ ChangeLog | 1 + checks/esx_vsphere_counters | 2 +- checks/fc_port | 8 ++++---- checks/fritz | 1 + checks/if64 | 2 +- checks/if64_tplink | 2 +- checks/if_brocade | 2 +- checks/if_lancom | 2 +- checks/ucs_bladecenter_if | 2 +- modules/check_mk_base.py | 14 +++++++------- web/plugins/wato/check_mk_configuration.py | 2 +- web/plugins/wato/check_parameters.py | 28 ++++++++++++++-------------- 13 files changed, 44 insertions(+), 32 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=20de7ae62c…

9 years, 6 months

Check_MK Git: check_mk: mknotifyd: removed removed exception from test

by Mathias Kettner

Module: check_mk Branch: master Commit: 5116b80c085a816ea83cb516916771d085c4cd59 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5116b80c085a81… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 6 16:06:54 2015 +0100 mknotifyd: removed removed exception from test --- doc/treasures/mknotifyd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/treasures/mknotifyd b/doc/treasures/mknotifyd index 1c55dee..5c48c6f 100755 --- a/doc/treasures/mknotifyd +++ b/doc/treasures/mknotifyd @@ -220,7 +220,7 @@ def cmp_config_paths(a, b): def wato_config_mtime(): try: return os.stat(g_config_dir + "/mknotifyd.d/wato/global.mk").st_mtime - except 1: + except: return None

9 years, 6 months

Check_MK Git: check_mk: cisco_wlc_clients: Added missing OID in scan function

by Bastian Kuhn

Module: check_mk Branch: master Commit: 33e6e8e611e986d0dd2922fff8326611081e03f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33e6e8e611e986… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Mar 6 14:33:21 2015 +0100 cisco_wlc_clients: Added missing OID in scan function --- checks/cisco_wlc_clients | 1 + 1 file changed, 1 insertion(+) diff --git a/checks/cisco_wlc_clients b/checks/cisco_wlc_clients index 1a7b4bf..bbd8917 100644 --- a/checks/cisco_wlc_clients +++ b/checks/cisco_wlc_clients @@ -74,6 +74,7 @@ check_info["cisco_wlc_clients"] = { "has_perfdata" : True, "snmp_scan_function" : lambda oid: oid('.1.3.6.1.2.1.1.2.0') in [".1.3.6.1.4.1.9.1.1069", ".1.3.6.1.4.1.9.1.1645", + ".1.3.6.1.4.1.14179.1.1.4.3", ".1.3.6.1.4.1.9.1.1279"], "snmp_info" : ( ".1.3.6.1.4.1.14179.2.1.1.1", [ 2, 42, 38 ]), }

9 years, 6 months

Check_MK Git: check_mk: minor fix to inventory function

by Goetz Golla

Module: check_mk Branch: master Commit: b7b6e8a00c5e05783407849725416190b265f1d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7b6e8a00c5e05… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Mar 6 12:57:29 2015 +0100 minor fix to inventory function --- checks/ibm_imm_fan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/ibm_imm_fan b/checks/ibm_imm_fan index 727ecff..ebe47ba 100644 --- a/checks/ibm_imm_fan +++ b/checks/ibm_imm_fan @@ -26,7 +26,7 @@ def inventory_ibm_imm_fan(info): for line in info: - yield line[0], {} + yield line[0], None def check_ibm_imm_fan(item, _no_params, info): for line in info:

9 years, 6 months

Check_MK Git: check_mk: #1867 ibm_imm_voltage: new check to monitor power supply and CMS battery voltages on servers via IBMs IMM

by Goetz Golla

Module: check_mk Branch: master Commit: 71717bf7342237257cca61c22fbe482781436839 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71717bf7342237… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Mar 6 12:58:49 2015 +0100 #1867 ibm_imm_voltage: new check to monitor power supply and CMS battery voltages on servers via IBMs IMM --- .werks/1867 | 9 ++++++ ChangeLog | 1 + checkman/ibm_imm_voltage | 23 +++++++++++++++ checks/ibm_imm_voltage | 71 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 104 insertions(+) diff --git a/.werks/1867 b/.werks/1867 new file mode 100644 index 0000000..83b1310 --- /dev/null +++ b/.werks/1867 @@ -0,0 +1,9 @@ +Title: ibm_imm_voltage: new check to monitor power supply and CMS battery voltages on servers via IBMs IMM +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1425643084 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 55b0f0d..54ea7c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -112,6 +112,7 @@ * 2044 IBM SVC checks: renamed services, remove bogus IBM SVC... * 1894 hwg_humidity: New check to monitor humidity sensors attached to HWg-STE... * 1866 ibm_imm_fan, ibm_imm_temp: new checks to monitor fans and temp sensors on IBM Servers via the IMM + * 1867 ibm_imm_voltage: new check to monitor power supply and CMS battery voltages on servers via IBMs IMM * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/checkman/ibm_imm_voltage b/checkman/ibm_imm_voltage new file mode 100644 index 0000000..383a11a --- /dev/null +++ b/checkman/ibm_imm_voltage @@ -0,0 +1,23 @@ +title: Voltages of Power Supply and CMOS Battery via IBM Integrated Management Module (IMM) +agents: snmp +catalog: hw/server/ibm +license: GPL +distribution: check_mk +description: + This check monitors the voltages provided by the power supply and CMOS + battery of servers via a IBM Integrated Management Module (IMM). It uses + snmp and the IBM IMM MIB to gather the data. + + The check uses the lower and upper warning and critical levels extracted + from the device (OIDs {voltCritLimitLow}, {voltNonCritLimitLow}, + {voltCritLimitHigh} ,{voltNonCritLimitHigh}) to calculate the state of + the service. + +inventory: + The service discovery will find one service per voltage measurement channel + +item: + The name of the power supply measurement channel as extracted from the OID {voltDescr} + +perfdata: + The voltage of the measurement channel diff --git a/checks/ibm_imm_voltage b/checks/ibm_imm_voltage new file mode 100644 index 0000000..694014f --- /dev/null +++ b/checks/ibm_imm_voltage @@ -0,0 +1,71 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +def inventory_ibm_imm_voltage(info): + for line in info: + yield line[0], None + +def check_ibm_imm_voltage(item, _no_params, info): + for line in info: + if line[0] == item: + volt, crit, warn, crit_low, warn_low = map(lambda v: float(v)/1000, line[1:]) + infotext = "%.2f Volt" % volt + + perfdata = [ ("volt", volt, str(warn_low)+":"+str(warn), str(crit_low)+":"+str(crit)) ] + levelstext = " (levels warn/crit lower: %.1f/%.1f upper: %.1f/%.1f)" % (warn_low, crit_low, warn, crit) + + if (crit_low and volt <= crit_low) or (crit and volt >= crit): + state = 2 + infotext += levelstext + elif (warn_low and volt <= warn_low) or (warn and volt >= warn): + state = 1 + infotext += levelstext + else: + state = 0 + + return state, infotext, perfdata + +check_info["ibm_imm_voltage"] = { + 'check_function' : check_ibm_imm_voltage, + 'inventory_function' : inventory_ibm_imm_voltage, + 'service_description' : 'Voltage %s', + 'has_perdata' : True, + 'snmp_scan_function' : + lambda oid: oid('.1.3.6.1.2.1.1.1.0').lower().endswith(" mips") or \ + oid('.1.3.6.1.2.1.1.1.0').lower().endswith(" sh4a"), + 'snmp_info' : ('.1.3.6.1.4.1.2.3.51.3.1.2.2.1', [ # voltTable.voltEntry + #1, # voltIndex + 2, # voltDescr + 3, # voltReading + #4, # voltNominalReading + #5, # voltNonRecovLimitHigh + 6, # voltCritLimitHigh + 7, # voltNonCritLimitHigh + #8, # voltNonRecovLimitLow + 9, # voltCritLimitLow + 10, # voltNonCritLimitLow + ]), +}

9 years, 6 months

Check_MK Git: check_mk: Conflicts:

by Lars Michelsen

Module: check_mk Branch: master Commit: 6b3ab5840627c14925942de7eb048a21b6ec1324 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b3ab5840627c1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 6 12:50:37 2015 +0100 Conflicts: ChangeLog web/htdocs/dashboard.py --- .werks/2092 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/dashboard.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/2092 b/.werks/2092 new file mode 100644 index 0000000..ad3bea3 --- /dev/null +++ b/.werks/2092 @@ -0,0 +1,10 @@ +Title: Dashboards: Possible to configure an empty custom title +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1425642562 + + diff --git a/ChangeLog b/ChangeLog index e4c66ee..55b0f0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -283,6 +283,7 @@ * 2024 FIX: Views: Fixed problem when filtering views by strings containing umlauts... * 2054 FIX: Sidebar snapin "Tree of folders": fixed exception when using localized default value... * 2090 FIX: Fixed errors when editing / rendering custom url dashlets in some cases... + * 2092 FIX: Dashboards: Possible to configure an empty custom title WATO: * 1760 Added search form to manual checks page diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 8a5aed9..0f31ad1 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -572,7 +572,7 @@ def render_dashlet(name, board, nr, dashlet, wato_folder, add_url_vars): if dashlet_type.get('title_func'): title = dashlet_type.get('title_func')(dashlet) title = dashlet.get('title', title) - if title and dashlet.get('show_title'): + if title != None and dashlet.get('show_title'): url = dashlet.get("title_url", None) if url: title = '<a href="%s">%s</a>' % (url, _u(title))

9 years, 6 months

← Newer
1
...
24
25
26
27
28
29
30
31
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2015