Checkmk git commits February 2012

checkmk-commits@lists.checkmk.com

3 participants
223 discussions

Check_MK Git: check_mk: ntp: do not check 'when' anymore

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e142be7c65195335386f45fbe06722d5ef200b86 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e142be7c651953… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 22 18:14:29 2012 +0100 ntp: do not check 'when' anymore --- ChangeLog | 2 ++ checks/ntp | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 12b96e4..60b24ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,8 @@ in order to be consistent with the Linux load check * dell_powerconnect_cpu: hopefully correctly handle incomplete output from agent now. + * ntp: do not check 'when' anymore since it can produce false + alarms. Multisite: * Added several missing localization strings diff --git a/checks/ntp b/checks/ntp index 0e988f5..8474197 100644 --- a/checks/ntp +++ b/checks/ntp @@ -110,8 +110,13 @@ def check_ntp_server_state(line, params): return (2, infotext, offset, jitter) elif stratum >= maxstratum: return (2, infotext + (", stratum is too high (max allowed is %d)" % (maxstratum - 1))) - elif when > 2*poll and when > 128: # when can exceed poll for small polling values - return (3, "response due since %d secs%s" % (when - poll, infotext), offset, jitter) + + # The following check in some cases produces false alarms. The poll interval can + # switch back to a low value while 'when' still being at a high value. While + # this happens only for a short time, it will make the check alarm. So we + # rather switch this condition off: + # elif when > 2*poll and when > 128: # when can exceed poll for small polling values + # return (3, "response due since %d secs%s" % (when - poll, infotext), offset, jitter) elif abs(offset) >= warn: return (1, "offset too high" + infotext, offset, jitter)

12 years, 7 months

Check_MK Git: check_mk: dell_powerconnect_cpu: hopefully correctly handle incomplete agent output

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3e4fb57a3c7cdf020d4073b9bd6097746fc05873 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e4fb57a3c7cdf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 21 22:07:42 2012 +0100 dell_powerconnect_cpu: hopefully correctly handle incomplete agent output --- ChangeLog | 2 ++ checks/dell_powerconnect_cpu | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7ee5b34..12b96e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -49,6 +49,8 @@ (this prevents an exception of pfSense) * statgrab_load: level is now checked against 15min average - in order to be consistent with the Linux load check + * dell_powerconnect_cpu: hopefully correctly handle incomplete + output from agent now. Multisite: * Added several missing localization strings diff --git a/checks/dell_powerconnect_cpu b/checks/dell_powerconnect_cpu index 124c138..aaf2150 100644 --- a/checks/dell_powerconnect_cpu +++ b/checks/dell_powerconnect_cpu @@ -43,7 +43,7 @@ dell_powerconnect_cpu_default_levels = (80, 90) # Inventory of dell power connect CPU details. def inventory_dell_powerconnect_cpu(checkname, info): enabled, onesecondperc, oneminuteperc, fiveminutesperc = info[0] - if int(enabled) == 1 and int(onesecondperc) >= 0 <= 100: + if enabled == '1' and onesecondperc != '' and int(onesecondperc) >= 0: return [ (None, 'dell_powerconnect_cpu_default_levels') ] # Check of dell power connect CPU details. @@ -53,7 +53,7 @@ def check_dell_powerconnect_cpu(item, params, info): except ValueError: raise MKCounterWrapped("", "Ignoring empty data from SNMP agent") if int(enabled) == 1: - cpu_load = int(onesecondperc) + cpu_load = saveint(onesecondperc) if cpu_load >= 0 <= 100: status = 0 output = '' @@ -67,8 +67,8 @@ def check_dell_powerconnect_cpu(item, params, info): return (status, '%s - CPU utilization is %d%% %s' % (nagios_state_names[status], cpu_load, output), [('load', '%d%%' % cpu_load, params[0], params[1], 0, 100), - ('loadavg 60s', '%d%%' % int(oneminuteperc), params[0], params[1], 0, 100), - ('loadavg 5m', '%d%%' % int(fiveminutesperc), params[0], params[1], 0, 100), + ('loadavg 60s', '%d%%' % saveint(oneminuteperc), params[0], params[1], 0, 100), + ('loadavg 5m', '%d%%' % saveint(fiveminutesperc), params[0], params[1], 0, 100), ]) return (3, "UNKNOWN - Invalid information in SNMP data")

12 years, 7 months

Check_MK Git: check_mk: logwatch: Renamed button "Acknowledge" to "Clear"

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ceed7244caab469ee8955fcc3ccad3115f6e9bd8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ceed7244caab46… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 21 21:55:11 2012 +0100 logwatch: Renamed button "Acknowledge" to "Clear" --- web/htdocs/logwatch.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/logwatch.py b/web/htdocs/logwatch.py index 9bd914b..24086b1 100644 --- a/web/htdocs/logwatch.py +++ b/web/htdocs/logwatch.py @@ -140,7 +140,7 @@ def show_file(host, filename): return if config.may("act") and may_see(host): - html.context_button(_("Acknowledge"), "logwatch.py?host=%s&file=%s&ack=1" % \ + html.context_button(_("Clear logs"), "logwatch.py?host=%s&file=%s&ack=1" % \ (htmllib.urlencode(host), htmllib.urlencode(html.var('file')) )) html.context_button(_("Context"), 'logwatch.py?host=%s&file=%s&hidecontext=%s">%s</a>' % \

12 years, 7 months

Check_MK Git: check_mk: Added missing flapping image

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4adef6b4e9a92a982b3cd28d8ed8c8620ab64664 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4adef6b4e9a92a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 21 21:53:18 2012 +0100 Added missing flapping image --- web/htdocs/images/alert_flapping.png | Bin 0 -> 856 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/alert_flapping.png b/web/htdocs/images/alert_flapping.png new file mode 100644 index 0000000..e15b60c Binary files /dev/null and b/web/htdocs/images/alert_flapping.png differ

12 years, 7 months

Check_MK Git: check_mk: statgrab_load: level is now checked against 15min average

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 008eb32fae920c0f122fe1c08af16981b77d49ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=008eb32fae920c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 21 21:52:10 2012 +0100 statgrab_load: level is now checked against 15min average --- ChangeLog | 2 ++ checks/cpu | 6 +++--- checks/statgrab_load | 19 +++++++++++-------- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2c1ac63..7ee5b34 100644 --- a/ChangeLog +++ b/ChangeLog @@ -47,6 +47,8 @@ * ps: output node process is running on (only for clusters) * hr_mem: handle rare case where more than one entry is present (this prevents an exception of pfSense) + * statgrab_load: level is now checked against 15min average - + in order to be consistent with the Linux load check Multisite: * Added several missing localization strings diff --git a/checks/cpu b/checks/cpu index 5a42b0a..ea3198e 100644 --- a/checks/cpu +++ b/checks/cpu @@ -50,11 +50,11 @@ def check_cpu_load(item, params, info): perfdata = [ ('load' + str(z), l, warn, crit, 0 ) for (z,l) in [ (1,load[0]), (5,load[1]), (15, load[2]) ] ] if load[2] >= crit: - return (2, "CRIT - 15min Load %.2f at %s CPUs (critical at %.2f)" % (load[2], num_cpus, crit), perfdata) + return (2, "CRIT - 15min load %.2f at %s CPUs (critical at %.2f)" % (load[2], num_cpus, crit), perfdata) elif load[2] >= warn: - return (1, "WARN - 15min Load %.2f at %s CPUs (warning at %.2f)" % (load[2], num_cpus, warn), perfdata) + return (1, "WARN - 15min load %.2f at %s CPUs (warning at %.2f)" % (load[2], num_cpus, warn), perfdata) else: - return (0, "OK - 15min Load %.2f at %s CPUs" % (load[2], num_cpus), perfdata) + return (0, "OK - 15min load %.2f at %s CPUs" % (load[2], num_cpus), perfdata) def inventory_cpu_threads(info): if len(info) == 1 and len(info[0]) >= 5: diff --git a/checks/statgrab_load b/checks/statgrab_load index 46c3ff0..4c7b5fa 100644 --- a/checks/statgrab_load +++ b/checks/statgrab_load @@ -39,15 +39,18 @@ def check_statgrab_load(item, params, info): load_15 = float(value) warn, crit = params - perfdata = [ ('load' + str(z), l, warn, crit, 0 ) for (z,l) in [ (1,load_1), (5,load_5), (15, load_15) ] ] - - - if load_1 >= crit: - return (2, "CRIT - %.2f (critical at %.2f)" % (load_1, crit), perfdata) - elif load_1 >= warn: - return (1, "WARN - %.2f (warning at %.2f)" % (load_1, warn), perfdata) + perfdata = [ ('load' + str(z), l, warn, crit, 0 ) + for (z,l) in + [ (1, load_1), (5, load_5), (15, load_15) ] ] + + if load_15 >= crit: + return (2, "CRIT - 15min load %.2f (critical at %.2f)" % (load_15, crit), perfdata) + elif load_15 >= warn: + return (1, "WARN - 15min load %.2f (warning at %.2f)" % (load_15, warn), perfdata) else: - return (0, "OK - %.2f" % load_1, perfdata) + return (0, "OK - 15min load %.2f" % load_15, perfdata) + check_info['statgrab_load'] = (check_statgrab_load, "CPU load", 1, inventory_statgrab_load) +checkgroup_of['statgrab_load'] = "cpu_load"

12 years, 7 months

Check_MK Git: check_mk: Events view now shows icon and text for "flapping" events

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 45eb1c8a72bb10255b9991e721d28f504e53d4a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45eb1c8a72bb10… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 21 21:45:55 2012 +0100 Events view now shows icon and text for "flapping" events --- ChangeLog | 3 ++- web/htdocs/images/icon_flapping.gif | Bin 1037 -> 1037 bytes web/plugins/views/painters.py | 26 ++++++++++++++++++++++++-- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 399296a..2c1ac63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -49,7 +49,7 @@ (this prevents an exception of pfSense) Multisite: - * Added several missing localization stringsw + * Added several missing localization strings * IE: Fixed problem with clicking SELECT fields in the new wato foldertree snapin * Fixed problem when trying to visit dashboards from new wato foldertree snapin * Chrome: Fixed styling problem of foldertree snapin @@ -64,6 +64,7 @@ automatically logged out after showing the error message * Retry livestatus connect until timeout is used up. This avoids error messages when the core is being restarted + * Events view now shows icon and text for "flapping" events BI: diff --git a/web/htdocs/images/icon_flapping.gif b/web/htdocs/images/icon_flapping.gif index 2429db2..e259ff8 100644 Binary files a/web/htdocs/images/icon_flapping.gif and b/web/htdocs/images/icon_flapping.gif differ diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index bc6e828..acdfa9d 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1554,11 +1554,31 @@ multisite_painters["log_message"] = { "paint" : lambda row: ("", row["log_message"]), } +def paint_log_plugin_output(row): + output = row["log_plugin_output"] + if output: + return "", format_plugin_output(row, output) + else: + log_type = row["log_type"] + lst = row["log_state_type"] + if "FLAPPING" in log_type: + if "HOST" in log_type: + what = _("host") + else: + what = _("service") + if lst == "STOPPED": + return "", _("The %s stopped flapping") % what + else: + return "", _("The %s started flapping") % what + + return "", (lst + " - " + log_type) + + multisite_painters["log_plugin_output"] = { "title" : _("Log: output of check plugin"), "short" : _("Check output"), - "columns" : ["log_plugin_output"], - "paint" : lambda row: ("", format_plugin_output(row, row["log_plugin_output"])), + "columns" : ["log_plugin_output", "log_type", "log_state_type" ], + "paint" : paint_log_plugin_output, } multisite_painters["log_attempt"] = { @@ -1607,6 +1627,8 @@ def paint_log_icon(row): img = "start" elif "shutdown..." in log_type: img = "stop" + elif " FLAPPING " in log_type: + img = "flapping" if img: return "icon", '<img src="images/alert_%s.png">' % img

12 years, 7 months

Check_MK Git: check_mk: FIX: hr_mem: handle rare case where more than one entry is present

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c505863948d2e2df9e93d94c1c91b17f773c0516 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c505863948d2e2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 21 21:26:03 2012 +0100 FIX: hr_mem: handle rare case where more than one entry is present --- ChangeLog | 2 ++ checks/hr_mem | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 08d36ea..399296a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -45,6 +45,8 @@ * FIX: fix inventory of f5_bigip_temp * mk_oracle (lnx+win): Fixed TEMP tablespace size calculations * ps: output node process is running on (only for clusters) + * hr_mem: handle rare case where more than one entry is present + (this prevents an exception of pfSense) Multisite: * Added several missing localization stringsw diff --git a/checks/hr_mem b/checks/hr_mem index d3efa88..4f334eb 100644 --- a/checks/hr_mem +++ b/checks/hr_mem @@ -44,8 +44,12 @@ def check_hr_mem(item, params, info): ".1.3.6.1.2.1.25.2.1.3" ]: size = saveint(hrsize) * saveint(hrunits) / 1048576.0 used = saveint(hrused) * saveint(hrunits) / 1048576.0 - usage[hrtype] = (size, used) - + # We use only the first entry of each type. We have + # seen devices (pfSense), that have lots of additional + # entries that are not useful. + if hrtype not in usage: + usage[hrtype] = (size, used) + # Account for cached memory (this works at least for systems using # the UCD snmpd (such as Linux based applicances) cached_mb = 0 @@ -57,6 +61,7 @@ def check_hr_mem(item, params, info): ramused_mb -= cached_mb totalvirt_mb, virtused_mb = usage.get(".1.3.6.1.2.1.25.2.1.3", (0,0)) totalmem_mb, totalused_mb = totalram_mb + totalvirt_mb, ramused_mb + virtused_mb + if totalmem_mb > 0: totalused_perc = 100 * totalused_mb / totalram_mb

12 years, 7 months

Check_MK Git: check_mk: Updated bug entries #0632

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a1604fe5b8938f9a27144acf44717a5b2f2aa246 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1604fe5b8938f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 21 17:49:25 2012 +0100 Updated bug entries #0632 --- .bugs/632 | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.bugs/632 b/.bugs/632 index cb8a441..175c395 100644 --- a/.bugs/632 +++ b/.bugs/632 @@ -1,9 +1,9 @@ Title: No Multisite-permission but login Component: multisite -State: open +Class: bug +State: done Date: 2012-02-14 16:24:10 Targetversion: 1.2.0 -Class: bug If you have no role and thus no permission to use Multisite, then you can login anyways (via Cookie-based login or other). But @@ -16,3 +16,7 @@ Solution: 1. Do not allow to save a user without any roles 2. (in addition): Add a logout link to the error message. + +2012-02-21 17:49:12: changed state open -> done +Lars has done this. The user is automatically logged +out again in such a case.

12 years, 7 months

Check_MK Git: check_mk: Updated bug entries #0650

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 642f5dd2c6af04aadb0fde377ec0ee01dbe3d596 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=642f5dd2c6af04… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 21 17:44:22 2012 +0100 Updated bug entries #0650 --- .bugs/650 | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/650 b/.bugs/650 index 9915edb..98fc5ab 100644 --- a/.bugs/650 +++ b/.bugs/650 @@ -1,8 +1,11 @@ Title: OMD shared mode: <site>/etc/auth.secret not writeable Component: multisite -State: open +Class: bug +State: done Date: 2012-02-13 16:05:37 Targetversion: future -Class: bug The file can not be written by the system wide apache. + +2012-02-21 17:44:15: changed state open -> done +Already has been fixed by Lars some days ago.

12 years, 7 months

Check_MK Git: check_mk: Updated bug entries #0609

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 161a0fdc1f3f4e5acb9becca4e6ac40afeaa5c7b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=161a0fdc1f3f4e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 21 17:32:32 2012 +0100 Updated bug entries #0609 --- .bugs/609 | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/609 b/.bugs/609 index c776645..6190957 100644 --- a/.bugs/609 +++ b/.bugs/609 @@ -1,11 +1,14 @@ Title: User Migration nach WatoNG Component: wato -State: open +Class: bug +State: done Date: 2012-01-30 22:18:13 Targetversion: 1.2.0 -Class: bug Die Userverwaltung in WatoNG liest weder bestehende User aus der OMD htpasswd datei aus, noch werden die bestehenden User aus dieser Datei behalten wenn man einen User in WatoNG anlegt. Auch wenn das eigentlich Funktionieren sollte, tat es das noch bei keiner Seite die ich migriert habe. + +2012-02-21 17:32:29: changed state open -> done +Das ist seit dem 16. Februar repariert.

12 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2012