Checkmk git commits April 2016

checkmk-commits@lists.checkmk.com

8 participants
356 discussions

3419 FIX solaris_mem: avoid crash in case of empty agent section, treat section as missing

by Mathias Kettner

Module: check_mk Branch: master Commit: 40f261f0e2a6fb75c7087e130ac4bc2a5c366b7d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=40f261f0e2a6fb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 22 13:00:15 2016 +0200 3419 FIX solaris_mem: avoid crash in case of empty agent section, treat section as missing Unter some unclear circumstances the neccessary information seems to be missing in the agent output. --- .werks/3419 | 11 +++++++++++ ChangeLog | 1 + checks/solaris_mem | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/.werks/3419 b/.werks/3419 new file mode 100644 index 0000000..71d81bb --- /dev/null +++ b/.werks/3419 @@ -0,0 +1,11 @@ +Title: solaris_mem: avoid crash in case of empty agent section, treat section as missing +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461322776 + +Unter some unclear circumstances the neccessary information seems to be missing +in the agent output. diff --git a/ChangeLog b/ChangeLog index e52ad93..874aa8b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -175,6 +175,7 @@ * 3433 FIX: cmc_temp: Fixed broken check * 3434 FIX: cmctc_lcp: Fixed broken check in case parameter are specified * 3435 FIX: check_varnish_uptime: Fixed broken check + * 3419 FIX: solaris_mem: avoid crash in case of empty agent section, treat section as missing... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/solaris_mem b/checks/solaris_mem index f3471b6..2c2bb3a 100644 --- a/checks/solaris_mem +++ b/checks/solaris_mem @@ -40,6 +40,10 @@ # Memory: 2048M real, 913M free, 723M swap in use, 2863M swap free def parse_solaris_mem(info): + # The 1.2.4 agent seems to create an empty section under some circumstances + if not info: + return + values = [] mem_tokens = " ".join(info[0][1:]).split(",") is_total_swap = False

8 years, 2 months

#3207 FIX msexch_dag.copyqueue: Fixed broken check in case of non OK state

by Lars Michelsen

Module: check_mk Branch: master Commit: f0b5c2fd788081d0b7eab73e292c3f7c0f3e1ea0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0b5c2fd788081… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 15 16:54:38 2016 +0100 #3207 FIX msexch_dag.copyqueue: Fixed broken check in case of non OK state --- .werks/3207 | 10 ++++++++++ ChangeLog | 1 + checks/msexch_dag | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3207 b/.werks/3207 new file mode 100644 index 0000000..41d8149 --- /dev/null +++ b/.werks/3207 @@ -0,0 +1,10 @@ +Title: msexch_dag.copyqueue: Fixed broken check in case of non OK state +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1455551666 + + diff --git a/ChangeLog b/ChangeLog index c8c761d..fb3a4b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -73,6 +73,7 @@ * 3075 FIX: windows agent: fixed data encryption of realtime updates were incompatible... * 3205 FIX: raritan_pdu_inlet: Fixed exception in case phases report a non OK state * 3206 FIX: esx_vsphere_hostsystem.mem_usage_cluster: Fixed broken check + * 3207 FIX: msexch_dag.copyqueue: Fixed broken check in case of non OK state * 3209 FIX: esx_vsphere_datastores: Added missing uncommitted and overprovisioned graphs * 3210 FIX: oracle_asm_diskgroup: Fixed exception when using required mirror free space parameter * 3211 FIX: logwatch: Fixed broken error messages in case of failed filesystem operations diff --git a/checks/msexch_dag b/checks/msexch_dag index 0af6143..1110b46 100644 --- a/checks/msexch_dag +++ b/checks/msexch_dag @@ -236,7 +236,7 @@ def check_msexch_dag_copyqueue(item, params, info): else: state = 0 if state > 0: - infotext += " (warn/crit at %d/%d)" % (warn, crit) + infotxt += " (warn/crit at %d/%d)" % (warn, crit) perfdata = [ ("length", int(val), warn, crit, 0) ] return state, infotxt, perfdata

8 years, 2 months

3435 FIX check_varnish_uptime: Fixed broken check

by Lars Michelsen

Module: check_mk Branch: master Commit: 4ff1e20bf20e297c3be8ddb01e7d6326b870e3d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ff1e20bf20e29… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 22 11:19:27 2016 +0200 3435 FIX check_varnish_uptime: Fixed broken check --- .werks/3435 | 9 +++++++++ ChangeLog | 1 + checks/varnish | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/3435 b/.werks/3435 new file mode 100644 index 0000000..288fc0c --- /dev/null +++ b/.werks/3435 @@ -0,0 +1,9 @@ +Title: check_varnish_uptime: Fixed broken check +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1461316750 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index fb3a4b8..e52ad93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -174,6 +174,7 @@ * 3392 FIX: avaya_45xx_temp: Fixed broken check * 3433 FIX: cmc_temp: Fixed broken check * 3434 FIX: cmctc_lcp: Fixed broken check in case parameter are specified + * 3435 FIX: check_varnish_uptime: Fixed broken check Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/varnish b/checks/varnish index a73dd46..37ed762 100644 --- a/checks/varnish +++ b/checks/varnish @@ -279,7 +279,7 @@ def inventory_varnish_uptime(parsed): def check_varnish_uptime(_no_item, _no_params, parsed): if "uptime" in parsed: - return check_uptime_seconds(params, parsed["uptime"][0]) + return check_uptime_seconds(_no_params, parsed["uptime"][0]) check_info["varnish"] = {

8 years, 2 months

3434 FIX cmctc_lcp: Fixed broken check in case parameter are specified

by Lars Michelsen

Module: check_mk Branch: master Commit: 4ca500a402d55602ffb9f47f246ddfbc040b1c3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ca500a402d556… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 22 08:30:29 2016 +0200 3434 FIX cmctc_lcp: Fixed broken check in case parameter are specified --- .werks/3434 | 9 +++++++++ ChangeLog | 1 + checks/cmctc_lcp | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3434 b/.werks/3434 new file mode 100644 index 0000000..cb5685b --- /dev/null +++ b/.werks/3434 @@ -0,0 +1,9 @@ +Title: cmctc_lcp: Fixed broken check in case parameter are specified +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1461306614 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 28abeaa..c8c761d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -172,6 +172,7 @@ * 3391 FIX: CPU checks: Fixed graph per core when cores names don't have a tailing number * 3392 FIX: avaya_45xx_temp: Fixed broken check * 3433 FIX: cmc_temp: Fixed broken check + * 3434 FIX: cmctc_lcp: Fixed broken check in case parameter are specified Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/cmctc_lcp b/checks/cmctc_lcp index c714e52..0637aeb 100644 --- a/checks/cmctc_lcp +++ b/checks/cmctc_lcp @@ -109,7 +109,8 @@ def check_cmctc_lcp(item, params, info, sensortype): extra_state = 2 elif value >= warn: extra_state = 1 - if states[-1]: + + if extra_state: extra_info += " (warn/crit at %d/%d%s)" % (warn, crit, unit) else: perfdata = [(sensortype, value)]

8 years, 2 months

3433 FIX cmc_temp: Fixed broken check

by Lars Michelsen

Module: check_mk Branch: master Commit: c7ac769ed7763aca30fcb811a6feb856367e85a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7ac769ed7763a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 22 08:26:47 2016 +0200 3433 FIX cmc_temp: Fixed broken check --- .werks/3433 | 10 ++++++++++ ChangeLog | 1 + checks/cmc_temp | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/3433 b/.werks/3433 new file mode 100644 index 0000000..05ee2e6 --- /dev/null +++ b/.werks/3433 @@ -0,0 +1,10 @@ +Title: cmc_temp: Fixed broken check +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461306398 + + diff --git a/ChangeLog b/ChangeLog index 07925f5..28abeaa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -171,6 +171,7 @@ * 3389 FIX: ps: Fixed stripped command lines for process checking on solaris systems * 3391 FIX: CPU checks: Fixed graph per core when cores names don't have a tailing number * 3392 FIX: avaya_45xx_temp: Fixed broken check + * 3433 FIX: cmc_temp: Fixed broken check Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/cmc_temp b/checks/cmc_temp index 780ecf2..39e7a15 100644 --- a/checks/cmc_temp +++ b/checks/cmc_temp @@ -39,8 +39,8 @@ def check_cmc_temp(item, params, info): offset = int(item) - 1 current_temp = int(info[0][0][offset]) dev_high, dev_low = map(int, info[1][0][offset * 2:][:2]) - return check_temperature(current_temp, params, dev_levels = (dev_high, dev_high), - dev_levels_lower = (dev_low, dev_low)) + return check_temperature(current_temp, params, "cmc_temp_%s" % item, + dev_levels = (dev_high, dev_high), dev_levels_lower = (dev_low, dev_low)) check_info['cmc_temp'] = { "inventory_function" : inventory_cmc_temp,

8 years, 2 months

3392 FIX avaya_45xx_temp: Fixed broken check

by Lars Michelsen

Module: check_mk Branch: master Commit: d9d455ee138d751b136f2d1a1858c071c67d7f3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9d455ee138d75… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 22 08:24:55 2016 +0200 3392 FIX avaya_45xx_temp: Fixed broken check --- .werks/3392 | 9 +++++++++ ChangeLog | 1 + checks/avaya_45xx_temp | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3392 b/.werks/3392 new file mode 100644 index 0000000..63ab1ef --- /dev/null +++ b/.werks/3392 @@ -0,0 +1,9 @@ +Title: avaya_45xx_temp: Fixed broken check +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1461306279 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 49704bb..07925f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -170,6 +170,7 @@ * 3030 FIX: brocade_info: fixed problem in snmp scan function during service discovery... * 3389 FIX: ps: Fixed stripped command lines for process checking on solaris systems * 3391 FIX: CPU checks: Fixed graph per core when cores names don't have a tailing number + * 3392 FIX: avaya_45xx_temp: Fixed broken check Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/avaya_45xx_temp b/checks/avaya_45xx_temp index 392d8f3..6ccb47d 100644 --- a/checks/avaya_45xx_temp +++ b/checks/avaya_45xx_temp @@ -36,7 +36,8 @@ def inventory_avaya_45xx_temp(info): def check_avaya_45xx_temp(item, params, info): for idx, temp in enumerate(info): if str(idx) == item: - return check_temperature(int(temp[0]), params, dev_unit = "f") + return check_temperature(int(temp[0]), params, + "avaya_45xx_temp_%s" % item, dev_unit = "f") check_info["avaya_45xx_temp"] = { "check_function": check_avaya_45xx_temp,

8 years, 2 months

Reserved 30 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 863b14365204ba8fb94881983c9533224a28b96e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=863b14365204ba… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 22 08:26:20 2016 +0200 Reserved 30 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index d0f1d75..b18589c 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3433 +3463

8 years, 2 months

3391 FIX CPU checks: Fixed graph per core when cores names don'

by Lars Michelsen

t have a tailing number Message-ID: <5719c25d.zRN4sSC2bKYBJpu5%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: bd6140d1d58adabcc7a4eeabf9abde7c5cf5c700 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd6140d1d58ada… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 22 08:18:52 2016 +0200 3391 FIX CPU checks: Fixed graph per core when cores names don't have a tailing number --- .werks/3391 | 10 ++++++++++ ChangeLog | 1 + checks/cpu_util.include | 20 ++++++++++---------- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/.werks/3391 b/.werks/3391 new file mode 100644 index 0000000..86b9317 --- /dev/null +++ b/.werks/3391 @@ -0,0 +1,10 @@ +Title: CPU checks: Fixed graph per core when cores names don't have a tailing number +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461305854 + + diff --git a/ChangeLog b/ChangeLog index b83ba63..49704bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -169,6 +169,7 @@ * 3124 FIX: workaround for overrunnig counters in a couple of wmi checks... * 3030 FIX: brocade_info: fixed problem in snmp scan function during service discovery... * 3389 FIX: ps: Fixed stripped command lines for process checking on solaris systems + * 3391 FIX: CPU checks: Fixed graph per core when cores names don't have a tailing number Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/cpu_util.include b/checks/cpu_util.include index 72df42c..9d188dc 100644 --- a/checks/cpu_util.include +++ b/checks/cpu_util.include @@ -40,7 +40,7 @@ # recognizes it. If the input name doesn't end on a number, this # returns consecutive numbers per call so this function has to be # called exactly once per core -def cpu_util_core_name(orig): +def cpu_util_core_name(orig, core_counter): expr = regex("\d+$") match = expr.search(orig) if match is not None: @@ -48,11 +48,9 @@ def cpu_util_core_name(orig): else: # fallback: if the cores have odd names, use # consecutive numbers for each call - if not hasattr(core_name, "counter"): - core_name.counter = 0 - num = core_name.counter - core_name.counter += 1 - return "cpu_core_util_%s" % num + num = core_counter + core_counter += 1 + return "cpu_core_util_%s" % num, core_counter def check_cpu_util(util, params, this_time = None, cores = None): @@ -98,10 +96,11 @@ def check_cpu_util(util, params, this_time = None, cores = None): yield state, infotext, perfdata if cores and ("core_util_graph" in params or "core_util_time" in params): - ctr = 0 + core_counter = 0 for core, total_perc in cores: if "core_util_graph" in params: - yield 0, None, [(cpu_util_core_name(core), total_perc)] + core_name, core_counter = cpu_util_core_name(core, core_counter) + yield 0, None, [(core_name, total_perc)] if "core_util_time" in params: threshold, warn_core, crit_core = params["core_util_time"] @@ -209,7 +208,7 @@ def check_cpu_util_unix(values, params, cores = None): if cores and\ ("core_util_graph" in params or \ "core_util_time" in params): - ctr = 0 + core_counter = 0 cores_padded = [line + [0] * (11 - len(line)) for line in cores] for core, user, nice, system, idle, iowait,\ irq, softirq, steal, guest, guest_nice in cores_padded: @@ -223,7 +222,8 @@ def check_cpu_util_unix(values, params, cores = None): total_perc = ((100.0 * total_diff) / sum_jiffies) * len(cores) if "core_util_graph" in params: - yield 0, None, [(cpu_util_core_name(core), total_perc)] + core_name, core_counter = cpu_util_core_name(core, core_counter) + yield 0, None, [(core_name, total_perc)] if "core_util_time" in params: threshold, warn_core, crit_core = params["core_util_time"]

8 years, 2 months

3390 Events can now be cancelled by the syslog application

by Lars Michelsen

Module: check_mk Branch: master Commit: b31b62341f37f6ac0ae6819ed6a6dbce1b6d2d9a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b31b62341f37f6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 21 17:41:30 2016 +0200 3390 Events can now be cancelled by the syslog application Event Console rules can now close the events they created by having a specific syslog application in messages. If the application of the message matches this regular expression (case insensitive) and either no text to cancel is specified or that text also matched, then events created by this rule will automatically be cancelled (if host, facility and match groups match). --- .werks/3390 | 15 +++++++++++++++ ChangeLog | 1 + bin/mkeventd | 34 ++++++++++++++++++++++------------ web/plugins/wato/mkeventd.py | 15 ++++++++++++--- 4 files changed, 50 insertions(+), 15 deletions(-) diff --git a/.werks/3390 b/.werks/3390 new file mode 100644 index 0000000..56c44ca --- /dev/null +++ b/.werks/3390 @@ -0,0 +1,15 @@ +Title: Events can now be cancelled by the syslog application +Level: 1 +Component: ec +Compatible: compat +Version: 1.2.9i1 +Date: 1461253178 +Class: feature + +Event Console rules can now close the events they created by having +a specific syslog application in messages. + +If the application of the message matches this regular expression +(case insensitive) and either no text to cancel is specified or +that text also matched, then events created by this rule will +automatically be cancelled (if host, facility and match groups match). diff --git a/ChangeLog b/ChangeLog index b3ef07c..b83ba63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -325,6 +325,7 @@ * 2999 The contact name is now included in Event Console notifications... * 3262 Event Console: bulk delete button for custom MIBs now available * 3388 Event Console can now process SNMPv3 traps... + * 3390 Events can now be cancelled by the syslog application... * 3058 FIX: Event Console is now allowing non loadable MIB modules on startup... * 3097 FIX: mkeventd: fixed crash with non-descriptive error message if mibs couldn't be loaded * 3335 FIX: Improved error handling when requested rule pack does not exist diff --git a/bin/mkeventd b/bin/mkeventd index e68dc12..2aeb09d 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -1892,7 +1892,8 @@ class EventServer: self.hash_rule(rule) if "match_facility" not in rule \ and "match_priority" not in rule \ - and "cancel_priority" not in rule: + and "cancel_priority" not in rule \ + and "cancel_application" not in rule: count_unspecific += 1 @@ -2138,15 +2139,22 @@ class EventServer: log(" did not match, because timeperiod %s is not active" % rule["match_timeperiod"]) return False - if "match_ok" in rule or "cancel_priority" in rule: + if "match_ok" in rule or "cancel_priority" in rule or "cancel_application" in rule: if "cancel_priority" in rule: up, lo = rule["cancel_priority"] cp = event["priority"] >= lo and event["priority"] <= up else: cp = True + if "cancel_application" in rule: + cancel_by_application = match(rule.get("cancel_application"), + event["application"], + complete=False) + else: + cancel_by_application = True + match_groups = match(rule.get("match_ok", ""), event["text"], complete = False) - if match_groups != False and cp: + if match_groups != False and cp and cancel_by_application: if debug: log(" found cancelling event") if match_groups == True: @@ -3194,15 +3202,17 @@ class EventStatus(): (event["id"], event["host"], host)) return False - # The same for the application - application = new_event["application"] - if "set_application" in rule: - application = replace_groups(rule["set_application"], application, match_groups) - if event["application"] != application: - if debug: - log("Do not cancel event %d: application is not the same (%s != %s)" % - (event["id"], event["application"], application)) - return False + # The same for the application. But in case there is cancelling based on the application + # configured in the rule, then don't check for tidfferent applications. + if "cancel_application" not in rule: + application = new_event["application"] + if "set_application" in rule: + application = replace_groups(rule["set_application"], application, match_groups) + if event["application"] != application: + if debug: + log("Do not cancel event %d: application is not the same (%s != %s)" % + (event["id"], event["application"], application)) + return False if event["facility"] != new_event["facility"]: if debug: diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index fd1fa8f..41df8d3 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -651,7 +651,7 @@ vs_mkeventd_rule = Dictionary( title = _("Syslog priority to cancel event"), help = _("If the priority of the event lies withing this range and either no text to cancel " "is specified or that text also matched, then events created with this rule will " - "automatically be cancelled (if host, application and match groups match)."), + "automatically be cancelled (if host, application, facility and match groups match)."), orientation = "horizontal", show_titles = False, elements = [ @@ -660,6 +660,15 @@ vs_mkeventd_rule = Dictionary( ], ), ), + ( "cancel_application", + RegExpUnicode( + title = _("Syslog application to cancel event"), + help = _("If the application of the message matches this regular expression " + "(case insensitive) and either no text to cancel is specified or " + "that text also matched, then events created by this rule will " + "automatically be cancelled (if host, facility and match groups match)."), + ), + ), ( "invert_matching", Checkbox( title = _("Invert matching"), @@ -743,11 +752,11 @@ vs_mkeventd_rule = Dictionary( optional_keys = [ "delay", "livetime", "count", "expect", "match_priority", "match_priority", "match_facility", "match_sl", "match_host", "match_ipaddress", "match_application", "match_timeperiod", "set_text", "set_host", "set_application", "set_comment", - "set_contact", "cancel_priority", "match_ok", "contact_groups", ], + "set_contact", "cancel_priority", "cancel_application", "match_ok", "contact_groups", ], headers = [ ( _("Rule Properties"), [ "id", "description", "comment", "docu_url", "disabled" ] ), ( _("Matching Criteria"), [ "match", "match_host", "match_ipaddress", "match_application", "match_priority", "match_facility", - "match_sl", "match_ok", "cancel_priority", "match_timeperiod", "invert_matching" ]), + "match_sl", "match_ok", "cancel_priority", "cancel_application", "match_timeperiod", "invert_matching" ]), ( _("Outcome & Action"), [ "state", "sl", "contact_groups", "actions", "cancel_actions", "cancel_action_phases", "drop", "autodelete" ]), ( _("Counting & Timing"), [ "count", "expect", "delay", "livetime", ]), ( _("Rewriting"), [ "set_text", "set_host", "set_application", "set_comment", "set_contact" ]),

8 years, 2 months

3389 FIX ps: Fixed stripped command lines for process checking on solaris systems

by Lars Michelsen

Module: check_mk Branch: master Commit: 3184460a0216e9017649a538f6fdbc8021d4cf78 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3184460a0216e9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 21 16:57:50 2016 +0200 3389 FIX ps: Fixed stripped command lines for process checking on solaris systems --- .werks/3389 | 10 ++++++++++ ChangeLog | 1 + agents/check_mk_agent.solaris | 23 +++++++++++++++++++++-- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/.werks/3389 b/.werks/3389 new file mode 100644 index 0000000..26f9987 --- /dev/null +++ b/.werks/3389 @@ -0,0 +1,10 @@ +Title: ps: Fixed stripped command lines for process checking on solaris systems +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461250626 + + diff --git a/ChangeLog b/ChangeLog index 29b051d..ebb8499 100644 --- a/ChangeLog +++ b/ChangeLog @@ -167,6 +167,7 @@ * 3387 FIX: ps: Fixed crash during service discovery on AIX hosts having defunct processes * 3417 FIX: wmi_cpuload: fix exception in case of missing NumberOfLogicalProcessors on some OS versions * 3124 FIX: workaround for overrunnig counters in a couple of wmi checks... + * 3389 FIX: ps: Fixed stripped command lines for process checking on solaris systems Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index da5b85c..d251723 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -189,8 +189,27 @@ fi # Processes echo '<<<ps>>>' -ps -o user,vsz,rss,pcpu,args $pszone | \ -sed -e 1d -e 's/ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ */(\1,\2,\3,\4) /' +# The default solaris ps command strips the command lines of the processes. But for good process +# matching on the server we really need to whole command line. On linux there are arguments to +# make ps output the whole command line, but on solaris this seems to be missing. We use the ucb +# ps command to get the full command line instead. What a hack. +UCB_PS=$(/usr/ucb/ps -agwwwx) +PS=$(ps -o user,vsz,rss,pcpu,etime,pid,args $pszone | \ + sed -e 1d -e 's/ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ *$[^ ]*$ */(\1,\2,\3,\4,\5,\6) /') +while read -r LINE; do + STATS=${LINE%) *} + PID=${STATS##*,} + + CMD=$(echo "$UCB_PS" | grep "\s*$PID " | head -n1 | \ + awk '{ s = ""; for (i = 5; i <= NF; i++) s = s $i " "; print s }') + # Only use the ucb ps line when it's not empty (process might already been gone) and the + # ps line is long enough the be potentially stripped. + if [ -z "$CMD" ] || [ ${#LINE} -lt 100 ]; then + echo "$LINE" + else + echo "${STATS}) ${CMD}" + fi +done <<< "$PS" # Statgrab

8 years, 2 months

← Newer
1
...
9
10
11
12
13
14
15
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2016