Checkmk git commits August 2016

checkmk-commits@lists.checkmk.com

8 participants
256 discussions

by Simon Betz

Module: check_mk Branch: master Commit: 87dc1d3c797c68b7a55ac67a708fb71a8e3d13e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87dc1d3c797c68… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Aug 19 14:36:23 2016 +0200 added ignored keys --- web/plugins/wato/check_parameters.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 8aab886..d784207 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1928,7 +1928,8 @@ register_check_parameters( orientation = "horizontal", ) ), - ] + ], + ignored_keys = [ "ignored_sensors" ], ), TextAscii(title = _("The sensor name.")), "dict",

7 years, 10 months

Fetched livestatus from downstream.

by Sven Panne

Module: check_mk Branch: master Commit: 4ea9f4ad07fcda0f9e340cac333c6586a54709ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ea9f4ad07fcda… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Aug 19 14:09:09 2016 +0200 Fetched livestatus from downstream. --- livestatus/src/CustomVarsFilter.cc | 66 ++++++++++++------------------------ livestatus/src/CustomVarsFilter.h | 7 ++-- livestatus/src/StringFilter.cc | 46 ++++++++----------------- livestatus/src/StringFilter.h | 7 ++-- 4 files changed, 41 insertions(+), 85 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4ea9f4ad07…

7 years, 10 months

3777 ipmi: IPMI sensor states are configurable

by Simon Betz

Module: check_mk Branch: master Commit: 505a9dd428e45bcf1348f84250a9aa80763cefe7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=505a9dd428e45b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Aug 19 12:01:44 2016 +0200 3777 ipmi: IPMI sensor states are configurable --- .werks/3777 | 9 ++++++ ChangeLog | 1 + checks/ipmi | 57 ++++++++++++++++++++++------------ web/plugins/wato/check_parameters.py | 28 +++++++++++++++-- 4 files changed, 73 insertions(+), 22 deletions(-) diff --git a/.werks/3777 b/.werks/3777 new file mode 100644 index 0000000..23972cc --- /dev/null +++ b/.werks/3777 @@ -0,0 +1,9 @@ +Title: ipmi: IPMI sensor states are configurable +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1471600864 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 1613e05..cfa2fb9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -131,6 +131,7 @@ * 3776 check_mail_loop: now you can specify the subject text instead of default 'Check_MK-Mail-Loop' * 2242 fortigate_sessions, fortigate_sessions_base: Allow configuration of levels for sessions * 3842 juniper_cpu_util: Allow configuratioh of level for routing engine + * 3777 ipmi: IPMI sensor states are configurable * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/checks/ipmi b/checks/ipmi index 9f76df2..c660fcd 100644 --- a/checks/ipmi +++ b/checks/ipmi @@ -187,7 +187,7 @@ def check_ipmi(item, params, info): if item == "Summary": return check_ipmi_summarized(parsed, params) else: - return check_ipmi_detailed(item, parsed) + return check_ipmi_detailed(item, params, parsed) def ipmi_format_message(status, val, unit): @@ -203,8 +203,8 @@ def ipmi_format_message(status, val, unit): return infotext -def check_ipmi_detailed(item, parsed): - for name, val, unit, status, unrec_low, crit_low, \ +def check_ipmi_detailed(item, params, parsed): + for name, val, unit, status_txt, unrec_low, crit_low, \ warn_low, warn_high, crit_high, unrec_high in parsed: if name == item: @@ -213,18 +213,23 @@ def check_ipmi_detailed(item, parsed): else: perfdata = [] - if status.startswith('ok') and not "failure detected" in status.lower(): + if status_txt.startswith('ok') and not "failure detected" in status_txt.lower(): state = 0 - elif status.startswith('nc'): + elif status_txt.startswith('nc'): state = 1 else: state = 2 - return state, "Status: %s" % ipmi_format_message(status, val, unit), perfdata + for wato_status_txt, wato_status in params.get("sensor_states", []): + if status_txt.startswith(wato_status_txt): + state = wato_status + break + + return state, "Status: %s" % ipmi_format_message(status_txt, val, unit), perfdata def check_ipmi_summarized(parsed, params): - worst_status = 0 + worst_state = 0 warn_texts = [] crit_texts = [] count = 0 @@ -234,30 +239,41 @@ def check_ipmi_summarized(parsed, params): if 'ignored_sensors' not in params: params['ignored_sensors'] = ipmi_get_ignored_sensors(g_hostname) - for name, val, unit, status, unrec_low, crit_low, \ + for name, val, unit, status_txt, unrec_low, crit_low, \ warn_low, warn_high, crit_high, unrec_high in parsed: # Skip datasets which have no valid data (zero value, no unit and state nc) - if val == '0.000' and unit == 'unspecified' and status.startswith('nc'): + if val == '0.000' and unit == 'unspecified' and status_txt.startswith('nc'): continue - if ipmi_ignore_entry(name, status, params['ignored_sensors']): + if ipmi_ignore_entry(name, status_txt, params['ignored_sensors']): continue - count += 1 - infotext = "%s (%s)" % (name, ipmi_format_message(status, val, unit)) + count += 1 + infotext = "%s (%s)" % (name, ipmi_format_message(status_txt, val, unit)) + tmp_state = 0 - if status.startswith('nc'): - worst_status = max(worst_status, 1) - warn_texts.append(infotext) + if status_txt.startswith('nc'): + tmp_state = 1 - elif status.startswith('nr') and ipmi_ignore_nr: + elif status_txt.startswith('nr') and ipmi_ignore_nr: pass - elif not status.startswith('ok') or "failure detected" in status.lower(): - worst_status = 2 + elif not status_txt.startswith('ok') or "failure detected" in status_txt.lower(): + tmp_state = 2 + + for wato_status_txt, wato_status in params.get("sensor_states", []): + if status_txt.startswith(wato_status_txt): + tmp_state = wato_status + break + + if tmp_state == 1: + warn_texts.append(infotext) + elif tmp_state == 2: crit_texts.append(infotext) + worst_state = max(worst_state, tmp_state) + if "amb" in name or "Ambient" in name: try: ambient_count += 1 @@ -270,7 +286,7 @@ def check_ipmi_summarized(parsed, params): else: perfdata = [] - if worst_status == 0: + if worst_state == 0: infotexts = [ "%d sensors OK" % count ] else: @@ -280,7 +296,7 @@ def check_ipmi_summarized(parsed, params): if len(warn_texts) > 0: infotexts.append("WARN are: %s" % ", ".join(warn_texts)) - return worst_status, ' - '.join(infotexts), perfdata + return worst_state, ' - '.join(infotexts), perfdata def ipmi_precompile(hostname, item, params): @@ -305,6 +321,7 @@ check_info["ipmi"] = { 'service_description' : 'IPMI Sensor %s', 'has_perfdata' : True, 'extra_sections' : [ "ipmi_discrete" ], + 'group' : 'ipmi' } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index fdbb6f4..8aab886 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -253,8 +253,8 @@ register_rule(group + '/' + subgroup_inventory, elements = [ ( "ignored_sensors", ListOfStrings( - title = _("Ignore the following IPMI Sensors"), - help = _("Names of IPMI Sensors that should be ignored during inventory " + title = _("Ignore the following IPMI sensors"), + help = _("Names of IPMI sensors that should be ignored during inventory " "and when summarizing." "The pattern specified here must match exactly the beginning of " "the actual sensor name (case sensitive)."), @@ -1909,6 +1909,30 @@ register_check_parameters( match_type = "dict", ) +register_check_parameters( + subgroup_environment, + "ipmi", + _("IPMI sensors"), + Dictionary( + elements = [ + ("sensor_states", + ListOf( + Tuple( + elements = [ + TextAscii(), MonitoringState() + ] + ), + title = _("Set states of IPMI sensor status texts"), + help = _("The pattern specified here must match exactly the beginning of " + "the sensor state (case sensitive)."), + orientation = "horizontal", + ) + ), + ] + ), + TextAscii(title = _("The sensor name.")), + "dict", +) register_check_parameters( subgroup_environment,

7 years, 10 months

Fetched livestatus from downstream plus associated fixes.

by Sven Panne

Module: check_mk Branch: master Commit: 17679e821a0a26f021fe6ce1d447e83d266101ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=17679e821a0a26… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Aug 19 09:19:57 2016 +0200 Fetched livestatus from downstream plus associated fixes. --- livestatus/src/LogCache.cc | 4 +--- livestatus/src/Query.cc | 2 +- livestatus/src/TableStateHistory.cc | 3 +-- livestatus/src/TimeperiodsCache.cc | 5 ++--- livestatus/src/VariadicFilter.cc | 2 +- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc index ec0090a..55d5592 100644 --- a/livestatus/src/LogCache.cc +++ b/livestatus/src/LogCache.cc @@ -43,8 +43,6 @@ using std::chrono::system_clock; extern time_t last_log_rotation; #endif // CMC -using std::make_pair; - #define CHECK_MEM_CYCLE 1000 /* Check memory every N'th new message */ // watch nagios' logfile rotation @@ -166,7 +164,7 @@ void LogCache::scanLogfile(char *path, bool watch) { // under normal circumstances this never happens. But the // user might have copied files around. if (_logfiles.find(since) == _logfiles.end()) { - _logfiles.insert(make_pair(since, logfile)); + _logfiles.emplace(since, logfile); } else { logger(LG_WARN, "Ignoring duplicate logfile %s", path); delete logfile; diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 13513fe..32d1f2e 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -877,7 +877,7 @@ Aggregator **Query::getStatsGroup(Query::_stats_group_spec_t &groupspec) { for (unsigned i = 0; i < _stats_columns.size(); i++) { aggr[i] = _stats_columns[i]->createAggregator(); } - _stats_groups.insert(make_pair(groupspec, aggr)); + _stats_groups.emplace(groupspec, aggr); return aggr; } return it->second; diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 82dbb98..c980afa 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -64,7 +64,6 @@ class VariadicFilter; using mk::starts_with; using std::deque; using std::lock_guard; -using std::make_pair; using std::map; using std::mutex; using std::set; @@ -559,7 +558,7 @@ void TableStateHistory::answerQuery(Query *query) { } // Store this state object for tracking state transitions - state_info.insert(make_pair(key, state)); + state_info.emplace(key, state); state->_from = _since; // Get notification period of host/service diff --git a/livestatus/src/TimeperiodsCache.cc b/livestatus/src/TimeperiodsCache.cc index 48492c3..3880701 100644 --- a/livestatus/src/TimeperiodsCache.cc +++ b/livestatus/src/TimeperiodsCache.cc @@ -31,7 +31,6 @@ #include "logger.h" using std::lock_guard; -using std::make_pair; using std::mutex; extern timeperiod *timeperiod_list; @@ -54,7 +53,7 @@ void TimeperiodsCache::logCurrentTimeperiods() { auto it = _cache.find(tp); if (it == _cache.end()) { // first entry logTransition(tp->name, -1, is_in ? 1 : 0); - _cache.insert(make_pair(tp, is_in)); + _cache.emplace(tp, is_in); } logTransition(tp->name, it->second ? 1 : 0, is_in ? 1 : 0); } @@ -84,7 +83,7 @@ void TimeperiodsCache::update(time_t now) { auto it = _cache.find(tp); if (it == _cache.end()) { // first entry logTransition(tp->name, -1, is_in ? 1 : 0); - _cache.insert(make_pair(tp, is_in)); + _cache.emplace(tp, is_in); } else if (it->second != is_in) { logTransition(tp->name, it->second ? 1 : 0, is_in ? 1 : 0); it->second = is_in; diff --git a/livestatus/src/VariadicFilter.cc b/livestatus/src/VariadicFilter.cc index 3aa29f0..8adc5ef 100644 --- a/livestatus/src/VariadicFilter.cc +++ b/livestatus/src/VariadicFilter.cc @@ -81,7 +81,7 @@ void VariadicFilter::combineFilters(int count, LogicalOperator andor) { } auto variadic = VariadicFilter::make(andor); - while (count-- != 0) { + for (auto i = 0; i < count; ++i) { variadic->addSubfilter(_subfilters.back()); _subfilters.pop_back(); }

7 years, 10 months

corrected typos in man of juniper_cpu_util

by Sven Rueß

Module: check_mk Branch: master Commit: e0faed22b2bd9a995791a04654cf54e0a6eec000 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0faed22b2bd9a… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Fri Aug 19 03:00:13 2016 +0200 corrected typos in man of juniper_cpu_util --- checkman/juniper_cpu_util | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/checkman/juniper_cpu_util b/checkman/juniper_cpu_util index 4da2484..33c80c9 100644 --- a/checkman/juniper_cpu_util +++ b/checkman/juniper_cpu_util @@ -1,14 +1,17 @@ -title: CPU utilization of juniper devices +title: Juniper: CPU utilization agents: snmp catalog: hw/network/juniper license: GPL distribution: check_mk description: - Check CPU utilizationin percent on Juniper devices. + Check CPU utilization percent on Juniper devices. This check replaces the older and broken juniper_cpu check. + The upper default levels are set to (80%, 90%). + These levels are configurable. + item: The name of the routing engine. inventory: - One service for each Routing Engine will be creted + One service for each routing engine will be created.

7 years, 10 months

Updated manpage of juniper_cpu_util

by Sven Rueß

Module: check_mk Branch: master Commit: 6a31d954e2fa8b17443e0c716b8072fa0e04ba14 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a31d954e2fa8b… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Fri Aug 19 02:26:53 2016 +0200 Updated manpage of juniper_cpu_util --- checkman/juniper_cpu_util | 3 +++ 1 file changed, 3 insertions(+) diff --git a/checkman/juniper_cpu_util b/checkman/juniper_cpu_util index 2176029..4da2484 100644 --- a/checkman/juniper_cpu_util +++ b/checkman/juniper_cpu_util @@ -7,5 +7,8 @@ description: Check CPU utilizationin percent on Juniper devices. This check replaces the older and broken juniper_cpu check. +item: + The name of the routing engine. + inventory: One service for each Routing Engine will be creted

7 years, 10 months

3842 juniper_cpu_util: Allow configuratioh of level for routing engine

by Sven Rueß

Module: check_mk Branch: master Commit: 3dec631de7e44a87f8daa445e0c0c9e964232f7d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3dec631de7e44a… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Fri Aug 19 02:22:01 2016 +0200 3842 juniper_cpu_util: Allow configuratioh of level for routing engine --- .werks/3842 | 9 +++++++++ ChangeLog | 1 + checks/juniper_cpu_util | 12 +++++------- web/plugins/wato/check_parameters.py | 28 ++++++++++++++++++++++++++++ 4 files changed, 43 insertions(+), 7 deletions(-) diff --git a/.werks/3842 b/.werks/3842 new file mode 100644 index 0000000..1731ddc --- /dev/null +++ b/.werks/3842 @@ -0,0 +1,9 @@ +Title: juniper_cpu_util: Allow configuratioh of level for routing engine +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1471566068 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index a73df3f..1613e05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -130,6 +130,7 @@ * 3775 fjdarye500_pfm: new check which monitors health status and lifetime of PCIe flash modules of Eternus DX500 storage systems * 3776 check_mail_loop: now you can specify the subject text instead of default 'Check_MK-Mail-Loop' * 2242 fortigate_sessions, fortigate_sessions_base: Allow configuration of levels for sessions + * 3842 juniper_cpu_util: Allow configuratioh of level for routing engine * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/checks/juniper_cpu_util b/checks/juniper_cpu_util index 092e889..3d1a51a 100644 --- a/checks/juniper_cpu_util +++ b/checks/juniper_cpu_util @@ -25,18 +25,16 @@ # Boston, MA 02110-1301 USA. -factory_settings['juniper_cpu_util_default_levels'] = { - 'levels': (80.0, 90.0) -} - - def inventory_juniper_cpu_util(info): for line in info: if "Routing Engine" in line[0]: - yield line[0], {} + yield line[0], { 'levels': (80.0, 90.0) } def check_juniper_cpu_util(item, params, info): + if not params: + params = { 'levels': (80.0, 90.0) } + for name, util in info: if name == item: return check_cpu_util(int(util), params) @@ -45,6 +43,7 @@ def check_juniper_cpu_util(item, params, info): check_info['juniper_cpu_util'] = { 'check_function' : check_juniper_cpu_util, 'inventory_function' : inventory_juniper_cpu_util, + 'group' : 'juniper_cpu_util', 'service_description' : "CPU utilization %s", 'has_perfdata' : True, 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.2636.1.1.1.2"), @@ -53,5 +52,4 @@ check_info['juniper_cpu_util'] = { 8, #jnxOperatingCPU ]), 'includes' : ["cpu_util.include"], - 'default_levels_variable' : "juniper_cpu_util_default_levels" } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 287695f..fdbb6f4 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -5443,6 +5443,34 @@ register_check_parameters( register_check_parameters( subgroup_os, + "juniper_cpu_util", + _("Juniper Processor Utilization of Routing Engine"), + Transform( + Dictionary( + help = _("CPU utilization of routing engine."), + optional_keys = [], + elements = [ + ("levels", + Tuple( + title = _("Specify levels in percentage of processor routing engine usage"), + elements = [ + Percentage(title = _("Warning at"), default_value = 80.0), + Percentage(title = _("Critical at"), default_value = 90.0), + ], + ), + ), + ] + ), + forth = lambda old: not old and { 'levels': (80.0, 90.0) } or old, + ), + TextAscii( + title = _("Routing Engine"), + ), + "dict", +) + +register_check_parameters( + subgroup_os, "netscaler_mem", _("Netscaler Memory Usage"), Tuple(

7 years, 10 months

Reserved 1 Werk IDS

by Sven Rueß

Module: check_mk Branch: master Commit: 6e2d08b05b76386c5c4dab86627003b063240467 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e2d08b05b7638… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Fri Aug 19 02:14:49 2016 +0200 Reserved 1 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 8a8ecb7..ea1f766 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3842 +3843

7 years, 10 months

2242 fortigate_sessions, fortigate_sessions_base: Allow configuration of levels for sessions

by Sven Rueß

Module: check_mk Branch: master Commit: 9635cfc9b186f063f9225d8522df694d2dc18478 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9635cfc9b186f0… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Fri Aug 19 02:12:41 2016 +0200 2242 fortigate_sessions, fortigate_sessions_base: Allow configuration of levels for sessions --- .werks/2242 | 9 +++++++++ ChangeLog | 1 + checks/fortigate_sessions | 2 +- checks/fortigate_sessions_base | 3 +-- web/plugins/wato/check_parameters.py | 4 ++-- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.werks/2242 b/.werks/2242 new file mode 100644 index 0000000..ce818c9 --- /dev/null +++ b/.werks/2242 @@ -0,0 +1,9 @@ +Title: fortigate_sessions, fortigate_sessions_base: Allow configuration of levels for sessions +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1471565420 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 5f367f6..a73df3f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -129,6 +129,7 @@ * 3832 diskstat: added new device bcache * 3775 fjdarye500_pfm: new check which monitors health status and lifetime of PCIe flash modules of Eternus DX500 storage systems * 3776 check_mail_loop: now you can specify the subject text instead of default 'Check_MK-Mail-Loop' + * 2242 fortigate_sessions, fortigate_sessions_base: Allow configuration of levels for sessions * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/checks/fortigate_sessions b/checks/fortigate_sessions index 0a9bcad..88f8c2e 100644 --- a/checks/fortigate_sessions +++ b/checks/fortigate_sessions @@ -51,6 +51,7 @@ def check_fortigate_sessions(item, params, info): check_info["fortigate_sessions"] = { "inventory_function" : inventory_fortigate_sessions, "check_function" : check_fortigate_sessions, + "group" : "fortigate_sessions", "service_description" : "Sessions", "has_perfdata" : True, # uses mib FORTINET-MIB-280 @@ -58,4 +59,3 @@ check_info["fortigate_sessions"] = { oid(".1.3.6.1.4.1.12356.1.10.0"), "snmp_info" : ( ".1.3.6.1.4.1.12356.1", [ 10 ]), } - diff --git a/checks/fortigate_sessions_base b/checks/fortigate_sessions_base index 5cd841b..23693c5 100644 --- a/checks/fortigate_sessions_base +++ b/checks/fortigate_sessions_base @@ -48,12 +48,11 @@ def check_fortigate_sessions_base(item, params, info): check_info["fortigate_sessions_base"] = { "inventory_function" : inventory_fortigate_sessions_base, "check_function" : check_fortigate_sessions_base, + "group" : "fortigate_sessions", "service_description" : "Sessions", "has_perfdata" : True, # uses mib FORTINET-FORTIGATE-MIB "snmp_scan_function" : lambda oid: ".1.3.6.1.4.1.12356.101.1" in oid(".1.3.6.1.2.1.1.2.0") and\ oid(".1.3.6.1.4.1.12356.101.4.1.8.0"), "snmp_info" : ( ".1.3.6.1.4.1.12356.101.4.1", [ 8 ]), - "group" : "fortigate_sessions", } - diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 3860b6f..287695f 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -205,8 +205,8 @@ register_check_parameters( Tuple( title = _(u"Levels for active sessions"), elements = [ - Integer( title = _(u"Warning at"), default_value = 100000 ), - Integer( title = _(u"Critical at"), default_value = 150000 ), + Integer( title = _(u"Warning at"), default_value = 100000, size = 10 ), + Integer( title = _(u"Critical at"), default_value = 150000, size = 10 ), ]), None, "first"

7 years, 10 months

3776 check_mail_loop: now you can specify the subject text instead of default ' Check_MK-Mail-Loop'

by Simon Betz

Module: check_mk Branch: master Commit: 0c87091b2a9e4fc09fa9c4ab813d786e16cc91b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0c87091b2a9e4f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Aug 18 11:34:05 2016 +0200 3776 check_mail_loop: now you can specify the subject text instead of default 'Check_MK-Mail-Loop' --- .werks/3776 | 9 +++++++++ ChangeLog | 1 + checks/check_mail_loop | 4 +++- doc/treasures/active_checks/check_mail_loop | 10 +++++++--- web/plugins/wato/active_checks.py | 8 +++++++- 5 files changed, 27 insertions(+), 5 deletions(-) diff --git a/.werks/3776 b/.werks/3776 new file mode 100644 index 0000000..89d75ae --- /dev/null +++ b/.werks/3776 @@ -0,0 +1,9 @@ +Title: check_mail_loop: now you can specify the subject text instead of default 'Check_MK-Mail-Loop' +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1471512811 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 4c3a97d..5f367f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -128,6 +128,7 @@ * 3784 agent_netapp / 7mode: now also reports snapsvaults for the default filer... * 3832 diskstat: added new device bcache * 3775 fjdarye500_pfm: new check which monitors health status and lifetime of PCIe flash modules of Eternus DX500 storage systems + * 3776 check_mail_loop: now you can specify the subject text instead of default 'Check_MK-Mail-Loop' * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/checks/check_mail_loop b/checks/check_mail_loop index 6121d49..b905fbc 100644 --- a/checks/check_mail_loop +++ b/checks/check_mail_loop @@ -77,6 +77,9 @@ def check_mail_loop_arguments(params): args += [ '--warning=%d' % params['duration'][0] ] args += [ '--critical=%d' % params['duration'][1] ] + if 'subject' in params: + args += ' --subject=%s' % quote_shell_string(params['subject']) + return args @@ -86,4 +89,3 @@ active_check_info['mail_loop'] = { "service_description" : lambda params: "Mail Loop %s" % params['item'], "has_perfdata" : True, } - diff --git a/doc/treasures/active_checks/check_mail_loop b/doc/treasures/active_checks/check_mail_loop index ff4288f..b795765 100755 --- a/doc/treasures/active_checks/check_mail_loop +++ b/doc/treasures/active_checks/check_mail_loop @@ -84,6 +84,8 @@ OPTIONS: check plugin. This is disabled by default, which might make your mailbox grow when you not clean it up manually. + --subject SUBJECT You can specify the subject text. If choosen the subject + 'Check_MK-Mail-Loop' will be replace by the stated text. -d, --debug Enable debug mode -h, --help Show this help message and exit @@ -129,7 +131,7 @@ conn_timeout = 10 delete_messages = False status_dir = None status_suffix = None - +subject = 'Check_MK-Mail-Loop' for o,a in opts: if o in [ '-h', '--help' ]: usage() @@ -175,6 +177,8 @@ for o,a in opts: status_dir = a elif o == '--status-suffix': status_suffix = a + elif o == '--subject': + subject = a param_names = dict(opts).keys() for p in required_params: @@ -287,7 +291,7 @@ def fetch_mails(): raise Exception('Failed to fetch mail %s (%s). Available messages: %r' % (num, parse_exception(e), messages)) # Now filter out the messages for this check - pattern = re.compile('(?:Re: |WG: )?Check_MK-Mail-Loop ([^\s]+) ([^\s]+)') + pattern = re.compile('(?:Re: |WG: )?%s ([^\s]+) ([^\s]+)' % subject) for index, msg in mails.items(): matches = pattern.match(msg.get('Subject', '')) if matches: @@ -324,7 +328,7 @@ def send_mail(): mail = email.mime.text.MIMEText("") mail['From'] = mail_from mail['To'] = mail_from - mail['Subject'] = 'Check_MK-Mail-Loop %d %d' % (now, key) + mail['Subject'] = '%s %d %d' % (subject, now, key) try: S = smtplib.SMTP(smtp_server, smtp_port) diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 20140a4..99f47ba 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -1803,13 +1803,19 @@ register_rule(group, 'the SMTP protocol and then tries to receive these mails back by querying the ' 'inbox of a IMAP or POP3 mailbox. With this check you can verify that your whole ' 'mail delivery progress is working.'), - optional_keys = ['smtp_server', 'smtp_tls', 'smtp_port', 'smtp_auth', 'imap_tls', 'connect_timeout', 'delete_messages', 'duration'], + optional_keys = ['subject', 'smtp_server', 'smtp_tls', 'smtp_port', 'smtp_auth', 'imap_tls', 'connect_timeout', 'delete_messages', 'duration'], elements = [ ('item', TextUnicode( title = _('Name'), help = _('The service description will be <b>Mail Loop</b> plus this name'), allow_empty = False )), + ('subject', TextAscii( + title = _('Subject'), + allow_empty = False, + help = _('Here you can specify the subject text ' + 'instead of default text \'Check_MK-Mail-Loop\'.'), + )), ('smtp_server', TextAscii( title = _('SMTP Server'), allow_empty = False,

7 years, 10 months

← Newer
1
...
10
11
12
13
14
15
16
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2016