Checkmk git commits March 2015

checkmk-commits@lists.checkmk.com

7 participants
320 discussions

Check_MK Git: check_mk: #1233 FIX Fixed fileinfo check for solaris in case of missing files

by Bastian Kuhn

Module: check_mk Branch: master Commit: 36f3301e8bc8b99d42d477b1a765a315d32e866e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36f3301e8bc8b9… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Mar 19 10:00:47 2015 +0100 #1233 FIX Fixed fileinfo check for solaris in case of missing files --- .werks/1233 | 10 ++++++++++ ChangeLog | 1 + checks/fileinfo | 5 ++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/1233 b/.werks/1233 new file mode 100644 index 0000000..9847fac --- /dev/null +++ b/.werks/1233 @@ -0,0 +1,10 @@ +Title: Fixed fileinfo check for solaris in case of missing files +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1426755598 + + diff --git a/ChangeLog b/ChangeLog index 516af60..906ad9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -264,6 +264,7 @@ * 2144 FIX: Fixed exception in inventory GUI when trying to render dates of inventorized exe files... * 2058 FIX: ucs_bladecenter_fans.temp, ucs_bladecenter_psu.chassis_temp: fixed broken temperature checks (nagios only)... * 2059 FIX: ucs_bladecenter_if: fixed exception when fibrechannel interfaces were not configured... + * 1233 FIX: Fixed fileinfo check for solaris in case of missing files Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/fileinfo b/checks/fileinfo index b625db3..b3594ac 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -171,7 +171,10 @@ def check_fileinfo_groups(item, params, info): if inclusion != inclusion_tmp: inclusion = inclusion_tmp date_inclusion = inclusion_tmp - if fnmatch.fnmatch(line[0], inclusion) and str(line[1]) != 'missing' \ + # endswith("No such file...") is needed to + # support the solaris perl based version of fileinfo + if not line[0].endswith("No such file or directory") \ + and fnmatch.fnmatch(line[0], inclusion) and str(line[1]) != 'missing' \ and not fnmatch.fnmatch(line[0], exclusion): size = int(line[1]) size_all += size

9 years, 3 months

Check_MK Git: check_mk: fixed typo

by Andreas Boesl

Module: check_mk Branch: master Commit: 83f6ec508935d5037bf174f1b4e455a79f4ec7cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83f6ec508935d5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Mar 19 08:59:26 2015 +0100 fixed typo --- checkman/winperf_ts_sessions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkman/winperf_ts_sessions b/checkman/winperf_ts_sessions index e2d10eb..69366a1 100644 --- a/checkman/winperf_ts_sessions +++ b/checkman/winperf_ts_sessions @@ -21,7 +21,7 @@ perfdata: The check generates perfdata for the active and inactive sessions. [parameters] -paramaeters(dict): A dictionary with the following optional keys: +parameters(dict): A dictionary with the following optional keys: {"active"}: A tuple of warn and crit thresholds {"inactive"}: A tuple of warn and crit thresholds

9 years, 3 months

Check_MK Git: check_mk: #2059 FIX ucs_bladecenter_if: fixed exception when fibrechannel interfaces were not configured

by Andreas Boesl

Module: check_mk Branch: master Commit: 473962306469adc102feae9b53ae2c9d6966ac49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=473962306469ad… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Mar 19 08:58:27 2015 +0100 #2059 FIX ucs_bladecenter_if: fixed exception when fibrechannel interfaces were not configured This check couldn't handle agent data were there was no trace of fibrechannel interfaces. --- .werks/2059 | 10 ++++++++++ ChangeLog | 1 + checks/ucs_bladecenter_if | 39 ++++++++++++++++++++++----------------- 3 files changed, 33 insertions(+), 17 deletions(-) diff --git a/.werks/2059 b/.werks/2059 new file mode 100644 index 0000000..78cce39 --- /dev/null +++ b/.werks/2059 @@ -0,0 +1,10 @@ +Title: ucs_bladecenter_if: fixed exception when fibrechannel interfaces were not configured +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1426751801 + +This check couldn't handle agent data were there was no trace of fibrechannel interfaces. diff --git a/ChangeLog b/ChangeLog index c1075e7..516af60 100644 --- a/ChangeLog +++ b/ChangeLog @@ -263,6 +263,7 @@ * 2143 FIX: Solaris-Agent: Fixed broken zfsget checks on solaris 10 * 2144 FIX: Fixed exception in inventory GUI when trying to render dates of inventorized exe files... * 2058 FIX: ucs_bladecenter_fans.temp, ucs_bladecenter_psu.chassis_temp: fixed broken temperature checks (nagios only)... + * 2059 FIX: ucs_bladecenter_if: fixed exception when fibrechannel interfaces were not configured... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/ucs_bladecenter_if b/checks/ucs_bladecenter_if index 696d8e4..c9a578f 100644 --- a/checks/ucs_bladecenter_if +++ b/checks/ucs_bladecenter_if @@ -44,11 +44,12 @@ def parse_ucs_bladecenter_if(info): # TODO: fabricFcSanPcEp for what, cut in [ ("fcStats", 6), ("fcErrStats", 10) ]: - for key, values in data[what].items(): - fc_name = key[:-cut] - if fc_name in fc_interfaces: - fc_interfaces[fc_name].setdefault(what, {}) - fc_interfaces[key[:-cut]][what].update(values) + if what in data: + for key, values in data[what].items(): + fc_name = key[:-cut] + if fc_name in fc_interfaces: + fc_interfaces[fc_name].setdefault(what, {}) + fc_interfaces[key[:-cut]][what].update(values) # ==== Ethernet ==== @@ -72,11 +73,12 @@ def parse_ucs_bladecenter_if(info): for what, cut in [ ("etherRxStats", 9), ("etherTxStats", 9), ("etherErrStats", 10) ]: - for key, values in data[what].items(): - eth_name = key[:-cut] - if eth_name in eth_interfaces: - eth_interfaces[eth_name].setdefault(what, {}) - eth_interfaces[key[:-cut]][what].update(values) + if what in data: + for key, values in data[what].items(): + eth_name = key[:-cut] + if eth_name in eth_interfaces: + eth_interfaces[eth_name].setdefault(what, {}) + eth_interfaces[key[:-cut]][what].update(values) # ==== Interconnects ==== icnt_interfaces = {} @@ -100,11 +102,12 @@ def parse_ucs_bladecenter_if(info): for what, cut in [ ("etherRxStats", 9), ("etherTxStats", 9), ("etherErrStats", 10) ]: - for key, values in data[what].items(): - eth_name = key[:-cut] - if eth_name in icnt_interfaces: - icnt_interfaces[eth_name].setdefault(what, {}) - icnt_interfaces[key[:-cut]][what].update(values) + if what in data: + for key, values in data[what].items(): + eth_name = key[:-cut] + if eth_name in icnt_interfaces: + icnt_interfaces[eth_name].setdefault(what, {}) + icnt_interfaces[key[:-cut]][what].update(values) # Example interfaces @@ -251,8 +254,8 @@ def parse_ucs_bladecenter_if(info): converted = [] last_index = 0 for what, group_prefix, interfaces, item_template in [ - ("fibrechannel", "Fibrechannel-Group", fc_interfaces, "Slot %s FC-Switch %s Port %s"), - ("ethernet", "Ethernet-Group", eth_interfaces, "Slot %s Switch %s Port %s"), + ("fibrechannel", "Fibrechannel-Group", fc_interfaces, "Slot %s FC-Switch %s Port %s"), + ("ethernet", "Ethernet-Group", eth_interfaces, "Slot %s Switch %s Port %s"), ("interconnect", "Interconnect-Group", icnt_interfaces, "Slot %s IC-Switch %s Port %s"), ]: for index, (name, values) in enumerate(interfaces.items()): @@ -303,6 +306,8 @@ def parse_ucs_bladecenter_if(info): else: ctr_value += int(values.get(ctr_key, "0")) entry[table_index] = str(ctr_value) + else: + index = 0 last_index += index + 1 return converted

9 years, 3 months

Check_MK Git: check_mk: Add missing graph for lnx_thermal

by Mathias Kettner

Module: check_mk Branch: master Commit: e0ac0df33de5808bf49a7d13c0f2bd3a79a17985 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0ac0df33de580… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 19 07:18:05 2015 +0100 Add missing graph for lnx_thermal --- web/htdocs/check_mk.css | 58 +++++++++++++++++++++++++++++++++------ web/htdocs/views.css | 2 +- web/plugins/metrics/check_mk.py | 8 ++++-- 3 files changed, 57 insertions(+), 11 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index ac40c1e..8ff0a64 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -544,13 +544,18 @@ div.popup span { color: white; } -/* TEST */ +/* Graphs */ table.graph { border: 1px solid black; - box-shadow: 0.5px 0.5px 2px #888; + box-shadow: 0.5px 0.5px 3px #888; border-spacing: 0px; - background-color: #eeeeee; - padding: 10px 10px; + background-color: #f8f4f0; + padding: 8px 16px 4px 8px; +} + +table.graph td.title { + text-align: center; + font-weight: bold; } table.graph canvas { @@ -560,13 +565,49 @@ table.prediction td { padding: 0px; } -table.graph td.legend { - padding-left: 43px; +table.graph tr > td.legend { color: #000000; - padding-bottom: 12px; - padding-top: 2px; + padding: 5px; + padding-left: 49px; +} + +table.graph tr > td.legend > table { + border-collapse: collapse; + width: 100%; +} + +table.graph tr > td.legend > table th, +table.graph tr > td.legend > table td { + padding: 2px 8px 3px 2px; + white-space: nowrap; +} + +table.graph tr > td.legend > table .scalar { + padding: 1px 10px; + width: 80px; } +table.graph tr > td.legend > table th, +table.graph tr > td.legend > table th.scalar { + background-color: transparent; + border-style: none; + color: black; + text-align: right; + padding-bottom: 3px; + border-bottom: 1px solid #bbb; + color: #888; + font-weight: bold; +} + +table.graph tr > td.legend > table > tbody > tr:nth-child(2) td { + padding-top: 4px; +} + +table.graph tr > td.legend > table td.scalar { + text-align: right; +} + + table.graph td.legend div { display: inline-block; float: none; @@ -580,6 +621,7 @@ table.graph td.legend div.color { display: inline-block; box-shadow: 0.5px 0.5px 1px #888; } + table.graph td.legend div.entry { margin-right: 20px; margin-left: 5px; diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 827cffe..3c53ac5 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -356,7 +356,7 @@ table.data.single { empty-cells: show; } -table.data.single tr.data td { +table.data.single tr.data > td { padding-bottom: 4px; padding: 4px 5px 2px 5px; text-align: left; diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 5ab342d..484c5c6 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -803,14 +803,18 @@ perfometer_info.append(("dual", [ # | Definitions of time series graphs | # '----------------------------------------------------------------------' graph_info.append({ - # "title" : _("Das ist der Titel"), # Wenn fehlt, dann nimmt er den Titel der ersten Metrik - # "vertical_label" : _("Das hier kommt vertikal"), # Wenn fehlt, dann nimmt er die Unit der ersten Metrik "metrics" : [ ( "fs_used", "area" ), ] }) graph_info.append({ + "metrics" : [ + ( "temp", "area" ), + ] +}) + +graph_info.append({ "title" : _("CPU utilization"), "metrics" : [ ( "user", "area" ),

9 years, 3 months

Check_MK Git: check_mk: Added some test stylesheets

by Mathias Kettner

Module: check_mk Branch: master Commit: 90d5f40d40fb6a05bb229963ed9ee56784321ecb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90d5f40d40fb6a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 18 14:29:26 2015 +0100 Added some test stylesheets --- web/htdocs/check_mk.css | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 0ce8b7a..ac40c1e 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -546,5 +546,41 @@ div.popup span { /* TEST */ table.graph { - border: 1px solid #888888; + border: 1px solid black; + box-shadow: 0.5px 0.5px 2px #888; + border-spacing: 0px; + background-color: #eeeeee; + padding: 10px 10px; +} + +table.graph canvas { + margin: 0px; +} +table.prediction td { + padding: 0px; +} + +table.graph td.legend { + padding-left: 43px; + color: #000000; + padding-bottom: 12px; + padding-top: 2px; +} + +table.graph td.legend div { + display: inline-block; + float: none; +} + +table.graph td.legend div.color { + border: 1px solid black; + height: 12px; + width: 12px; + vertical-align: bottom; + display: inline-block; + box-shadow: 0.5px 0.5px 1px #888; +} +table.graph td.legend div.entry { + margin-right: 20px; + margin-left: 5px; }

9 years, 3 months

Check_MK Git: check_mk: win_os: Another fix for the datetime string parsing

by Lars Michelsen

Module: check_mk Branch: master Commit: 8d233b4c7ba15270f167fd449dd5aafc0b49e6b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d233b4c7ba152… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 18 13:36:05 2015 +0100 win_os: Another fix for the datetime string parsing --- inventory/win_os | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/inventory/win_os b/inventory/win_os index 9e93a34..b720912 100644 --- a/inventory/win_os +++ b/inventory/win_os @@ -43,11 +43,13 @@ def inv_win_os(info): if '+' in line[6]: datestr, tz = line[6].split('+') + tz = int(tz) elif '-' in line[6]: datestr, tz = line[6].split('-') + tz = int(tz)*-1 else: datestr, tz = line[6], 0 - node["install_date"] = int(time.mktime(time.strptime(datestr, "%Y%m%d%H%M%S.%f"))) - int(tz)*60 + node["install_date"] = int(time.mktime(time.strptime(datestr, "%Y%m%d%H%M%S.%f"))) - tz*60 inv_info['win_os'] = {

9 years, 3 months

Check_MK Git: check_mk: win_os: Another fix for the datetime string parsing

by Lars Michelsen

Module: check_mk Branch: master Commit: 92d3afbef83e3ddd09adc8e040ca97bae100ffa7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92d3afbef83e3d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 18 13:34:22 2015 +0100 win_os: Another fix for the datetime string parsing --- inventory/win_os | 2 ++ 1 file changed, 2 insertions(+) diff --git a/inventory/win_os b/inventory/win_os index a6d8bfe..9e93a34 100644 --- a/inventory/win_os +++ b/inventory/win_os @@ -43,6 +43,8 @@ def inv_win_os(info): if '+' in line[6]: datestr, tz = line[6].split('+') + elif '-' in line[6]: + datestr, tz = line[6].split('-') else: datestr, tz = line[6], 0 node["install_date"] = int(time.mktime(time.strptime(datestr, "%Y%m%d%H%M%S.%f"))) - int(tz)*60

9 years, 3 months

Check_MK Git: check_mk: Updated werk text

by Lars Michelsen

Module: check_mk Branch: master Commit: efa00d64fdccf7775df51dd62a6e8e67a99fa25f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=efa00d64fdccf7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 18 13:20:17 2015 +0100 Updated werk text --- .werks/2149 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/2149 b/.werks/2149 index 7890d07..59eeb3d 100644 --- a/.werks/2149 +++ b/.werks/2149 @@ -1,6 +1,6 @@ Title: LDAP: The diagnostic log has been changed to use a fixed path Level: 1 -Component: wato +Component: multisite Class: fix Compatible: compat State: unknown @@ -9,4 +9,4 @@ Date: 1426671051 The LDAP diagnostic log, which should only be enabled for debugging purposes, has been changed from a free configurable path to a fixed path. In your -OMD sites it will now always be located within <tt>var/log/ldap.log</tt>. +OMD sites it will now always be located within <tt>var/log/web.log</tt>.

9 years, 3 months

Check_MK Git: check_mk: Updated bug entries #2266, #0991

by Lars Michelsen

Module: check_mk Branch: master Commit: 15a2e93b71728260f0b58362f80786087fddd17f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15a2e93b717282… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 18 13:11:17 2015 +0100 Updated bug entries #2266, #0991 --- .bugs/2266 | 7 +++++-- .bugs/991 | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.bugs/2266 b/.bugs/2266 index 0130a3f..25b4f18 100644 --- a/.bugs/2266 +++ b/.bugs/2266 @@ -1,11 +1,14 @@ Title: LDAP-Logfile create exception if directory does not exist Component: wato -State: open +Class: cleanup +State: done Date: 2014-12-23 09:28:57 Targetversion: 1.2.7 -Class: cleanup Anyway we should move the log messages of the LDAP connecttor to some central place. It needn't be a separate Logfile. We should create one central multisite.log or the like and put everything there. With log levels and a similar format as cmc.log. + +2015-03-18 13:11:11: changed state open -> done +Introduced var/log/web.log for multisite logging. diff --git a/.bugs/991 b/.bugs/991 index d5513ab..14105fa 100644 --- a/.bugs/991 +++ b/.bugs/991 @@ -1,10 +1,13 @@ Title: LDAP Updates creates Auditlog entries with random user names Component: multisite -State: open +Class: nastiness +State: done Date: 2013-09-27 11:02:23 Targetversion: 1.2.3i3 -Class: nastiness Due to the cache every couple of minutes a random user might trigger an LDAP update and thus an entry in the audit log with his/her username. Better leave the user empty here or add some dummy entry. + +2015-03-18 12:39:31: changed state open -> done +has already been fixed.

9 years, 3 months

Check_MK Git: check_mk: #2150 FIX Reworked internal logging mechanism

by Lars Michelsen

Module: check_mk Branch: master Commit: 155e08f4bbd698b6aec47b7e6cb641698ad1d503 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=155e08f4bbd698… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 18 13:22:56 2015 +0100 #2150 FIX Reworked internal logging mechanism The web GUI has now a central log file, which is located at <tt>var/log/web.log</tt> in your OMD site. This logfile is used for all application internal logs, for example the LDAP diagnostic log. --- .werks/2150 | 12 +++++++++++ ChangeLog | 1 + web/htdocs/html_mod_python.py | 13 ++---------- web/htdocs/index.py | 2 +- web/htdocs/lib.py | 45 ++++++++++++++++++++++++++++++++++++++--- web/htdocs/sidebar.py | 2 +- web/htdocs/userdb.py | 12 +++++------ web/htdocs/wato.py | 4 ++-- web/plugins/userdb/ldap.py | 5 +---- 9 files changed, 68 insertions(+), 28 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=155e08f4bb…

9 years, 3 months

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