Checkmk git commits May 2011

checkmk-commits@lists.checkmk.com

2 participants
134 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: b269203e34550677ad1d7aef1e27a0254352d601 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b269203e345506… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 27 09:22:17 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 6 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: 8957acab7a9038981d4067aa556b5b2ebca4f270 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8957acab7a9038… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 26 20:52:57 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk Conflicts: ChangeLog ---

13 years, 6 months

Check_MK Git: check_mk: FIX: Improved ipmi check

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: c4bba6dae1732edf7f12bdf0d972428822b959ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4bba6dae1732e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 25 12:45:24 2011 +0200 FIX: Improved ipmi check --- ChangeLog | 3 +++ checks/ipmi | 21 +++++++++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index a0b1663..f186d77 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,9 @@ * Introduced basic infrastructure for multilanguage support in Multisite * FIX: make non-Ascii characters in services names work again * FIX: printer_supply perfometer: Using white font for black toners + * FIX: icmp: Skipping items with invalid data (0.000 val, "unspecified" + unit) in summary mode + * FIX: icmp: Improved output formating in summary mode WATO: * Configration files can now be administered via the WEB UI diff --git a/checks/ipmi b/checks/ipmi index b5c5d08..a47e0ee 100644 --- a/checks/ipmi +++ b/checks/ipmi @@ -146,10 +146,16 @@ def check_ipmi_summarized(info): try: for name, val, unit, status, unrec_low, crit_low, \ warn_low, warn_high, crit_high, unrec_high in info: + # Skip datasets which have no valid data (zero value, no unit and state nc) + if val == '0.000' and unit == 'unspecified' and status == 'nc': + continue + if ipmi_ignore_entry(name, status): continue - text = "%s is %s %s" % (name, val, unit) + text = "%s is %s" % (name, val) + if unit != 'unspecified': + text += ' %s' % unit count += 1 if status == 'nc': worst_status = max(worst_status, 1) @@ -176,16 +182,15 @@ def check_ipmi_summarized(info): statname = { 0: "OK", 1:"WARN", 2:"CRIT" }[worst_status] if worst_status == 0: - infotext = "%d sensors OK" % count + infotext = [ "%d sensors OK" % count ] else: - infotext = "" + infotext = [] if len(crit_texts) > 0: - infotext += "critical are: %s" % ", ".join(crit_texts) + infotext.append("CRIT are: %s" % ", ".join(crit_texts)) if len(warn_texts) > 0: - if infotext != "": - infotext += ", " - infotext += "warning are: %s" % ", ".join(warn_texts) - return (worst_status, "%s - %s" % (statname, infotext), perfdata) + infotext.append("WARN are: %s" % ", ".join(warn_texts)) + return (worst_status, "%s - %s" % (statname, ' - '.join(infotext)), perfdata) + check_info['ipmi'] = (check_ipmi, "IPMI Sensor %s", 1, inventory_ipmi)

13 years, 6 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: 6c287530b60dc10efb674a7d6bed2c9043dbd9b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c287530b60dc1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sat May 21 13:58:11 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years, 6 months

Check_MK Git: check_mk: mbg_lantime_state: Handling refclock offsets correctly now; Changed default thresholds to 5/ 10 refclock offset

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 72d527cd269888c860e37bd60a629ae2ca8d7469 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72d527cd269888… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 19 14:49:51 2011 +0200 mbg_lantime_state: Handling refclock offsets correctly now; Changed default thresholds to 5/10 refclock offset --- ChangeLog | 2 ++ checkman/mbg_lantime_state | 9 +++++---- checks/mbg_lantime_state | 12 +++++++++--- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 289eaa3..3dde4c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,8 @@ * brocade_port: check for Brocade FC ports has been rewritten with lots of new features. * AIX agent now simulates <<<netctr>>> output (by Jörg Linge) + * mbg_lantime_state: Handling refclock offsets correctly now; Changed + default thresholds to 5/10 refclock offset Multisite: * Introduced basic infrastructure for multilanguage support in Multisite diff --git a/checkman/mbg_lantime_state b/checkman/mbg_lantime_state index 372a0b0..f5befac 100644 --- a/checkman/mbg_lantime_state +++ b/checkman/mbg_lantime_state @@ -13,7 +13,8 @@ description: The check raises a {CRITICAL} when the clock is in state {notSynchronized} or {noGoodRefclock}. It also handles bad stratums and refclock offsets which can be - configured. + configured. The refclock offset can either be a positive or negative integer. + inventory: One check per device is created automatically. @@ -24,13 +25,13 @@ stratum_warn (int): stratums above this value will raise a {WARNING} state. stratum_warn (int): stratums above this value will raise a {CRITICAL} state. The default is set to {0}. The threshold can be disabled by setting to {None}. ref_offset_warn (int): refclock offsets above this value will raise a {WARNING} state. - The default is set to {0}. The threshold can be disabled by setting to {None}. + The default is set to {5}. The threshold can be disabled by setting to {None}. ref_offset_crit (int): refclock offsets above this value will raise a {CRITICAL} state. - The default is set to {0}. The threshold can be disabled by setting to {None}. + The default is set to {10}. The threshold can be disabled by setting to {None}. [configuration] mbg_lantime_state_default_levels (int, int, int, int): A tuple of four floats or integers: The default levels. These levels are used for inventorized checks. This variable - is preset to {(0, 0, 0, 0)} + is preset to {(0, 0, 5, 10)} diff --git a/checks/mbg_lantime_state b/checks/mbg_lantime_state index 4430a67..07335f8 100644 --- a/checks/mbg_lantime_state +++ b/checks/mbg_lantime_state @@ -35,7 +35,7 @@ mbg_lantime_state_statemap = { } # stratum, refclock_offset -mbg_lantime_state_default_levels = (0, 0, 0, 0) +mbg_lantime_state_default_levels = (0, 0, 5, 10) def inventory_mbg_lantime_state(checkname, info): if len(info) > 0 and len(info[0]) == 5: @@ -69,10 +69,16 @@ def check_mbg_lantime_state(item, params, info): state_txt.append('Refclock: %s (%s)' % (refclock_name, refclock_id)) thr_txt = '' - if params[2] is not None and int(refclock_offset) > params[3]: + + if refclock_offset < 0: + pos_refclock_offset = refclock_offset * -1 + else: + pos_refclock_offset = refclock_offset + + if params[2] is not None and int(pos_refclock_offset) > params[3]: state = max(state, 2) thr_txt = ' (!!)' - elif params[3] is not None and int(refclock_offset) > params[2]: + elif params[3] is not None and int(pos_refclock_offset) > params[2]: state = max(state, 1) thr_txt = ' (!)' state_txt.append('Refclock Offset: %sms%s' % (refclock_offset, thr_txt))

13 years, 6 months

Check_MK Git: check_mk: FIX: Fixed displaying of host states ( after i18n introduction)

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: de178b60b3cf4eaec94b8dfb502a580c659cf998 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de178b60b3cf4e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun May 22 18:32:24 2011 +0200 FIX: Fixed displaying of host states (after i18n introduction) --- ChangeLog | 3 +++ web/plugins/views/bi.py | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index edfb7a2..a0b1663 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,9 @@ (config_files in multisite.mk is obsolete) * Bulk operation on host lists (inventory, tags changed, etc) + BI: + * Fixed displaying of host states (after i18n introduction)h + MK Livestatus: * Column aggregation (Stats) now also works for perf_data diff --git a/web/plugins/views/bi.py b/web/plugins/views/bi.py index 6e1654a..252cc9e 100644 --- a/web/plugins/views/bi.py +++ b/web/plugins/views/bi.py @@ -169,7 +169,7 @@ def aggr_render_leaf(tree, show_host): content += '<a href="%s">%s</a><b class=bullet>&diams;</b>' % (host_url, host) if not service: - content += '<a href="%s">%s</a>' % (_("Host status"), host_url) + content += '<a href="%s">%s</a>' % (host_url, _("Host status")) else: content += '<a href="%s">%s</a>' % (service_url, service)

13 years, 6 months

Check_MK Git: check_mk: FIX: printer_supply perfometer: Using white font for black toners

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: ebc479f492455b36ad68d081450bad169186072e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ebc479f492455b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 20 09:05:54 2011 +0200 FIX: printer_supply perfometer: Using white font for black toners --- ChangeLog | 1 + web/plugins/perfometer/check_mk.py | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3dde4c6..a76ccdd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ Multisite: * Introduced basic infrastructure for multilanguage support in Multisite * FIX: make non-Ascii characters in services names work again + * FIX: printer_supply perfometer: Using white font for black toners WATO: * Configration files can now be administered via the WEB UI diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 068b296..8f8da49 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -319,8 +319,10 @@ def perfometer_check_mk_printer_supply(row, check_command, perf_data): s = row['service_description'].lower() + fg_color = '#000000' if 'black' in s: - colors = [ '#000000', '#6E6F00', '#6F0000' ] + colors = [ '#000000', '#6E6F00', '#6F0000' ] + fg_color = '#ffffff' elif 'magenta' in s: colors = [ '#fc00ff', '#FC7FFF', '#FEDFFF' ] elif 'yellow' in s: @@ -337,7 +339,7 @@ def perfometer_check_mk_printer_supply(row, check_command, perf_data): else: color = colors[2] - return "%.0f%%" % left, perfometer_linear(left, color) + return "<font color=\"%s\">%.0f%%</font>" % (fg_color, left), perfometer_linear(left, color) perfometers["check_mk-printer_supply"] = perfometer_check_mk_printer_supply

13 years, 6 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: 2601133a53d5a3a3d1be1a1a9d410150aead0c2c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2601133a53d5a3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 20 08:56:45 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years, 6 months

Check_MK Git: check_mk: FIX: fix livestatus compile problem on Debian unstable

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fc7006dd70d0873197c72b084b1581f78b995aa7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc7006dd70d087… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 26 10:09:18 2011 +0200 FIX: fix livestatus compile problem on Debian unstable --- ChangeLog | 1 + livestatus/src/TableCommands.cc | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index e621f49..2faef14 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,7 @@ no scan will be done until new button "Full Scan" is pressed. MK Livestatus: + * FIX: fix compile problem on Debian unstable (Thanks to Sven Velt) * Column aggregation (Stats) now also works for perf_data 1.1.11i1: diff --git a/livestatus/src/TableCommands.cc b/livestatus/src/TableCommands.cc index 8743955..cc9a5b4 100644 --- a/livestatus/src/TableCommands.cc +++ b/livestatus/src/TableCommands.cc @@ -22,12 +22,16 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. +#include <cstddef> + #define NSCORE #include "nagios.h" #include "Query.h" #include "OffsetStringColumn.h" #include "TableCommands.h" + + extern command *command_list; TableCommands::TableCommands()

13 years, 6 months

Check_MK Git: check_mk: Cleaned up internal docu

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 14bc695e351ce68bfa1a34582efab4d976b7809d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14bc695e351ce6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 26 10:11:42 2011 +0200 Cleaned up internal docu --- BUGS.bi | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/BUGS.bi b/BUGS.bi deleted file mode 100644 index 9abb474..0000000 --- a/BUGS.bi +++ /dev/null @@ -1,7 +0,0 @@ -Habe in bi.py alles auskommentiert. Trotzdem erscheinen die Aggregationen -in der GUI noch. Nur wenn ich explizit aggregations = [] setze, ist alles -weg. Kann man das in den Griff bekommen? - -Wenn man einen Host explizit angibt, muss man zwingend die Site -vom dem Doppelpunkt angeben. Das verwirrt. Bei weglassen muss -automatisch alle Sites danach durchsuchen.

13 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2011