Checkmk git commits September 2014

checkmk-commits@lists.checkmk.com

5 participants
195 discussions

Check_MK Git: check_mk: Removed some trailing whitespaces

by Mathias Kettner

Module: check_mk Branch: master Commit: 4cea39c39ddb2f53a6620103f39b55cb240f0c46 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4cea39c39ddb2f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 24 14:30:08 2014 +0200 Removed some trailing whitespaces --- agents/plugins/mk_oracle.new | 2 +- checkman/kernel.util | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/agents/plugins/mk_oracle.new b/agents/plugins/mk_oracle.new index 4241596..e67269c 100755 --- a/agents/plugins/mk_oracle.new +++ b/agents/plugins/mk_oracle.new @@ -845,7 +845,7 @@ function run_cached_local () { # Cache file outdated and new job not yet running? Start it if [ -z "$USE_CACHEFILE" -a ! -e "$CACHEFILE.new" ] ; then if [ $DEBUG -eq 1 ] ; then - echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | bash + echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | bash else echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup bash 2>/dev/null & fi diff --git a/checkman/kernel.util b/checkman/kernel.util index d0d58a1..c663939 100644 --- a/checkman/kernel.util +++ b/checkman/kernel.util @@ -5,8 +5,8 @@ license: GPL distribution: check_mk description: This check measures the CPU utilization during the last check - cycle. Levels can be set on the total utilization and also - specifically on the disk wait (IO wait). + cycle. Levels can be set on the total utilization and also + specifically on the disk wait (IO wait). perfdata: Three variables: The percentage of time spent in {user}, {system} and {wait}

9 years, 11 months

Check_MK Git: check_mk: printer_supply_ricoh: code cleanup

by Mathias Kettner

Module: check_mk Branch: master Commit: 991de71d65e44d33311e89974da3af076aace399 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=991de71d65e44d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 24 12:10:11 2014 +0200 printer_supply_ricoh: code cleanup --- checks/printer_supply_ricoh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/checks/printer_supply_ricoh b/checks/printer_supply_ricoh index 612a5b7..d90510d 100644 --- a/checks/printer_supply_ricoh +++ b/checks/printer_supply_ricoh @@ -35,18 +35,15 @@ def check_printer_supply_ricoh(item, params, info): for line in info: if item == line[0]: state = 0 - label = "" level = saveint(line[1]) if level < crit: state = 2 - label = "(!!)" elif level < warn: state = 1 - label = "(!)" message = "Remaining: %s%%%s (levels at %d%%/%d%%) " % (level, label, warn, crit) perfdata = [ ("level", level, warn, crit, 0, 100)] return (state, message, perfdata) - return(3, "Ukn: Supply not found in SNMP data") + return(3, "Supply information not found") check_info['printer_supply_ricoh'] = { "inventory_function" : inventory_printer_supply_ricoh,

9 years, 11 months

Check_MK Git: check_mk: Minor cleanup in check output

by Mathias Kettner

Module: check_mk Branch: master Commit: 953c1f9f5d3b62b921bf14c5969e7801e59b74ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=953c1f9f5d3b62… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 24 11:54:25 2014 +0200 Minor cleanup in check output --- checks/vxvm_enclosures | 2 +- checks/vxvm_multipath | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/checks/vxvm_enclosures b/checks/vxvm_enclosures index 862a9fa..e850683 100644 --- a/checks/vxvm_enclosures +++ b/checks/vxvm_enclosures @@ -35,7 +35,7 @@ def check_vxvm_enclosures(item, params, info): return(2, "Status is %s" % line[3]) else: return(0, "Status is CONNECTED") - return(3, "UKN - Item not found") + return(3, "Item not found") check_info["vxvm_enclosures"] = { diff --git a/checks/vxvm_multipath b/checks/vxvm_multipath index 2ed421c..4a1f669 100644 --- a/checks/vxvm_multipath +++ b/checks/vxvm_multipath @@ -25,11 +25,11 @@ # Boston, MA 02110-1301 USA. # Example output: -#<<<vxvm_multipath>>> -#sda ENABLED OTHER_DISKS 1 1 0 other_disks -#LIO-Sechs_0 ENABLED aluadisk 1 1 0 LIO-Sechs -#LIO-Sechs_1 ENABLED aluadisk 1 1 0 LIO-Sechs -#LIO-Sechs_2 ENABLED aluadisk 1 1 0 LIO-Sechs +# <<<vxvm_multipath>>> +# sda ENABLED OTHER_DISKS 1 1 0 other_disks +# LIO-Sechs_0 ENABLED aluadisk 1 1 0 LIO-Sechs +# LIO-Sechs_1 ENABLED aluadisk 1 1 0 LIO-Sechs +# LIO-Sechs_2 ENABLED aluadisk 1 1 0 LIO-Sechs # def check_vxvm_multipath(item, params, info): @@ -42,7 +42,7 @@ def check_vxvm_multipath(item, params, info): state = 2 return(state, "Status: %s, (%d/%d) Paths to enclosure %s enabled" % (status_txt, int(paths_act), int(paths), enclosure )) - return(3, "UKN - Item not found") + return(3, "Item not found") check_info["vxvm_multipath"] = {

9 years, 11 months

Check_MK Git: check_mk: wagner_titanus_topsense.temp: code cleanup

by Mathias Kettner

Module: check_mk Branch: master Commit: 61de359aec18990d0cb637f94def554648f100cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61de359aec1899… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 24 10:55:19 2014 +0200 wagner_titanus_topsense.temp: code cleanup --- checks/wagner_titanus_topsense | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/wagner_titanus_topsense b/checks/wagner_titanus_topsense index ce24821..0c2d4d2 100644 --- a/checks/wagner_titanus_topsense +++ b/checks/wagner_titanus_topsense @@ -327,9 +327,9 @@ def check_wagner_titanus_topsense_temp(item, params, info): if temp >= crit: status = 2 - perfdata = [("temp", str(temp) + "C", warn, crit)] + perfdata = [("temp", temp, warn, crit)] - return status, "Temperature is %0.2f °C" % temp, perfdata + return status, "Temperature is %0.1f °C" % temp, perfdata check_info["wagner_titanus_topsense.temp"] = { "check_function" : check_wagner_titanus_topsense_temp,

9 years, 11 months

Check_MK Git: check_mk: Minor code cleanup

by Mathias Kettner

Module: check_mk Branch: master Commit: 5697152b6f92e4ae61f72b13b0881c5f815983ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5697152b6f92e4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 24 10:34:57 2014 +0200 Minor code cleanup --- checks/kaspersky_av_tasks | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/checks/kaspersky_av_tasks b/checks/kaspersky_av_tasks index 6f18b1b..583d225 100644 --- a/checks/kaspersky_av_tasks +++ b/checks/kaspersky_av_tasks @@ -25,27 +25,27 @@ # Boston, MA 02110-1301 USA. # Example output from agent: -#Number of tasks: 15 -#Name: System:EventManager -# Id: 1 -# Runtime ID: 1314160393 -# Class: EventManager -# State: Started -#Name: System:AVS -# Id: 2 -# Runtime ID: 1314160398 -# Class: AVS -# State: Started -#Name: System:Quarantine -# Id: 3 -# Runtime ID: 1314160399 -# Class: Quarantine -# State: Started -#Name: System:Statistics -# Id: 4 -# Runtime ID: 1314160396 -# Class: Statistics -# State: Started +# Number of tasks: 15 +# Name: System:EventManager +# Id: 1 +# Runtime ID: 1314160393 +# Class: EventManager +# State: Started +# Name: System:AVS +# Id: 2 +# Runtime ID: 1314160398 +# Class: AVS +# State: Started +# Name: System:Quarantine +# Id: 3 +# Runtime ID: 1314160399 +# Class: Quarantine +# State: Started +# Name: System:Statistics +# Id: 4 +# Runtime ID: 1314160396 +# Class: Statistics +# State: Started # def inventory_kaspersky_av_tasks(info):

9 years, 11 months

Check_MK Git: check_mk: decru_datafort: minor cleanup

by Mathias Kettner

Module: check_mk Branch: master Commit: 6df18597a1721efb5d55f2ec8d7841a613586d3f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6df18597a1721e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 24 10:46:13 2014 +0200 decru_datafort: minor cleanup --- checks/decru_fans | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/checks/decru_fans b/checks/decru_fans index 9f14dd2..695fd8a 100644 --- a/checks/decru_fans +++ b/checks/decru_fans @@ -27,18 +27,18 @@ decru_fan_default_levels = (8000, 8400) def inventory_decru_fans(info): - return [ (l[0], l[1] + " RPM", "decru_fan_default_levels") for l in info ] + return [ (l[0], "decru_fan_default_levels") for l in info ] def check_decru_fans(item, params, info): - for fan in info: - if fan[0] == item: - rpm = int(fan[1]) + for fan_name, rpm in info: + if fan_name == item: + rpm = int(rpm) crit, warn = params - perfdata = [("rpm", rpm, 0, "", warn, crit)] + perfdata = [("rpm", rpm, 0, None, warn, crit)] infotxt = "%d RPM" % rpm - if rpm < crit: + if rpm <= crit: return (2, infotxt, perfdata) - elif rpm < warn: + elif rpm <= warn: return (1, infotxt, perfdata) else: return (0, infotxt, perfdata)

9 years, 11 months

Check_MK Git: check_mk: Minor code cleanup

by Mathias Kettner

Module: check_mk Branch: master Commit: 653967167353b929855683898b4c048a547f1368 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=653967167353b9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 24 10:37:06 2014 +0200 Minor code cleanup --- checks/vxvm_enclosures | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/vxvm_enclosures b/checks/vxvm_enclosures index 236a87f..862a9fa 100644 --- a/checks/vxvm_enclosures +++ b/checks/vxvm_enclosures @@ -25,8 +25,8 @@ # Boston, MA 02110-1301 USA. # Example output: -#<<<vxvm_enclosures>>> -#LIO-Sechs aluadisk ALUAdisk CONNECTED ALUA 3 +# <<<vxvm_enclosures>>> +# LIO-Sechs aluadisk ALUAdisk CONNECTED ALUA 3 def check_vxvm_enclosures(item, params, info): for line in info:

9 years, 11 months

Check_MK Git: check_mk: Minor code cleanup

by Mathias Kettner

Module: check_mk Branch: master Commit: 704ff30a05b24f92de62a50f147da163cb768c97 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=704ff30a05b24f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 23 16:05:14 2014 +0200 Minor code cleanup --- checks/snmp_uptime | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/snmp_uptime b/checks/snmp_uptime index 3396b56..8cc9ddb 100644 --- a/checks/snmp_uptime +++ b/checks/snmp_uptime @@ -24,12 +24,12 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# Author: Lars Michelsen <lm(a)mathias-kettner.de> def inventory_snmp_uptime(info): if len(info) > 0 and len(info[0]) >= 1: return [ (None, {}) ] + def check_snmp_uptime(checktype, params, info): ticks = info[0][0] try:

9 years, 11 months

Check_MK Git: check_mk: Fix exception in comment-icon

by Mathias Kettner

Module: check_mk Branch: master Commit: 103f24482a07cc20dd12ebc429fb9feb8c756189 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=103f24482a07cc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 23 15:58:34 2014 +0200 Fix exception in comment-icon --- web/htdocs/views.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 64be415..d264da8 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1327,10 +1327,12 @@ def view_options(viewname): # variables for each option. if config.may("general.painter_options"): for option_name, opt in multisite_painter_options.items(): - old_value = v.get(option_name) - var_prefix = 'po_' + option_name + have_old_value = option_name in v + if have_old_value: + old_value = v.get(option_name) # Are there settings for this painter option present? + var_prefix = 'po_' + option_name if html.has_var_prefix(var_prefix): # Get new value for the option from the value spec @@ -1340,11 +1342,13 @@ def view_options(viewname): v[option_name] = value opt['value'] = value # make globally present for painters - if v[option_name] != old_value: + if not have_old_value or v[option_name] != old_value: must_save = True - else: + elif have_old_value: opt['value'] = old_value # make globally present for painters + elif 'value' in opt: + del opt['value'] # If the user has no permission for changing painter options # (or has *lost* his permission) then we need to remove all @@ -2376,7 +2380,8 @@ def get_painter_option(name): opt = multisite_painter_options[name] if not config.may("general.painter_options"): return opt['valuespec'].default_value() - return opt.get("value", opt['valuespec'].default_value()) + else: + return opt.get("value", opt['valuespec'].default_value()) def get_host_tags(row): if type(row.get("host_custom_variables")) == dict:

9 years, 11 months

Check_MK Git: check_mk: bluecat_dhcp: fixed invalid reference in check function

by Andreas Boesl

Module: check_mk Branch: master Commit: 6f0f4e5f5c51e9cf5f335a76b68f2184de03b536 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f0f4e5f5c51e9… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Sep 23 14:36:53 2014 +0200 bluecat_dhcp: fixed invalid reference in check function --- checks/bluecat_dhcp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/bluecat_dhcp b/checks/bluecat_dhcp index ff677d8..9093536 100644 --- a/checks/bluecat_dhcp +++ b/checks/bluecat_dhcp @@ -45,7 +45,7 @@ def check_bluecat_dhcp(item, params, info): state = 0 for line in info: - oper_state, leases_sec = map(int, info[0]) + oper_state, leases_sec = map(int, line[0]) if oper_state in params['oper_states']['warning']: state = 1 elif oper_state in params['oper_states']['critical']:

9 years, 11 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2014