Checkmk git commits August 2015

checkmk-commits@lists.checkmk.com

7 participants
211 discussions

Check_MK Git: check_mk: bugfix: hovering over the graph icon failed for services that contained a backslash (i.e. windows paths)

by Sebastian Herbord

Module: check_mk Branch: master Commit: 18da30a25e539d1551c269935d9213e48a1a2b39 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18da30a25e539d… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Aug 26 18:20:07 2015 +0200 bugfix: hovering over the graph icon failed for services that contained a backslash (i.e. windows paths) in passing strings to the js hover function (on icons) one level of escaping is lost --- web/plugins/icons/builtin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 1895e6c..2e10c19 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -322,7 +322,7 @@ def pnp_icon(row, what): hover_content_func = 'pnp_hover_contents(\'%s\')' % pnp_popup_url(row, what) else: hover_content_func = 'hover_graph(\'%s\', \'%s\', \'%s\')' % \ - (row['site'], row['host_name'], row.get('service_description', '_HOST_')) + (row['site'], row['host_name'], row.get('service_description', '_HOST_').replace("\\", "\\\\")) return '<a href="%s" onmouseover="show_hover_menu(event, %s)" ' \ 'onmouseout="hide_hover_menu()">%s</a>' % (url, hover_content_func, html.render_icon('pnp', ''))

8 years, 10 months

Check_MK Git: check_mk: bugfix: access to undefined variable

by Sebastian Herbord

Module: check_mk Branch: master Commit: 7d2526ef7ec662cefcadfb3a8678ee0a58b98b61 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d2526ef7ec662… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Aug 26 16:58:57 2015 +0200 bugfix: access to undefined variable --- web/htdocs/prediction.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/web/htdocs/prediction.py b/web/htdocs/prediction.py index 26a0640..c19f2c2 100644 --- a/web/htdocs/prediction.py +++ b/web/htdocs/prediction.py @@ -83,13 +83,14 @@ def page_graph(): tg_name = tg_info["name"] timegroups.sort(cmp = lambda a,b: cmp(a["range"][0], b["range"][0])) - if not timegroup: - timegroup = timegroups[0] - tg_name = choices[0][0] choices = [ (tg_info["name"], tg_info["name"].title()) for tg_info in timegroups ] + if not timegroup: + timegroup = timegroups[0] + tg_name = choices[0][0] + html.begin_form("prediction") html.write(_("Show prediction for ")) html.select("timegroup", choices, tg_name, onchange="document.prediction.submit();")

8 years, 10 months

Check_MK Git: check_mk: #2424 esx_vsphere_counters: improved handling when data is missing

by Andreas Boesl

Module: check_mk Branch: master Commit: 3c990b2b65ca08fc7a11ea89ee2bbf386313e950 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c990b2b65ca08… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Aug 26 17:27:12 2015 +0200 #2424 esx_vsphere_counters: improved handling when data is missing A few times per day, the ESX system reports invalid counter values. This is an ESX issue and can't be fixed. The esx_vsphere_counter checks were unable to work with this invalid/missing data. This has been fixed. --- .werks/2424 | 12 ++++++++++++ ChangeLog | 3 ++- checks/esx_vsphere_counters | 16 +++++++--------- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/.werks/2424 b/.werks/2424 new file mode 100644 index 0000000..eda935a --- /dev/null +++ b/.werks/2424 @@ -0,0 +1,12 @@ +Title: esx_vsphere_counters: improved handling when data is missing +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1440602655 +Class: feature + +A few times per day, the ESX system reports invalid counter values. +This is an ESX issue and can't be fixed. The esx_vsphere_counter checks were unable +to work with this invalid/missing data. This has been fixed. + diff --git a/ChangeLog b/ChangeLog index 9887eba..b55dbc7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -65,6 +65,7 @@ * 2422 winperf_mem: new check to monitor memory pages per second... * 2423 interface checks: now able to configure absolute levels for error packets... * 1286 blade_bx_powerfan: Discovery ignores not present fans now + * 2424 esx_vsphere_counters: improved handling when data is missing... * 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset... * 2316 FIX: windows agent: fix garbled output of cached agent plugins... * 2358 FIX: check_mk_agent.solaris: more correct computation of zfs used space... @@ -139,8 +140,8 @@ * 1282 FIX: win_printers: Not longer discover offline printers * 1284 FIX: symantec_av_progstate: Now Supports the current version of Symantec AV * 1285 FIX: blade_bx_powerfan: Fixed exception in case of fan failure - * 1287 FIX: akcp_temperature: Fixed interpretation of device levels... * 2522 FIX: check_mk_agent.aix: now handles different output formats of the uptime function + * 1287 FIX: akcp_temperature: Fixed interpretation of device levels... Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/esx_vsphere_counters b/checks/esx_vsphere_counters index 28631ce..dcc3f85 100644 --- a/checks/esx_vsphere_counters +++ b/checks/esx_vsphere_counters @@ -51,6 +51,7 @@ # sys.uptime||630664|second + # .--Disk IO-------------------------------------------------------------. # | ____ _ _ ___ ___ | # | | _ \(_)___| | __ |_ _/ _ \ | @@ -74,7 +75,7 @@ def inventory_esx_vsphere_counters_diskio(parsed): return [("SUMMARY", {})] def check_esx_vsphere_counters_diskio(item, params, parsed): - if not parsed: + if "disk.read" not in parsed: raise MKCounterWrapped("Counter data is missing") values = {} @@ -147,7 +148,7 @@ def inventory_esx_vsphere_counters_datastoreio(parsed): esx_vsphere_counters_get_item_mapping(parsed).values())) def check_esx_vsphere_counters_datastoreio(item, params, parsed): - if not parsed: + if "datastore.read" not in parsed: raise MKCounterWrapped("Counter data is missing") datastores = {} @@ -314,7 +315,7 @@ def inventory_esx_vsphere_counters_if(parsed): return inventory_if_common(converted) def check_esx_vsphere_counters_if(item, params, parsed): - if not parsed: + if "net.bytesRx" not in parsed: raise MKCounterWrapped("Counter data is missing") converted = convert_esx_counters_if(parsed) @@ -345,13 +346,10 @@ def inventory_esx_vsphere_counters_uptime(parsed): return [ (None, {}) ] def check_esx_vsphere_counters_uptime(_no_item, params, parsed): - if not parsed: + if "sys.uptime" not in parsed: raise MKCounterWrapped("Counter data is missing") - if "sys.uptime" in parsed: - return check_uptime_seconds(params, int(parsed["sys.uptime"][""][0][0])) - else: - return 3, "No uptime information found in agent output" + return check_uptime_seconds(params, int(parsed["sys.uptime"][""][0][0])) check_info['esx_vsphere_counters.uptime'] = { @@ -397,7 +395,7 @@ def inventory_esx_vsphere_counters_ramdisk(parsed): return df_inventory(ramdisks) def check_esx_vsphere_counters_ramdisk(item, params, parsed): - if not parsed: + if "sys.resourceMemConsumed" not in parsed: raise MKCounterWrapped("Counter data is missing") ramdisks = []

8 years, 10 months

Check_MK Git: check_mk: db2_logsizes: added missing manpage

by Andreas Boesl

Module: check_mk Branch: master Commit: b40982e3977167a7d95a0af49ffff6f057035743 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b40982e3977167… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Aug 26 17:20:02 2015 +0200 db2_logsizes: added missing manpage --- checkman/db2_logsizes | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/checkman/db2_logsizes b/checkman/db2_logsizes new file mode 100644 index 0000000..39e1570 --- /dev/null +++ b/checkman/db2_logsizes @@ -0,0 +1,22 @@ +title: DB2 Logfile Usage +agents: aix, linux +catalog: app/db2 +license: GPL +distribution: check_mk +description: + This check monitors amount of free logfile space. + You can configure limits for absolute and percentage free space. + + This check needs the mk_db2 plugin installed in the agent. + +item: + The DB2 instance name followed by a : and the database name, e.g. db2ilog1:REST1 + +inventory: + One separate check for each database will be created. + +perfdata: + Four values: The first value is the used space of the logfile. Then the size + of logfile itself (in case it is growing). Finally the growth and the trend. + For more information regarding trend and growth you can have a look at the df manpage. +

8 years, 10 months

Check_MK Git: check_mk: merge conflict

by Bastian Kuhn

Module: check_mk Branch: master Commit: 02a96bfd07bd701a91d1562e2380aa14730641ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02a96bfd07bd70… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Aug 26 17:08:00 2015 +0200 merge conflict ---

8 years, 10 months

Check_MK Git: check_mk: #1287 FIX akcp_temperature: Fixed interpretation of device levels

by Bastian Kuhn

Module: check_mk Branch: master Commit: d355b31b40cdcef25bf34690b09d293edac56b61 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d355b31b40cdce… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Aug 26 17:07:11 2015 +0200 #1287 FIX akcp_temperature: Fixed interpretation of device levels This fix handle devices who seamed to have to low levels like 3.5 or 2.5 --- .werks/1287 | 11 +++++++++++ ChangeLog | 1 + checks/akcp_sensor.include | 11 ++++++++--- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.werks/1287 b/.werks/1287 new file mode 100644 index 0000000..b019a9f --- /dev/null +++ b/.werks/1287 @@ -0,0 +1,11 @@ +Title: akcp_temperature: Fixed interpretation of device levels +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1440601502 + +This fix handle devices who seamed to have to low levels like 3.5 or 2.5 + diff --git a/ChangeLog b/ChangeLog index 17c9711..9d1832c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -139,6 +139,7 @@ * 1282 FIX: win_printers: Not longer discover offline printers * 1284 FIX: symantec_av_progstate: Now Supports the current version of Symantec AV * 1285 FIX: blade_bx_powerfan: Fixed exception in case of fan failure + * 1287 FIX: akcp_temperature: Fixed interpretation of device levels... Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/akcp_sensor.include b/checks/akcp_sensor.include index 344075b..a3b0690 100644 --- a/checks/akcp_sensor.include +++ b/checks/akcp_sensor.include @@ -153,9 +153,14 @@ def check_akcp_sensor_temp(item, params, info): map(float, (low_crit, low_warn, high_warn, high_crit)) else: unit_normalised = unit.lower() - # Devices with "F" or "C" have the levels in degrees * 10 - low_crit, low_warn, high_warn, high_crit = \ - map(lambda t: (float(t) / 10), (low_crit, low_warn, high_warn, high_crit)) + if int(high_crit) > 100: + # Devices with "F" or "C" have the levels in degrees * 10 + low_crit, low_warn, high_warn, high_crit = \ + map(lambda t: (float(t) / 10), (low_crit, low_warn, high_warn, high_crit)) + else: + low_crit, low_warn, high_warn, high_crit = \ + map(float, (low_crit, low_warn, high_warn, high_crit)) + if degreeraw and degreeraw != "0": temperature = float(degreeraw) / 10.0

8 years, 10 months

Check_MK Git: check_mk: #2522 FIX check_mk_agent.aix: now handles different output formats of the uptime function

by Simon Betz

Module: check_mk Branch: master Commit: 165d46f91dec03d26eb7d2adf29a5644c0632369 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=165d46f91dec03… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Aug 26 16:00:58 2015 +0200 #2522 FIX check_mk_agent.aix: now handles different output formats of the uptime function --- .werks/2522 | 9 +++++++++ ChangeLog | 1 + agents/check_mk_agent.aix | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/2522 b/.werks/2522 new file mode 100644 index 0000000..265fe3c --- /dev/null +++ b/.werks/2522 @@ -0,0 +1,9 @@ +Title: check_mk_agent.aix: now handles different output formats of the uptime function +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1440597462 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 4b8d591..80a2192 100644 --- a/ChangeLog +++ b/ChangeLog @@ -134,6 +134,7 @@ * 1280 FIX: check_mail_loop: It was not possible to use POP3 as protocol to fetch mails * 1282 FIX: win_printers: Not longer discover offline printers * 1284 FIX: symantec_av_progstate: Now Supports the current version of Symantec AV + * 2522 FIX: check_mk_agent.aix: now handles different output formats of the uptime function Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 92238ff..c3927fd 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -218,7 +218,7 @@ fi echo '<<<uptime>>>' -uptime | awk '{print $3,$5}' | tr ":" " " | sed 's/,//' | awk '{a=86400*int($1)+3600*int($2)+60*int($3);printf("%d\n",a)}' +uptime | sed -e 's/^.*up//g' -e 's/user.*$//g' -e 's/hrs/0/g' -e 's/:/ /g' -e 's/days,//g' -e 's/mins//g' | sed -r 's/(.*),.*/\1/' | awk '{if (NF == 3) a=86400*int($1)+3600*int($2)+60*int($3); else if (NF ==2) a=3600*int($1)+60*int($2); else a=60*int($1); printf("%d\n",a)}' if cd $PLUGINSDIR 2>/dev/null

8 years, 10 months

Check_MK Git: check_mk: #1286 blade_bx_powerfan: Discovery ignores not present fans now

by Bastian Kuhn

Module: check_mk Branch: master Commit: 7e1f5e7cbef2104d9982b74b1b368458579d4069 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e1f5e7cbef210… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Aug 26 15:36:30 2015 +0200 #1286 blade_bx_powerfan: Discovery ignores not present fans now --- .werks/1286 | 9 +++++++++ ChangeLog | 1 + checks/blade_bx_powerfan | 7 ++++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/1286 b/.werks/1286 new file mode 100644 index 0000000..115629c --- /dev/null +++ b/.werks/1286 @@ -0,0 +1,9 @@ +Title: blade_bx_powerfan: Discovery ignores not present fans now +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1440596160 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index e22bebb..17c9711 100644 --- a/ChangeLog +++ b/ChangeLog @@ -64,6 +64,7 @@ * 2421 winperf_phydisk: now able to monitor the average read/write duration for each disk... * 2422 winperf_mem: new check to monitor memory pages per second... * 2423 interface checks: now able to configure absolute levels for error packets... + * 1286 blade_bx_powerfan: Discovery ignores not present fans now * 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset... * 2316 FIX: windows agent: fix garbled output of cached agent plugins... * 2358 FIX: check_mk_agent.solaris: more correct computation of zfs used space... diff --git a/checks/blade_bx_powerfan b/checks/blade_bx_powerfan index 40b1657..39ee9db 100644 --- a/checks/blade_bx_powerfan +++ b/checks/blade_bx_powerfan @@ -37,6 +37,11 @@ blade_bx_status = { "1" : "unknow", "8" : "not-present", "9" : "not-available" } +def inventory_blade_bx_powerfan(info): + for line in info: + if line[1] != "8": + yield line[2], "blade_bx_fan_default_error_levels" + def check_blade_bx_powerfan(item, params, info): warn_perc, crit_perc = params for index, status, descr, rpm, max_speed, speed, ctrlstate in info: @@ -64,7 +69,7 @@ def check_blade_bx_powerfan(item, params, info): check_info['blade_bx_powerfan'] = { "check_function" : check_blade_bx_powerfan, - "inventory_function" : lambda info: [ (line[2], "blade_bx_fan_default_error_levels" ) for line in info ] , + "inventory_function" : inventory_blade_bx_powerfan, "service_description" : "Blade Cooling %s", "has_perfdata" : True, "snmp_info" : (".1.3.6.1.4.1.7244.1.1.1.3.3.1.1", [

8 years, 10 months

Check_MK Git: check_mk: #1285 FIX blade_bx_powerfan: Fixed exception in case of fan failure

by Bastian Kuhn

Module: check_mk Branch: master Commit: 1ab91797485f71a09bf1341e343637691f4ca3f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ab91797485f71… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Aug 26 15:24:51 2015 +0200 #1285 FIX blade_bx_powerfan: Fixed exception in case of fan failure --- .werks/1285 | 10 ++++++++++ ChangeLog | 1 + checks/blade_bx_powerfan | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1285 b/.werks/1285 new file mode 100644 index 0000000..829f5b1 --- /dev/null +++ b/.werks/1285 @@ -0,0 +1,10 @@ +Title: blade_bx_powerfan: Fixed exception in case of fan failure +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1440595471 + + diff --git a/ChangeLog b/ChangeLog index c1fc112..1eff3c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -133,6 +133,7 @@ * 1280 FIX: check_mail_loop: It was not possible to use POP3 as protocol to fetch mails * 1282 FIX: win_printers: Not longer discover offline printers * 1284 FIX: symantec_av_progstate: Now Supports the current version of Symantec AV + * 1285 FIX: blade_bx_powerfan: Fixed exception in case of fan failure Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/blade_bx_powerfan b/checks/blade_bx_powerfan index bb6be0d..40b1657 100644 --- a/checks/blade_bx_powerfan +++ b/checks/blade_bx_powerfan @@ -50,7 +50,7 @@ def check_blade_bx_powerfan(item, params, info): if ctrlstate != "2": return (2, "Fan not present or poweroff", perfdata) elif status != "3": - return (2, "Status not OK (Status %s)" % blade_bx_status(status) , perfdata) + return (2, "Status not OK (Status %s)" % blade_bx_status[status] , perfdata) elif speedperc_int <= crit_perc: return (2, "Speed at %d%% of max (crit at %d%%)" % (speedperc_int, crit_perc), perfdata) elif speedperc_int <= warn_perc:

8 years, 10 months

Check_MK Git: check_mk: Fixed exception during creating hosts when having an empty sites.mk

by Lars Michelsen

Module: check_mk Branch: master Commit: ffbca8afde75b8f27cdabf278102c5b15c2a2dd5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ffbca8afde75b8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 26 14:12:55 2015 +0200 Fixed exception during creating hosts when having an empty sites.mk --- web/htdocs/wato.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 9a21f2a..dd744c0 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11112,7 +11112,14 @@ def load_sites(): site['disabled'] = True del site['socket'] - return vars["sites"] + if not vars["sites"]: + # There seem to be installations out there which have a sites.mk + # which has an empty sites dictionary. Apply the default configuration + # for these sites too. + return config.default_single_site_configuration() + else: + return vars["sites"] + except Exception, e: if config.debug:

8 years, 10 months

← Newer
1
2
3
4
5
6
7
8
9
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2015