Checkmk git commits November 2013

checkmk-commits@lists.checkmk.com

6 participants
274 discussions

Check_MK Git: check_mk: Fixed entries in changelog

by Lars Michelsen

Module: check_mk Branch: master Commit: 22dcb3da9d1373224118d3cc4f365b84632ba7e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22dcb3da9d1373… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 5 13:03:34 2013 +0100 Fixed entries in changelog --- ChangeLog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 22b7aff..fffe4b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -670,8 +670,8 @@ * FIX: check_mkevents now uses case insensitive host name matching Livestatus: - * livestatus: fixed incorrect output formatting of comments_with_info column - * table statehist: fixed memory leak + * FIX: fixed incorrect output formatting of comments_with_info column + * FIX: statehist table: fixed memory leak 1.2.2p2: Core:

10 years, 10 months

Check_MK Git: check_mk: FIX table statehist: code cleanup /

by Andreas Boesl

minor performance improvements Message-ID: <5278d926.SUWTYkeVxQnNKnEK%ab(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: c6d1b7394fbd12de47ba2ec428c7cb15b46f9a9f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c6d1b7394fbd12… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Nov 5 12:39:50 2013 +0100 FIX table statehist: code cleanup / minor performance improvements --- .werks/23 | 8 +++++ ChangeLog | 3 ++ livestatus/src/TableStateHistory.cc | 68 ++++++++++++----------------------- 3 files changed, 33 insertions(+), 46 deletions(-) diff --git a/.werks/23 b/.werks/23 new file mode 100644 index 0000000..d4e3beb --- /dev/null +++ b/.werks/23 @@ -0,0 +1,8 @@ +Title: table statehist: code cleanup / minor performance improvements +Level: 1 +Component: livestatus +Version: 1.2.3i7 +Date: 1383651560 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 22b7aff..ac4690a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,9 @@ * 0050 : New concept of favorite hosts and services plus matching filters and views... * 0043 FIX : LDAP: Improved error reporting during synchronisation... + Livestatus: + * 0023 FIX : table statehist: code cleanup / minor performance improvements... + 1.2.3i6: Core & Setup: diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index e35088b..24bc474 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -117,9 +117,6 @@ extern Store *g_store; #define CLASSMASK_STATEHIST 0xC6 -// Debug information -int total_update_calls = 0; - // Debugging logging is hard if debug messages are logged themselves... void debug_statehist(const char *loginfo, ...) { @@ -347,56 +344,38 @@ void TableStateHistory::answerQuery(Query *query) return; } - // Set initial logentry - // Further logfile traversal is handled via getPreviousLogentry() / getNextLogentry() + // Determine initial logentry + LogEntry* entry; _entries = _it_logs->second->getEntriesFromQuery(query, g_store->logCache(), _since, _until, CLASSMASK_STATEHIST); - _it_entries = _entries->begin(); - - // Start at the logentry LOG VERSION: 2.0 which is logged in the first lines of each logfile - // If no entry is found there will be an UNMONITORED entry till the host or service appears - LogEntry* entry = _it_entries->second; - bool version_found = false; - while (entry != 0) { - if (entry->_time >= _since){ - break; - } - if (entry->_type == LOG_VERSION) { - version_found = true; - break; + _it_entries = _entries->end(); + // Check last entry. If it's younger than _since -> use this logfile too + if (--_it_entries != _entries->begin()) { + entry = _it_entries->second; + if (entry->_time >= _since) { + _it_entries = _entries->begin(); } - entry = getNextLogentry(); } -// if (!version_found) { -// query->setError(RESPONSE_CODE_INVALID_REQUEST, "Unable to find any LOG VERSION entries before query " -// "timeframe. Logfiles seem corrupted."); -// g_store->logCache()->unlockLogCache(); -// return; -// } - + // From now on use getPreviousLogentry() / getNextLogentry() HostServiceKey key; bool only_update = true; bool in_nagios_initial_states = false; - // Debug parameters - int total_calls_saved = 0; - total_update_calls = 0; - int logentry_counter = 0; - - while (0 != (entry = getNextLogentry())) { - logentry_counter++; -// -// if (logentry_counter % 50000 == 0) -// logger(LOG_NOTICE, "Statehist Entry: %d", logentry_counter); - if (entry->_time >= _until) { getPreviousLogentry(); break; } if (only_update && entry->_time >= _since) { // Reached start of query timeframe. From now on let's produce real output + // Update _from time of every state entry + state_info_t::iterator it_hst = state_info.begin(); + while (it_hst != state_info.end()) { + it_hst->second->_from = _since; + it_hst->second->_until = _since; + it_hst++; + } only_update = false; } @@ -473,7 +452,6 @@ void TableStateHistory::answerQuery(Query *query) { Filter *filter = *it; if (!filter->accepts(state)) { - // logger(LOG_NOTICE, "kann ich rausschmeissen: %s/%s", key.first.c_str(), key.second.c_str()); filtered_out = true; break; } @@ -541,7 +519,8 @@ void TableStateHistory::answerQuery(Query *query) } // Log UNMONITORED state if this host or service just appeared within the query timeframe - if (!only_update) { + // It gets a grace period of ten minutes (nagios startup) + if (!only_update && entry->_time - _since > 60 * 10) { state->_debug_info = "UNMONITORED "; state->_state = -1; } @@ -555,7 +534,6 @@ void TableStateHistory::answerQuery(Query *query) if (state_changed != 0) { - total_calls_saved += state_info.size() - state->_services.size(); HostServices::iterator it_svc = state->_services.begin(); while (it_svc != state->_services.end()) { updateHostServiceState(query, entry, *it_svc, only_update); @@ -602,10 +580,6 @@ void TableStateHistory::answerQuery(Query *query) } } - //logger(LOG_DEBUG, "Processed statehist logentries: %d", logentry_counter); - //logger(LOG_DEBUG, "Total calls %d saved: %d", total_update_calls, total_calls_saved); - //logger(LOG_DEBUG, "Objects: %d, Blacklisted: %d", state_info.size(), object_blacklist.size()); - // Create final reports state_info_t::iterator it_hst = state_info.begin(); while (it_hst != state_info.end()) @@ -634,6 +608,8 @@ void TableStateHistory::answerQuery(Query *query) process(query, hst); it_hst++; } + + // Cleanup ! it_hst = state_info.begin(); while (it_hst != state_info.end()) { delete it_hst->second; @@ -650,14 +626,14 @@ bool TableStateHistory::objectFilteredOut(Query *query, void *entry) inline int TableStateHistory::updateHostServiceState(Query *query, const LogEntry *entry, HostServiceState *hs_state, const bool only_update){ int state_changed = 1; - total_update_calls++; // Revive host / service if it was unmonitored if (entry->_type != TIMEPERIOD_TRANSITION && hs_state->_has_vanished) { hs_state->_time = hs_state->_last_known_time; hs_state->_until = hs_state->_last_known_time; - process(query, hs_state); + if (!only_update) + process(query, hs_state); hs_state->_may_no_longer_exist = false; hs_state->_has_vanished = false;

10 years, 10 months

Check_MK Git: check_mk: werk new/edit now able to process custom files

by Andreas Boesl

Module: check_mk Branch: master Commit: e9725ef62d4ac2146ca12d53ac7b34dd2995ed49 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9725ef62d4ac2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Nov 5 12:37:48 2013 +0100 werk new/edit now able to process custom files --- werk | 42 +++++++++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/werk b/werk index 3b9c9d2..8d3e4e2 100755 --- a/werk +++ b/werk @@ -1,6 +1,6 @@ #!/usr/bin/python -import sys, os, time, termios, tty +import sys, os, time, termios, tty, subprocess # colored output, if stdout is a tty if sys.stdout.isatty(): @@ -63,7 +63,8 @@ def bail_out(text): sys.exit(1) def goto_werksdir(): - base_dir = os.path.abspath('.') + global g_base_dir + g_base_dir = os.path.abspath('.') while not os.path.exists(".werks") and os.path.abspath('.') != '/': os.chdir("..") @@ -233,14 +234,28 @@ def save_werk(werk): def git_add(werk): os.system("git add %d" % werk["id"]) -def git_commit(werk): +def git_commit(werk, custom_files): title = werk["title"] for classid, classname, prefix in classes: if werk["class"] == classid: if prefix: title = "%s %s" % (prefix, title) - os.system("git commit -a -m %s" % quote_shell_string(title + "\n\n" + werk["description"])) + if custom_files: + files_to_commit = custom_files + default_files = [ ".werks", "ChangeLog" ] + # Get top level + info = subprocess.Popen(["git", "rev-parse", "--show-toplevel"], stdout=subprocess.PIPE) + git_top_level = info.communicate()[0].split()[0] + for entry in default_files: + files_to_commit.append("%s/%s" % (git_top_level, entry)) + + os.chdir(g_base_dir) + os.system("git commit %s -m %s" % (" ".join(files_to_commit), + quote_shell_string(title + "\n\n" + werk["description"]))) + + else: + os.system("git commit -a -m %s" % quote_shell_string(title + "\n\n" + werk["description"])) def quote_shell_string(s): return "'" + s.replace("'", "'\"'\"'") + "'" @@ -480,7 +495,7 @@ def main_new(args): werk = {} werk["id"] = next_werk_id() werk["date"] = int(time.time()) - werk["version"] = g_current_version + werk["version"] = g_current_version werk["title"] = get_input("Title") if werk["title"] == "": sys.stderr.write("Cancelled.\n") @@ -493,7 +508,7 @@ def main_new(args): g_werks[werk["id"]] = werk save_werk(werk) invalidate_my_werkid(werk["id"]) - edit_werk(werk["id"]) + edit_werk(werk["id"], args) sys.stdout.write("Werk saved with id %d.\n" % werk["id"]) @@ -605,15 +620,20 @@ def main_edit(args): werkid = int(g_last_werk) if werkid == None: bail_out("No last werk. Please specify id.") - else: - werkid = int(args[0]) + try: + werkid = int(args[0]) + args = args[1:] + except: + werkid = int(g_last_werk) + if werkid == None: + bail_out("No last werk. Please specify id.") - edit_werk(werkid) + edit_werk(werkid, args) save_last_werkid(werkid) -def edit_werk(werkid): +def edit_werk(werkid, custom_files = []): if not os.path.exists(str(werkid)): bail_out("No werk with this id.") editor = os.getenv("EDITOR") @@ -630,7 +650,7 @@ def edit_werk(werkid): werk = g_werks[werkid] git_add(g_werks[werkid]) rewrite_changelog() - git_commit(werk) + git_commit(werk, custom_files) def main_commit(args):

10 years, 10 months

Check_MK Git: check_mk: Updated bug entries #0835

by Mathias Kettner

Module: check_mk Branch: master Commit: 955bfda245cc713335c7d5faa28307efa2389145 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=955bfda245cc71… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 5 10:44:52 2013 +0100 Updated bug entries #0835 --- .bugs/835 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/835 b/.bugs/835 index d3fe410..9807cab 100644 --- a/.bugs/835 +++ b/.bugs/835 @@ -3,7 +3,7 @@ Component: wato State: discuss Date: 2013-10-30 10:49:32 Targetversion: 1.2.3i5 -Class: bug +Class: feature They still appearing as critical

10 years, 10 months

Check_MK Git: check_mk: FIX LDAP: Improved error reporting during synchronisation

by Lars Michelsen

Module: check_mk Branch: master Commit: 272730df76b5951169d89414179a70e7482b33b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=272730df76b595… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 5 10:10:55 2013 +0100 FIX LDAP: Improved error reporting during synchronisation Providing more details in case of errors during sync --- .werks/43 | 8 ++++++++ ChangeLog | 3 +++ web/htdocs/userdb.py | 12 ++++++++++-- web/plugins/userdb/ldap.py | 16 ++++++++++++---- 4 files changed, 33 insertions(+), 6 deletions(-) diff --git a/.werks/43 b/.werks/43 new file mode 100644 index 0000000..cd717b6 --- /dev/null +++ b/.werks/43 @@ -0,0 +1,8 @@ +Title: LDAP: Improved error reporting during synchronisation +Level: 1 +Component: multisite +Version: 1.2.3i7 +Date: 1383642604 +Class: fix + +Providing more details in case of errors during sync diff --git a/ChangeLog b/ChangeLog index 5554448..5fe2918 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ 1.2.3i7: + Multisite: + * 0043 FIX : LDAP: Improved error reporting during synchronisation... + 1.2.3i6: Core & Setup: diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 51814ee..dab736f 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -161,6 +161,7 @@ def on_failed_login(username): root_dir = defaults.check_mk_configdir + "/wato/" multisite_dir = defaults.default_config_dir + "/multisite.d/wato/" +#. # .--Users---------------------------------------------------------------. # | _ _ | # | | | | |___ ___ _ __ ___ | @@ -460,6 +461,7 @@ def save_users(profiles): # Call the users_saved hook hooks.call("users-saved", users) +#. # .-Roles----------------------------------------------------------------. # | ____ _ | # | | _ \ ___ | | ___ ___ | @@ -513,6 +515,7 @@ def load_roles(): 'Initializing structure...' % (filename, e)) return roles +#. # .-Groups---------------------------------------------------------------. # | ____ | # | / ___|_ __ ___ _ _ _ __ ___ | @@ -548,6 +551,7 @@ def load_group_information(): 'Initializing structure...' % (filename, e)) return {} +#. # .--Custom-Attrs.-------------------------------------------------------. # | ____ _ _ _ _ | # | / ___| _ ___| |_ ___ _ __ ___ / \ | |_| |_ _ __ ___ | @@ -595,6 +599,7 @@ def declare_custom_user_attrs(): topic = attr.get('topic', 'personal'), ) +#. # .----------------------------------------------------------------------. # | _ _ _ | # | | | | | ___ ___ | | _____ | @@ -743,6 +748,9 @@ def hook_page(): def ajax_sync(): try: hook_sync(add_to_changelog = False, raise_exc = True) - html.write('OK') + html.write('OK\n') except Exception, e: - html.write('ERROR %s' % e) + if config.debug: + raise + else: + html.write('ERROR %s\n' % e) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index c6719e1..645878c 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -195,8 +195,8 @@ def ldap_connect(enforce_new = False, enforce_server = None): # Got no connection to any server if ldap_connection is None: - raise MKLDAPException(_('The LDAP connector is unable to connect to the LDAP server.\n%s') % - ('<br />\n'.join(errors))) + raise MKLDAPException(_('LDAP connection failed:\n%s') % + ('\n'.join(errors))) # on success, store the connection options the connection has been made with ldap_connection_options = config.ldap_connection @@ -316,6 +316,7 @@ def ldap_search(base, filt = '(objectclass=*)', columns = [], scope = None): # be as stable as it is needed. So we try to repeat the query for three times. tries_left = 2 success = False + last_exc = None while not success: tries_left -= 1 try: @@ -345,6 +346,7 @@ def ldap_search(base, filt = '(objectclass=*)', columns = [], scope = None): 'incomplete results. You should change the scope of operation ' 'within the ldap or adapt the limit settings of the LDAP server.')) except (ldap.SERVER_DOWN, ldap.TIMEOUT, MKLDAPException), e: + last_exc = e if tries_left: ldap_log(' Received %r. Retrying with clean connection...' % e) ldap_disconnect() @@ -357,8 +359,14 @@ def ldap_search(base, filt = '(objectclass=*)', columns = [], scope = None): if not success: ldap_log(' FAILED') - raise MKLDAPException(_('Unable to successfully perform the LDAP search. ' - 'Maybe there is a connection problem with the LDAP server.')) + if config.debug: + raise MKLDAPException(_('Unable to successfully perform the LDAP search ' + '(Base: %s, Scope: %s, Filter: %s, Columns: %s): %s') % + (html.attrencode(base), html.attrencode(scope), + html.attrencode(filt), html.attrencode(','.join(columns))), + last_exc) + else: + raise MKLDAPException(_('Unable to successfully perform the LDAP search (%s)') % last_exc) ldap_log(' RESULT length: %d, duration: %0.3f' % (len(result), duration)) return result

10 years, 10 months

Check_MK Git: check_mk: Updated bug entries #0835

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: f664eb396f09cc1d928ccab69f556e08e29c7a02 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f664eb396f09cc… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Nov 5 09:51:24 2013 +0100 Updated bug entries #0835 --- .bugs/835 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.bugs/835 b/.bugs/835 index 1551b20..d3fe410 100644 --- a/.bugs/835 +++ b/.bugs/835 @@ -1,12 +1,18 @@ Title: BI doesent honours acknowledgement of services Component: wato -Class: bug State: discuss Date: 2013-10-30 10:49:32 Targetversion: 1.2.3i5 +Class: bug They still appearing as critical 2013-11-05 09:40:43: changed state open -> discuss by bs: is'nt this a "works as designed"? only because of someone working on a problem, an application (aggregation) is still unavailable and should be shown as unavailable (e. g. in Hotline Callcenter) + +2013-11-05 09:51:20: changed state discuss -> discuss +one more note by bs: maybe we better should add the acknoleged icon to the aggregation +and keep state unchanged +this would be e. g. very helpful for telefone hotline: They could tell customers: +Yes we have a known problem with application xyz and there is already someone working on

10 years, 10 months

Check_MK Git: check_mk: Updated bug entries #0835

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 81f9dd6e39b0ad3ce17041692a11e6e089e40a48 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=81f9dd6e39b0ad… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Nov 5 09:41:50 2013 +0100 Updated bug entries #0835 --- .bugs/835 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.bugs/835 b/.bugs/835 index e25c0b1..1551b20 100644 --- a/.bugs/835 +++ b/.bugs/835 @@ -1,8 +1,12 @@ Title: BI doesent honours acknowledgement of services Component: wato -State: open +Class: bug +State: discuss Date: 2013-10-30 10:49:32 Targetversion: 1.2.3i5 -Class: bug + They still appearing as critical +2013-11-05 09:40:43: changed state open -> discuss +by bs: is'nt this a "works as designed"? +only because of someone working on a problem, an application (aggregation) is still unavailable and should be shown as unavailable (e. g. in Hotline Callcenter)

10 years, 10 months

Check_MK Git: check_mk: added the first manpages for brocade_mlx checks

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 141f3f4c77466726f019e2a827e0e09d0d885ee0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=141f3f4c774667… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Nov 4 17:59:42 2013 +0100 added the first manpages for brocade_mlx checks --- checkman/brocade_mlx.fan | 18 ++++++++++++++ checkman/brocade_mlx.module_mem | 47 ++++++++++++++++++++++++++++++++++++ checkman/brocade_mlx.module_status | 18 ++++++++++++++ checkman/brocade_mlx.power | 18 ++++++++++++++ 4 files changed, 101 insertions(+) diff --git a/checkman/brocade_mlx.fan b/checkman/brocade_mlx.fan new file mode 100644 index 0000000..5095b83 --- /dev/null +++ b/checkman/brocade_mlx.fan @@ -0,0 +1,18 @@ +title: Brocade NetIron MLX devices: Fans +agents: snmp +catalog: hw/network/brocade +license: GPL +distribution: check_mk +description: + Checks the operational status of fans in Brocade NetIron MLX + switching / routing devices. + + Returns {OK} on status 2 (normal), {CRIT} on status 3 (failure) + and {UNKN} on every other status. + +item: + If a fan description is delivered by SNMP, the item is build from the + fan ID plus the description. Otherwise it is just the ID. + +inventory: + Finds one item per fan. diff --git a/checkman/brocade_mlx.module_mem b/checkman/brocade_mlx.module_mem new file mode 100644 index 0000000..4faa737 --- /dev/null +++ b/checkman/brocade_mlx.module_mem @@ -0,0 +1,47 @@ +title: Brocade NetIron MLX devices: NI-MLX Module Memory (RAM usage) +agents: snmp +catalog: hw/network/brocade +license: GPL +distribution: check_mk +description: + Checks the Module Memory (RAM usage) of a NI-MLX module in Brocade + NetIron MLX switching / routing devices. + + {WARN} or {CRIT} is returned, if the usage is above given thresholds. + {OK} is returned otherwise. + +item: + If a module description is delivered by SNMP, the item is build from the + module ID plus the description. Otherwise it is just the ID. + +examples: + # set default levels to 70 and 80 percent: + brocade_mlx_mem_default_levels = (70.0, 80.0) + + # Check Module with ID 33 on a box called my-mlx-device with default levels + checks += [ + ("my-mlx-device", "brocade_mlx.module_mem", '33 NI-MLX-32_MR Management Module', brocade_mlx_mem_default_levels), + ] + + # or use individual levels for warn and crit + checks += [ + ("my-mlx-device", "brocade_mlx.module_mem", '33 NI-MLX-32_MR Management Module', (75.0, 85.0)), + ] + +perfdata: + one value is returned: The amount of memory used (in Bytes), + together with warn and crit levels and maximum value + +inventory: + Finds one item per NI-MLX module. + Empty modules are omitted. + +[parameters] +warn(int): {WARN} state is triggered, if the memory usage in percent is higher + than this. +crit(int): {CRIT} state is triggered, if the memory usage in percent is higher + than this. + +[configuration] +brocade_mlx_mem_default_levels(float, float): The standard levels for {WARN} and + {CRIT}. Defaults are (80.0, 90.0) diff --git a/checkman/brocade_mlx.module_status b/checkman/brocade_mlx.module_status new file mode 100644 index 0000000..1d97598 --- /dev/null +++ b/checkman/brocade_mlx.module_status @@ -0,0 +1,18 @@ +title: Brocade NetIron MLX devices: Module Overall Status +agents: snmp +catalog: hw/network/brocade +license: GPL +distribution: check_mk +description: + Checks the overall status of modules in Brocade NetIron MLX + switching / routing devices. + + Returns {OK} on status 10 (running), {WARN} on status 0 (empty) + and {CRIT} on every other status. + +item: + If a module description is delivered by SNMP, the item is build from the + module ID plus the description. Otherwise it is just the ID. + +inventory: + Finds one item per power supply. diff --git a/checkman/brocade_mlx.power b/checkman/brocade_mlx.power new file mode 100644 index 0000000..cd5d592 --- /dev/null +++ b/checkman/brocade_mlx.power @@ -0,0 +1,18 @@ +title: Brocade NetIron MLX devices: Power Supplies +agents: snmp +catalog: hw/network/brocade +license: GPL +distribution: check_mk +description: + Checks the operational status of power supplies on Brocade NetIron MLX + switching / routing devices. + + Returns {OK} on status 2 (normal), {CRIT} on status 3 (failure) + and {UNKN} on every other status. + +item: + If a power supply description is delivered by SNMP, the item is build from + the power supply ID plus the description. Otherwise it is just the ID. + +inventory: + Finds one item per power supply.

10 years, 10 months

Check_MK Git: check_mk: hp_proliant check manpage: fixed title for correct sorting in manpage catalog

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 040a74f4193474e944f8450cf1681e693ebc60af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=040a74f4193474… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Nov 4 16:11:23 2013 +0100 hp_proliant check manpage: fixed title for correct sorting in manpage catalog --- checkman/hp_proliant | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkman/hp_proliant b/checkman/hp_proliant index fe03fcd..9bc094e 100644 --- a/checkman/hp_proliant +++ b/checkman/hp_proliant @@ -1,4 +1,4 @@ -title: HP Proliant servers: General Status +title: HP Proliant Servers: General Status agents: snmp catalog: hw/server/hp license: GPL

10 years, 10 months

Check_MK Git: check_mk: brocade_mlx: added checks for Temperature Sensors

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 355a05035b2003fdbe6166dedcd9dfee53e28ad5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=355a05035b2003… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Nov 4 16:09:20 2013 +0100 brocade_mlx: added checks for Temperature Sensors --- checks/brocade_mlx | 50 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 45 insertions(+), 5 deletions(-) diff --git a/checks/brocade_mlx b/checks/brocade_mlx index 469348e..f8bec7a 100644 --- a/checks/brocade_mlx +++ b/checks/brocade_mlx @@ -30,6 +30,7 @@ brocade_mlx_info = [ ('.1.3.6.1.4.1.1991.1.1.1.2.1.1', [ 1, 2, 3 ]), # power sup # modules (id, descr, overall status, MemoryTotal, MemoryAvailable) ('.1.3.6.1.4.1.1991.1.1.2.11.1.1.5', [ OID_END, "" ]), # modules (Rest of OId starting with module ID, CpuUtilPercent) + ('.1.3.6.1.4.1.1991.1.1.2.13.1.1', [ 3, 4 ]), # temperature sensors (descr, temperature) ] def brocade_mlx_scan(oid): @@ -39,7 +40,7 @@ def combine_item(id, descr): if descr == "": return id else: - return "%s: %s" % (id, descr) + return "%s %s" % (id, descr) ############################################################################# # Power Supplies @@ -124,10 +125,10 @@ def check_brocade_mlx_module(item, _no_params, info): return 2, "Module reports status %s" % module_state return 3, "Module %s not found" % item -check_info["brocade_mlx.module"] = { +check_info["brocade_mlx.module_status"] = { "check_function" : check_brocade_mlx_module, "inventory_function" : inventory_brocade_mlx_module, - "service_description" : "Module %s Status", + "service_description" : "Line module %s Status", "snmp_info" : brocade_mlx_info, "snmp_scan_function" : brocade_mlx_scan, "has_perfdata" : False, @@ -179,7 +180,7 @@ def check_brocade_mlx_module_mem(item, params, info): check_info["brocade_mlx.module_mem"] = { "check_function" : check_brocade_mlx_module_mem, "inventory_function" : inventory_brocade_mlx_module_mem, - "service_description" : "Module %s Memory", + "service_description" : "Line module %s Memory", "snmp_info" : brocade_mlx_info, "snmp_scan_function" : brocade_mlx_scan, "has_perfdata" : True, @@ -246,9 +247,48 @@ def check_brocade_mlx_module_cpu(item, params, info): check_info["brocade_mlx.module_cpu"] = { "check_function" : check_brocade_mlx_module_cpu, "inventory_function" : inventory_brocade_mlx_module_cpu, - "service_description" : "Module %s CPU", + "service_description" : "Line module %s CPU", "snmp_info" : brocade_mlx_info, "snmp_scan_function" : brocade_mlx_scan, "has_perfdata" : True, } +############################################################################# +# Temperature Sensors +############################################################################# + +brocade_mlx_temperature_default_levels = (100, 120) + +def inventory_brocade_mlx_temp(info): + inventory = [] + for temp_descr, temp_value in info[4]: + inventory.append( (temp_descr, "brocade_mlx_temperature_default_levels") ) + return inventory + +def check_brocade_mlx_temp(item, params, info): + warn, crit = params + for temp_descr, temp_value in info[4]: + temp_value = saveint(temp_value) + if temp_descr == item: + + status = 0 + if temp_value > warn: + status = 1 + if temp_value > crit: + status = 2 + + perfdata = [ ('temperature', str(temp_value) + '°C', warn, crit, 0, '') ] + + return status, "Temperature is %s°C" % temp_value, perfdata + + return 3, "temp supply %s not found" % item + +check_info["brocade_mlx.temperature"] = { + "check_function" : check_brocade_mlx_temp, + "inventory_function" : inventory_brocade_mlx_temp, + "service_description" : "%s", + "snmp_info" : brocade_mlx_info, + "snmp_scan_function" : brocade_mlx_scan, + "has_perfdata" : False, +} +

10 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2013