Checkmk git commits July 2012

checkmk-commits@lists.checkmk.com

1 participants
183 discussions

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 53d79bb39fbbc77a4bcc01de9c7d49e407c6c9dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53d79bb39fbbc7… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jul 12 15:09:43 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 11 months

Check_MK Git: check_mk: blade_bx_temp: typecast in parameters

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 765e6a7ab0c61a6fd5df85e4f152a91a93dca243 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=765e6a7ab0c61a… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jul 12 15:09:33 2012 +0200 blade_bx_temp: typecast in parameters --- checks/blade_bx_temp | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/checks/blade_bx_temp b/checks/blade_bx_temp index 3e64bde..880a392 100644 --- a/checks/blade_bx_temp +++ b/checks/blade_bx_temp @@ -36,13 +36,16 @@ def check_blade_bx_temp(item, params, info): unit = "°C" for index, status, descr, level_warn, level_crit, temp, crit_react in info: status = saveint(status) + level_crit = saveint(level_crit) + level_warn = saveint(level_warn) + temp = saveint(temp) if descr != item: continue - max_temp = int(level_crit) + (int(level_crit) * 15 /100) # critical + 15% - perfdata=[ ('temp', temp, level_warn, level_crit, "0", max_temp ) ] - if params != None: level_warn, level_crit = params + max_temp = level_crit + (level_crit * 15 /100) # critical + 15% + perfdata=[ ('temp', temp, level_warn, level_crit, "0", max_temp ) ] + if crit_react != "2": return (2, "CRIT - Temperature not present or poweroff", perfdata) elif status != 3:

11 years, 11 months

Check_MK Git: check_mk: FIX: fixed localization of general permissions

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4f9aeea092d3e28cd571bebd741ce85da1ed5834 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f9aeea092d3e2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 12 14:53:15 2012 +0200 FIX: fixed localization of general permissions --- ChangeLog | 8 ++ web/htdocs/config.py | 124 ++++-------------------------------- web/htdocs/default_permissions.py | 128 +++++++++++++++++++++++++++++++++++++ web/htdocs/htmllib.py | 4 +- web/htdocs/index.py | 6 +- web/htdocs/logwatch.py | 6 +- web/htdocs/mobile.py | 4 +- web/htdocs/sidebar.py | 18 +++--- web/htdocs/views.py | 46 +++++++------- web/htdocs/wato.py | 59 ++++++++++------- web/plugins/sidebar/shipped.py | 2 +- web/plugins/views/layouts.py | 2 +- 12 files changed, 229 insertions(+), 178 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4f9aeea092…

11 years, 11 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e9e75f58ad259fcced7a5f2101013eac425efd26 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9e75f58ad259f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 12 14:55:26 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk Conflicts: ChangeLog ---

11 years, 11 months

Check_MK Git: check_mk: Added wato rule for blade_bx_temp

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c071b03b56526a2e8576d7931b36f7def5d7c762 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c071b03b56526a… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jul 12 14:53:29 2012 +0200 Added wato rule for blade_bx_temp --- checks/blade_bx_temp | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/checks/blade_bx_temp b/checks/blade_bx_temp index 6328ca9..3e64bde 100644 --- a/checks/blade_bx_temp +++ b/checks/blade_bx_temp @@ -72,5 +72,6 @@ check_info['blade_bx_temp'] = { 7, # crit react ]), "snmp_scan_function" : lambda oid: "BX600" in oid(".1.3.6.1.2.1.1.1.0"), + "group" : "hw_temperature", }

11 years, 11 months

Check_MK Git: check_mk: check services: added service name in output

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: da40bb33ebace42ed117b0d1bd98f7a2d8571c2b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da40bb33ebace4… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jul 12 13:40:04 2012 +0200 check services: added service name in output --- checks/services | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/services b/checks/services index f64cb0b..7516f9d 100644 --- a/checks/services +++ b/checks/services @@ -157,7 +157,7 @@ def check_windows_services(item, params, info): best_info = state, start_type best_running_on = running_on - infotext = nagios_state_names[best_state] + " - %s (start type is %s)" % best_info + infotext = nagios_state_names[best_state] + " - %s (start type is %s): %s" % (best_info , item) if best_running_on: infotext += " (running on: %s)" % best_running_on

11 years, 11 months

Check_MK Git: check_mk: Added manual warning/crit levels for blade_bx_temp

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a2674d3b4c33854d4ae7ad07aa97e45843682690 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2674d3b4c3385… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jul 12 12:27:07 2012 +0200 Added manual warning/crit levels for blade_bx_temp --- checks/blade_bx_temp | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/checks/blade_bx_temp b/checks/blade_bx_temp index 1c3e4d6..6328ca9 100644 --- a/checks/blade_bx_temp +++ b/checks/blade_bx_temp @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. -def check_blade_bx_temp(item, no_params, info): +def check_blade_bx_temp(item, params, info): blade_bx_status = { 1 : "unknow", 2 : "sensor-disabled", 3 : "ok", @@ -39,6 +39,9 @@ def check_blade_bx_temp(item, no_params, info): if descr != item: continue max_temp = int(level_crit) + (int(level_crit) * 15 /100) # critical + 15% perfdata=[ ('temp', temp, level_warn, level_crit, "0", max_temp ) ] + + if params != None: + level_warn, level_crit = params if crit_react != "2": return (2, "CRIT - Temperature not present or poweroff", perfdata)

11 years, 11 months

Check_MK Git: check_mk: Fix in Dashboards if browser window to small

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4dcb24eb7f9ac384a1eba46db6634e63df24f958 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4dcb24eb7f9ac3… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jul 12 11:56:17 2012 +0200 Fix in Dashboards if browser window to small --- web/htdocs/js/dashboard.js | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/web/htdocs/js/dashboard.js b/web/htdocs/js/dashboard.js index 8836e52..c06f70f 100644 --- a/web/htdocs/js/dashboard.js +++ b/web/htdocs/js/dashboard.js @@ -44,6 +44,10 @@ function resize_dashlets(id, code) // check if dashlet has title and resize its width oDash = document.getElementById("dashlet_title_" + d_number); if (oDash) { + //if browser window to small prevent js error + if(d_width <= 20){ + d_width = 21; + } oDash.style.width = d_width - 20 + "px"; /* oDash.style.top = "-" + title_height + "px"; oDash.style.height = title_height + "px"; */

11 years, 11 months

Check_MK Git: check_mk: Added blade_bx_temp Check

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 68df08c0ca3b46b8c67a9e16f804b1c872493ade URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68df08c0ca3b46… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jul 11 15:41:55 2012 +0200 Added blade_bx_temp Check --- checks/blade_bx_temp | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 73 insertions(+), 0 deletions(-) diff --git a/checks/blade_bx_temp b/checks/blade_bx_temp new file mode 100644 index 0000000..1c3e4d6 --- /dev/null +++ b/checks/blade_bx_temp @@ -0,0 +1,73 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2012 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. + + +def check_blade_bx_temp(item, no_params, info): + blade_bx_status = { 1 : "unknow", + 2 : "sensor-disabled", + 3 : "ok", + 4 : "sensor-faild", + 5 : "warning-temp", + 6 : "critical-temp", + 7 : "not-available" } + unit = "°C" + for index, status, descr, level_warn, level_crit, temp, crit_react in info: + status = saveint(status) + if descr != item: continue + max_temp = int(level_crit) + (int(level_crit) * 15 /100) # critical + 15% + perfdata=[ ('temp', temp, level_warn, level_crit, "0", max_temp ) ] + + if crit_react != "2": + return (2, "CRIT - Temperature not present or poweroff", perfdata) + elif status != 3: + return (2, "CRIT - Status is %s" % blade_bx_status.get(status,1) , perfdata) + elif temp >= level_crit: + return (2, "CRIT - Temperature at %s%s " % (temp, unit), perfdata) + elif temp >= level_warn: + return (1, "WARNING - Temperature at %s%s " % (temp,unit), perfdata) + else: + return (0, "OK - Temperature at %s%s " % (temp,unit), perfdata) + return (3, "UNKNOWN - Device %s not found in SNMP data %s " % (item, perfdata ) ) + + return (3, "UNKNOWN - Device %s not found in SNMP data" % item) + +check_info['blade_bx_temp'] = { + "check_function" : check_blade_bx_temp, + "inventory_function" : lambda info: [ (line[2], None) for line in info if int(line[1]) != 7] , + "service_description" : "Blade Temp %s", + "has_perfdata" : True, + "snmp_info" : (".1.3.6.1.4.1.7244.1.1.1.3.4.1.1", [ + 1, # index + 2, # status + 3, # desc + 4, # level warn + 5, # level crit + 6, # temp + 7, # crit react + ]), + "snmp_scan_function" : lambda oid: "BX600" in oid(".1.3.6.1.2.1.1.1.0"), +} +

11 years, 11 months

Check_MK Git: check_mk: Added check blade_bx_powermod

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1bbef501d6e7aa15201c2774e53a490f89d5b3f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1bbef501d6e7aa… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jul 11 15:15:31 2012 +0200 Added check blade_bx_powermod --- checks/blade_bx_powermod | 64 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 64 insertions(+), 0 deletions(-) diff --git a/checks/blade_bx_powermod b/checks/blade_bx_powermod new file mode 100644 index 0000000..927760a --- /dev/null +++ b/checks/blade_bx_powermod @@ -0,0 +1,64 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2012 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. + + + + +def check_blade_bx_powermod(item, _no_param, info): + power_status = { + 1 : "unknow", + 2 : "ok", + 3 : "not-present", + 4 : "error", + 5 : "critical", + 6 : "off", + 7 : "dummy" + } + + for index, status, product_name in info: + status = saveint(status) + if index != item: continue + state = 0 + if status != 2: + state = 2 + + return (state, nagios_state_names[state] + " - %s Status is %s" % (product_name, power_status[status]) ) + + return (3, "Module %s not found in SNMP info" % index) + +check_info['blade_bx_powermod'] = { + "check_function" : check_blade_bx_powermod, + "inventory_function" : lambda info: [ (line[0], None) for line in info ], + "service_description" : "Power Module %s", + "has_perfdata" : False, + "snmp_info" : (".1.3.6.1.4.1.7244.1.1.1.3.2.4.1", [ + 1, # index + 2, # status + 4, # product name + ]), + "snmp_scan_function" : lambda oid: "BX600" in oid(".1.3.6.1.2.1.1.1.0"), +} +

11 years, 11 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2012