Checkmk git commits October 2013

checkmk-commits@lists.checkmk.com

6 participants
384 discussions

Check_MK Git: check_mk: FIX: fix bug with missing services in WATO inventory

by Mathias Kettner

Module: check_mk Branch: master Commit: 388775dd40198629fecec474b14dbbd20f3b013d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=388775dd401986… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 29 11:42:54 2013 +0100 FIX: fix bug with missing services in WATO inventory --- web/htdocs/html_mod_python.py | 2 +- web/htdocs/htmllib.py | 13 +++++++++++++ web/htdocs/wato.py | 9 ++++++--- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index e794044..fd8a17a 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -3,7 +3,7 @@ import htmllib import os, time, config, weblib, re import defaults -varname_regex = re.compile('^[\w\d_-]+$') +varname_regex = re.compile('^[\w\d_.%+]+$') class html_mod_python(htmllib.html): diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index c26a0da..7101834 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1117,6 +1117,19 @@ class html: ret += c return ret + # Escape a variable name so that it only uses allowed charachters for URL variables + def varencode(self, varname): + if varname == None: + return "None" + + ret = "" + for c in varname: + if not c.isdigit() and not c.isalnum() and c != "_": + ret += "%%%02x" % ord(c) + else: + ret += c + return ret + def u8(self, c): if ord(c) > 127: return "&#%d;" % ord(c) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d08f172..623ab32 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2204,14 +2204,17 @@ def mode_inventory(phase, firsttime): for st, ct, checkgroup, item, paramstring, params, descr, state, output, perfdata in table: if (html.has_var("_cleanup") or html.has_var("_fixall")) \ and st in [ "vanished", "obsolete" ]: + html.debug("%s: %s/%s" % (st, ct, item)) pass elif (html.has_var("_activate_all") or html.has_var("_fixall")) \ and st == "new": active_checks[(ct, item)] = paramstring else: - varname = "_%s_%s" % (ct, item) + varname = "_%s_%s" % (ct, html.varencode(item)) if html.var(varname, "") != "": active_checks[(ct, item)] = paramstring + else: + html.debug("Ausgelassen: %s/%s (varname: %s, value: %s)" % (ct, item, varname, html.var(varname))) check_mk_automation(host[".siteid"], "set-autochecks", [hostname], active_checks) if host.get("inventory_failed"): @@ -2370,8 +2373,8 @@ def show_service_table(host, firsttime): # Temporary ignore checkbox html.write("<td>") if checkbox != None: - varname = "_%s_%s" % (ct, item) - html.checkbox(varname, checkbox, add_attr = ['title="%s"' % _('Temporary ignore this service')]) + varname = "_%s_%s" % (ct, html.varencode(item)) + html.checkbox(varname, checkbox, add_attr = ['title="%s"' % _('Temporarily ignore this service')]) html.write("</td>") html.write("</tr>\n")

10 years, 10 months

Check_MK Git: check_mk: Added host diagnose page ( linked from host edit page)

by Lars Michelsen

Module: check_mk Branch: master Commit: b9fc917b980189da1b9405a7f2552be088632096 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9fc917b980189… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 29 09:40:22 2013 +0100 Added host diagnose page (linked from host edit page) --- ChangeLog | 2 + modules/automation.py | 67 ++++++++ modules/check_mk_base.py | 15 +- web/htdocs/forms.py | 35 ++--- web/htdocs/images/icon_diagnose.png | Bin 0 -> 3885 bytes web/htdocs/images/icon_loading.gif | Bin 0 -> 7696 bytes web/htdocs/images/icon_retry.gif | Bin 0 -> 1852 bytes web/htdocs/images/icon_retry_disabled.gif | Bin 0 -> 1800 bytes web/htdocs/js/wato.js | 47 ++++++ web/htdocs/wato.css | 41 +++++ web/htdocs/wato.py | 236 ++++++++++++++++++++++++++++- 11 files changed, 416 insertions(+), 27 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b9fc917b98…

10 years, 10 months

Check_MK Git: check_mk: esx_vsphere_vm.heartbeat: heartbeat status now configurable

by Andreas Boesl

Module: check_mk Branch: master Commit: d3a9016b27bae5b02001f7827807f396c1ea922e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3a9016b27bae5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Oct 28 17:56:01 2013 +0100 esx_vsphere_vm.heartbeat: heartbeat status now configurable --- ChangeLog | 1 + checkman/esx_vsphere_vm.heartbeat | 9 ++++++++ checks/esx_vsphere_vm | 29 +++++++++++++++--------- web/plugins/wato/check_parameters.py | 40 ++++++++++++++++++++++++++++++++++ 4 files changed, 69 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 74abad2..aa3359b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -72,6 +72,7 @@ * windows_tasks: New check to monitor the Windows Task Scheduler * sensatronics_temp: New check for Sensatronic E4 Temperatur Sensor * akcp_sensor_drycontact: New Check for AKCP drycontact Sensors + * esx_vsphere_vm.heartbeat: Heartbeat status alert level now configurable * ps: new configuration option: handle_count (windows only) * FIX: Windows agent: gracefully handle garbled logstate.txt * FIX: esx_vsphere_counters: added missing ramdisk type upgradescratch diff --git a/checkman/esx_vsphere_vm.heartbeat b/checkman/esx_vsphere_vm.heartbeat index 6ba0012..1bd49ec 100644 --- a/checkman/esx_vsphere_vm.heartbeat +++ b/checkman/esx_vsphere_vm.heartbeat @@ -25,3 +25,12 @@ description: inventory: On each VM one check is generated. + +[parameters] +parameters (dict): A dictionary with the following keys +{"heartbeat_missing"}: vsphere state: red (see above) +{"heartbeat_intermittend"}: vsphere state: yello (see above) +{"heartbeat_no_tools"}: vsphere state: gray (see above) +{"heartbeat_ok"}: vsphere state: gree (see above) + + The value of each keys represents the alert level: 0(OK), 1(WARN), 2(CRIT), 3(UNKNOWN) diff --git a/checks/esx_vsphere_vm b/checks/esx_vsphere_vm index 8813c0f..c0a723f 100644 --- a/checks/esx_vsphere_vm +++ b/checks/esx_vsphere_vm @@ -138,26 +138,35 @@ def inventory_esx_vsphere_vm_hb_status(info): if 'guestHeartbeatStatus' in data: return [(None, None)] -def check_esx_vsphere_vm_hb_status(_no_item, _no_params, info): +def check_esx_vsphere_vm_hb_status(_no_item, params, info): data = esx_vsphere_vm_convert(info) vm_status = data['guestHeartbeatStatus'][0] state = 3 - if vm_status == 'gray': - return 1, "No VMWare Tools installed" - elif vm_status == 'green': - state = 0 - elif vm_status == 'red': - state = 2 - elif vm_status == 'yellow': - state = 1 - return state, "Heartbeat status is %s" % vm_status + + vm_heartbeat_map = { "gray" : (1, "heartbeat_no_tools"), + "green" : (0, "heartbeat_ok"), + "red" : (2, "heartbeat_missing"), + "yellow" : (1, "heartbeat_intermittend") } + if vm_status in vm_heartbeat_map: + if params: + state = params.get(vm_heartbeat_map.get(vm_status)[1], 3) + else: + state = vm_heartbeat_map.get(vm_status)[0] + if vm_status == 'gray': + return state, "No VMWare Tools installed" + else: + return state, "Heartbeat status is %s" % vm_status + else: + return 3, "Unknown heartbeat status %s" % vm_status + check_info['esx_vsphere_vm.heartbeat'] = { "inventory_function" : inventory_esx_vsphere_vm_hb_status, "check_function" : check_esx_vsphere_vm_hb_status, "service_description" : "ESX Heartbeat", + "group" : "vm_heartbeat" } #. diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index f391dad..7222157 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1963,6 +1963,46 @@ register_check_parameters( ) register_check_parameters( + subgroup_os, + "vm_heartbeat", + _("Virtual machine heartbeat status"), + Dictionary( + optional_keys = False, + elements = [ + ( "heartbeat_missing", + MonitoringState( + title = _("No heartbeat"), + help = _("Guest operating system may have stopped responding."), + default_value = 2, + ) + ), + ( "heartbeat_intermittend", + MonitoringState( + title = _("Intermittent heartbeat"), + help = _("May be due to high guest load."), + default_value = 1, + ) + ), + ( "heartbeat_no_tools", + MonitoringState( + title = _("Heartbeat tools missing or not installed"), + help = _("No VMWare Tools installed."), + default_value = 1, + ) + ), + ( "heartbeat_ok", + MonitoringState( + title = _("Heartbeat OK"), + help = _(" Guest operating system is responding normally."), + default_value = 0, + ) + ), + ] + ), + None, + "dict", +) +register_check_parameters( subgroup_applications, "esx_vsphere_objects", _("State of ESX hosts and virtual machines"),

10 years, 10 months

Check_MK Git: check_mk: ps check:

by Andreas Boesl

Module: check_mk Branch: master Commit: ab9f255c582dbda3cf091c377fe6aaa9690dfec9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab9f255c582dbd… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Oct 28 16:47:41 2013 +0100 ps check: "Process inventory" brought in line with "State and count of processes" New configuration option handle_count (windows only) --- ChangeLog | 5 +++ agents/windows/plugins/psperf.bat | 2 +- checkman/ps | 3 ++ checks/ps | 38 ++++++++++++++---- web/plugins/wato/check_parameters.py | 72 +++++++++++++++++++++++++++++++++- 5 files changed, 110 insertions(+), 10 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ab9f255c58…

10 years, 10 months

Check_MK Git: check_mk: Fixed redirect after WATO rule edit (

by Lars Michelsen

shortly introduced bug) Message-ID: <526e6db1.1m0ja50btsdzPbcw%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 61cecbedf3eb98f047927305d970780104730551 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61cecbedf3eb98… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 28 14:59:08 2013 +0100 Fixed redirect after WATO rule edit (shortly introduced bug) --- 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 d08f172..188f8c2 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11311,7 +11311,7 @@ def mode_edit_rule(phase, new = False): varname = html.var("varname") rulespec = g_rulespecs[varname] - back_mode = html.var('back_mode') + back_mode = html.var('back_mode', 'edit_ruleset') if phase == "title": return _("%s rule %s") % (new and _("New") or _("Edit"), rulespec["title"])

10 years, 10 months

Check_MK Git: check_mk: FIX: procedure argument added

by Götz Golla

Module: check_mk Branch: master Commit: 94769e5f948416db46dd228d369a0b64120fc630 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=94769e5f948416… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Sat Oct 26 22:44:07 2013 +0200 FIX: procedure argument added --- doc/treasures/active_checks/check_sql | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/doc/treasures/active_checks/check_sql b/doc/treasures/active_checks/check_sql index 05898ea..021419f 100755 --- a/doc/treasures/active_checks/check_sql +++ b/doc/treasures/active_checks/check_sql @@ -67,15 +67,13 @@ def saverfloat(f): else: return float(f) - - # # defining and collection input parameters # short_options = 'hou:i:p:d:n:H:P:w:c:v' long_options = [ 'help', 'user=', 'password=', 'dbms=', 'name=', 'warning=', 'critical=', 'hostname=', - 'port=', 'debug', 'verbose', 'inputvars=' + 'port=', 'debug', 'verbose', 'procedures', 'inputvars=' ] try:

10 years, 10 months

Check_MK Git: check_mk: check_sql check now supports procedures including input parameters

by Götz Golla

Module: check_mk Branch: master Commit: e3b21f4af947642ac5a5b4efd9bc2eb74df51f6e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3b21f4af94764… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Sat Oct 26 22:24:40 2013 +0200 check_sql check now supports procedures including input parameters --- checks/check_sql | 11 +++++++ doc/treasures/active_checks/check_sql | 54 +++++++++++++++++++++++---------- web/plugins/wato/active_checks.py | 43 +++++++++++++++++++++----- 3 files changed, 84 insertions(+), 24 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e3b21f4af9…

10 years, 10 months

Check_MK Git: check_mk: FIX: Typo in check hwg_temp

by Götz Golla

Module: check_mk Branch: master Commit: 1049cfa2021956d2f491013420a4ea2c68dc0589 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1049cfa2021956… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Sat Oct 26 22:12:23 2013 +0200 FIX: Typo in check hwg_temp --- checks/hwg_temp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/hwg_temp b/checks/hwg_temp index f6222bc..6929191 100644 --- a/checks/hwg_temp +++ b/checks/hwg_temp @@ -58,7 +58,7 @@ def check_hwg_temp(item, params, info): state = 2 elif current_state >= warn: state = 1 - eelif status in ('4', '2'): + elif status in ('4', '2'): state = 1 elif status in('0', '3', '5'): state = 2

10 years, 10 months

Check_MK Git: check_mk: changelog updated: moved fixed memory leak to 1.2. 2p3

by Andreas Boesl

Module: check_mk Branch: master Commit: 6dba878cc9c38254714ef8e6af3bfa6c3a95208e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6dba878cc9c382… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Oct 25 17:23:24 2013 +0200 changelog updated: moved fixed memory leak to 1.2.2p3 --- ChangeLog | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index aa24215..7e2e860 100644 --- a/ChangeLog +++ b/ChangeLog @@ -114,7 +114,6 @@ * table statehist: no longer computes an unmonitored state for hosts and services on certain instances. (showed up as no hosts/services in the multisite gui) - * table statehist: fixed memory leak 1.2.3i4: Core: @@ -632,6 +631,10 @@ * FIX: apply rewriting of application/hostname also when cancelling events * FIX: check_mkevents now uses case insensitive host name matching + Livestatus: + * livestatus: fixed incorrect output formatting of comments_with_info column + * table statehist: fixed memory leak + 1.2.2p2: Core: * FIX: livecheck: fixed handling of one-line plugin outputs and missing \n

10 years, 10 months

Check_MK Git: check_mk: table statehist: fixed memory leak

by Andreas Boesl

Module: check_mk Branch: master Commit: b99b29197896ca3c259a8c4de4571d82ab83afe9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b99b29197896ca… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Oct 25 17:14:53 2013 +0200 table statehist: fixed memory leak --- ChangeLog | 1 + livestatus/src/TableStateHistory.cc | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index 55101fc..9a73686 100644 --- a/ChangeLog +++ b/ChangeLog @@ -112,6 +112,7 @@ * table statehist: no longer computes an unmonitored state for hosts and services on certain instances. (showed up as no hosts/services in the multisite gui) + * table statehist: fixed memory leak 1.2.3i4: Core: diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 6a6d93c..ac95135 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -633,6 +633,12 @@ void TableStateHistory::answerQuery(Query *query) process(query, hst); it_hst++; } + it_hst = state_info.begin(); + while (it_hst != state_info.end()) { + delete it_hst->second; + it_hst++; + } + g_store->logCache()->unlockLogCache(); }

10 years, 10 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2013