Checkmk git commits November 2013

checkmk-commits@lists.checkmk.com

6 participants
274 discussions

Check_MK Git: check_mk: brocade_mlx: PNP templates

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: e4a79efd592741de02fb7323e6af3df820d52b8a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e4a79efd592741… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Nov 8 15:43:50 2013 +0100 brocade_mlx: PNP templates --- pnp-templates/check_mk-brocade_mlx.module_cpu.php | 8 +++-- pnp-templates/check_mk-brocade_mlx.module_mem.php | 36 ++++++++++++++++++++ pnp-templates/check_mk-brocade_mlx.temperature.php | 1 + 3 files changed, 42 insertions(+), 3 deletions(-) diff --git a/pnp-templates/check_mk-brocade_mlx.module_cpu.php b/pnp-templates/check_mk-brocade_mlx.module_cpu.php index fd953f3..97e0d8c 100644 --- a/pnp-templates/check_mk-brocade_mlx.module_cpu.php +++ b/pnp-templates/check_mk-brocade_mlx.module_cpu.php @@ -23,7 +23,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -$opt[1] = "--vertical-label 'CPU utilization %' -l0 -u 100 --title \"CPU Utilization for $hostname\" "; +$opt[1] = "--vertical-label '%' -l0 -u 100 --title \"CPU Utilization\" "; # $def[1] = "DEF:util1=$RRDFILE[1]:$DS[1]:AVERAGE " ; $def[1] .= "DEF:util5=$RRDFILE[2]:$DS[1]:AVERAGE " ; @@ -33,9 +33,11 @@ $def[1] .= "DEF:util300=$RRDFILE[4]:$DS[1]:AVERAGE " ; $def[1] .= "AREA:util60#60f020:\"Utilization 60s\" " ; $def[1] .= "GPRINT:util60:MIN:\"Min\: %2.1lf%%\" " ; $def[1] .= "GPRINT:util60:MAX:\"Max\: %2.1lf%%\" " ; -$def[1] .= "GPRINT:util60:LAST:\"Last\: %2.1lf%%\\n\" " ; +$def[1] .= "GPRINT:util60:LAST:\"Last\: %2.1lf%%\" " ; +$def[1] .= "HRULE:$WARN[3]#FFFF00:\"Warn\" " ; +$def[1] .= "HRULE:$CRIT[3]#FF0000:\"Crit\\n\" " ; -$def[1] .= "LINE:util1#000000:\"1s \" " ; +$def[1] .= "LINE:util1#000000:\"Util 1s \" " ; $def[1] .= "GPRINT:util1:LAST:\"Last\: %2.1lf%%\" " ; $def[1] .= "LINE:util5#0000ff:\"5s \" " ; diff --git a/pnp-templates/check_mk-brocade_mlx.module_mem.php b/pnp-templates/check_mk-brocade_mlx.module_mem.php new file mode 100644 index 0000000..99abfe1 --- /dev/null +++ b/pnp-templates/check_mk-brocade_mlx.module_mem.php @@ -0,0 +1,36 @@ +<?php +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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. + +$opt[1] = "--vertical-label 'Bytes' -l 0 --title \"Main Memory (RAM)\" "; +# +$def[1] = "DEF:used=$RRDFILE[1]:$DS[1]:AVERAGE " ; + +$def[1] .= "AREA:used#60f020:\"Used\" " ; +$def[1] .= "GPRINT:used:MIN:\"Min\: %2.0lf Bytes\" " ; +$def[1] .= "GPRINT:used:MAX:\"Max\: %2.0lf Bytes\" " ; +$def[1] .= "GPRINT:used:LAST:\"Last\: %2.0lf Bytes\\n\" " ; +$def[1] .= "HRULE:$WARN[1]#FFFF00:\"Warn\" " ; +$def[1] .= "HRULE:$CRIT[1]#FF0000:\"Crit\\n\" " ; +?> diff --git a/pnp-templates/check_mk-brocade_mlx.temperature.php b/pnp-templates/check_mk-brocade_mlx.temperature.php new file mode 120000 index 0000000..fd89bc4 --- /dev/null +++ b/pnp-templates/check_mk-brocade_mlx.temperature.php @@ -0,0 +1 @@ +check_mk-dell_powerconnect_temp.php \ No newline at end of file

10 years, 10 months

Check_MK Git: check_mk: FIX WATO forms: incorrect handling of checkbox state

by Andreas Boesl

Module: check_mk Branch: master Commit: 3b122d4f1de5750c031cffe93c107507c445e5db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b122d4f1de575… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Nov 8 14:31:35 2013 +0100 FIX WATO forms: incorrect handling of checkbox state --- .werks/33 | 8 ++++++++ ChangeLog | 1 + web/htdocs/htmllib.py | 6 +++--- web/htdocs/wato.py | 6 +++++- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.werks/33 b/.werks/33 new file mode 100644 index 0000000..f4304e5 --- /dev/null +++ b/.werks/33 @@ -0,0 +1,8 @@ +Title: WATO forms: incorrect handling of checkbox state +Level: 1 +Component: wato +Version: 1.2.3i7 +Date: 1383917396 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 700b194..9e9b7a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ WATO: * 0053 New rule for configuring the display_name of a service... * 0048 FIX: Fixed locking issue on host diagnose page + * 0033 FIX: WATO forms: incorrect handling of checkbox state Notifications: * 0032 FIX: mail notification plugin: replace windows forbidden characters in mail images diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index d9f209c..2912d54 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -583,8 +583,8 @@ class html: form_name = self.form_name return self.has_var("filled_in") and ( - self.form_name == None or \ - self.form_name in self.list_var("filled_in")) + form_name == None or \ + form_name in self.list_var("filled_in")) # Get value of checkbox. Return True, False or None. None means @@ -594,7 +594,7 @@ class html: def get_checkbox(self, varname, form_name = None): if self.has_var(varname): return not not self.var(varname) - elif not self.form_filled_in(): + elif not self.form_filled_in(form_name): return None else: # Form filled in but variable missing -> Checkbox not checked diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3728d33..83c113b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2296,7 +2296,11 @@ def mode_diag_host(phase): reload_hosts(g_folder) call_hook_hosts_changed(g_folder) - html.http_redirect(make_link([("mode", "edithost"), ("host", hostname), ("folder", g_folder[".path"])])) + html.del_all_vars() + html.set_var("host", hostname) + html.set_var("folder", g_folder[".path"]) + + return "edithost" return html.write('<div class="diag_host">')

10 years, 10 months

Check_MK Git: check_mk: brocade_mlx: improved checks with informations from the MIB

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 103a83b19afd48ead47bc07874ec0f7932293311 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=103a83b19afd48… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Nov 8 14:11:31 2013 +0100 brocade_mlx: improved checks with informations from the MIB --- checkman/brocade_mlx.module_status | 6 ++++-- checkman/brocade_mlx.temperature | 8 ++++---- checks/brocade_mlx | 21 +++++++++++++++------ 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/checkman/brocade_mlx.module_status b/checkman/brocade_mlx.module_status index 1d97598..8bd537e 100644 --- a/checkman/brocade_mlx.module_status +++ b/checkman/brocade_mlx.module_status @@ -7,8 +7,10 @@ description: Checks the overall status of modules in Brocade NetIron MLX switching / routing devices. - Returns {OK} on status 10 (running), {WARN} on status 0 (empty) - and {CRIT} on every other status. + Returns {OK} on status 10 (running). + Returns {WARN} on status 0 (empty), 2 (going down) and 9 (coming up). + Returns {CRIT} on status 3 (rejected) and 4 (bad). + Returns {UNKN} on every other status. item: If a module description is delivered by SNMP, the item is build from the diff --git a/checkman/brocade_mlx.temperature b/checkman/brocade_mlx.temperature index 0502d6d..113e389 100644 --- a/checkman/brocade_mlx.temperature +++ b/checkman/brocade_mlx.temperature @@ -14,8 +14,8 @@ item: The description of the temperature sensor as provided by SNMP. examples: - # set default levels to 70°C and 80°C: - brocade_mlx_temperature_default_levels = (70, 80) + # set default levels to 30°C and 40°C: + brocade_mlx_temperature_default_levels = (30, 40) # Check a sensor with description Switch Fabric module 0, sensor 1 temperature # on a box called my-mlx-device with default levels @@ -25,7 +25,7 @@ examples: # or use individual levels for warn and crit checks += [ - ("my-mlx-device", "brocade_mlx.temperature", 'Switch Fabric module 0, sensor 1 temperature', (80, 100) + ("my-mlx-device", "brocade_mlx.temperature", 'Switch Fabric module 0, sensor 1 temperature', (40, 50) ] perfdata: @@ -40,4 +40,4 @@ crit(int): {CRIT} state is triggered, if the temperature is higher than this. [configuration] brocade_mlx_temperature_default_levels(int, int): The standard levels for {WARN} - and {CRIT}. Defaults are (100, 120) + and {CRIT}. Defaults are (50, 60) diff --git a/checks/brocade_mlx b/checks/brocade_mlx index 2a042f8..9eb14b3 100644 --- a/checks/brocade_mlx +++ b/checks/brocade_mlx @@ -117,12 +117,20 @@ def inventory_brocade_mlx_module(info): def check_brocade_mlx_module(item, _no_params, info): for module_id, module_descr, module_state, mem_total, mem_avail in info[2]: if combine_item(module_id, module_descr) == item: - if module_state == "10": - return 0, "Module reports status 10 (running)" - elif module_state == "0": + if module_state == "0": return 1, "Module reports status 0 (empty)" + elif module_state == "2": + return 1, "Module reports status 2 (going down)" + elif module_state == "3": + return 2, "Module reports status 3 (rejected)" + elif module_state == "4": + return 2, "Module reports status 4 (bad)" + elif module_state == "9": + return 1, "Module reports status 9 (coming up)" + elif module_state == "10": + return 0, "Module reports status 10 (running)" else: - return 2, "Module reports status %s" % module_state + return 3, "Module reports unidentified status %s" % module_state return 3, "Module %s not found" % item check_info["brocade_mlx.module_status"] = { @@ -262,7 +270,7 @@ check_info["brocade_mlx.module_cpu"] = { # Temperature Sensors ############################################################################# -brocade_mlx_temperature_default_levels = (100, 120) +brocade_mlx_temperature_default_levels = (50, 60) def inventory_brocade_mlx_temp(info): inventory = [] @@ -273,7 +281,8 @@ def inventory_brocade_mlx_temp(info): def check_brocade_mlx_temp(item, params, info): warn, crit = params for temp_descr, temp_value in info[4]: - temp_value = saveint(temp_value) + # Info from the MIB: "Each unit is 0.5 degrees Celcius." + temp_value = int(saveint(temp_value) / 2) if temp_descr == item: status = 0

10 years, 10 months

Check_MK Git: check_mk: cisco_wlc_clients: Fixed pnp graph

by Bastian Kuhn

Module: check_mk Branch: master Commit: e5e23ef35839cb3647a4e8fa111bf273298cca71 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5e23ef35839cb… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Nov 8 14:08:20 2013 +0100 cisco_wlc_clients: Fixed pnp graph --- pnp-templates/check_mk-cisco_wlc_clients.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pnp-templates/check_mk-cisco_wlc_clients.php b/pnp-templates/check_mk-cisco_wlc_clients.php index 9c0c848..fbe78f1 100644 --- a/pnp-templates/check_mk-cisco_wlc_clients.php +++ b/pnp-templates/check_mk-cisco_wlc_clients.php @@ -32,8 +32,8 @@ $def[1] .= "GPRINT:var1:LAST:\"%5.1lf%%\" "; $def[1] .= "GPRINT:var1:AVERAGE:\"(Avg\: %5.1lf%%,\" "; $def[1] .= "GPRINT:var1:MIN:\"Min\: %5.1lf%%,\" "; $def[1] .= "GPRINT:var1:MAX:\"Max\: %5.1lf%%)\" "; -$def[1] .= "HRULE:$CRIT[1]#FFFF00 "; -$def[1] .= "HRULE:$WARN[1]#FF0000 "; -$def[1] .= "HRULE:$MIN[1]#FFFF00 "; -$def[1] .= "HRULE:$MAX[1]#FF0000 "; +#$def[1] .= "HRULE:$CRIT[1]#FFFF00 "; +#$def[1] .= "HRULE:$WARN[1]#FF0000 "; +#$def[1] .= "HRULE:$MIN[1]#FFFF00 "; +#$def[1] .= "HRULE:$MAX[1]#FF0000 "; ?>

10 years, 10 months

Check_MK Git: check_mk: Tolerate rules with missing titles

by Mathias Kettner

Module: check_mk Branch: master Commit: 880b0ec7731b4334a762f63a02d85fc6caea6b9e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=880b0ec7731b43… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 8 12:46:22 2013 +0100 Tolerate rules with missing titles --- 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 3728d33..9ddb5d6 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11746,7 +11746,7 @@ def mode_edit_rule(phase, new = False): # Value if valuespec: - forms.header(valuespec.title()) + forms.header(valuespec.title() or _("Value")) value = rule[0] forms.section() try:

10 years, 10 months

Check_MK Git: check_mk: FIX mail notification plugin: replace windows forbidden characters in mail images

by Andreas Boesl

Module: check_mk Branch: master Commit: abc0dccff6e28674fc0857ac17b27ddcbe99422e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=abc0dccff6e286… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Nov 8 12:44:53 2013 +0100 FIX mail notification plugin: replace windows forbidden characters in mail images --- .werks/32 | 8 ++++++++ ChangeLog | 5 ++++- notifications/mail | 3 +++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/32 b/.werks/32 new file mode 100644 index 0000000..fdc8b52 --- /dev/null +++ b/.werks/32 @@ -0,0 +1,8 @@ +Title: mail notification plugin: replace windows forbidden characters in mail images +Level: 2 +Component: notifications +Version: 1.2.3i7 +Date: 1383911035 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 83964bd..700b194 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,7 +21,10 @@ WATO: * 0053 New rule for configuring the display_name of a service... - * 0048 FIX: Fixed locking issue on host diagnose page... + * 0048 FIX: Fixed locking issue on host diagnose page + + Notifications: + * 0032 FIX: mail notification plugin: replace windows forbidden characters in mail images Reporting & Availability: * 0051 Option for showing timeline directly in availability table... diff --git a/notifications/mail b/notifications/mail index 7303115..a4248ec 100755 --- a/notifications/mail +++ b/notifications/mail @@ -409,6 +409,9 @@ def main(): svc_desc = '_HOST_' else: svc_desc = context['SERVICEDESC'].replace(' ', '_') + # replace forbidden windows characters < > ? " : | \ / * + for token in ["<", ">", "?", "\"", ":", "|", "\\", "/", "*"] : + svc_desc = svc_desc.replace(token, "x%s" % ord(token)) name = '%s-%s-%d.png' % (context['HOSTNAME'], svc_desc, source) attachments.append(('img', name, content, 'inline'))

10 years, 10 months

Check_MK Git: check_mk: Fix exception in WATO logfile pattern editor

by Mathias Kettner

Module: check_mk Branch: master Commit: bd24e5ae5206b7ed8b3a6a6aa85d2e205c02a6ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd24e5ae5206b7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 8 12:44:26 2013 +0100 Fix exception in WATO logfile pattern editor --- web/plugins/wato/check_parameters.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 08e41f3..5260d38 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -82,6 +82,7 @@ register_rule(group + '/' + subgroup_applications, ), ] ), + title = _("Logfile pattern rules"), help = _('<p>You can define one or several patterns (regular expressions) in each logfile pattern rule. ' 'These patterns are applied to the selected logfiles to reclassify the ' 'matching log messages. The first pattern which matches a line will '

10 years, 10 months

Check_MK Git: check_mk: htmllib: new function http_redirect

by Andreas Boesl

Module: check_mk Branch: master Commit: 0f89fb83ca4c64d2f508ca43508cdb3eaf58f1c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f89fb83ca4c64… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Nov 8 12:39:32 2013 +0100 htmllib: new function http_redirect --- web/htdocs/html_mod_python.py | 4 ++++ web/htdocs/htmllib.py | 3 +++ web/htdocs/wato.py | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index f50d8ad..c8082ec 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -125,6 +125,10 @@ class html_mod_python(htmllib.html): msg = repr(msg) self.req.log_error(msg, apache.APLOG_WARNING) + def http_redirect(self, url): + self.set_http_header('Location', url) + raise apache.SERVER_RETURN, apache.HTTP_MOVED_TEMPORARILY + # Needs to set both, headers_out and err_headers_out to be sure to send # the header on all responses def set_http_header(self, key, val): diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 7101834..d9f209c 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -713,6 +713,9 @@ class html: def set_browser_reload(self, secs): self.browser_reload = secs + def http_redirect(self, url): + raise MKGeneralException("http_redirect not implemented") + def set_browser_redirect(self, secs, url): self.browser_reload = secs self.browser_redirect = url diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c908506..3728d33 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2295,8 +2295,8 @@ def mode_diag_host(phase): save_folder_and_hosts(g_folder) reload_hosts(g_folder) call_hook_hosts_changed(g_folder) - return 'edithost' + html.http_redirect(make_link([("mode", "edithost"), ("host", hostname), ("folder", g_folder[".path"])])) return html.write('<div class="diag_host">')

10 years, 10 months

Check_MK Git: check_mk: Trying to improve ping feedback during host diag

by Lars Michelsen

Module: check_mk Branch: master Commit: 82004701d773d35720909e96517e53e6db215440 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82004701d773d3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 8 10:36:01 2013 +0100 Trying to improve ping feedback during host diag --- modules/automation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/automation.py b/modules/automation.py index 6c9e5e0..94dc497 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -679,7 +679,7 @@ def automation_diag_host(args): try: if test == 'ping': import subprocess - p = subprocess.Popen('ping -c 3 -W 5 %s 2>&1' % ipaddress, shell = True, stdout = subprocess.PIPE) + p = subprocess.Popen('ping -A -i 0.2 -c 2 -W 5 %s 2>&1' % ipaddress, shell = True, stdout = subprocess.PIPE) response = p.stdout.read() return (p.wait(), response)

10 years, 10 months

Check_MK Git: check_mk: Fixed exception in latest change

by Lars Michelsen

Module: check_mk Branch: master Commit: 76af8078b194f9e7e666ab8e3980b778dd80ec5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76af8078b194f9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 8 10:28:10 2013 +0100 Fixed exception in latest change --- web/htdocs/wato.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 16501a8..c908506 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2354,6 +2354,8 @@ def mode_diag_host(phase): def ajax_diag_host(): try: + prepare_folder_info() + if not html.check_transaction(): return @@ -2392,7 +2394,8 @@ def ajax_diag_host(): # Second is treated as text output html.write("%s %s" % (result[0], html.attrencode(result[1]))) except Exception, e: - html.write("1 %s" % _("Exception: %s") % html.attrencode(str(e))) + import traceback + html.write("1 %s" % _("Exception: %s") % html.attrencode(traceback.format_exc())) #. # .-Inventory & Services-------------------------------------------------.

10 years, 10 months

← Newer
1
...
17
18
19
20
21
22
23
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2013