Checkmk git commits October 2015

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

fixed ucd_scan_function: conflicts with hr-checks

by Simon Betz

Module: check_mk Branch: master Commit: e560325fd534627c5ce534641919fb95a842615a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e560325fd53462… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Oct 12 16:15:04 2015 +0200 fixed ucd_scan_function: conflicts with hr-checks --- checks/ucd.include | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/checks/ucd.include b/checks/ucd.include index 4863e0d..eaffa92 100644 --- a/checks/ucd.include +++ b/checks/ucd.include @@ -32,12 +32,14 @@ def ucd_scan_function(oid): - return ("linux" in oid(".1.3.6.1.2.1.1.1.0").lower() or \ - "CMC-TC" in oid(".1.3.6.1.2.1.1.1.0") or \ - "HP Onboard Administrator" in oid(".1.3.6.1.2.1.1.1.0") or \ - # for barracuda spam firewall appliance - "barracuda" in oid(".1.3.6.1.2.1.1.1.0").lower() or \ - # for artec email archiv appliance - ( oid('.1.3.6.1.2.1.1.2.0') == '.1.3.6.1.4.1.8072.3.2.10' and \ - "version" in oid('.1.3.6.1.2.1.1.1.0').lower() and \ - "serial" in oid('.1.3.6.1.2.1.1.1.0').lower() )) + return (("linux" in oid(".1.3.6.1.2.1.1.1.0").lower() or \ + "CMC-TC" in oid(".1.3.6.1.2.1.1.1.0") or \ + "HP Onboard Administrator" in oid(".1.3.6.1.2.1.1.1.0") or \ + # for barracuda spam firewall appliance + "barracuda" in oid(".1.3.6.1.2.1.1.1.0").lower() or \ + # for artec email archiv appliance + ( oid('.1.3.6.1.2.1.1.2.0') == '.1.3.6.1.4.1.8072.3.2.10' and \ + "version" in oid('.1.3.6.1.2.1.1.1.0').lower() and \ + "serial" in oid('.1.3.6.1.2.1.1.1.0').lower() )) and \ + # we prefer HOST-RESOURCES-MIB implementation + not oid(".1.3.6.1.2.1.25.1.1.0"))

8 years, 11 months

#2677 FIX Fixed duplicate Event Console reload in distributed setups

by Lars Michelsen

Module: check_mk Branch: master Commit: 300f0eb90b993cdf0c6d8398fcaaa603661761c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=300f0eb90b993c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 12 15:42:36 2015 +0200 #2677 FIX Fixed duplicate Event Console reload in distributed setups When activating WATO changes, Check_MK was trying to reload Event Consoles running on remote sites twice which lead to errors like this: Error: Internal automation error: Cannot connect to event daemon via /omd/sites/AAA/tmp/run/mkeventd/status: [Errno 104] Connection reset by peer --- .werks/2677 | 14 ++++++++++++++ ChangeLog | 1 + mkeventd/web/plugins/wato/mkeventd.py | 2 +- web/htdocs/wato.py | 6 +----- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.werks/2677 b/.werks/2677 new file mode 100644 index 0000000..bcb3c82 --- /dev/null +++ b/.werks/2677 @@ -0,0 +1,14 @@ +Title: Fixed duplicate Event Console reload in distributed setups +Level: 1 +Component: ec +Compatible: compat +Version: 1.2.7i3 +Date: 1444657254 +Class: fix + +When activating WATO changes, Check_MK was trying to reload Event +Consoles running on remote sites twice which lead to errors like this: + +Error: Internal automation error: Cannot +connect to event daemon via /omd/sites/AAA/tmp/run/mkeventd/status: +[Errno 104] Connection reset by peer diff --git a/ChangeLog b/ChangeLog index 6027ccf..14eb5c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -344,6 +344,7 @@ * 2644 FIX: Fix exception in executing actions or notifications when match groups contain non-ASCII characters * 2673 FIX: SNMP-Traps: Fixed translation of OIDs which are parts of trap values... NOTE: Please refer to the migration notes! + * 2677 FIX: Fixed duplicate Event Console reload in distributed setups... Livestatus: * 2493 FIX: Fixed wrong JSON format when using stats queries together with header columns... diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 56427b5..9f5287d 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -2908,5 +2908,5 @@ register_hook("pre-activate-changes", mkeventd_update_notifiation_configuration) # Only register the reload hook when mkeventd is enabled if mkeventd_enabled: - register_hook("activate-changes", lambda hosts: mkeventd_reload()) + register_hook("activate-changes", lambda hosts: config.mkeventd_enabled and mkeventd_reload()) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5db482e..8ee74bf 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12362,16 +12362,12 @@ def automation_push_snapshot(): create_distributed_wato_file(site_id, mode) log_audit(None, "replication", _("Synchronized with master (my site id is %s.)") % site_id) - # Restart monitoring core, if neccessary + # Restart/reload monitoring core, if neccessary if html.var("restart", "no") == "yes": configuration_warnings = check_mk_local_automation(config.wato_activation_method) else: configuration_warnings = [] - # Reload event console, if we have one - if config.mkeventd_enabled: - mkeventd_reload() - return configuration_warnings except Exception, e: if config.debug:

8 years, 11 months

Added missing "PING v4/v6" service to nagios based installations

by Lars Michelsen

Module: check_mk Branch: master Commit: d97254f9741db1c05f9528992ba4b978cb1055c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d97254f9741db1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 12 15:00:26 2015 +0200 Added missing "PING v4/v6" service to nagios based installations --- check_mk_templates.cfg | 7 +--- modules/check_mk.py | 79 ++++++++++++++++++++++++++++++----------- web/plugins/views/painters.py | 3 +- 3 files changed, 62 insertions(+), 27 deletions(-) diff --git a/check_mk_templates.cfg b/check_mk_templates.cfg index ddb65a3..9094329 100644 --- a/check_mk_templates.cfg +++ b/check_mk_templates.cfg @@ -318,12 +318,7 @@ define command { # Commands for services of PING-only hosts define command { command_name check-mk-ping - command_line @CHECK_ICMP@ $ARG1$ $HOSTADDRESS$ -} - -define command { - command_name check-mk-ping-cluster - command_line @CHECK_ICMP@ -m 1 $ARG1$ $_HOSTNODEIPS$ + command_line @CHECK_ICMP@ $ARG1$ } # Host check commands diff --git a/modules/check_mk.py b/modules/check_mk.py index 284f767..d20f98e 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -724,6 +724,27 @@ def get_host_attributes(hostname): return attrs +def get_cluster_attributes(hostname, nodes): + attrs = {} + node_ips_4 = [] + if is_ipv4_host(hostname): + node_ips_4 = [ ip_address_of(h, 4) for h in nodes ] + + node_ips_6 = [] + if is_ipv6_host(hostname): + node_ips_6 = [ ip_address_of(h, 6) for h in nodes ] + + if is_ipv6_primary(hostname): + node_ips = node_ips_6 + else: + node_ips = node_ips_4 + + for suffix, val in [ ("", node_ips), ("_4", node_ips_4), ("_6", node_ips_6) ]: + attrs["_NODEIPS%s" % suffix] = " ".join(val) + + return attrs + + def ip_address_of(hostname, family=None): try: return lookup_ip_address(hostname, family) @@ -2225,16 +2246,16 @@ def create_nagios_config_host(outfile, hostname): outfile.write("\n# ----------------------------------------------------\n") outfile.write("# %s\n" % hostname) outfile.write("# ----------------------------------------------------\n") + host_attrs = get_host_attributes(hostname) if generate_hostconf: - create_nagios_hostdefs(outfile, hostname) - create_nagios_servicedefs(outfile, hostname) + create_nagios_hostdefs(outfile, hostname, host_attrs) + create_nagios_servicedefs(outfile, hostname, host_attrs) -def create_nagios_hostdefs(outfile, hostname): +def create_nagios_hostdefs(outfile, hostname, attrs): is_clust = is_cluster(hostname) # Determine IP address. For cluster hosts this is optional. # A cluster might have or not have a service ip address. - attrs = get_host_attributes(hostname) if not is_clust and attrs["address"] in [ "0.0.0.0", "::" ]: if ignore_ip_lookup_failures: failed_ip_lookups.append(hostname) @@ -2247,6 +2268,16 @@ def create_nagios_hostdefs(outfile, hostname): (hostname, varname)) ip = attrs["address"] + if is_clust: + verify_cluster_address_family(hostname) + + nodes = nodes_of(hostname) + for node in nodes: + if node not in all_active_realhosts(): + raise MKGeneralException("Node %s of cluster %s not in all_hosts." % (node, hostname)) + + attrs.update(get_cluster_attributes(hostname, nodes)) + # _ # / | # | | @@ -2306,15 +2337,7 @@ def create_nagios_hostdefs(outfile, hostname): # Special handling of clusters if is_clust: - verify_cluster_address_family(hostname) - - nodes = nodes_of(hostname) - for node in nodes: - if node not in all_active_realhosts(): - raise MKGeneralException("Node %s of cluster %s not in all_hosts." % (node, hostname)) - node_ips = [ lookup_ip_address(h) for h in nodes ] alias = "cluster of %s" % ", ".join(nodes) - outfile.write(" _NODEIPS\t\t\t%s\n" % " ".join(node_ips)) if not extra_conf_parents: outfile.write(" parents\t\t\t%s\n" % ",".join(nodes)) @@ -2378,7 +2401,7 @@ def create_nagios_hostdefs(outfile, hostname): outfile.write("}\n") outfile.write("\n") -def create_nagios_servicedefs(outfile, hostname): +def create_nagios_servicedefs(outfile, hostname, host_attrs): # _____ # |___ / # |_ \ @@ -2752,22 +2775,38 @@ define servicedependency { } """ % (service_dependency_template, hostname, hostname, service_discovery_name)) - # Levels for host check + # No check_mk service, no legacy service -> create PING service + if not have_at_least_one_service and not legchecks and not actchecks and not custchecks: + add_ping_service(outfile, hostname, host_attrs["address"], is_ipv6_primary(hostname) and 6 or 4, + "PING", host_attrs.get("_NODEIPS")) + + if is_ipv4v6_host(hostname): + if is_ipv6_primary(hostname): + add_ping_service(outfile, hostname, host_attrs["_ADDRESS_4"], 4, + "PING IPv4", host_attrs.get("_NODEIPS_4")) + else: + add_ping_service(outfile, hostname, host_attrs["_ADDRESS_6"], 6, + "PING IPv6", host_attrs.get("_NODEIPS_6")) + + +def add_ping_service(outfile, hostname, ipaddress, family, descr, node_ips): + arguments = check_icmp_arguments_of(hostname, family=family) + + ping_command = 'check-mk-ping' if is_cluster(hostname): - ping_command = 'check-mk-ping-cluster' + arguments += ' -m 1 ' + node_ips else: - ping_command = 'check-mk-ping' + arguments += ' ' + ipaddress - # No check_mk service, no legacy service -> create PING service - if not have_at_least_one_service and not legchecks and not actchecks and not custchecks: - outfile.write(""" + outfile.write(""" define service { use\t\t\t\t%s + service_description\t\t%s check_command\t\t\t%s!%s %s host_name\t\t\t%s } -""" % (pingonly_template, ping_command, check_icmp_arguments_of(hostname), extra_service_conf_of(hostname, "PING"), hostname)) +""" % (pingonly_template, descr, ping_command, arguments, extra_service_conf_of(hostname, descr), hostname)) def verify_cluster_address_family(hostname): diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 1063117..77c53af 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1611,7 +1611,8 @@ multisite_painters["host_custom_vars"] = { "title" : _("Host custom variables"), "columns" : [ "host_custom_variables" ], "groupby" : lambda row: tuple(row["host_custom_variables"].items()), - "paint" : lambda row: paint_custom_vars('host', row, [ 'FILENAME', 'TAGS', 'ADDRESS_4', 'ADDRESS_6', 'ADDRESS_FAMILY' ]), + "paint" : lambda row: paint_custom_vars('host', row, [ 'FILENAME', 'TAGS', 'ADDRESS_4', 'ADDRESS_6', + 'ADDRESS_FAMILY', 'NODEIPS', 'NODEIPS_4', 'NODEIPS_6' ]), }

8 years, 11 months

Merge mathias-kettner.de:check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: 7d579f965600d0b28b3b0515696cf0f6b38850d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d579f965600d0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 12 15:06:33 2015 +0200 Merge mathias-kettner.de:check_mk ---

8 years, 11 months

werk 2658 cherry picked

by Sebastian Herbord

Module: check_mk Branch: master Commit: e3a221fc51ef1e468e5ac17d10fa1bb98e8a9fd6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3a221fc51ef1e… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Oct 12 13:41:35 2015 +0200 werk 2658 cherry picked --- .werks/2658 | 12 ++++++++++++ ChangeLog | 1 + checks/logwatch | 16 +++++++++++++++- 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/.werks/2658 b/.werks/2658 new file mode 100644 index 0000000..024a335 --- /dev/null +++ b/.werks/2658 @@ -0,0 +1,12 @@ +Title: logwatch: unacknowledged messages exceeding the max size are now dropped, even if they were already stored due to a previous bug +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1444649368 + +A previous modification to the logwatch check caused the internal message buffer +(var/check_mk/logwatch) to become bloated, causing high cpu load and memory usage. +This change now auto-corrects those files for those affected. diff --git a/ChangeLog b/ChangeLog index f73bafc..6027ccf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -219,6 +219,7 @@ * 2675 FIX: checkpoint_connections checkpoint_packets: Fixed wrong discovered services on non checkpoint devices * 2657 FIX: windows agent: fixed failure to resolve named performance counters... * 2676 FIX: cisco_asa_failover: Failover state is not treated as warning state anymore... + * 2658 FIX: logwatch: unacknowledged messages exceeding the max size are now dropped, even if they were already stored due to a previous bug... Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/logwatch b/checks/logwatch index 39ed09d..65c7d98 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -339,6 +339,16 @@ check_info['logwatch.groups'] = { precompile_params['logwatch.groups'] = logwatch_group_precompile #. + +# truncate a file near the specified offset while keeping lines intact +def truncate_by_line(filename, offset): + f = open(filename, 'r+') + f.seek(offset) + f.readline() # ensures we don't cut inside a line + f.truncate() + f.close() + + def check_logwatch_generic(item, params, loglines, found, groups=False): # Create directories, if neccessary try: @@ -470,9 +480,13 @@ def check_logwatch_generic(item, params, loglines, found, groups=False): logwatch_file.seek(0) skip_reclassification = False - if skip_reclassification and os.path.getsize(logfile) > logwatch_max_filesize: + logfile_size = os.path.getsize(logfile) + if skip_reclassification and logfile_size > logwatch_max_filesize: # early out: without reclassification the file wont shrink and if it is already at # the maximum size, all input is dropped anyway + if logfile_size > logwatch_max_filesize * 2: + # if the file is far too large, truncate it + truncate_by_line(logfile, logwatch_max_filesize) return (2, "unacknowledged messages have exceeded max size, " "new messages are dropped (limit %d Bytes)" % logwatch_max_filesize)

8 years, 11 months

#2674 Added native support for monitoring via IPv6

by Lars Michelsen

Module: check_mk Branch: master Commit: de78194e58a4464ecd9bfc523718605083574f7a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de78194e58a446… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 12 13:32:54 2015 +0200 #2674 Added native support for monitoring via IPv6 Check_MK is now providing native support for monitoring IPv6 and even dual-stack hosts. This has been implemented in a clean and straight forward way. For each host you can choose which address family shal be used for communication with this host. By default Check_MK is still using only IPv4, but now you can change it to IPv6 for monitoring IPv6 only hosts. In WATO this is done by configuring the host attribute <i>IP Address Family</i>. You can even configure one host to be monitored via IPv4 and IPv6 at the same time. In this situation you need to decide which of the both address families is the primary one. The primary address family is the one which is used for regular monitoring tasks (communication with the agent or SNMP). The secondary address family is only being pinged by default. For the secondary address family a dedicated PING service named (PING v4 or PING v6) is added to the dual-stack hosts. By default the primary address family is IPv4 for all dual-stack hosts. In WATO this can be changed by configuring the rule set <i>Primary IP address family of dual-stack hosts</i>. In some cases you want to perform active checks to check the avilability of a service, e.g. HTTP, using both IPv4 and IPv6. For this case you can add two active checks to the dual-stack host, one having IPv6 enabled and one without having it enabled for using IPv4. But each active check needs to support IPv6 on its own. For the moment the only check working vith IPv6 is <tt>check_http</tt>. This is the default and recommended way for monitoring dual-stack hosts. You use one address family for monitoring the whole system and the other one is just being pinged. Note: If you use the Check_MK Enterprise Edition togehter with the Micro Core, the Smart PING mechanism is not used for IPv6 hosts at the moment. This mechanism has a slightly slower performance, but if you don't have too many IPv6 hosts, this should be OK for the beginning. The basic implementation for IPv6 monitoring has been done. But there are several components in the Check_MK environment left which need to be extended to be fully compatible with IPv6. Some of them are: LI: Parent scanning (check_mk --scan-parents) LI: WATO - Host-Diagnose LI: WATO - Most active checks LI: Event Console LI: Notification Forwarding LI: Livestatus Proxy LI: Several active checks LI: Most special agents LI: The Check_MK Appliance --- .f12 | 15 -- .werks/2621 | 9 + .werks/2674 | 51 +++++ ChangeLog | 2 + agents/cfg_examples/xinetd.conf | 2 + agents/cfg_examples/xinetd_caching.conf | 2 + check_mk_templates.cfg | 3 + checks/check_http | 15 +- modules/automation.py | 8 +- modules/check_mk.py | 334 ++++++++++++++++++++++------ modules/check_mk_base.py | 5 +- modules/config.py | 4 +- modules/discovery.py | 14 +- modules/inventory.py | 2 +- modules/snmp.py | 3 +- web/htdocs/wato.py | 247 ++++++++++++++------ web/plugins/views/builtin.py | 2 +- web/plugins/views/painters.py | 72 +++++- web/plugins/views/sorters.py | 2 + web/plugins/visuals/filters.py | 116 +++++++++- web/plugins/wato/active_checks.py | 14 ++ web/plugins/wato/builtin_attributes.py | 24 +- web/plugins/wato/check_mk_configuration.py | 15 ++ 23 files changed, 772 insertions(+), 189 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=de78194e58…

8 years, 11 months

#2676 FIX cisco_asa_failover: Failover state is not treated as warning state anymore

by Lars Michelsen

Module: check_mk Branch: master Commit: b8f2cea79ce59ad02e73666a7a2f3e9f4f72a177 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8f2cea79ce59a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Oct 12 09:43:09 2015 +0200 #2676 FIX cisco_asa_failover: Failover state is not treated as warning state anymore The Cisco ASA cluster is operating as expected and in practice, it does not really matter which of the cluster members is the primary one. So the failover state, where the secondary device is the active one, is not treated as warning anymore. --- .werks/2676 | 11 +++++++++++ ChangeLog | 1 + checks/cisco_asa_failover | 4 ++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/2676 b/.werks/2676 new file mode 100644 index 0000000..ba82368 --- /dev/null +++ b/.werks/2676 @@ -0,0 +1,11 @@ +Title: cisco_asa_failover: Failover state is not treated as warning state anymore +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1444635713 +Class: fix + +The Cisco ASA cluster is operating as expected and in practice, it does not really +matter which of the cluster members is the primary one. So the failover state, where +the secondary device is the active one, is not treated as warning anymore. diff --git a/ChangeLog b/ChangeLog index 8fee803..66e1a8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -216,6 +216,7 @@ * 2622 FIX: postfix_mailq: Fixed exception when postfix is installed but not configured properly * 2675 FIX: checkpoint_connections checkpoint_packets: Fixed wrong discovered services on non checkpoint devices * 2657 FIX: windows agent: fixed failure to resolve named performance counters... + * 2676 FIX: cisco_asa_failover: Failover state is not treated as warning state anymore... Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/cisco_asa_failover b/checks/cisco_asa_failover index 8c16433..0f4e565 100644 --- a/checks/cisco_asa_failover +++ b/checks/cisco_asa_failover @@ -68,8 +68,8 @@ def check_cisco_asa_failover(_no_item, _no_params, info): or (unit_type == "secondary" and device_state == 10): state = 0 elif device_state in [ 9, 10 ] and other_device_state in [ 9, 10 ]: - state = 1 - details = "The cluster is in failover state" + state = 0 + details = "The cluster is in failover state (Secondary device is active)" elif device_state == 4: state = 2 details = "The device reports an error state"

8 years, 11 months

after werk #2654 t

by Sebastian Herbord

Module: check_mk Branch: master Commit: e4813da947d93219037abd7c8a39ffacce0549b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e4813da947d932… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Oct 7 17:21:48 2015 +0200 after werk #2654 t --- checks/logwatch | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/checks/logwatch b/checks/logwatch index 65ee8ab..39ed09d 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -445,8 +445,9 @@ def check_logwatch_generic(item, params, loglines, found, groups=False): current_block = None + log_exists = os.path.exists(logfile) try: - if os.path.exists(logfile): + if log_exists: logwatch_file = open(logfile, 'r+') else: logwatch_file = open(logfile, 'w') @@ -455,8 +456,10 @@ def check_logwatch_generic(item, params, loglines, found, groups=False): pattern_hash = hash(tuple(patterns)) + net_lines = 0 + # parse cached log lines - if os.path.exists(logfile): + if log_exists: # new format contains hash of patterns on the first line so we only reclassify if they # changed initline = logwatch_file.readline().rstrip('\n') @@ -485,6 +488,7 @@ def check_logwatch_generic(item, params, loglines, found, groups=False): current_block = LogwatchBlock(line) elif current_block is not None: current_block.add_line(line, skip_reclassification) + net_lines += 1 # The last section is finished here. Add it to the list of reclassified lines if the # state of the block is not "I" -> "ignore" @@ -496,6 +500,9 @@ def check_logwatch_generic(item, params, loglines, found, groups=False): collect_block.output_lines = [] else: output_size = sum([len(line) for line in collect_block.output_lines]) + else: + output_size = 0 + skip_reclassification = False header = time.strftime("<<<%Y-%m-%d %H:%M:%S UNKNOWN>>>\n") output_size += len(header) @@ -505,23 +512,23 @@ def check_logwatch_generic(item, params, loglines, found, groups=False): current_block = LogwatchBlock(header) for line in loglines: current_block.add_line(line.encode("utf-8"), False) + net_lines += 1 output_size += len(line) if output_size >= logwatch_max_filesize: break collect_block(current_block) # when reclassifying, rewrite the whole file, outherwise append - if not skip_reclassification: + if not skip_reclassification and collect_block.output_lines: logwatch_file.seek(0) logwatch_file.truncate() logwatch_file.write("[[[%d]]]\n" % pattern_hash) - logwatch_file.writelines(collect_block.output_lines) + if collect_block.output_lines: + logwatch_file.writelines(collect_block.output_lines) # correct output size - output_size = logwatch_file.tell() logwatch_file.close() - - if output_size == 0: + if net_lines == 0: os.unlink(logfile) # if logfile has reached maximum size, abort with critical state

8 years, 11 months

#2657 FIX windows agent: fixed failure to resolve named performance counters

by Sebastian Herbord

Module: check_mk Branch: master Commit: 1f4505d084a772556eeec1a69a6cc66681a93513 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f4505d084a772… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Oct 9 16:06:27 2015 +0200 #2657 FIX windows agent: fixed failure to resolve named performance counters The problem occured when there were very many performance counters on the system. --- .werks/2657 | 9 +++ ChangeLog | 1 + agents/windows/Configuration.cc | 67 +++++++++++----------- agents/windows/Makefile | 2 +- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 826368 -> 210944 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 826368 -> 210944 bytes agents/windows/check_mk_agent.cc | 3 +- agents/windows/check_mk_agent.exe | Bin 743424 -> 206336 bytes agents/windows/check_mk_agent.msi | Bin 1827328 -> 665600 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 743424 -> 206336 bytes agents/windows/install_agent-64.exe | Bin 380165 -> 196415 bytes agents/windows/install_agent.exe | Bin 370666 -> 191727 bytes 13 files changed, 48 insertions(+), 36 deletions(-) diff --git a/.werks/2657 b/.werks/2657 new file mode 100644 index 0000000..6e3ef88 --- /dev/null +++ b/.werks/2657 @@ -0,0 +1,9 @@ +Title: windows agent: fixed failure to resolve named performance counters +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1444399470 +Class: fix + +The problem occured when there were very many performance counters on the system. diff --git a/ChangeLog b/ChangeLog index c21e520..8fee803 100644 --- a/ChangeLog +++ b/ChangeLog @@ -215,6 +215,7 @@ * 2654 FIX: logwatch: fixed high memory and cpu usage caused by too many unacknowledged messages... * 2622 FIX: postfix_mailq: Fixed exception when postfix is installed but not configured properly * 2675 FIX: checkpoint_connections checkpoint_packets: Fixed wrong discovered services on non checkpoint devices + * 2657 FIX: windows agent: fixed failure to resolve named performance counters... Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/agents/windows/Configuration.cc b/agents/windows/Configuration.cc index 5db2c8a..6c32957 100644 --- a/agents/windows/Configuration.cc +++ b/agents/windows/Configuration.cc @@ -171,51 +171,52 @@ bool Configuration::handleGlobalConfigVariable(char *var, char *value) } +// retrieve the next line from a multi-sz registry key +const TCHAR *get_next_multi_sz(const std::vector<TCHAR> &data, size_t &offset) +{ + const TCHAR *next = &data[offset]; + size_t len = strlen(next); + if ((len == 0) || (offset + len > data.size())) { + // the second condition would only happen with an invalid registry value but that's not + // unheard of + return NULL; + } else { + offset += len + 1; + return next; + } +} + + int Configuration::getCounterIdFromLang(const char *language, const char *counter_name) { - HKEY hKey; - LONG result; - TCHAR szValueName[300000]; - DWORD dwcbData = sizeof(szValueName); char regkey[512]; snprintf(regkey, sizeof(regkey), "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Perflib\\%s", language); - result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, regkey, REG_MULTI_SZ, KEY_READ, &hKey); - RegQueryValueEx( - hKey, - "Counter", - NULL, - NULL, - (LPBYTE) szValueName, - &dwcbData - ); + HKEY hKey; + LONG result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, regkey, REG_MULTI_SZ, KEY_READ, &hKey); + + // preflight + std::vector<TCHAR> szValueName; + DWORD dwcbData = 0; + RegQueryValueEx(hKey, "Counter", NULL, NULL, (LPBYTE)&szValueName[0], &dwcbData); + szValueName.resize(dwcbData); + // actual read op + RegQueryValueEx(hKey, "Counter", NULL, NULL, (LPBYTE) &szValueName[0], &dwcbData); RegCloseKey (hKey); if (result != ERROR_SUCCESS) { return -1; } - int length = 0; - int last_ctr_id = 0; - bool is_name = false; - DWORD offset = 0; - - TCHAR* ptr_perf = szValueName; + size_t offset = 0; for(;;) { - if (offset > dwcbData) + const TCHAR *id = get_next_multi_sz(szValueName, offset); + const TCHAR *name = get_next_multi_sz(szValueName, offset); + if ((id == NULL) || (name == NULL)) { break; - - length = strlen(ptr_perf); - if (length == 0) - break; - - if (is_name && !strcmp(counter_name, ptr_perf)) - return last_ctr_id; - else - last_ctr_id = atoi(ptr_perf); - - offset = offset + length + 1; - ptr_perf = szValueName + offset; - is_name = !is_name; + } + if (strcmp(name, counter_name) == 0) { + return strtol(id, NULL, 10); + } } return -1; diff --git a/agents/windows/Makefile b/agents/windows/Makefile index a9e1eb8..36b3117 100644 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -27,7 +27,7 @@ SHELL = /bin/bash VERSION = 1.2.7i3 VERSION_DUMMY = @@@@@CHECK_MK_VERSION@@@@@ WINDRES = i686-w64-mingw32-windres -COPTIONS = -s -O2 -Wall -Werror -static -DCHECK_MK_VERSION='"$(VERSION_DUMMY)"' +COPTIONS = -s -O2 -Wall -Werror -static -fno-rtti -DCHECK_MK_VERSION='"$(VERSION_DUMMY)"' MKDIR = mkdir -p ifeq ($(shell uname),Linux) diff --git a/agents/windows/build_version b/agents/windows/build_version index 5873851..ff5670f 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -467 +481 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index f084614..5173a19 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index beb4cbe..7ddefd1 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index d23ed23..6635814 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -832,8 +832,9 @@ void section_winperf(SOCKET &out) // also output additionally configured counters for (winperf_counters_t::const_iterator it_wp = g_config->winperfCounters().begin(); - it_wp != g_config->winperfCounters().end(); ++it_wp) + it_wp != g_config->winperfCounters().end(); ++it_wp) { dump_performance_counters(out, (*it_wp)->id, (*it_wp)->name); + } } diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index c807ed5..a25cd30 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 42340c5..c188732 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 6c1907a..61fd4c0 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 988b428..0510833 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 0040c28..6110f96 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 11 months

Memory allocated with new[] must be deallocted with delete[].

by Sven Panne

Module: check_mk Branch: master Commit: b0c64a59e78d15509d342c941fdd0b22a7c472e5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0c64a59e78d15… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Oct 9 10:04:21 2015 +0200 Memory allocated with new[] must be deallocted with delete[]. --- livestatus/src/Query.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 876cb5a..2fca315 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -977,7 +977,7 @@ void Query::finish() delete _stats_aggregators[i]; } outputDatasetEnd(); - delete _stats_aggregators; + delete[] _stats_aggregators; } // normal query

8 years, 11 months

← Newer
1
...
21
22
23
24
25
26
27
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2015