Checkmk git commits April 2013

checkmk-commits@lists.checkmk.com

3 participants
237 discussions

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Andreas Boesl

Module: check_mk Branch: master Commit: ed7d53bd751ac4a84477195ce7fcd24c37cb7942 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed7d53bd751ac4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Apr 8 17:58:11 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk Conflicts: ChangeLog ---

11 years, 2 months

Check_MK Git: check_mk: predictive levels: fixed bug when existing predictive levels get new options

by Andreas Boesl

Module: check_mk Branch: master Commit: 0fa387256715d677d33b54452d31f18e8db8d8dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0fa387256715d6… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Apr 8 17:28:13 2013 +0200 predictive levels: fixed bug when existing predictive levels get new options (fixed horrible wording) --- ChangeLog | 1 + modules/prediction.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 36ead63..01155b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -64,6 +64,7 @@ * windows_agent: check_mk.ini: new option "port" - specifies agent port * winperf_processor: introduce averaging, support predictive levels * cpu_util.include: fixed bug when params are set to None + * predictive levels: fixed bug when existing predictive levels get new options Notifications: * notify.py: unique spoolfiles name no longer created with uuid diff --git a/modules/prediction.py b/modules/prediction.py index 7817081..109a4f1 100644 --- a/modules/prediction.py +++ b/modules/prediction.py @@ -253,7 +253,7 @@ def get_predictive_levels(dsname, params, cf, levels_factor=1.0): try: last_info = eval(file(info_file).read()) for k, v in params.items(): - if last_info[k] != v: + if last_info.get(k) != v: if opt_debug: sys.stderr.write("Prediction parameters have changed.\n") last_info = None

11 years, 2 months

Check_MK Git: check_mk: predictive levels: fixed bug when new options existing predictive levels

by Andreas Boesl

Module: check_mk Branch: master Commit: bc734fb6222b4acc42a57be666fca5bd3a97c293 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc734fb6222b4a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Apr 8 17:28:13 2013 +0200 predictive levels: fixed bug when new options existing predictive levels + are introduced --- ChangeLog | 2 ++ modules/prediction.py | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 36ead63..04bf241 100644 --- a/ChangeLog +++ b/ChangeLog @@ -64,6 +64,8 @@ * windows_agent: check_mk.ini: new option "port" - specifies agent port * winperf_processor: introduce averaging, support predictive levels * cpu_util.include: fixed bug when params are set to None + * predictive levels: fixed bug when new options existing predictive levels + are introduced Notifications: * notify.py: unique spoolfiles name no longer created with uuid diff --git a/modules/prediction.py b/modules/prediction.py index 7817081..109a4f1 100644 --- a/modules/prediction.py +++ b/modules/prediction.py @@ -253,7 +253,7 @@ def get_predictive_levels(dsname, params, cf, levels_factor=1.0): try: last_info = eval(file(info_file).read()) for k, v in params.items(): - if last_info[k] != v: + if last_info.get(k) != v: if opt_debug: sys.stderr.write("Prediction parameters have changed.\n") last_info = None

11 years, 2 months

Check_MK Git: check_mk: cpu_util.include: fixed bug when params are set to None

by Andreas Boesl

Module: check_mk Branch: master Commit: c50d8e401830e01cea7fbc1ea97164c24670fabd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c50d8e401830e0… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Apr 8 17:25:33 2013 +0200 cpu_util.include: fixed bug when params are set to None --- ChangeLog | 1 + checks/cpu_util.include | 5 ++++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 15bb0a1..36ead63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,6 +63,7 @@ * if64_tplink: special new check for TP Link switches with broken SNMP output * windows_agent: check_mk.ini: new option "port" - specifies agent port * winperf_processor: introduce averaging, support predictive levels + * cpu_util.include: fixed bug when params are set to None Notifications: * notify.py: unique spoolfiles name no longer created with uuid diff --git a/checks/cpu_util.include b/checks/cpu_util.include index a6e2661..fe21bb8 100644 --- a/checks/cpu_util.include +++ b/checks/cpu_util.include @@ -40,7 +40,9 @@ def check_cpu_util(util, params, this_time = None): if this_time == None: this_time = time.time() - if type(params) == tuple: + if params == None: + params = {} + elif type(params) == tuple: params = { "levels" : params, } @@ -63,6 +65,7 @@ def check_cpu_util(util, params, this_time = None): warn, crit = levels # only for perfdata else: warn, crit = None, None + state, extrainfo, extraperf = check_levels(check_against, counter, levels) if extrainfo: infotext += ", " + extrainfo

11 years, 2 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Mathias Kettner

Module: check_mk Branch: master Commit: ff098d47c069537dc4a5c43fa8b1483ea84cfe9f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff098d47c06953… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 8 12:34:57 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 2 months

Check_MK Git: check_mk: Remove lots of trailing spaces

by Mathias Kettner

11 years, 2 months

Check_MK Git: check_mk: Fix error handling in vSphere agent

by Mathias Kettner

Module: check_mk Branch: master Commit: 8e4469f48933a09d1abb9b72aa5e9649814f3960 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e4469f48933a0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 8 11:50:52 2013 +0200 Fix error handling in vSphere agent --- agents/special/agent_vsphere | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index a832654..fca2522 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -67,7 +67,7 @@ long_options = [ try: opts, args = getopt.getopt(sys.argv[1:], short_options, long_options) except getopt.GetoptError, err: - print str(err) + sys.stderr.write("%s\n" % err) sys.exit(1) opt_debug = False @@ -97,9 +97,11 @@ for o,a in opts: if len(args) == 1: host_address = args[0] +elif not args: + sys.stderr.write("ERROR: No host given.\n") + sys.exit(1) else: - sys.stderr.write("ERROR: No HOST given.\n") - usage() + sys.stderr.write("ERROR: Please specify exactly one host.\n") sys.exit(1) def get_agent_info_tcp(hostname):

11 years, 2 months

Check_MK Git: check_mk: FIX: Syslog server is now able to parse RFC 5424 syslog messages

by Lars Michelsen

Module: check_mk Branch: master Commit: e3e6ec1700f90d9b0777de2e5f6c56976e2db756 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3e6ec1700f90d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 8 09:36:23 2013 +0200 FIX: Syslog server is now able to parse RFC 5424 syslog messages --- ChangeLog | 4 ++- mkeventd/bin/mkeventd | 57 +++++++++++++++++++++++++++++++++--------------- 2 files changed, 42 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 75cbff4..c5c5e3e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -94,7 +94,6 @@ Checks & Agents: * FIX: blade_bx_load: remove invalid WATO group - Notifications: * FIX: Removing GRAPH_CODE in html mails when not available * Using plugin argument 1 for path to pnp4nagios index php to render graphs @@ -107,6 +106,9 @@ * FIX: Fix several cases where WATO rule analyser did not hilite all matching rules * Added tcp port parameter to SSL certificate check (Thanks to Marcel Schulte) + Event Console: + * FIX: Syslog server is now able to parse RFC 5424 syslog messages + 1.2.2b7: Checks & Agents: * FIX: postfix_mailq: fix labels in WATO rule, set correct default levels diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 5f6b6e8..5e3049c 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -1432,6 +1432,25 @@ class EventServer: if "set_contact" in rule and "contact" not in event: event["contact"] = replace_groups(rule["set_contact"], event.get("contact", ""), groups) + def parse_syslog_info(self, line): + event = {} + # Replaced ":" by ": " here to make tags with ":" possible. This + # is needed to process logs generated by windows agent logfiles + # like "c://test.log". + tag, message = line.split(": ", 1) + event["text"] = message.strip() + + if '[' in tag: + app, pid = tag.split('[', 1) + pid = pid.rstrip(']') + else: + app = tag + pid = 0 + + event["application"] = app + event["pid"] = pid + return event + def parse_monitoring_info(self, line): event = {} # line starts with '@' @@ -1460,7 +1479,7 @@ class EventServer: # Variant 1: plain syslog message without priority/facility: # May 26 13:45:01 Klapprechner CRON[8046]: message.... - # Variant 2: syslog message including facility (RFC 3360) + # Variant 2: syslog message including facility (RFC 3164) # <78>May 26 13:45:01 Klapprechner CRON[8046]: message.... # Variant 3: local Nagios alert posted by mkevent -n @@ -1469,7 +1488,14 @@ class EventServer: # Variant 4: remote Nagios alert posted by mkevent -n -> syslog # <154>Jul 9 17:28:32 Klapprechner @1341847712;5;Contact Info; MyHost My Service: CRIT - This che - # Variant 2,3,4 + # Variant 5: syslog message (RFC 5424) + # Timestamp is RFC3339 with additional restrictions: + # - The "T" and "Z" characters in this syntax MUST be upper case. + # - Usage of the "T" character is REQUIRED. + # - Leap seconds MUST NOT be used. + # <166>2013-04-05T13:49:31.685Z esx Vpxa: message.... + + # Variant 2,3,4,5 if line.startswith('<'): i = line.find('>') prio = int(line[1:i]) @@ -1486,6 +1512,15 @@ class EventServer: if line.startswith("@"): event.update(self.parse_monitoring_info(line)) + # Variant 5 + elif len(line) > 24 and line[10] == 'T': + # There is no 3339 parsing built into python. We do ignore subseconds and timezones + # here. This is seems to be ok for the moment - sorry. Please drop a note if you + # got a good solutuion for this. + rfc3339_part, event['host'], line = line.split(' ', 2) + event['time'] = time.mktime(time.strptime(rfc3339_part[:19], '%Y-%m-%dT%H:%M:%S')) + event.update(self.parse_syslog_info(line)) + # Variant 1,2,4 else: month_name, day, timeofday, host, rest = line.split(None, 4) @@ -1497,25 +1532,11 @@ class EventServer: # Variant 1, 2 else: - # Replaced ":" by ": " here to make tags with ":" possible. This - # is needed to process logs generated by windows agent logfiles - # like "c://test.log". - tag, message = rest.split(": ", 1) - event["text"] = message.strip() - - if '[' in tag: - app, pid = tag.split('[', 1) - pid = pid.rstrip(']') - else: - app = tag - pid = 0 - - event["application"] = app - event["pid"] = pid + event.update(self.parse_syslog_info(rest)) month = EventServer.month_names[month_name] day = int(day) - + # Nasty: the year is not contained in the message. We cannot simply # assume that the message if from the current year. lt = time.localtime()

11 years, 2 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: cdd8a12b1285ae91c438091dc09c7f82d8d4042a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cdd8a12b1285ae… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 8 10:04:07 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk Conflicts: ChangeLog ---

11 years, 2 months

Check_MK Git: check_mk: ipmi: remove obsolete exception handler

by Mathias Kettner

Module: check_mk Branch: master Commit: 75631cfffb400e0582bc1c09c369cce47180ea04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=75631cfffb400e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Apr 7 18:27:48 2013 +0200 ipmi: remove obsolete exception handler --- checks/ipmi | 56 +++++++++++++++++++++++++++----------------------------- 1 files changed, 27 insertions(+), 29 deletions(-) diff --git a/checks/ipmi b/checks/ipmi index 9282fd9..6814ba5 100644 --- a/checks/ipmi +++ b/checks/ipmi @@ -143,36 +143,34 @@ def check_ipmi_summarized(info): count = 0 ambient_count = 0 ambient_sum = 0.0 - try: - for name, val, unit, status, unrec_low, crit_low, \ - warn_low, warn_high, crit_high, unrec_high in info: - # Skip datasets which have no valid data (zero value, no unit and state nc) - if val == '0.000' and unit == 'unspecified' and status == 'nc': - continue - - if ipmi_ignore_entry(name, status): - continue - - text = "%s is %s" % (name, val) - if unit != 'unspecified': - text += ' %s' % unit - count += 1 - if status == 'nc': - worst_status = max(worst_status, 1) - warn_texts.append(text) - elif status == 'nr' and ipmi_ignore_nr: + + for name, val, unit, status, unrec_low, crit_low, \ + warn_low, warn_high, crit_high, unrec_high in info: + # Skip datasets which have no valid data (zero value, no unit and state nc) + if val == '0.000' and unit == 'unspecified' and status == 'nc': + continue + + if ipmi_ignore_entry(name, status): + continue + + text = "%s is %s" % (name, val) + if unit != 'unspecified': + text += ' %s' % unit + count += 1 + if status == 'nc': + worst_status = max(worst_status, 1) + warn_texts.append(text) + elif status == 'nr' and ipmi_ignore_nr: + pass + elif status != 'ok': + worst_status = 2 + crit_texts.append(text) + if "amb" in name or "Ambient" in name: + try: + ambient_count += 1 + ambient_sum += float(val) + except: pass - elif status != 'ok': - worst_status = 2 - crit_texts.append(text) - if "amb" in name or "Ambient" in name: - try: - ambient_count += 1 - ambient_sum += float(val) - except: - pass - except: - return (3, "invalid or incomplete output from agent") if ambient_count > 0:

11 years, 2 months

← Newer
1
...
14
15
16
17
18
19
20
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2013