Checkmk git commits May 2015

checkmk-commits@lists.checkmk.com

7 participants
200 discussions

Check_MK Git: check_mk: #1246 blade_bays, blade_blades, blade_blowers, blade_health, blade_mediatray: Checks now support IBM Flex Bladecenter

by Bastian Kuhn

Module: check_mk Branch: master Commit: 7cfbef1093b5bfe16a64a6809158ca13991fb886 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7cfbef1093b5bf… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri May 15 11:04:37 2015 +0200 #1246 blade_bays,blade_blades,blade_blowers,blade_health,blade_mediatray: Checks now support IBM Flex Bladecenter --- .werks/1246 | 9 +++++++++ ChangeLog | 1 + checks/blade_bays | 2 +- checks/blade_blades | 2 +- checks/blade_blowers | 2 +- checks/blade_health | 2 +- checks/blade_mediatray | 5 +---- 7 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.werks/1246 b/.werks/1246 new file mode 100644 index 0000000..e7178b8 --- /dev/null +++ b/.werks/1246 @@ -0,0 +1,9 @@ +Title: blade_bays,blade_blades,blade_blowers,blade_health,blade_mediatray: Checks now support IBM Flex Bladecenter +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1431680627 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index d92f3f2..1599737 100644 --- a/ChangeLog +++ b/ChangeLog @@ -176,6 +176,7 @@ * 2252 SEC: mk_logwatch: Fixed mostly uncritical command injection from config... * 2270 windows agent: now able to add cached information into section headers... * 2271 logwatch_ec: Now able to create a single check for each logfile forwarded to the event console... + * 1246 blade_bays,blade_blades,blade_blowers,blade_health,blade_mediatray: Checks now support IBM Flex Bladecenter * 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/checks/blade_bays b/checks/blade_bays index 0daac3a..ab22f0c 100644 --- a/checks/blade_bays +++ b/checks/blade_bays @@ -77,5 +77,5 @@ check_info["blade_bays"] = { "3", # powerDomain2 ], [ "1.1.5", "1.1.6", "1.1.2", "1.1.1" ] ), # BLADE-MIB 'snmp_scan_function': \ - lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")) != None, + lambda oid: re.match('(BladeCenter|BladeCenter Advanced|IBM Flex Chassis) Management Module', oid(".1.3.6.1.2.1.1.1.0")) != None, } diff --git a/checks/blade_blades b/checks/blade_blades index 24c4a29..cda13bd 100644 --- a/checks/blade_blades +++ b/checks/blade_blades @@ -79,5 +79,5 @@ check_info["blade_blades"] = { 6, # bladeName ]), 'snmp_scan_function': \ - lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")) != None, + lambda oid: re.match('(BladeCenter|BladeCenter Advanced|IBM Flex Chassis) Management Module', oid(".1.3.6.1.2.1.1.1.0")) != None, } diff --git a/checks/blade_blowers b/checks/blade_blowers index 555c5f4..6e9b382 100644 --- a/checks/blade_blowers +++ b/checks/blade_blowers @@ -106,5 +106,5 @@ check_info["blade_blowers"] = { 'has_perfdata': True, 'snmp_info': ('.1.3.6.1.4.1.2.3.51.2.2', [3]), 'snmp_scan_function': \ - lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")) != None, + lambda oid: re.match('(BladeCenter|BladeCenter Advanced|IBM Flex Chassis) Management Module', oid(".1.3.6.1.2.1.1.1.0")) != None, } diff --git a/checks/blade_health b/checks/blade_health index 2c1d892..568cce6 100644 --- a/checks/blade_health +++ b/checks/blade_health @@ -59,5 +59,5 @@ check_info["blade_health"] = { 'service_description': 'Summary health state', 'snmp_info': ('.1.3.6.1.4.1.2.3.51.2.2.7', ['1.0', '2.1.3.1']), 'snmp_scan_function': \ - lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")) != None, + lambda oid: re.match('(BladeCenter|BladeCenter Advanced|IBM Flex Chassis) Management Module', oid(".1.3.6.1.2.1.1.1.0")) != None, } diff --git a/checks/blade_mediatray b/checks/blade_mediatray index 1d001b2..1c80fb4 100644 --- a/checks/blade_mediatray +++ b/checks/blade_mediatray @@ -41,14 +41,11 @@ def check_blade_mediatray(_no_item, _no_params, info): return (0, "media tray present and communicating") - - - check_info["blade_mediatray"] = { 'check_function': check_blade_mediatray, 'inventory_function': inventory_blade_mediatray, 'service_description': 'Media tray', 'snmp_info': ('.1.3.6.1.4.1.2.3.51.2.2.5.2', [74, 75]), 'snmp_scan_function': \ - lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")) != None, + lambda oid: re.match('(BladeCenter|BladeCenter Advanced|IBM Flex Chassis) Management Module', oid(".1.3.6.1.2.1.1.1.0")) != None, }

9 years, 1 month

Check_MK Git: check_mk: Updated bug entries #0848

by Bastian Kuhn

Module: check_mk Branch: master Commit: 27353f4ac0e524053974f2187818877eeb474434 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27353f4ac0e524… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed May 13 14:59:20 2015 +0200 Updated bug entries #0848 --- .bugs/848 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/848 b/.bugs/848 new file mode 100644 index 0000000..e1bb1c3 --- /dev/null +++ b/.bugs/848 @@ -0,0 +1,8 @@ +Title: RBN: Rules after user removal +Component: wato +State: open +Date: 2015-05-13 14:56:09 +Targetversion: 1.2.7 +Class: bug + +After removing a user in wato and editing a rbn rule explicity containg this user, the next user from the list will choiced when saving

9 years, 1 month

Check_MK Git: check_mk: merge conflict

by Bastian Kuhn

Module: check_mk Branch: master Commit: e77c6298b394a4674206f26d7850e4c341aa2901 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e77c6298b394a4… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri May 15 11:05:09 2015 +0200 merge conflict ---

9 years, 1 month

Check_MK Git: check_mk: Reserved 10 Werk IDS

by si

Module: check_mk Branch: master Commit: 66bb5c4ff008e2df70f03ff66683fde8faadaf55 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66bb5c4ff008e2… Author: si <si(a)mathias-kettner.de> Date: Fri May 15 09:32:20 2015 +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 cc6f0ac..c7ffbf8 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2283 +2293

9 years, 1 month

Check_MK Git: check_mk: #2283 cisco_srst_call_legs cisco_srst_phones cisco_srst_state : new checks for monitoring Cisco SRST routers

by si

Module: check_mk Branch: master Commit: 2823de778712a7cb1ac02bad453eeeae15c97b22 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2823de778712a7… Author: si <si(a)mathias-kettner.de> Date: Fri May 15 09:36:35 2015 +0200 #2283 cisco_srst_call_legs cisco_srst_phones cisco_srst_state : new checks for monitoring Cisco SRST routers --- .werks/2283 | 9 ++++++++ ChangeLog | 1 + checkman/cisco_srst_call_legs | 16 +++++++++++++ checkman/cisco_srst_phones | 14 ++++++++++++ checkman/cisco_srst_state | 21 +++++++++++++++++ checks/cisco_srst.include | 48 --------------------------------------- checks/cisco_srst_call_legs | 45 ++++++++++++++++++++++++++++++++++++ checks/cisco_srst_phones | 5 ++-- checks/cisco_srst_state | 7 +++--- web/plugins/metrics/check_mk.py | 20 ++++++++++++++++ 10 files changed, 132 insertions(+), 54 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2823de7787…

9 years, 1 month

Check_MK Git: check_mk: Renamed filter text 'Time of Downtime' to ' Time when downtime was created'

by Andreas Boesl

Module: check_mk Branch: master Commit: d8f1ed8f3f115c453562e31f9a1ecb6e63ab40d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8f1ed8f3f115c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri May 15 10:16:08 2015 +0200 Renamed filter text 'Time of Downtime' to 'Time when downtime was created' --- web/plugins/visuals/filters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index 255ecba..1dc2404 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -689,7 +689,7 @@ declare_filter(251, FilterTime("service", "svc_last_check", _("Last service chec declare_filter(250, FilterTime("host", "host_last_state_change", _("Last host state change"), "host_last_state_change")) declare_filter(251, FilterTime("host", "host_last_check", _("Last host check"), "host_last_check")) declare_filter(253, FilterTime("comment", "comment_entry_time", _("Time of comment"), "comment_entry_time" )) -declare_filter(253, FilterTime("downtime", "downtime_entry_time", _("Time of Downtime"), "downtime_entry_time" )) +declare_filter(253, FilterTime("downtime", "downtime_entry_time", _("Time when downtime was created"), "downtime_entry_time" )) declare_filter(254, FilterText("downtime_comment", _("Downtime comment"), "downtime", "downtime_comment", "downtime_comment", "~")) # _ # | | ___ __ _

9 years, 1 month

Check_MK Git: check_mk: New configuration option for mknotifyd

by Mathias Kettner

Module: check_mk Branch: master Commit: fb2cd6da875dc20ca2aac90a3d0fa227670bc529 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb2cd6da875dc2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 15 09:45:48 2015 +0200 New configuration option for mknotifyd --- checks/mknotifyd | 2 +- web/htdocs/valuespec.py | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/checks/mknotifyd b/checks/mknotifyd index b9ee50b..a839d54 100644 --- a/checks/mknotifyd +++ b/checks/mknotifyd @@ -80,7 +80,7 @@ def parse_mknotifyd(info): else: if value == "None": value = None - elif value and varname not in [ "Type", "State", "Version", "Status Message" ]: + elif value and varname not in [ "Type", "State", "Version", "Status Message", "Pending Acknowledgements" ]: value = int(value.split()[0]) sub_entry[varname] = value diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 33ec9e3..0294774 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -202,11 +202,12 @@ class Age(ValueSpec): html.write("</div>") def from_html_vars(self, varprefix): + # TODO: Validate for correct numbers! return ( - saveint(html.var(varprefix+'_days', 0)) * 3600 * 24 - + saveint(html.var(varprefix+'_hours',0)) * 3600 - + saveint(html.var(varprefix+'_minutes',0)) * 60 - + saveint(html.var(varprefix+'_seconds',0)) + saveint(html.var(varprefix + '_days', 0)) * 3600 * 24 + + saveint(html.var(varprefix + '_hours', 0)) * 3600 + + saveint(html.var(varprefix + '_minutes', 0)) * 60 + + saveint(html.var(varprefix + '_seconds', 0)) ) def value_to_text(self, value):

9 years, 1 month

Check_MK Git: check_mk: Improved MIB header parsing to match more mibs

by Lars Michelsen

Module: check_mk Branch: master Commit: 90cec0c28a86b788b35ee41282e05c787d883bab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90cec0c28a86b7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 13 16:47:24 2015 +0200 Improved MIB header parsing to match more mibs --- mkeventd/web/plugins/wato/mkeventd.py | 44 ++++++++++++++------------------- 1 file changed, 18 insertions(+), 26 deletions(-) diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index d013c21..3488f1b 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -1881,7 +1881,7 @@ def mode_mkeventd_mibs(phase): table.cell(_("Filename"), filename) table.cell(_("MIB"), mib.get("name", "")) table.cell(_("Organization"), mib.get("organization", "")) - table.cell(_("Size"), str(mib.get("size")), css="number") + table.cell(_("Size"), bytes_human_readable(mib.get("size", 0)), css="number") table.end() @@ -1897,31 +1897,23 @@ def load_snmp_mibs(path): def parse_snmp_mib_header(path): mib = {} mib["size"] = os.stat(path).st_size - lineno = 0 - fileit = file(path) - line = "" - while lineno < 100: - lineno += 1 - try: - next_line = fileit.next().strip() - except: - break - if not next_line: - continue - old_line = line - line = next_line - if line.startswith("ORGANIZATION"): - parts = line.split(None, 1) - if len(parts) > 1: - org = parts[1].lstrip('"').rstrip('"') - if org: - mib["organization"] = org - elif "DEFINITIONS" in line: - if line.startswith("DEFINITIONS"): - name = old_line - else: - name = line.split()[0] - mib["name"] = name + + # read till first "OBJECT IDENTIFIER" declaration + head = '' + for line in file(path): + if 'OBJECT IDENTIFIER' in line: + break # seems the header is finished + head += line + + # now try to extract some relevant information from the header + + matches = re.search('ORGANIZATION[^"]+"([^"]+)"', head, re.M) + if matches: + mib['organization'] = matches.group(1) + + matches = re.search('^\s*([A-Z0-9][A-Z0-9-]+)\s', head, re.I | re.M) + if matches: + mib['name'] = matches.group(1) return mib

9 years, 1 month

Check_MK Git: check_mk: parameters of host/services: fixed exception when the icon image was set to None

by Andreas Boesl

Module: check_mk Branch: master Commit: 4ac67ece10610d4bb6292695ae694347ce86d52e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ac67ece10610d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed May 13 15:13:45 2015 +0200 parameters of host/services: fixed exception when the icon image was set to None --- web/plugins/wato/check_mk_configuration.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 44f3817..07951c1 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -2255,7 +2255,7 @@ register_rule(group, and defaults.omd_root + "/local/share/check_mk/web/htdocs/images/icons" or defaults.web_dir + "/htdocs/images/icons" ), ), - forth = lambda v: v.endswith('.png') and v[:-4] or v, + forth = lambda v: v and (v.endswith('.png') and v[:-4]) or v, )) @@ -2270,7 +2270,7 @@ register_rule(group, and defaults.omd_root + "/local/share/check_mk/web/htdocs/images/icons" or defaults.web_dir + "/htdocs/images/icons" ), ), - forth = lambda v: v.endswith('.png') and v[:-4] or v, + forth = lambda v: v and (v.endswith('.png') and v[:-4]) or v, ), itemtype = "service")

9 years, 1 month

Check_MK Git: check_mk: Per default one check "Log Forwarding"

by Andreas Boesl

was created when log messages should be forwarded Message-ID: <555349cb./OGWnKbWLP20xlsn%ab(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 67c4a61b9aa5fc7f3310d6bd5bcb7a91fce4dc5e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67c4a61b9aa5fc… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed May 13 14:52:35 2015 +0200 Per default one check "Log Forwarding" was created when log messages should be forwarded to the event console. With the new option <i>Separate check</i> (configurable in WATO) it is now possible to create one logwatch forwarding check per logfile. These checks also provides the number of messages as performance data. --- .werks/2271 | 13 +++++ ChangeLog | 1 + checkman/logwatch.ec | 5 +- checkman/logwatch.ec_single | 15 +++++ checks/logwatch | 102 ++++++++++++++++++++++++++++------ web/plugins/metrics/check_mk.py | 14 +++++ web/plugins/wato/check_parameters.py | 13 ++++- 7 files changed, 142 insertions(+), 21 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=67c4a61b9a…

9 years, 1 month

← Newer
1
...
9
10
11
12
13
14
15
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2015