Checkmk git commits June 2014

checkmk-commits@lists.checkmk.com

6 participants
135 discussions

Check_MK Git: check_mk: SEC Fixed various core SIGSEGV when using malformed livestatus queries

by Andreas Boesl

Module: check_mk Branch: master Commit: 5af0de3414330771aa3e3f0c948a76f04a1db595 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5af0de34143307… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jun 18 11:11:13 2014 +0200 SEC Fixed various core SIGSEGV when using malformed livestatus queries Some malformed livestatus queries could crash the monitoring core. This happened whenever the value field for certain keys was missing.<br> For example C+: lq "GET hosts\nColumnHeaders:\n" lq "GET hosts\nAnd:\n" lq "GET hosts\nKeepalive:\n C-: --- .werks/940 | 22 ++++++++++++++++++++++ ChangeLog | 3 +++ livestatus/src/Query.cc | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+) diff --git a/.werks/940 b/.werks/940 new file mode 100644 index 0000000..e637d3f --- /dev/null +++ b/.werks/940 @@ -0,0 +1,22 @@ +Title: Fixed various core SIGSEGV when using malformed livestatus queries +Level: 2 +Component: core +Version: 1.2.5i4 +Date: 1403082179 +Class: security + +Some malformed livestatus queries could crash the monitoring core. +This happened whenever the value field for certain keys was missing.<br> + +For example +C+: + +lq "GET hosts\nColumnHeaders:\n" + +lq "GET hosts\nAnd:\n" + +lq "GET hosts\nKeepalive:\n + +C-: + + diff --git a/ChangeLog b/ChangeLog index 6cc5539..ed3a14c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ 1.2.5i4: + Core & Setup: + * 0940 SEC: Fixed various core SIGSEGV when using malformed livestatus queries... + Checks & Agents: * 0812 nginx_status: New check for monitoring status information of the Nginx web server... * 0986 citrix_licenses: new check for monitoring Citrix licenses diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index b7a163b..d6899e0 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -263,6 +263,13 @@ Filter *Query::createFilter(Column *column, int operator_id, char *value) void Query::parseAndOrLine(char *line, int andor, bool filter) { char *value = next_field(&line); + if (!value) { + _output->setError(RESPONSE_CODE_INVALID_HEADER, "Missing value for %s%s: need non-zero integer number", + filter ? "" : "WaitCondition", + andor == ANDOR_OR ? "Or" : "And"); + return; + } + int number = atoi(value); if (!isdigit(value[0]) || number <= 0) { _output->setError(RESPONSE_CODE_INVALID_HEADER, "Invalid value for %s%s: need non-zero integer number", @@ -311,6 +318,11 @@ void Query::parseNegateLine(char *line, bool filter) void Query::parseStatsAndOrLine(char *line, int andor) { char *value = next_field(&line); + if (!value) { + _output->setError(RESPONSE_CODE_INVALID_HEADER, "Missing value for Stats%s: need non-zero integer number", + andor == ANDOR_OR ? "Or" : "And"); + } + int number = atoi(value); if (!isdigit(value[0]) || number <= 0) { _output->setError(RESPONSE_CODE_INVALID_HEADER, "Invalid value for Stats%s: need non-zero integer number", @@ -559,6 +571,12 @@ void Query::parseSeparatorsLine(char *line) void Query::parseOutputFormatLine(char *line) { char *format = next_field(&line); + if (!format) { + _output->setError(RESPONSE_CODE_INVALID_HEADER, + "Missing output format. Only 'csv' and 'json' are available."); + return; + } + if (!strcmp(format, "csv")) _output_format = OUTPUT_FORMAT_CSV; else if (!strcmp(format, "json")) @@ -573,6 +591,12 @@ void Query::parseOutputFormatLine(char *line) void Query::parseColumnHeadersLine(char *line) { char *value = next_field(&line); + if (!value) { + _output->setError(RESPONSE_CODE_INVALID_HEADER, + "Missing value for ColumnHeaders: must be 'on' or 'off'"); + return; + } + if (!strcmp(value, "on")) _show_column_headers = true; else if (!strcmp(value, "off")) @@ -585,6 +609,12 @@ void Query::parseColumnHeadersLine(char *line) void Query::parseKeepAliveLine(char *line) { char *value = next_field(&line); + if (!value) { + _output->setError(RESPONSE_CODE_INVALID_HEADER, + "Missing value for KeepAlive: must be 'on' or 'off'"); + return; + } + if (!strcmp(value, "on")) _output->setDoKeepalive(true); else if (!strcmp(value, "off")) @@ -597,6 +627,12 @@ void Query::parseKeepAliveLine(char *line) void Query::parseResponseHeaderLine(char *line) { char *value = next_field(&line); + if (!value) { + _output->setError(RESPONSE_CODE_INVALID_HEADER, + "Missing value for ResponseHeader: must be 'off' or 'fixed16'"); + return; + } + if (!strcmp(value, "off")) _output->setResponseHeader(RESPONSE_HEADER_OFF); else if (!strcmp(value, "fixed16"))

10 years, 3 months

Check_MK Git: check_mk: FIX Fixed multisite exception caused by missing explanation text for a AUTODELETE event action

by Andreas Boesl

Module: check_mk Branch: master Commit: 39fbc7e3d8ba3c027a4b86357986bc0245e5d4b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=39fbc7e3d8ba3c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jun 18 10:15:50 2014 +0200 FIX Fixed multisite exception caused by missing explanation text for a AUTODELETE event action --- .werks/939 | 9 +++++++++ ChangeLog | 1 + mkeventd/web/htdocs/mkeventd.py | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/939 b/.werks/939 new file mode 100644 index 0000000..06cbc14 --- /dev/null +++ b/.werks/939 @@ -0,0 +1,9 @@ +Title: Fixed multisite exception caused by missing explanation text for a AUTODELETE event action +Level: 2 +Component: multisite +Class: fix +State: unknown +Version: 1.2.5i4 +Date: 1403079248 + + diff --git a/ChangeLog b/ChangeLog index 76b4179..6cc5539 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ * 0166 FIX: mobile gui: Fixed colors of command list... * 0820 FIX: Fixed wrong NagVis links in "custom links" snapin * 0938 FIX: logwatch: fixed incorrect display of warning messages + * 0939 FIX: Fixed multisite exception caused by missing explanation text for a AUTODELETE event action WATO: * 0987 New button for updating DNS cache... diff --git a/mkeventd/web/htdocs/mkeventd.py b/mkeventd/web/htdocs/mkeventd.py index 8e056f5..517cc46 100644 --- a/mkeventd/web/htdocs/mkeventd.py +++ b/mkeventd/web/htdocs/mkeventd.py @@ -88,7 +88,7 @@ action_whats = { "NOCOUNT" : _("Event deleted in counting state because rule does not count anymore"), "DELAYOVER" : _("Event opened because the delay time has elapsed before cancelling event arrived."), "EXPIRED" : _("Event deleted because its livetime expired"), - "COUNTREACHED" : _("Event deleted bacause required count had been reached"), + "COUNTREACHED" : _("Event deleted because required count had been reached"), "COUNTFAILED" : _("Event created by required count was not reached in time"), "UPDATE" : _("Event information updated by user"), "NEW" : _("New event created"), @@ -97,6 +97,7 @@ action_whats = { "SCRIPT" : _("Script executed"), "CANCELLED" : _("The event was cancelled because the corresponding OK message was received"), "ARCHIVED" : _("Event was archived because no rule matched and archiving is activated in global settings."), + "AUTODELETE" : _("Event was deleted automatically"), } def service_levels():

10 years, 3 months

Check_MK Git: check_mk: werk: added new class for security fixes

by Lars Michelsen

Module: check_mk Branch: master Commit: 64a1e33443d9e5984d2dc21ed3920135b4673faa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64a1e33443d9e5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 18 10:16:33 2014 +0200 werk: added new class for security fixes --- .werks/config | 1 + 1 file changed, 1 insertion(+) diff --git a/.werks/config b/.werks/config index b894ba3..e829f11 100644 --- a/.werks/config +++ b/.werks/config @@ -15,6 +15,7 @@ components = [ classes = [ ( "feature", "New Feature", "" ), ( "fix", "Bug Fix", "FIX" ), + ( "security", "Security Fix", "SEC" ), ( "incomp", "Incompatible Change", "" ), ]

10 years, 3 months

Check_MK Git: check_mk: FIX Reducing size of auth.php ( needed for authorisation in NagVis) in large environments

by Lars Michelsen

Module: check_mk Branch: master Commit: b6f0f98410079bc7b852e42c1b931542831fddf3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6f0f98410079b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 18 10:03:00 2014 +0200 FIX Reducing size of auth.php (needed for authorisation in NagVis) in large environments In environments with a large user base or a large folder structure, the auth.php file which is being generated while modifying users, roles and activating the pending changes, the file could get very large. This change reduces the size of the file in such a case dramatically. --- .werks/821 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 18 +++++++++++++----- web/plugins/userdb/hook_auth.py | 9 ++++++++- 4 files changed, 32 insertions(+), 6 deletions(-) diff --git a/.werks/821 b/.werks/821 new file mode 100644 index 0000000..44c60ac --- /dev/null +++ b/.werks/821 @@ -0,0 +1,10 @@ +Title: Reducing size of auth.php (needed for authorisation in NagVis) in large environments +Level: 1 +Component: wato +Version: 1.2.5i4 +Date: 1403078473 +Class: fix + +In environments with a large user base or a large folder structure, the auth.php file which +is being generated while modifying users, roles and activating the pending changes, the file +could get very large. This change reduces the size of the file in such a case dramatically. diff --git a/ChangeLog b/ChangeLog index 45beef1..a7b0e3f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,7 @@ * 0987 New button for updating DNS cache... * 0813 FIX: LDAP: Improved slightly missleading logging of LDAP sync actions... * 0935 FIX: CPU utilization: increased maximum value to 10000... + * 0821 FIX: Reducing size of auth.php (needed for authorisation in NagVis) in large environments... Reporting & Availability: * 0985 Availability: display phases of freqent state changes as "chaos"... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 04ec06d..edf2644 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1060,12 +1060,20 @@ def get_folder_permissions_of_users(users): users = userdb.load_users() for username in users.iterkeys(): - permissions[username] = {} + perms = {} for folder_path, folder in folders.iteritems(): - permissions[username][folder_path] = { - 'read': check_folder_permissions(folder, 'read', False, username, users) == True, - 'write': check_folder_permissions(folder, 'write', False, username, users) == True, - } + readable = check_folder_permissions(folder, 'read', False, username, users) == True + writable = check_folder_permissions(folder, 'write', False, username, users) == True + + if readable or writable: + perms[folder_path] = {} + if readable: + perms[folder_path]['read'] = True + if writable: + perms[folder_path]['write'] = True + + if perms: + permissions[username] = perms return permissions def check_folder_permissions(folder, how, exception=True, user = None, users = None): diff --git a/web/plugins/userdb/hook_auth.py b/web/plugins/userdb/hook_auth.py index 15392c6..771807c 100644 --- a/web/plugins/userdb/hook_auth.py +++ b/web/plugins/userdb/hook_auth.py @@ -112,7 +112,14 @@ function get_folder_permissions($username) { if(!isset($mk_folders[$username])) { return array(); } else { - return $mk_folders[$username]; + $permissions = $mk_folders[$username]; + foreach ($permissions as $folder => $perms) { + if (!isset($perms['read'])) + $perms['read'] = false; + elseif (!isset($perms['write'])) + $perms['write'] = false; + } + return $permissions; } }

10 years, 3 months

Check_MK Git: check_mk: FIX fsc_fans: upper levels for fan RPMs are now optional also for the check

by Goetz Golla

Module: check_mk Branch: master Commit: 18769c2fae2662456255a5c6e6a417dbb6d07d35 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18769c2fae2662… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Tue Jun 17 16:45:01 2014 +0200 FIX fsc_fans: upper levels for fan RPMs are now optional also for the check --- .werks/623 | 8 ++++++++ ChangeLog | 1 + checks/fsc_fans | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.werks/623 b/.werks/623 new file mode 100644 index 0000000..673b40d --- /dev/null +++ b/.werks/623 @@ -0,0 +1,8 @@ +Title: fsc_fans: upper levels for fan RPMs are now optional also for the check +Level: 1 +Component: checks +Version: 1.2.5i4 +Date: 1403016253 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 1d97eaf..8ae1571 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ * 0621 FIX: zfsget: better filesystem selection and calculation of sizes... * 0819 FIX: Fixed keepalive termination in case of exceptions during checking... * 0622 FIX: cisco_temp_sensor: fix to also work with newer IOS versions + * 0623 FIX: fsc_fans: upper levels for fan RPMs are now optional also for the check Multisite: * 0934 FIX: Logwatch messages with class unknown ( 'u' ) now displayed as WARN... diff --git a/checks/fsc_fans b/checks/fsc_fans index 01644cc..03917f5 100644 --- a/checks/fsc_fans +++ b/checks/fsc_fans @@ -34,7 +34,7 @@ def check_fsc_fans(item, params, info): up_warn, up_crit = None, None else: low_warn, low_crit = params['lower'] - up_warn, up_crit = params['upper'] + up_warn, up_crit = params.get('upper', ( None, None)) for line in info: # , value1, value2 in info: name = line[0]

10 years, 3 months

Check_MK Git: check_mk: FIX cisco_temp_sensor: fix to also work with newer IOS versions

by Goetz Golla

Module: check_mk Branch: master Commit: 9457b2f0affa6396874a9803d7966f553954f622 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9457b2f0affa63… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Tue Jun 17 13:06:39 2014 +0200 FIX cisco_temp_sensor: fix to also work with newer IOS versions --- .werks/622 | 9 +++++++++ ChangeLog | 1 + checkman/cisco_temp_sensor | 2 +- checks/cisco_temp_sensor | 10 +++++++--- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.werks/622 b/.werks/622 new file mode 100644 index 0000000..a9e3701 --- /dev/null +++ b/.werks/622 @@ -0,0 +1,9 @@ +Title: cisco_temp_sensor: fix to also work with newer IOS versions +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i4 +Date: 1403003070 + + diff --git a/ChangeLog b/ChangeLog index d916cb1..b69ccd7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ * 0936 FIX: agent_ibmsvc: improved error messages on using wrong credentials * 0621 FIX: zfsget: better filesystem selection and calculation of sizes... * 0819 FIX: Fixed keepalive termination in case of exceptions during checking... + * 0622 FIX: cisco_temp_sensor: fix to also work with newer IOS versions Multisite: * 0934 FIX: Logwatch messages with class unknown ( 'u' ) now displayed as WARN... diff --git a/checkman/cisco_temp_sensor b/checkman/cisco_temp_sensor index 2617cc7..40fa03d 100644 --- a/checkman/cisco_temp_sensor +++ b/checkman/cisco_temp_sensor @@ -9,7 +9,7 @@ description: It uses a combination of data from the standardized sensors MIB and vendor specific information. - Warning and critical levels are retrieved from the device + Upper warning and critical levels are retrieved from the device via SNMP and thus need not to be configured. item: diff --git a/checks/cisco_temp_sensor b/checks/cisco_temp_sensor index 8fdd45d..7ff3d26 100644 --- a/checks/cisco_temp_sensor +++ b/checks/cisco_temp_sensor @@ -138,13 +138,17 @@ def inventory_cisco_temp_sensor(info): return [ (entry[1], None) for entry in sensors if entry[1] != None and entry[2] == '8' - and len(entry[5]) == 2 ] + and ( len(entry[5]) == 2 or len(entry[5]) == 4 ) ] def check_cisco_temp_sensor(item, _no_params, info): sensors = parse_cisco_temp_sensor(info) for id, descr, sensortype, value, sensorstate, levels in sensors: if item == descr: - warn, crit = levels + warn, crit = levels[0:2] + if len(levels) == 4: + value = value/10.0 + warn = warn/10.0 + crit = crit/10.0 if sensorstate == "2": return (3, "data from sensor currently not available") elif sensorstate == "3": @@ -155,7 +159,7 @@ def check_cisco_temp_sensor(item, _no_params, info): state = 1 else: state = 0 - return (state, "%dC (levels at %d/%d)" % (value, warn, crit), [ + return (state, "%.1fC (levels at %.1f/%.1f)" % (value, warn, crit), [ ( "temperature", value, warn, crit ) ]) return (3, "sensor not found in SNMP data")

10 years, 3 months

Check_MK Git: check_mk: Updated bug entries #2129, #2130, #2131

by Lars Michelsen

Module: check_mk Branch: master Commit: 52b1551207457c036e5584253ea500d7f74180fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52b1551207457c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 16 15:42:42 2014 +0200 Updated bug entries #2129, #2130, #2131 --- .bugs/2129 | 10 ++++++++++ .bugs/2130 | 9 +++++++++ .bugs/2131 | 9 +++++++++ 3 files changed, 28 insertions(+) diff --git a/.bugs/2129 b/.bugs/2129 new file mode 100644 index 0000000..b0f0873 --- /dev/null +++ b/.bugs/2129 @@ -0,0 +1,10 @@ +Title: check_dns: Multiple expected IP addresses can be set in two ways +Component: wato +State: open +Date: 2014-06-16 15:36:50 +Targetversion: 1.2.5i1 +Class: bug + +The check accept either multiple "-a <host>" or "-a <host1>,<host2>. This depends on the +way you want the check to work. Either expect all of the addresses to be part of the +answer or just one of the given ones. diff --git a/.bugs/2130 b/.bugs/2130 new file mode 100644 index 0000000..dd94b0f --- /dev/null +++ b/.bugs/2130 @@ -0,0 +1,9 @@ +Title: Dynamic file system levels can not be edited +Component: wato +State: open +Date: 2014-06-16 15:38:54 +Targetversion: 1.2.5i1 +Class: bug + +When a df rule has dynamic file system levels configured, this is saved and can be used, but when +opened in WATO again, the value can not be loaded again. diff --git a/.bugs/2131 b/.bugs/2131 new file mode 100644 index 0000000..c46c32b --- /dev/null +++ b/.bugs/2131 @@ -0,0 +1,9 @@ +Title: Sorting views in dashlets, breaks layout +Component: multisite +State: open +Date: 2014-06-16 15:40:12 +Targetversion: 1.2.5i1 +Class: bug + +When a view is sorted within a dashlet, the display_options seem to be mixed. Suddenly the view header +is visible.

10 years, 3 months

Check_MK Git: check_mk: FIX logwatch: fixed incorrect display of warning messages

by Andreas Boesl

Module: check_mk Branch: master Commit: 9928aafa3846e173e08bac2b91e7c4461e31d4d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9928aafa3846e1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jun 16 13:28:42 2014 +0200 FIX logwatch: fixed incorrect display of warning messages --- .werks/938 | 9 +++++++++ ChangeLog | 1 + web/htdocs/logwatch.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/938 b/.werks/938 new file mode 100644 index 0000000..26fa36c --- /dev/null +++ b/.werks/938 @@ -0,0 +1,9 @@ +Title: logwatch: fixed incorrect display of warning messages +Level: 2 +Component: multisite +Class: fix +State: unknown +Version: 1.2.5i4 +Date: 1402918094 + + diff --git a/ChangeLog b/ChangeLog index d916cb1..45beef1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ * 0934 FIX: Logwatch messages with class unknown ( 'u' ) now displayed as WARN... * 0166 FIX: mobile gui: Fixed colors of command list... * 0820 FIX: Fixed wrong NagVis links in "custom links" snapin + * 0938 FIX: logwatch: fixed incorrect display of warning messages WATO: * 0987 New button for updating DNS cache... diff --git a/web/htdocs/logwatch.py b/web/htdocs/logwatch.py index 7bc20fe..6968f39 100644 --- a/web/htdocs/logwatch.py +++ b/web/htdocs/logwatch.py @@ -360,7 +360,7 @@ def parse_file(host, file, hidecontext = False): line_level = 1 line_class = 'WARN' - if line[0] == 'u': + elif line[0] == 'u': line_level = 1 line_class = 'WARN'

10 years, 3 months

Check_MK Git: check_mk: man page more detailed, default levels included, plus minor code cleanup

by Goetz Golla

Module: check_mk Branch: master Commit: ad76301dd9d73e61646b571af286c6a2648000ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad76301dd9d73e… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Jun 16 12:32:39 2014 +0200 man page more detailed, default levels included, plus minor code cleanup --- checkman/adva_fsp_temp | 43 +++++++++++++++++++++++++++++++++++++++++-- checks/adva_fsp_temp | 12 +++++++++--- 2 files changed, 50 insertions(+), 5 deletions(-) diff --git a/checkman/adva_fsp_temp b/checkman/adva_fsp_temp index d4ae755..eb2a477 100644 --- a/checkman/adva_fsp_temp +++ b/checkman/adva_fsp_temp @@ -7,12 +7,12 @@ description: This checks monitors the temperature of ports and modules of the Adva FSP 3000 scalable optical transport solution. - No limits are set for the temperatur , since limits are configured in the + No limits are set for the temperature, since limits are configured in the device itself. The upper and lower limits for the temperature are read from the device. If the current value is outside the allowed range the check is {CRIT}, otherwise it is {OK}. - In addition temperature trends are monitored by the check. If the rate of + In addition {temperature trends} are monitored by the check. If the rate of temperature increase is above a configured rate per configured time range, the check becomes {WARN} or {CRIT}. The check can also predict in which period of time the upper limit for the temperature configured on the device @@ -27,3 +27,42 @@ perfdata: inventory: All temperature sensors on all modules/ports are detected + +examples: + # Set levels via dictionary, old check_mk syntax + check_parameters = [ + ( {'trend_range': 60, + 'trend_c': (1, 5), + 'trend_timeleft': (1000, 500) + }, [], ALL_HOSTS, [ "PL" ] ) + ] + + # set levels via wato syntax: + checkgroup_parameters.setdefault('temperature_trends', []) + + checkgroup_parameters['temperature_trends'] = [ + ( {'trend_c': (1, 5), 'trend_timeleft': (1000, 500), 'trend_range': 60}, [], ALL_HOSTS, ALL_SERVICES ), + ] + checkgroup_parameters['temperature_trends'] + + # set default values + adva_fsp_temp_default_levels = { + # range in minutes, default is no trend computation + 'trend_range': None, + 'trend_c': (1, 5), + 'trend_timeleft': (240, 120), + } + +[parameters] +parameters (dict): a dictionary containing the parameters for the trend + computation with the following keys: + + {"trend_range"}: The time range in minutes over which trends are computed. + If you set this to None then trend computing is disabled and the check + outputs only one performance data value. + + {"trend_c"}: A tuple of numbers specifying limits for the temperature increase + in degrees Celcius within the configured time range + + {"trend_timeleft"}: A tuple of numbers specifying the minimum time in minutes + left before the temperature limit is reached + diff --git a/checks/adva_fsp_temp b/checks/adva_fsp_temp index dad5b47..0463ad5 100644 --- a/checks/adva_fsp_temp +++ b/checks/adva_fsp_temp @@ -24,13 +24,18 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +adva_fsp_temp_default_levels = { + "trend_range": None, # range in minutes, default is no trend computation + "trend_c": (5,10), # in degrees Celcius + "trend_timeleft": (240, 120), # in minutes +} + def inventory_adva_fsp_temp(info): inventory = [] for line in info: # Ignore unconnected sensors - #if len(line) == 5 and line[4] != "" and line[3] != "" and int(line[0]) >= -2730: if len(line) == 5 and line[0] != "" and line[4] != "" and int(line[0]) >= -2730: - inventory.append( (line[4], None) ) + inventory.append( (line[4], "adva_fsp_temp_default_levels") ) return inventory def check_adva_fsp_temp(item, params, info): @@ -86,7 +91,7 @@ def check_adva_fsp_temp(item, params, info): else: wa, cr = None, None - # compute time until filesystem is full (only for positive trend, of course) + # compute time until temperature limit is reached (only for positive trend, of course) # The start value of minutes_left is negative. The pnp graph and the perfometer # will interpret this as inifinite -> not growing minutes_left = -1 @@ -126,6 +131,7 @@ check_info['adva_fsp_temp'] = { "check_function" : check_adva_fsp_temp, "service_description" : "Temperature %s", "has_perfdata" : True, + "default_levels_variable" : "adva_fsp_temp_default_levels", "snmp_info" : ( ".1.3.6.1.4.1.2544", [ "1.11.2.4.2.1.1.1", # moduleDiagnosticsTemp "1.11.2.4.2.1.1.2", # moduleDiagnosticsUpperTempThres

10 years, 3 months

Check_MK Git: check_mk: FIX Fixed wrong NagVis links in "custom links" snapin

by Lars Michelsen

Module: check_mk Branch: master Commit: 16e44a7df8d91b077f3e99bc8dd93a72d51889bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=16e44a7df8d91b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jun 16 08:52:24 2014 +0200 FIX Fixed wrong NagVis links in "custom links" snapin --- .werks/820 | 8 ++++++++ ChangeLog | 1 + multisite.mk | 6 +----- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.werks/820 b/.werks/820 new file mode 100644 index 0000000..89508a3 --- /dev/null +++ b/.werks/820 @@ -0,0 +1,8 @@ +Title: Fixed wrong NagVis links in "custom links" snapin +Level: 1 +Component: multisite +Version: 1.2.5i4 +Date: 1402901516 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 6676490..2c1b90c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ Multisite: * 0934 FIX: Logwatch messages with class unknown ( 'u' ) now displayed as WARN... * 0166 FIX: mobile gui: Fixed colors of command list... + * 0820 FIX: Fixed wrong NagVis links in "custom links" snapin WATO: * 0987 New button for updating DNS cache... diff --git a/multisite.mk b/multisite.mk index 21b473a..4219522 100644 --- a/multisite.mk +++ b/multisite.mk @@ -41,11 +41,7 @@ custom_links['guest'] = [ ( "Classical Nagios GUI", "../nagios/", "link_home.gif" ), ( "Addons", True, [ ( "PNP4Nagios", "../pnp4nagios/", "link_reporting.gif" ), - ( "NagVis", False, [ - ( "Automap", "../nagvis/index.php?map=__automap", "link_map.gif"), - ( "Demo map", "../nagvis/index.php?map=demo-map", "link_map.gif"), - ( "Demo Map 2", "../nagvis/index.php?map=demo2", "link_map.gif"), - ]), + ( "NagVis", "../nagvis/", "link_map.gif" ), ]), ]

10 years, 3 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2014