Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
65204 discussions

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, 7 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, 7 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, 7 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, 7 months

Check_MK Git: check_mk: Fixed typo in man page

by Mathias Kettner

Module: check_mk Branch: master Commit: 66b963357b145694ce67ce411347cd9377322f08 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66b963357b1456… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Apr 7 12:55:50 2013 +0200 Fixed typo in man page --- checkman/hp_eml_sum | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checkman/hp_eml_sum b/checkman/hp_eml_sum index b37ae31..978d5b1 100644 --- a/checkman/hp_eml_sum +++ b/checkman/hp_eml_sum @@ -9,4 +9,4 @@ description: work with other models. It uses information provided by the SEMI-MIB. inventory: - The check supports automatic inventory. Each system gets one summary checks. + The check supports automatic inventory. Each system gets one summary check.

11 years, 7 months

Check_MK Git: check_mk: FIX: lnx_bonding: handle also 802.3ad type bonds

by Mathias Kettner

Module: check_mk Branch: master Commit: 3db263c7caa51daa25d81f36d9d128f66a6c8102 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3db263c7caa51d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Apr 6 19:02:13 2013 +0200 FIX: lnx_bonding: handle also 802.3ad type bonds --- ChangeLog | 2 +- checks/bonding.include | 4 ++-- checks/lnx_bonding | 13 ++++++++++--- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index fd94a8b..89f4b42 100644 --- a/ChangeLog +++ b/ChangeLog @@ -95,7 +95,7 @@ Checks & Agents: * FIX: blade_bx_load: remove invalid WATO group - + * FIX: lnx_bonding: handle also 802.3ad type bonds Notifications: * FIX: Removing GRAPH_CODE in html mails when not available diff --git a/checks/bonding.include b/checks/bonding.include index 44fd402..9a1048b 100644 --- a/checks/bonding.include +++ b/checks/bonding.include @@ -59,8 +59,8 @@ def check_bonding(item, params, parsed): primary = status.get("primary", params.get("primary")) if primary: infos.append("primary: " + primary) - active = status["active"] - if active: + if "active" in status: + active = status["active"] infos.append("active: " + active) expect = params.get("expect_active", "ignore") diff --git a/checks/lnx_bonding b/checks/lnx_bonding index 5dd260b..e0b2dce 100644 --- a/checks/lnx_bonding +++ b/checks/lnx_bonding @@ -76,6 +76,11 @@ def parse_lnx_bonding(info): if line[0].strip() == "Down Delay (ms)": break + # Here could come an additional part: + # "802.3ad info". We detect the end of + # this part by finding th efirst "Slave Interface" + eth = None + # Parse interfaces interfaces = {} bonds[bond]["interfaces"] = interfaces @@ -88,7 +93,7 @@ def parse_lnx_bonding(info): elif line[0].strip() == "Slave Interface": eth = line[1].strip() interfaces[eth] = {} - elif line: + elif line and eth: interfaces[eth][line[0].strip()] = ":".join(line[1:]).strip() except StopIteration: @@ -106,11 +111,13 @@ def parse_lnx_bonding(info): } converted[bond] = { "status" : status["main"]["MII Status"], - "primary" : status["main"].get("Primary Slave").split()[0], - "active" : status["main"].get("Currently Active Slave"), "mode" : status["main"]["Bonding Mode"].split('(')[0].strip(), "interfaces" : interfaces, } + if "Currently Active Slave" in status["main"]: + converted[bond]["active"] = status["main"]["Currently Active Slave"] + if "Primary Slave" in status["main"]: + converted[bond]["primary"] = status["main"]["Primary Slave"].split()[0] return converted

11 years, 7 months

Check_MK Git: check_mk: winperf_processor: introduce averaging, support predictive levels

by Mathias Kettner

Module: check_mk Branch: master Commit: eec0ef69eb15860309f08c541da49d6b6c19ef10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eec0ef69eb1586… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 5 16:28:29 2013 +0200 winperf_processor: introduce averaging, support predictive levels --- ChangeLog | 1 + checks/cpu_util.include | 76 +++++++++++++++++++++ checks/kernel | 4 +- checks/winperf_processor | 27 ++----- pnp-templates/check_mk-winperf_processor.util.php | 65 +++++++++++++++++- web/plugins/wato/check_parameters.py | 34 +++++++++- 6 files changed, 184 insertions(+), 23 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=eec0ef69eb…

11 years, 7 months

Check_MK Git: check_mk: add -static option to linker

by Andreas Boesl

Module: check_mk Branch: master Commit: bd3b4106578151899bfd1f17d57c8ffb7f3a14be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd3b4106578151… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Apr 5 14:31:01 2013 +0200 add -static option to linker --- agents/windows/Makefile | 2 +- agents/windows/check_mk_agent.exe | Bin 111104 -> 111104 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent.exe | Bin 131002 -> 131043 bytes agents/windows/nowin.exe | Bin 22511 -> 22511 bytes 5 files changed, 1 insertions(+), 1 deletions(-) diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 2b48f59..43e60e7 100755 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -37,7 +37,7 @@ install_agent.exe: check_mk_agent.exe crash.exe nowin.exe chmod +x install_agent.exe check_mk_agent.exe: check_mk_agent.cc Makefile - $(CXX) -s -O2 -Wall -Werror -o $@ $< -lwsock32 + $(CXX) -s -O2 -Wall -Werror -o $@ $< -static -lwsock32 crash.exe: crash.cc Makefile $(CXX) -o $@ $< diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index e209d4d..dcbe753 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index 50080b7..91b2320 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index e4adf64..8af2f9c 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index 798b142..0b6e2cd 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ

11 years, 7 months

Check_MK Git: check_mk: check_mk.ini: new option 'port' - specifies agent port

by Andreas Boesl

Module: check_mk Branch: master Commit: 1d1d45f8e71d55ff958f433be0b7bb29dcca80cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d1d45f8e71d55… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Apr 5 13:04:23 2013 +0200 check_mk.ini: new option 'port' - specifies agent port --- ChangeLog | 1 + agents/windows/check_mk.example.ini | 3 +++ agents/windows/check_mk_agent.cc | 13 +++++++++---- agents/windows/check_mk_agent.exe | Bin 111104 -> 111104 bytes agents/windows/install_agent.exe | Bin 130964 -> 131002 bytes 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 75cbff4..ff883ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,6 +61,7 @@ snapshotted during inventory. * smart.temp: add WATO configuration * if64_tplink: special new check for TP Link switches with broken SNMP output + * windows_agent: check_mk.ini: new option "port" - specifies agent port Notifications: * notify.py: unique spoolfiles name no longer created with uuid diff --git a/agents/windows/check_mk.example.ini b/agents/windows/check_mk.example.ini index 2929fc6..84eb9bf 100644 --- a/agents/windows/check_mk.example.ini +++ b/agents/windows/check_mk.example.ini @@ -2,6 +2,9 @@ # Restrict access to certain IP addresses # only_from = 127.0.0.1 192.168.56.0/24 + # Change port where the agent is listening ( default 6556 ) + # port = 6556 + # Do only execute programs and scripts with # the following suffixes (in local and plugins). # Per default all extensions except txt and dir diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index d558c0f..019fd26 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -158,6 +158,7 @@ bool do_tcp = false; bool should_terminate = false; bool force_tcp_output = false; // if true, send socket data immediately char g_hostname[256]; +int g_port = CHECK_MK_AGENT_PORT; // sections enabled (configurable in check_mk.ini) unsigned long enabled_sections = 0xffffffff; @@ -2636,6 +2637,10 @@ if (!strcmp(var, "only_from")) { parse_only_from(value); return true; } + else if (!strcmp(var, "port")) { + g_port = atoi(value); + return true; + } else if (!strcmp(var, "execute")) { parse_execute(value); return true; @@ -3013,14 +3018,14 @@ void listen_tcp_loop() SOCKADDR_IN addr; memset(&addr, 0, sizeof(SOCKADDR_IN)); addr.sin_family = AF_INET; - addr.sin_port = htons(CHECK_MK_AGENT_PORT); + addr.sin_port = htons(g_port); addr.sin_addr.s_addr = ADDR_ANY; int optval = 1; setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (const char*)&optval, sizeof(optval)); if (SOCKET_ERROR == bind(s, (SOCKADDR *)&addr, sizeof(SOCKADDR_IN))) { - fprintf(stderr, "Cannot bind socket to port %d\n", CHECK_MK_AGENT_PORT); + fprintf(stderr, "Cannot bind socket to port %d\n", g_port); exit(1); } @@ -3149,7 +3154,7 @@ void usage() "check_mk_agent remove -- remove Windows NT service\n" "check_mk_agent adhoc -- open TCP port %d and answer request until killed\n" "check_mk_agent test -- test output of plugin, do not open TCP port\n" - "check_mk_agent debug -- similar to test, but with lots of debug output\n", CHECK_MK_AGENT_PORT); + "check_mk_agent debug -- similar to test, but with lots of debug output\n", g_port); exit(1); } @@ -3174,7 +3179,7 @@ void do_test() void do_adhoc() { do_tcp = true; - printf("Listening for TCP connections on port %d\n", CHECK_MK_AGENT_PORT); + printf("Listening for TCP connections on port %d\n", g_port); printf("Close window or press Ctrl-C to exit\n"); fflush(stdout); diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 3f21a99..e209d4d 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index bf76f55..e4adf64 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

11 years, 7 months

Check_MK Git: check_mk: Fixed json formating in snapin refresh code

by Lars Michelsen

Module: check_mk Branch: master Commit: 63a69ee591aec6da5f26b6f62aeedd87b1b5adf6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63a69ee591aec6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 5 13:00:14 2013 +0200 Fixed json formating in snapin refresh code --- web/htdocs/sidebar.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index ea46437..2f84e65 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -312,7 +312,7 @@ def ajax_snapin(): snapin_code.append(html.drain()) html.unplug() - html.write('[%s]' % ','.join([ "'%s'" % s for s in snapin_code])) + html.write('[%s]' % ','.join([ '"%s"' % s.replace('"', '\\"').replace('\n', '') for s in snapin_code])) except Exception, e: html.flush() html.unplug()

11 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits