Checkmk git commits August 2014

checkmk-commits@lists.checkmk.com

5 participants
225 discussions

Check_MK Git: check_mk: better way to identified down or disabled nodes

by Goetz Golla

Module: check_mk Branch: master Commit: 4e4ee943818d0f4e9b8e60d1078503aead097ed2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e4ee943818d0f… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Aug 28 15:39:27 2014 +0200 better way to identified down or disabled nodes --- checkman/f5_bigip_pool | 13 ++++++------- checks/f5_bigip_pool | 16 +++++++++------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/checkman/f5_bigip_pool b/checkman/f5_bigip_pool index d20cea3..0a95867 100644 --- a/checkman/f5_bigip_pool +++ b/checkman/f5_bigip_pool @@ -13,8 +13,10 @@ description: It supports devices running the 9.0 and above releases of the F5 OS. It's tested against 9.3 devices. - If there are down nodes, the names of the nodes are also printed in the - service output. + If there are down or disabled nodes, the names of the nodes are + also printed in the service output. They are identified using the + following oids: ltmPoolMemberMonitorState, ltmPoolMemberMonitorStatus, + ltmPoolMemberSessionStatus examples: # Let the Pool named ABC on your first F5 be in WARNING state when it reaches 5 active members or in CRITICAL for anything between 3 and 0. @@ -28,12 +30,9 @@ inventory: non-enabled ones, as this is considered a temporary state. [parameters] -warning (int): issue a warning if there are less than warn members left in -a load balancing pool +warning (int): issue a warning if there are less than warn members left in a load balancing pool -crit (int): go to critical state if there are less than crit members left -in a load balancing pool. Note: 0 active members will always result in a -critical state. +crit (int): go to critical state if there are less than crit members left in a load balancing pool. Note: 0 active members will always result in a critical state. [configuration] f5_bigip_pool_default_levels = (int, int): The default levels for all F5 BIG-IP pool checks. This is preset to {(2, 1)}. diff --git a/checks/f5_bigip_pool b/checks/f5_bigip_pool index 9a4367a..be35327 100644 --- a/checks/f5_bigip_pool +++ b/checks/f5_bigip_pool @@ -46,14 +46,14 @@ def inventory_f5_bigip_pool(checkname,info): def f5_bigip_pool_get_down_members(info, item): downs = [] - if len(info) < 2: + if len(info) < 2: # no data for pool members return for line in info[1]: - if line[0] == item and line[2] != '4': - if re.match("\/\S*\/\S*", line[3]): - host = line[3].split("/")[2] + if line[0] == item and (line[2] != '4' or line[3] != '4' or line[4] in ('2', '3', '4', '5' )): + if re.match("\/\S*\/\S*", line[5]): + host = line[5].split("/")[2] else: - host = line[3] + host = line[5] downs.append(host+":"+line[1]) return downs @@ -76,7 +76,7 @@ def check_f5_bigip_pool(item, params, info): if pool_act_members < pool_def_members: downs = f5_bigip_pool_get_down_members(info, item) - message += ", down nodes: %s" % ", ".join(downs) + message += ", down/disabled nodes: %s" % ", ".join(downs) return state, message return 3, "unexpected Output from SNMP Agent" @@ -95,7 +95,9 @@ check_info["f5_bigip_pool"] = { ('.1.3.6.1.4.1.3375.2.2.5.3.2.1', [ 1, # ltmPoolMemberPoolName 4, # ltmPoolMemberPort - 10, # ltmPoolMemberState + 10, # ltmPoolMemberMonitorState + 11, # ltmPoolMemberMonitorStatus + 13, # ltmPoolMemberSessionStatus 19, # ltmPoolMemberNodeName ]), ],

9 years, 10 months

Check_MK Git: check_mk: #1149 FIX check_mk-ibm_svc_systemstats.diskio, check_mk-ibm_svc_systemstats.iops: fix exception in Perf-O-Meter

by Mathias Kettner

Module: check_mk Branch: master Commit: 516470251b18d474c0fd13bcf0dc88bfe13a1bf2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=516470251b18d4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 28 15:01:36 2014 +0200 #1149 FIX check_mk-ibm_svc_systemstats.diskio, check_mk-ibm_svc_systemstats.iops: fix exception in Perf-O-Meter --- .werks/1149 | 9 +++++++++ ChangeLog | 1 + web/plugins/perfometer/check_mk.py | 12 ++++++------ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.werks/1149 b/.werks/1149 new file mode 100644 index 0000000..210b9fc --- /dev/null +++ b/.werks/1149 @@ -0,0 +1,9 @@ +Title: check_mk-ibm_svc_systemstats.diskio, check_mk-ibm_svc_systemstats.iops: fix exception in Perf-O-Meter +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1409230838 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 06ba20f..5843001 100644 --- a/ChangeLog +++ b/ChangeLog @@ -64,6 +64,7 @@ * 0650 FIX: f5_bigip_pool: limits to the number of active nodes are now correctly applied... NOTE: Please refer to the migration notes! * 1102 FIX: esx_vsphere_counters: no longer raise false alarms because of invalid data from ESX Host... + * 1149 FIX: check_mk-ibm_svc_systemstats.diskio, check_mk-ibm_svc_systemstats.iops: fix exception in Perf-O-Meter Multisite: * 1066 Implemented Dashboard Designer... diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 53b1455..703eb2d 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -646,9 +646,9 @@ perfometers["check_mk-ibm_svc_nodestats.diskio"] = perfometer_check_mk_diskstat perfometers["check_mk-ibm_svc_systemstats.diskio"] = perfometer_check_mk_diskstat def perfometer_check_mk_iops_r_w(row, check_command, perf_data): - iops_r = int(perf_data[0][1]) - iops_w = int(perf_data[1][1]) - text = "%d IO/s %s IO/s" % (iops_r, iops_w) + iops_r = float(perf_data[0][1]) + iops_w = float(perf_data[1][1]) + text = "%.0f IO/s %.0f IO/s" % (iops_r, iops_w) return text, perfometer_logarithmic_dual( iops_r, "#60e0a0", iops_w, "#60a0e0", 100000, 10) @@ -656,9 +656,9 @@ perfometers["check_mk-ibm_svc_nodestats.iops"] = perfometer_check_mk_iops_r_w perfometers["check_mk-ibm_svc_systemstats.iops"] = perfometer_check_mk_iops_r_w def perfometer_check_mk_disk_latency_r_w(row, check_command, perf_data): - latency_r = int(perf_data[0][1]) - latency_w = int(perf_data[1][1]) - text = "%d ms %s ms" % (latency_r, latency_w) + latency_r = float(perf_data[0][1]) + latency_w = float(perf_data[1][1]) + text = "%.1f ms %.1f ms" % (latency_r, latency_w) return text, perfometer_logarithmic_dual( latency_r, "#60e0a0", latency_w, "#60a0e0", 20, 10)

9 years, 10 months

Check_MK Git: check_mk: #1148 Allow execution of actions when cancelling events

by Mathias Kettner

Module: check_mk Branch: master Commit: 2d163c343edbddcaeceef01739f78b2bd61c8e46 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d163c343edbdd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Aug 28 14:37:44 2014 +0200 #1148 Allow execution of actions when cancelling events The Event Console now allows to attach actions to the cancelling of events. This can for example be helpful if you have an action that opens a trouble ticket in an external system. When a cancelling event arrives you can have executed an action that also cancels the according trouble ticket. When events are cancelled then several data fields of the event are being replaced with data from the new event before the action is being executed. That way relevant data from the new event is available in the action script. Also the event phase is being set to <tt>closed</tt> and the state is set to 0 (OK). That way your action script can distinguish between a normal and a cancelling situation. The following fields are taken from the new (i.e. cancelling) event: <ul> <li>The text</li> <li>The time</li> <li>The time of the last occurance</li> <li>The syslog priority</li> </ul> All other fields are unchanged - including the original ID of the cancelled event. --- .werks/1148 | 31 ++++++++++++++++++++ ChangeLog | 3 +- mkeventd/bin/mkeventd | 52 ++++++++++++++++++++++++++------- mkeventd/web/htdocs/mkeventd.py | 1 + mkeventd/web/plugins/wato/mkeventd.py | 11 +++++-- 5 files changed, 84 insertions(+), 14 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2d163c343e…

9 years, 10 months

Check_MK Git: check_mk: improved werk formatting

by Andreas Boesl

Module: check_mk Branch: master Commit: 90fc0fe529c94b4df60e13b0fadcd80ae9ef3460 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90fc0fe529c94b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Aug 28 13:36:33 2014 +0200 improved werk formatting --- .werks/1103 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/1103 b/.werks/1103 index 7eb4138..032252a 100644 --- a/.werks/1103 +++ b/.werks/1103 @@ -7,7 +7,7 @@ Date: 1409224883 Class: feature You can now configure whether the context of the logfiles should be -sent too, if a ok/warn/crit logline was detected within the logfile. +sent too, if a ok/warn/crit logline was detected within the logfile. The context includes lines starting with '.' (default context) or 'I' (ignored lines).

9 years, 10 months

Check_MK Git: check_mk: updated werk text

by Andreas Boesl

Module: check_mk Branch: master Commit: 507783ef6b8b7c425d037f45511e25b0833ab735 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=507783ef6b8b7c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Aug 28 13:34:50 2014 +0200 updated werk text --- .werks/1103 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.werks/1103 b/.werks/1103 index b1a1e7b..7eb4138 100644 --- a/.werks/1103 +++ b/.werks/1103 @@ -6,4 +6,21 @@ Version: 1.2.5i6 Date: 1409224883 Class: feature +You can now configure whether the context of the logfiles should be +sent too, if a ok/warn/crit logline was detected within the logfile. +The context includes lines starting with '.' (default context) or 'I' (ignored lines). + +A new option <tt>nocontext</tt> has been introduced for the logfiles section in the <tt>check_mk.ini</tt> file. + +F+:check_mk.ini +[logfiles] +# The following textfile will not report any context info (nocontext option) +textfile = nocontext C:\tmp\memo.udf +# Set patterns for defined textfile +warn = *overdue* +ok = *mail sent* +F-: + +If you simply prepend the parameter <tt>nocontext</tt> to the actual path (or path pattern), +all files matching this pattern will exclude any context info.

9 years, 10 months

Check_MK Git: check_mk: #1103 windows agent: now able to omit context text of logfiles

by Andreas Boesl

Module: check_mk Branch: master Commit: e13bc78760ad070d967303a92ded8efb609e304d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e13bc78760ad07… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Aug 28 13:22:09 2014 +0200 #1103 windows agent: now able to omit context text of logfiles --- .werks/1103 | 9 ++++++ ChangeLog | 3 +- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 208896 -> 208896 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 208896 -> 208896 bytes agents/windows/check_mk_agent.cc | 33 +++++++++++++++------- agents/windows/check_mk_agent.exe | Bin 177664 -> 177664 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 177664 -> 177664 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent-64.exe | Bin 159952 -> 160048 bytes agents/windows/install_agent.exe | Bin 156803 -> 156931 bytes agents/windows/nowin.exe | Bin 22511 -> 22511 bytes 12 files changed, 35 insertions(+), 12 deletions(-) diff --git a/.werks/1103 b/.werks/1103 new file mode 100644 index 0000000..b1a1e7b --- /dev/null +++ b/.werks/1103 @@ -0,0 +1,9 @@ +Title: windows agent: now able to omit context text of logfiles +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1409224883 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 86d761b..e587903 100644 --- a/ChangeLog +++ b/ChangeLog @@ -37,6 +37,7 @@ * 1376 dmraid: moved plugin code into normal Linux agent... * 1377 Renamed agent plugin resolve_hostname into dnsclient, make portable to all Unices... * 1146 nfsmounts: supported by AIX agent now... + * 1103 windows agent: now able to omit context text of logfiles * 1051 FIX: tcp_conn_stats: fix missing performance data... * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked * 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries @@ -62,7 +63,7 @@ * 1099 FIX: tsm_scratch: now returns the variable name instead the values during inventory... * 0650 FIX: f5_bigip_pool: limits to the number of active nodes are now correctly applied... NOTE: Please refer to the migration notes! - * 1102 FIX: esx_vsphere_counters: now raise a MKCounterWrapped exception if counter data is missing... + * 1102 FIX: esx_vsphere_counters: no longer raise false alarms because of invalid data from ESX Host... Multisite: * 1066 Implemented Dashboard Designer... diff --git a/agents/windows/build_version b/agents/windows/build_version index dd47563..d88e313 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -76 +81 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 5b050b7..21d038a 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 5e9778e..4dd0178 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index b3ff311..2bbfe69 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -1710,6 +1710,7 @@ typedef vector<condition_pattern*> condition_patterns_t; // C:/tmp/Testfile*.log struct glob_token { char *pattern; + bool nocontext; bool found_match; }; typedef vector<glob_token*> glob_tokens_t; @@ -1736,6 +1737,7 @@ struct logwatch_textfile { unsigned long long file_size; // size of the file unsigned long long offset; // current fseek offset in the file bool missing; // file no longer exists + bool nocontext; // do not report ignored lines file_encoding encoding; condition_patterns_t *patterns; // glob patterns applying for this file }; @@ -1873,7 +1875,7 @@ logwatch_textfile* get_logwatch_textfile(const char *filename) // Add a new textfile and to the global textfile list // and determine some initial values -bool add_new_logwatch_textfile(const char *full_filename, condition_patterns_t *patterns) +bool add_new_logwatch_textfile(const char *full_filename, glob_token* token, condition_patterns_t *patterns) { logwatch_textfile *new_textfile = new logwatch_textfile(); @@ -1889,9 +1891,10 @@ bool add_new_logwatch_textfile(const char *full_filename, condition_patterns_t * GetFileInformationByHandle(hFile, &fileinfo); CloseHandle(hFile); - new_textfile->path = strdup(full_filename); - new_textfile->missing = false; - new_textfile->patterns = patterns; + new_textfile->path = strdup(full_filename); + new_textfile->missing = false; + new_textfile->patterns = patterns; + new_textfile->nocontext = token->nocontext; // Hier aus den gespeicherten Hints was holen.... bool found_hint = false; @@ -1922,7 +1925,7 @@ bool add_new_logwatch_textfile(const char *full_filename, condition_patterns_t * // Check if the given full_filename already exists. If so, do some basic file integrity checks // Otherwise create a new textfile instance -void update_or_create_logwatch_textfile(const char *full_filename, condition_patterns_t *patterns) +void update_or_create_logwatch_textfile(const char *full_filename, glob_token* token, condition_patterns_t *patterns) { logwatch_textfile *textfile; if ((textfile = get_logwatch_textfile(full_filename)) != NULL) @@ -1966,7 +1969,7 @@ void update_or_create_logwatch_textfile(const char *full_filename, condition_pat } } else - add_new_logwatch_textfile(full_filename, patterns); // Add new file + add_new_logwatch_textfile(full_filename, token, patterns); // Add new file } // Process a single expression (token) of a globline and try to find matching files @@ -1985,11 +1988,11 @@ void process_glob_expression(glob_token *glob_token, condition_patterns_t *patte basename = glob_token->pattern; } snprintf(full_filename,sizeof(full_filename), "%s\\%s", basename, data.cFileName); - update_or_create_logwatch_textfile(full_filename, patterns); + update_or_create_logwatch_textfile(full_filename, glob_token, patterns); while (FindNextFile(h, &data)){ snprintf(full_filename,sizeof(full_filename), "%s\\%s", basename, data.cFileName); - update_or_create_logwatch_textfile(full_filename, patterns); + update_or_create_logwatch_textfile(full_filename, glob_token, patterns); } if (end) @@ -1999,7 +2002,7 @@ void process_glob_expression(glob_token *glob_token, condition_patterns_t *patte } // Add a new globline from the config file: -// C:/Testfile D:/var/log/data.log D:/tmp/art*.log +// C:/Testfile | D:/var/log/data.log D:/tmp/art*.log // This globline is split into tokens which are processed by process_glob_expression void add_globline(char *value) { @@ -2020,6 +2023,16 @@ void add_globline(char *value) while (token) { token = lstrip(token); glob_token *new_token = new glob_token(); + + if (!strncmp(token, "nocontext", 9)) + { + new_token->nocontext = true; + token += 9; + token = lstrip(token); + } + else + new_token->nocontext = false; + new_token->pattern = strdup(token); new_globline->tokens->push_back(new_token); process_glob_expression(new_token, new_globline->patterns); @@ -2221,7 +2234,7 @@ bool process_textfile(FILE *file, logwatch_textfile* textfile, SOCKET &out, bool } } - if (write_output && strlen(line) > 0) + if (write_output && strlen(line) > 0 && !(textfile->nocontext && (state == 'I' || state == '.'))) output(out, "%c %s\n", state, line); } diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 4ac96e9..60e02f3 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index f2dd030..bb8b51a 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index 2581c99..812ff07 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 1e95b33..e564cd0 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 778fd5a..e97de73 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index bc04e04..86c3c0c 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ

9 years, 10 months

Check_MK Git: check_mk: printer_input/printer_output: Fixed inventory for printers without name/descr for in/out devices; Ignoring invalid values for current levels

by Lars Michelsen

Module: check_mk Branch: master Commit: b71f6a64618efae3997f52982b92b048e8f02170 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b71f6a64618efa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 28 11:49:42 2014 +0200 printer_input/printer_output: Fixed inventory for printers without name/descr for in/out devices; Ignoring invalid values for current levels --- checks/printer_input | 1 + checks/printer_io.include | 20 +++++++++++++------- checks/printer_output | 1 + 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/checks/printer_input b/checks/printer_input index b195313..783644c 100644 --- a/checks/printer_input +++ b/checks/printer_input @@ -31,6 +31,7 @@ check_info["printer_input"] = { 'has_perfdata': False, 'snmp_info': ( '.1.3.6.1.2.1.43.8.2.1', [ + OID_END, '13', # Printer-MIB::prtInputName '18', # Printer-MIB::prtInputDescription '11', # Printer-MIB::prtInputStatus diff --git a/checks/printer_io.include b/checks/printer_io.include index 013ef60..fdfe3b9 100644 --- a/checks/printer_io.include +++ b/checks/printer_io.include @@ -66,8 +66,9 @@ factory_settings['printer_output_default_levels'] = { def inventory_printer_io(info): for line in info: + index, name, descr, status = line[:4] ignore = False - snmp_status = saveint(line[2]) + snmp_status = saveint(status) for state_val in sorted(printer_io_states,reverse=True): if state_val > 0 and snmp_status - state_val >= 0: snmp_status -= state_val @@ -76,19 +77,24 @@ def inventory_printer_io(info): ignore = True if ignore == True: continue - if line[0]: - name = line[0] + + # When no name is set + # a) try to use the description + # b) try to use the type otherwise use the index + if not name and descr: + name = descr else: - name = line[1] + name = index.split('.')[-1] + yield (name, {}) def check_printer_io(item, params, info, what): for line in info: - name, descr, snmp_status, capacity_unit, capacity_max, level = line + index, name, descr, snmp_status, capacity_unit, capacity_max, level = line snmp_status, level, capacity_max = saveint(snmp_status), saveint(level), saveint(capacity_max) capacity_unit = printer_io_units[capacity_unit] - if descr == item or name == item: + if name == item or descr == item or index.split('.')[-1] == item: state_txt = [] state_state = 0 if snmp_status == 0: @@ -103,7 +109,7 @@ def check_printer_io(item, params, info, what): yield state_state, 'Status: %s' % ', '.join(state_txt) - if level in [-1, -2]: + if level in [-1, -2] or level < -3: pass # totally skip this info when level is unknown or not limited elif capacity_max in [ -1, -2 ]: diff --git a/checks/printer_output b/checks/printer_output index 6e7d2a6..92bf7b7 100644 --- a/checks/printer_output +++ b/checks/printer_output @@ -31,6 +31,7 @@ check_info["printer_output"] = { 'has_perfdata': False, 'snmp_info': ( '.1.3.6.1.2.1.43.9.2.1', [ + OID_END, '7', # Printer-MIB::prtOutputName '12', # Printer-MIB::prtOutputDescription '6', # Printer-MIB::prtOutputStatus

9 years, 10 months

Check_MK Git: check_mk: Updated werk text

by Andreas Boesl

Module: check_mk Branch: master Commit: 87b5257f8bb7c463d345b6db457c37a0efd49051 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87b5257f8bb7c4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Aug 28 10:35:45 2014 +0200 Updated werk text --- .werks/1102 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/1102 b/.werks/1102 index 3c24245..9511ffe 100644 --- a/.werks/1102 +++ b/.werks/1102 @@ -1,4 +1,4 @@ -Title: esx_vsphere_counters: now raise a MKCounterWrapped exception if counter data is missing +Title: esx_vsphere_counters: no longer raise false alarms because of invalid data from ESX Host Level: 1 Component: checks Compatible: compat

9 years, 10 months

Check_MK Git: check_mk: #1102 FIX esx_vsphere_counters: now raise a MKCounterWrapped exception if counter data is missing

by Andreas Boesl

Module: check_mk Branch: master Commit: 672051b3fcfa9c1e3dc425cec293d56720649076 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=672051b3fcfa9c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Aug 28 09:55:40 2014 +0200 #1102 FIX esx_vsphere_counters: now raise a MKCounterWrapped exception if counter data is missing Sometimes the ESX Host does not report valid counter ids. It may look like <pre> <id> <counterId>-2147483645</counterId> <instance>84</instance> </id> <pre> If this happens the <tt><<<esx_vsphere_counters>>></tt> section in the agent is empty. Any checks which relied on this section are now able to handle this scenario by raising a MKCounterWrappedException. Therefore these checks will no longer go UNKNOWN, but stale... --- .werks/1102 | 21 +++++++++++++++++++++ ChangeLog | 1 + checks/esx_vsphere_counters | 11 ++++++++++- 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/.werks/1102 b/.werks/1102 new file mode 100644 index 0000000..3c24245 --- /dev/null +++ b/.werks/1102 @@ -0,0 +1,21 @@ +Title: esx_vsphere_counters: now raise a MKCounterWrapped exception if counter data is missing +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1409212163 +Class: fix + +Sometimes the ESX Host does not report valid counter ids. +It may look like + +<pre> +<id> + <counterId>-2147483645</counterId> + <instance>84</instance> +</id> +<pre> + +If this happens the <tt><<<esx_vsphere_counters>>></tt> section in the agent is empty. +Any checks which relied on this section are now able to handle this scenario by raising a MKCounterWrappedException. +Therefore these checks will no longer go UNKNOWN, but stale... diff --git a/ChangeLog b/ChangeLog index d7975a8..86d761b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -62,6 +62,7 @@ * 1099 FIX: tsm_scratch: now returns the variable name instead the values during inventory... * 0650 FIX: f5_bigip_pool: limits to the number of active nodes are now correctly applied... NOTE: Please refer to the migration notes! + * 1102 FIX: esx_vsphere_counters: now raise a MKCounterWrapped exception if counter data is missing... Multisite: * 1066 Implemented Dashboard Designer... diff --git a/checks/esx_vsphere_counters b/checks/esx_vsphere_counters index 641a420..70564dc 100644 --- a/checks/esx_vsphere_counters +++ b/checks/esx_vsphere_counters @@ -76,7 +76,7 @@ def inventory_esx_vsphere_counters_diskio(info): def check_esx_vsphere_counters_diskio(_no_item, _no_params, info): if not info: - return 3, "Counter data is missing" + raise MKCounterWrapped(None, "Counter data is missing") read_bytes = 0 write_bytes = 0 @@ -236,6 +236,9 @@ def inventory_esx_vsphere_counters_if(info): return inventory_if_common(converted) def check_esx_vsphere_counters_if(item, params, info): + if not info: + raise MKCounterWrapped(None, "Counter data is missing") + converted = convert_esx_counters_if(info) return check_if_common(item, params, converted) @@ -265,6 +268,9 @@ def inventory_esx_vsphere_counters_uptime(info): return [ (None, {}) ] def check_esx_vsphere_counters_uptime(_no_item, params, info): + if not info: + raise MKCounterWrapped(None, "Counter data is missing") + for name, instance, counter, unit in info: if name == "sys.uptime": return check_uptime_seconds(params, int(counter)) @@ -314,6 +320,9 @@ def inventory_esx_vsphere_counters_ramdisk(info): return df_inventory(ramdisks) def check_esx_vsphere_counters_ramdisk(item, params, info): + if not info: + raise MKCounterWrapped(None, "Counter data is missing") + ramdisks = [] for name, instance, counter, unit in info: if name == 'sys.resourceMemConsumed' \

9 years, 10 months

Check_MK Git: check_mk: Fixed bug during sample config creation

by Lars Michelsen

Module: check_mk Branch: master Commit: c7e54c2092a26a95174d40daaedca757f1c37a44 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7e54c2092a26a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 27 16:15:08 2014 +0200 Fixed bug during sample config creation --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a708d35..a25e844 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15320,7 +15320,7 @@ def create_sample_config(): # A contact group where everyone is member of groups = { - "contact" : { 'all' : u'Everybody' }, + "contact" : { 'all' : {'alias': u'Everybody'} }, } save_group_information(groups)

9 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2014