Checkmk git commits March 2011

checkmk-commits@lists.checkmk.com

3 participants
205 discussions

Check_MK Git: check_mk: FIX: ucd_cpu_load and ucd_cpu_util: make scan function find Rittal

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 86a48219ad32d135dd742ef4a55f250b8661eb77 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=86a48219ad32d1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 17 09:44:26 2011 +0100 FIX: ucd_cpu_load and ucd_cpu_util: make scan function find Rittal --- ChangeLog | 1 + checks/ucd_cpu_load | 3 ++- checks/ucd_cpu_util | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9c09c03..fe00c57 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ * FIX: df: fix status in case of critical trend and warning used * FIX: df: fix display of trend warn/crit in PNP-graph * FIX: cmctc: fix inventory in case of incomplete entries + * FIX: ucd_cpu_load and ucd_cpu_util: make scan function find Rittal * printer_supply: Changed order of tests. When a printer reports -3 this is used before the check if maxlevel is -2. * cisco_locif: The check has been removed. Please switch to if/if64 diff --git a/checks/ucd_cpu_load b/checks/ucd_cpu_load index 153a71b..f1fa478 100644 --- a/checks/ucd_cpu_load +++ b/checks/ucd_cpu_load @@ -51,4 +51,5 @@ snmp_info['ucd_cpu_load'] = ( ".1.3.6.1.4.1.2021.10.1", [ 6 ] ) # of the info area for scanning is not a good idea. It will slow down # scans for *all* hosts. snmp_scan_functions['ucd_cpu_load'] = \ - lambda oid: "linux" in oid(".1.3.6.1.2.1.1.1.0").lower() + lambda oid: "linux" in oid(".1.3.6.1.2.1.1.1.0").lower() or \ + "CMC-TC" in oid(".1.3.6.1.2.1.1.1.0") diff --git a/checks/ucd_cpu_util b/checks/ucd_cpu_util index 02cfd4a..9cca8a5 100644 --- a/checks/ucd_cpu_util +++ b/checks/ucd_cpu_util @@ -90,4 +90,5 @@ snmp_info['ucd_cpu_util'] = ( ".1.3.6.1.4.1.2021.11", [ 50, 51, 52, 53, 54, 55, # of the info area for scanning is not a good idea. It will slow down # scans for *all* hosts. snmp_scan_functions['ucd_cpu_util'] = \ - lambda oid: "linux" in oid(".1.3.6.1.2.1.1.1.0").lower() + lambda oid: "linux" in oid(".1.3.6.1.2.1.1.1.0").lower() or \ + "CMC-TC" in oid(".1.3.6.1.2.1.1.1.0")

13 years, 8 months

Check_MK Git: check_mk: FIX: ucd_cpu_util: fix check in case of missing hi, si and st

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a1b0c5a5c32d6c9ea59a7e9834e3582e82b9bea3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1b0c5a5c32d6c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 17 09:46:00 2011 +0100 FIX: ucd_cpu_util: fix check in case of missing hi, si and st --- ChangeLog | 1 + checks/ucd_cpu_util | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index fe00c57..8bfd637 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ * FIX: df: fix display of trend warn/crit in PNP-graph * FIX: cmctc: fix inventory in case of incomplete entries * FIX: ucd_cpu_load and ucd_cpu_util: make scan function find Rittal + * FIX: ucd_cpu_util: fix check in case of missing hi, si and st * printer_supply: Changed order of tests. When a printer reports -3 this is used before the check if maxlevel is -2. * cisco_locif: The check has been removed. Please switch to if/if64 diff --git a/checks/ucd_cpu_util b/checks/ucd_cpu_util index 9cca8a5..0afe4cc 100644 --- a/checks/ucd_cpu_util +++ b/checks/ucd_cpu_util @@ -39,7 +39,7 @@ def inventory_ucd_cpu_util(checktype, info): return [(None, "kernel_util_default_levels")] def check_ucd_cpu_util(item, params, info): - counters = map(int, info[0]) + counters = map(saveint, info[0]) rates = [] this_time = time.time() some_counter_wrapped = False

13 years, 8 months

Check_MK Git: check_mk: printer_supply: Skipping inventory of supplies which have current value

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: cae0a223d4b582a44f5ea48053993921b20f4d84 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cae0a223d4b582… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 16 18:01:10 2011 +0100 printer_supply: Skipping inventory of supplies which have current value and maxlevel both set to -2. --- ChangeLog | 2 ++ checks/printer_supply | 4 +++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index f23596e..cfe6bfc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,8 @@ * FIX: cmctc: fix inventory in case of incomplete entries * printer_supply: Changed order of tests. When a printer reports -3 this is used before the check if maxlevel is -2. + * printer_supply: Skipping inventory of supplies which have current value + and maxlevel both set to -2. * cisco_locif: The check has been removed. Please switch to if/if64 * if/if64: scan function now also detects devices where the first port has not the index 1 diff --git a/checks/printer_supply b/checks/printer_supply index 66bb7d6..1532201 100644 --- a/checks/printer_supply +++ b/checks/printer_supply @@ -73,7 +73,9 @@ def printer_supply_fix_infos(info): return info def inventory_printer_supply(checkname, info): - return [ (line[0], "printer_supply_default_levels") for line in printer_supply_fix_infos(info) ] + # Ignore devices which show -2 for current value and -2 for max value -> useless + return [ (line[0], "printer_supply_default_levels") for line in printer_supply_fix_infos(info) + if savefloat(line[2]) != -2 and float(line[1]) != -2 ] def check_printer_supply(item, params, info): for line in printer_supply_fix_infos(info):

13 years, 8 months

Check_MK Git: check_mk: Updated bug entries

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: f662c780d418f1a42d2e417393f5ebe5dafadd65 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f662c780d418f1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 16 12:42:03 2011 +0100 Updated bug entries --- .bugs/180 | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/.bugs/180 b/.bugs/180 index d071621..7c5827b 100644 --- a/.bugs/180 +++ b/.bugs/180 @@ -8,3 +8,11 @@ Class: bug The perfdata icon is missing on PING checks created for ping only hosts. The check creates perfdata but the detections seems to fail. + +The problem is that the PING service in check_mk_templates.cfg does not use +the template 'check_mk_perf'. The use line should look like this: + + use check_mk_perf,check_mk_default + +In fact the data is gathered in the host check but the missing link seems +to confuse the users since the check generates performance data.

13 years, 8 months

Check_MK Git: check_mk: Updated bug entries

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: bc1fe69500750c44711b4c804cb3ba192ab2718a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc1fe69500750c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 16 11:31:05 2011 +0100 Updated bug entries --- .bugs/180 | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/.bugs/180 b/.bugs/180 new file mode 100644 index 0000000..d071621 --- /dev/null +++ b/.bugs/180 @@ -0,0 +1,10 @@ +Title: PING service of ping only hosts shown no 'perfdata' icon in multisite +Component: core +Benefit: 4 +State: open +Cost: 2 +Date: 2011-03-16 11:29:45 +Class: bug + +The perfdata icon is missing on PING checks created for ping only hosts. The +check creates perfdata but the detections seems to fail.

13 years, 8 months

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

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1c77f0fbf581fc2ab9851ec447a583b5059686ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c77f0fbf581fc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 16 09:46:41 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years, 8 months

Check_MK Git: check_mk: Added printer_supply perfometer

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: fac1ea2c2c4ac98c4ab3f2283c1c33d25a512d34 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fac1ea2c2c4ac9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 15 18:59:58 2011 +0100 Added printer_supply perfometer --- ChangeLog | 2 +- web/plugins/perfometer/check_mk.py | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0500cb2..59aaa0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,7 +8,7 @@ * Agent simulation mode (for internal use and check development) Multisite: - * Added snmp_uptime and uptime perfometers + * Added snmp_uptime, uptime and printer_supply perfometers BI: * Added new component BI to Multisite. diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index f7be5aa..767e171 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -271,3 +271,39 @@ def perfometer_check_mk_uptime(row, check_command, perf_data): perfometers["check_mk-uptime"] = perfometer_check_mk_uptime perfometers["check_mk-snmp_uptime"] = perfometer_check_mk_uptime + + +def perfometer_check_mk_printer_supply(row, check_command, perf_data): + left = float(perf_data[0][1]) + warn = float(perf_data[0][3]) + crit = float(perf_data[0][4]) + mini = float(perf_data[0][5]) + maxi = float(perf_data[0][6]) + + # If there is no 100% given, calculate the percentage + if maxi != 100.0: + left = left * 100 / maxi + + s = row['service_description'].lower() + + if 'black' in s: + colors = [ '#000000', '#6E6F00', '#6F0000' ] + elif 'magenta' in s: + colors = [ '#fc00ff', '#FC7FFF', '#FEDFFF' ] + elif 'yellow' in s: + colors = [ '#ffff00', '#FEFF7F', '#FFFFCF' ] + elif 'cyan' in s: + colors = [ '#00ffff', '#7FFFFF', '#DFFFFF' ] + else: + colors = [ '#cccccc', '#ffff00', '#ff0000' ] + + if left > warn: + color = colors[0] + elif left > crit: + color = colors[1] + else: + color = colors[2] + + return "%.0f%%" % left, perfometer_linear(left, color) + +perfometers["check_mk-printer_supply"] = perfometer_check_mk_printer_supply

13 years, 8 months

Check_MK Git: check_mk: Added missing files for omd_status

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 54c4e43f3d2682be57fa78406cd32dee2836d108 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54c4e43f3d2682… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 15 17:55:49 2011 +0100 Added missing files for omd_status --- checkman/omd_status | 18 ++++++++++++++++++ checks/omd_status | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 0 deletions(-) diff --git a/checkman/omd_status b/checkman/omd_status new file mode 100644 index 0000000..38da2e7 --- /dev/null +++ b/checkman/omd_status @@ -0,0 +1,18 @@ +title: Check status of OMD sites +agents: linux +author: Mathias Kettner <mk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check checks the status of OMD sites found on the system. + It uses the output of {omd status --bare --auto}. The site is considered + to be {OK} if all services of the site are running and {CRIT} + otherwise. If the site is only partially running then the check output + shows the names of the stopped services. + +item: + The name of the site (string). + +inventory: + One check per site will be created for each site where {AUTOSTART} is + set to {on}, regardless of the current state of the site. diff --git a/checks/omd_status b/checks/omd_status new file mode 100644 index 0000000..2c798cd --- /dev/null +++ b/checks/omd_status @@ -0,0 +1,40 @@ +# <<<omd_status>>> +# [kaputt] +# apache 1 +# rrdcached 1 +# npcd 1 +# nagios 1 +# crontab 1 +# OVERALL 1 +# [test] +# apache 1 +# rrdcached 1 +# npcd 0 +# nagios 1 +# crontab 1 +# OVERALL 2 + +def inventory_omd_status(checkname, info): + return [ ( line[0][1:-1], None ) for line in info if line[0][0] == '[' ] + +def check_omd_status(item, _no_params, info): + active = False + for line in info: + if line[0] == '[' + item + ']': + active = True + stopped = [] + elif active: + if line[0] == 'OVERALL': + if line[1] == '0': + return (0, 'OK - all services are running') + elif line[1] == '1': + return (2, 'CRIT - site is stopped') + else: + return (2, 'CRIT - partially running! stopped services: %s' % ", ".join(stopped)) + elif line[1] != '0': + stopped.append(line[0]) + return (3, "UNKNOWN - site not existing or AUTOSTART off") + +check_info['omd_status'] = \ + (check_omd_status, "OMD %s status", 0, inventory_omd_status) +

13 years, 8 months

Check_MK Git: check_mk: FIX: added missing \n in error output

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c98aca0b2b0f4ca152023e7e525e461bc3c9594a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c98aca0b2b0f4c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 15 17:36:15 2011 +0100 FIX: added missing \n in error output --- modules/check_mk.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index a3a4686..cec600a 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2215,7 +2215,7 @@ def show_check_manual(checkname): filename = all_manuals().get(checkname) if not filename: - sys.stdout.write("No manpage for %s. Sorry." % checkname) + sys.stdout.write("No manpage for %s. Sorry.\n" % checkname) return sections = {}

13 years, 8 months

Check_MK Git: check_mk: omd_status: new check for checking status of OMD sites

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5fe7a003200590baea42a78841eecccac669245f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5fe7a003200590… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 15 17:41:54 2011 +0100 omd_status: new check for checking status of OMD sites --- ChangeLog | 11 ++++++----- agents/check_mk_agent.linux | 6 ++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0500cb2..9c09c03 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,11 @@ * Allow moving hosts from one to another config file Checks & Agents: + * FIX: df: fix layout problems in PNP template + * FIX: df: fix trend computation (thanks to Sebastian Talmon) + * FIX: df: fix status in case of critical trend and warning used + * FIX: df: fix display of trend warn/crit in PNP-graph + * FIX: cmctc: fix inventory in case of incomplete entries * printer_supply: Changed order of tests. When a printer reports -3 this is used before the check if maxlevel is -2. * cisco_locif: The check has been removed. Please switch to if/if64 @@ -24,12 +29,8 @@ has not the index 1 * cisco_temp/cisco_temp_perf: scan function handles sensors not beginning with index 1 - * FIX: df: fix layout problems in PNP template - * FIX: df: fix trend computation (thanks to Sebastian Talmon) - * FIX: df: fix status in case of critical trend and warning used - * FIX: df: fix display of trend warn/crit in PNP-graph * df: split PNP graphs for growth/trend into two graphs - * FIX: cmctc: fix inventory in case of incomplete entries + * omd_status: new check for checking status of OMD sites 1.1.10: diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 1e4ee6e..83c78ed 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -326,6 +326,12 @@ if which mailq >/dev/null 2>&1 && getent passwd postfix >/dev/null 2>&1; then mailq | tail -n 6 fi +# Check status of OMD sites +if type omd >/dev/null +then + echo '<<<omd_status>>>' + omd status --bare --auto +fi # Einbinden von lokalen Plugins, die eine eigene Sektion ausgeben if cd $PLUGINSDIR

13 years, 8 months

← Newer
1
...
4
5
6
7
8
9
10
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2011