Checkmk git commits October 2013

checkmk-commits@lists.checkmk.com

6 participants
384 discussions

Check_MK Git: check_mk: Removed Debug output in wato

by Bastian Kuhn

Module: check_mk Branch: master Commit: dea9b3db459d664c679784eb7ccaba3b6daf5f7c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dea9b3db459d66… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Oct 30 15:35:28 2013 +0100 Removed Debug output in wato --- web/htdocs/wato.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 027f761..3673058 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2434,8 +2434,6 @@ def mode_inventory(phase, firsttime): varname = "_%s_%s" % (ct, html.varencode(item)) if html.var(varname, "") != "": active_checks[(ct, item)] = paramstring - else: - html.debug("Ausgelassen: %s/%s (varname: %s, value: %s)" % (ct, item, varname, html.var(varname))) check_mk_automation(host[".siteid"], "set-autochecks", [hostname], active_checks) if host.get("inventory_failed"):

10 years, 10 months

Check_MK Git: check_mk: Updated bug entries #0834

by Bastian Kuhn

Module: check_mk Branch: master Commit: bab324040056813abf6028959f2ed5f05a580a86 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bab32404005681… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Oct 30 10:23:49 2013 +0100 Updated bug entries #0834 --- .bugs/834 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/834 b/.bugs/834 new file mode 100644 index 0000000..ba1b624 --- /dev/null +++ b/.bugs/834 @@ -0,0 +1,8 @@ +Title: CSV Export for reporting +Component: multisite +State: open +Date: 2013-10-30 10:21:43 +Targetversion: 1.2.3i5 +Class: bug + +Clicking on export to csv does not work.

10 years, 10 months

Check_MK Git: check_mk: new bug

by Bastian Kuhn

Module: check_mk Branch: master Commit: 2e47191f7d926d92e850369cfe4278e670c55c16 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e47191f7d926d… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Oct 30 15:33:48 2013 +0100 new bug --- .bugs/835 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/835 b/.bugs/835 new file mode 100644 index 0000000..e25c0b1 --- /dev/null +++ b/.bugs/835 @@ -0,0 +1,8 @@ +Title: BI doesent honours acknowledgement of services +Component: wato +State: open +Date: 2013-10-30 10:49:32 +Targetversion: 1.2.3i5 +Class: bug +They still appearing as critical +

10 years, 10 months

Check_MK Git: check_mk: Improved performance of LDAP sync by refactoring the group sync code

by Lars Michelsen

Module: check_mk Branch: master Commit: ee2d6c993a02a51823d2e3817304ada7667e92bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee2d6c993a02a5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 30 15:10:21 2013 +0100 Improved performance of LDAP sync by refactoring the group sync code --- ChangeLog | 2 + web/plugins/userdb/ldap.py | 129 ++++++++++++++++++++++++-------------------- 2 files changed, 72 insertions(+), 59 deletions(-) diff --git a/ChangeLog b/ChangeLog index 13b1b43..618ffdd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ 1.2.3i6: + Multisite: + * Improved performance of LDAP sync by refactoring the group sync code 1.2.3i5: Core: diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index a8c1056..c6719e1 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -82,7 +82,8 @@ ldap_filter_map = { }, } -# .----------------------------------------------------------------------. +#. +# .-General LDAP code----------------------------------------------------. # | _ ____ _ ____ | # | | | | _ \ / \ | _ \ | # | | | | | | |/ _ \ | |_) | | @@ -505,53 +506,59 @@ def ldap_get_groups(add_filt = None): filt = '(&%s%s)' % (filt, add_filt) return ldap_search(ldap_replace_macros(config.ldap_groupspec['dn']), filt, ['cn']) -def ldap_user_groups(username, user_dn, attr = 'cn', nested = False): - # When configured to convert user_ids to lower case, all user ids here are lower case. - # Otherwise all user_ids are in the case which they are in LDAP. This should be ok - # for this function! I removed the snippet below to reduce the number of ldap queries. - # Before removal, this query was executed for every user again, just to fetch the DN - # and the username. - # # The given username might be wrong case. The ldap search is case insensitive, - # # so the username read from ldap might differ. Fix it here. - # user_dn, username = ldap_get_user(username, True) - - cache_key = '%s-%s' % (username, nested and 'n' or 'f') +def ldap_group_members(filters, filt_attr = 'cn', nested = False): + cache_key = '%s-%s-%s' % (filters, nested and 'n' or 'f', filt_attr) if cache_key in g_ldap_group_cache: - if attr == 'cn': - return g_ldap_group_cache[cache_key][0] - else: - return g_ldap_group_cache[cache_key][1] - - # posixGroup objects use the memberUid attribute to specify the group memberships. - # This is the username instead of the users DN. So the username needs to be used - # for filtering here. - if ldap_member_attr().lower() == 'memberuid': - user_filter = username - else: - user_filter = user_dn - - # Apply configured group ldap filter and only reply with groups - # having the current user as member - if config.ldap_connection['type'] and nested: - add_filt = '(member:1.2.840.113556.1.4.1941:=%s)' % ldap.filter.escape_filter_chars(user_dn) - else: - add_filt = '(%s=%s)' % (ldap_member_attr(), ldap.filter.escape_filter_chars(user_filter)) - - # First get all groups - groups_cn = [] - groups_dn = [] - for dn, group in ldap_get_groups(add_filt): - groups_cn.append(group['cn'][0]) - groups_dn.append(dn) + return g_ldap_group_cache[cache_key] - g_ldap_group_cache.setdefault(cache_key, (groups_cn, groups_dn)) + # When not searching for nested memberships, it is easy. Simply query the group + # for the memberships in one single query. + if not nested: + filt = ldap_filter('groups') + if filters: + add_filt = '(|%s)' % ''.join([ '(%s=%s)' % (filt_attr, f) for f in filters ]) + filt = '(&%s%s)' % (filt, add_filt) - if attr == 'cn': - return groups_cn + member_attr = ldap_member_attr().lower() + groups = {} + for dn, obj in ldap_search(ldap_replace_macros(config.ldap_groupspec['dn']), filt, ['cn', member_attr]): + groups[dn] = { + 'cn' : obj['cn'][0], + 'members' : obj[member_attr] + } else: - return groups_dn - -# .----------------------------------------------------------------------. + # Nested querying is more complicated. We have no option to simply do a query for group objects + # to make them resolve the memberships here. So we need to query all users with the nested + # memberof filter to get all group memberships of that group. We need one query for each group. + groups = {} + for filter_val in filters: + if filt_attr == 'cn': + result = ldap_search(ldap_replace_macros(config.ldap_groupspec['dn']), + '(&%s(cn=%s))' % (ldap_filter('groups'), filter_val), + columns = ['dn']) + if not result: + continue # Skip groups which can not be found + dn = result[0][0] + cn = filter_val + else: + dn = filter_val + # in case of asking with DNs in nested mode, the resulting objects have the + # cn set to None for all objects. We do not need it in that case. + cn = None + + filt = '(&%s(memberOf:1.2.840.113556.1.4.1941:=%s))' % (ldap_filter('users'), dn) + groups[dn] = { + 'members' : [], + 'cn' : cn, + } + for user_dn, obj in ldap_search(ldap_replace_macros(config.ldap_userspec['dn']), filt, columns = ['dn']): + groups[dn]['members'].append(user_dn) + + g_ldap_group_cache[cache_key] = groups + return groups + +#. +# .-Attributes-----------------------------------------------------------. # | _ _ _ _ _ _ | # | / \ | |_| |_ _ __(_) |__ _ _| |_ ___ ___ | # | / _ \| __| __| '__| | '_ \| | | | __/ _ \/ __| | @@ -746,15 +753,15 @@ def register_user_attribute_sync_plugins(): register_user_attribute_sync_plugins() def ldap_convert_groups_to_contactgroups(plugin, params, user_id, ldap_user, user): - groups = [] - # 1. Fetch CNs of all LDAP groups of the user (use group_dn, group_filter) - ldap_groups = ldap_user_groups(user_id, ldap_user['dn'], nested = params.get('nested', False)) - - # 2. Fetch all existing group names in WATO + # 1. Fetch all existing group names in WATO cg_names = load_group_information().get("contact", {}).keys() - # Only add groups which are already contactgroups in wato - return {'contactgroups': [ g for g in ldap_groups if g in cg_names]} + # 2. Load all LDAP groups which have a CN matching one contact + # group which exists in WATO + ldap_groups = ldap_group_members(cg_names, nested = params.get('nested', False)) + + # 3. Only add groups which the user is member of + return {'contactgroups': [ g['cn'] for dn, g in ldap_groups.items() if ldap_user['dn'] in g['members']]} ldap_attribute_plugins['groups_to_contactgroups'] = { 'title': _('Contactgroup Membership'), @@ -778,17 +785,20 @@ ldap_attribute_plugins['groups_to_contactgroups'] = { } def ldap_convert_groups_to_roles(plugin, params, user_id, ldap_user, user): - groups = [] - # 1. Fetch DNs of all LDAP groups of the user - ldap_groups = [ g.lower() for g in ldap_user_groups(user_id, ldap_user['dn'], - attr = 'dn', nested = params.get('nested', False)) ] + # Load the needed LDAP groups, which match the DNs mentioned in the role sync plugin config + ldap_groups = dict(ldap_group_members([ dn for role_id, dn in params.items() if isinstance(dn, str) ], + filt_attr = 'dn', nested = params.get('nested', False))) - # 2. Load default roles from default user profile + # Load default roles from default user profile roles = config.default_user_profile['roles'][:] - # 3. Loop all roles mentioned in params (configured to be synchronized) + # Loop all roles mentioned in params (configured to be synchronized) for role_id, dn in params.items(): - if isinstance(dn, str) and dn.lower() in ldap_groups and role_id not in roles: + if not isinstance(dn, str): + continue # skip non configured ones + + # if group could be found and user is a member, add the role + if dn in ldap_groups and ldap_user['dn'] in ldap_groups[dn]['members']: roles.append(role_id) return {'roles': roles} @@ -828,7 +838,8 @@ ldap_attribute_plugins['groups_to_roles'] = { 'parameters': ldap_list_roles_with_group_dn, } -# .----------------------------------------------------------------------. +#. +# .-Hooks----------------------------------------------------------------. # | _ _ _ | # | | | | | ___ ___ | | _____ | # | | |_| |/ _ \ / _ \| |/ / __| |

10 years, 10 months

Check_MK Git: check_mk: Updated version in changelog

by Lars Michelsen

Module: check_mk Branch: master Commit: f589ca8a6a1994e6326e7a6e70a8af1c0c0e83d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f589ca8a6a1994… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 30 15:07:48 2013 +0100 Updated version in changelog --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index c730666..13b1b43 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +1.2.3i6: + 1.2.3i5: Core: * Automatically remove duplicate checks when monitoring with Agent+SNMP

10 years, 10 months

Check_MK Git: check_mk: Updated bug entries #0944

by Andreas Boesl

Module: check_mk Branch: master Commit: d7f46de9076b377644e201050dcd7085b71850e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7f46de9076b37… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Oct 30 14:44:36 2013 +0100 Updated bug entries #0944 --- .bugs/944 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/944 b/.bugs/944 index 0749cc3..0038c14 100644 --- a/.bugs/944 +++ b/.bugs/944 @@ -5,5 +5,5 @@ Date: 2013-10-30 14:30:49 Targetversion: 1.2.3i6 Class: nastiness -Each software update modifies the file ~/etc/check/defaults (check_mk_version) +Each software update modifies the file ~/etc/check_mk/defaults (check_mk_version) This change is not commited -> warning box on WATO activate changes

10 years, 10 months

Check_MK Git: check_mk: Updated bug entries #0944

by Andreas Boesl

Module: check_mk Branch: master Commit: 63c228d6cb099cba6bf78b35a1a4deec2bfdbd57 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63c228d6cb099c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Oct 30 14:32:35 2013 +0100 Updated bug entries #0944 --- .bugs/944 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/944 b/.bugs/944 new file mode 100644 index 0000000..0749cc3 --- /dev/null +++ b/.bugs/944 @@ -0,0 +1,9 @@ +Title: WATO Git Version Control - Software Update +Component: wato +State: open +Date: 2013-10-30 14:30:49 +Targetversion: 1.2.3i6 +Class: nastiness + +Each software update modifies the file ~/etc/check/defaults (check_mk_version) +This change is not commited -> warning box on WATO activate changes

10 years, 10 months

Check_MK Git: check_mk: Updated release to 1.2.3i5

by Lars Michelsen

Module: check_mk Branch: master Commit: c387f4f28f5720ee9ce6460d74ca6c449737ad61 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c387f4f28f5720… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 30 14:31:13 2013 +0100 Updated release to 1.2.3i5 --- Makefile | 3 ++- agents/check_mk_agent.aix | 2 +- agents/check_mk_agent.freebsd | 2 +- agents/check_mk_agent.hpux | 2 +- agents/check_mk_agent.linux | 2 +- agents/check_mk_agent.macosx | 2 +- agents/check_mk_agent.netbsd | 2 +- agents/check_mk_agent.openbsd | 2 +- agents/check_mk_agent.openvms | 2 +- agents/check_mk_agent.solaris | 2 +- agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 151040 -> 151040 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent.exe | Bin 146764 -> 146763 bytes agents/windows/installer.nsi | 2 +- agents/windows/nowin.exe | Bin 22511 -> 22511 bytes debian/files | 2 +- doc/treasures/mknotifyd | 2 +- livestatus/configure.ac | 2 +- mkeventd/bin/mkeventd | 2 +- scripts/setup.sh | 2 +- 21 files changed, 18 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index b36464e..f6d149c 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.2.3i4 +VERSION = 1.2.3i5 NAME = check_mk RPM_TOPDIR = rpm.topdir RPM_BUILDROOT = rpm.buildroot @@ -137,6 +137,7 @@ version: -o "$$(head -c 12 /etc/issue)" = "Ubuntu 12.04" \ -o "$$(head -c 12 /etc/issue)" = "Ubuntu 12.10" \ -o "$$(head -c 12 /etc/issue)" = "Ubuntu 13.04" \ + -o "$$(head -c 12 /etc/issue)" = "Ubuntu 13.10" \ -o "$$(head -c 20 /etc/issue)" = "Debian GNU/Linux 6.0" ] \ || { echo 'You are not on the reference system!' ; exit 1; } @newversion=$$(dialog --stdout --inputbox "New Version:" 0 0 "$(VERSION)") ; \ diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 02d8917..82d8a19 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -48,7 +48,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.3i4 +echo Version: 1.2.3i5 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 3872457..009e60c 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -66,7 +66,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.3i4 +echo Version: 1.2.3i5 echo AgentOS: freebsd diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index c5048b7..e94f092 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -48,7 +48,7 @@ fi echo '<<<check_mk>>>' -echo Version: 1.2.3i4 +echo Version: 1.2.3i5 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index cc18602..ac4d0ee 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -89,7 +89,7 @@ function run_cached () { } echo '<<<check_mk>>>' -echo Version: 1.2.3i4 +echo Version: 1.2.3i5 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.macosx b/agents/check_mk_agent.macosx index f5e697d..1148988 100755 --- a/agents/check_mk_agent.macosx +++ b/agents/check_mk_agent.macosx @@ -43,7 +43,7 @@ fi echo '<<<check_mk>>>' -echo Version: 1.2.3i4 +echo Version: 1.2.3i5 echo AgentOS: macosx osver="$(uname -r)" diff --git a/agents/check_mk_agent.netbsd b/agents/check_mk_agent.netbsd index 75b7ce0..ed00be4 100755 --- a/agents/check_mk_agent.netbsd +++ b/agents/check_mk_agent.netbsd @@ -59,7 +59,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.3i4 +echo Version: 1.2.3i5 echo AgentOS: netbsd osver="$(uname -r)" diff --git a/agents/check_mk_agent.openbsd b/agents/check_mk_agent.openbsd index 77c3065..2cafe02 100644 --- a/agents/check_mk_agent.openbsd +++ b/agents/check_mk_agent.openbsd @@ -59,7 +59,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.3i4 +echo Version: 1.2.3i5 echo AgentOS: openbsd osver="$(uname -r)" diff --git a/agents/check_mk_agent.openvms b/agents/check_mk_agent.openvms index e47b95f..e9b761a 100644 --- a/agents/check_mk_agent.openvms +++ b/agents/check_mk_agent.openvms @@ -162,7 +162,7 @@ $set noVerify $define sys$output "''cacheFile'_new" $on error then goto WCFdone $say "<<<check_mk>>>" -$say "Version: 1.2.3i4" +$say "Version: 1.2.3i5" $say "AgentOS: openvms" $say "Nodename: ",f$getsyi("nodename") $say "Architecture: ''HWinfo'" diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 6891660..f5f6dcb 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -49,7 +49,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.3i4 +echo Version: 1.2.3i5 echo AgentOS: solaris diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 5b1d486..f8e8a95 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -75,7 +75,7 @@ // | Declarations of macrosk, structs and function prototypes | // '----------------------------------------------------------------------' -#define CHECK_MK_VERSION "1.2.3i4" +#define CHECK_MK_VERSION "1.2.3i5" #define CHECK_MK_AGENT_PORT 6556 #define SERVICE_NAME "Check_MK_Agent" #define KiloByte 1024 diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 4da6c4d..09510ef 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 fed9ba9..c57be26 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 04df2af..91e04a1 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/installer.nsi b/agents/windows/installer.nsi index aeaafc1..84f2c0b 100644 --- a/agents/windows/installer.nsi +++ b/agents/windows/installer.nsi @@ -4,7 +4,7 @@ ; Useful sources: ; http://nsis.sourceforge.net/Reusable_installer_script -!define CHECK_MK_VERSION "1.2.3i4" +!define CHECK_MK_VERSION "1.2.3i5" !define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index 75c8aba..57cbc09 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ diff --git a/debian/files b/debian/files index ae54203..b48ddee 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -check-mk_1.2.3i4-1_all.deb net optional +check-mk_1.2.3i5-1_all.deb net optional diff --git a/doc/treasures/mknotifyd b/doc/treasures/mknotifyd index 4e37b28..369010e 100755 --- a/doc/treasures/mknotifyd +++ b/doc/treasures/mknotifyd @@ -30,7 +30,7 @@ from pwd import getpwnam from grp import getgrnam -VERSION="1.2.3i4" +VERSION="1.2.3i5" # .--Helper functions----------------------------------------------------. # | _ _ _ | # | | | | | ___| |_ __ ___ _ __ ___ | diff --git a/livestatus/configure.ac b/livestatus/configure.ac index ee3312d..3a33de7 100644 --- a/livestatus/configure.ac +++ b/livestatus/configure.ac @@ -28,7 +28,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([MK Livestatus], [1.2.3i4], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.2.3i5], [mk(a)mathias-kettner.de]) AM_INIT_AUTOMAKE([-Wall foreign]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 97df06a..e9c5865 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -6,7 +6,7 @@ import socket, os, time, sys, getopt, signal, thread, pprint, re, \ from pwd import getpwnam from grp import getgrnam -VERSION="1.2.3i4" +VERSION="1.2.3i5" # .--Declarations--------------------------------------------------------. # | ____ _ _ _ | diff --git a/scripts/setup.sh b/scripts/setup.sh index 4f14aba..3ba8fe1 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.2.3i4 +VERSION=1.2.3i5 NAME=check_mk LANG= LC_ALL=

10 years, 10 months

Check_MK Git: check_mk: table statehist: fixed SIGSEGV chance on larger queries (strtok...)

by Andreas Boesl

Module: check_mk Branch: master Commit: 37279d6eec797fdc0b0e9ee56d832e15820c8ee2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37279d6eec797f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Oct 30 13:53:50 2013 +0100 table statehist: fixed SIGSEGV chance on larger queries (strtok...) --- ChangeLog | 3 ++- livestatus/src/TableStateHistory.cc | 14 ++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 24bd7f8..c730666 100644 --- a/ChangeLog +++ b/ChangeLog @@ -123,8 +123,9 @@ * Removed "livecheck". It never was really stable. Nagios4 has something similar built in. And also the Check_MK Micro Core. * table statehist: no longer computes an unmonitored state for hosts and - services on certain instances. + services on certain instances. (showed up as no hosts/services in the multisite gui) + * table statehist: fixed SIGSEGV chance on larger queries 1.2.3i4: Core: diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index ac95135..e35088b 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -567,10 +567,11 @@ void TableStateHistory::answerQuery(Query *query) } case TIMEPERIOD_TRANSITION: { + char *save_ptr; char *buffer = strdup(entry->_options); - char *tp_name = strtok(buffer, ";"); - strtok(NULL, ";"); - char *tp_state = strtok(NULL, ";"); + char *tp_name = strtok_r(buffer, ";", &save_ptr); + strtok_r(NULL, ";", &save_ptr); + char *tp_state = strtok_r(NULL, ";", &save_ptr); _notification_periods[tp_name] = atoi(tp_state); state_info_t::iterator it_hst = state_info.begin(); @@ -768,10 +769,11 @@ inline int TableStateHistory::updateHostServiceState(Query *query, const LogEntr } case TIMEPERIOD_TRANSITION: { + char *save_ptr; char *buffer = strdup(entry->_options); - char *tp_name = strtok(buffer, ";"); - strtok(NULL, ";"); - char *tp_state = strtok(NULL, ";"); + char *tp_name = strtok_r(buffer, ";", &save_ptr); + strtok_r(NULL, ";", &save_ptr); + char *tp_state = strtok_r(NULL, ";", &save_ptr); // if no _host pointer is available the initial status of _in_notification_period (1) never changes if (hs_state->_host && !strcmp(tp_name, hs_state->_notification_period)) {

10 years, 10 months

Check_MK Git: check_mk: FIX: if/if64/...: layout fix in PNP template for packets5~

by Mathias Kettner

Module: check_mk Branch: master Commit: 7c8baad2a5b1f0400f7ac0b36d622f6009589f40 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c8baad2a5b1f0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 30 10:11:48 2013 +0100 FIX: if/if64/...: layout fix in PNP template for packets5~ --- ChangeLog | 1 + pnp-templates/check_mk-if.php | 40 ++++++++++++++++++++-------------------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index b32ba8c..24bd7f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -92,6 +92,7 @@ the agent, no PNP graphs for them are drawn. (This is the case if ExtendedStatus set to Off in Apache config) * FIX: oracle_jobs: fixed issues with incorrect column count in check output + * FIX: if/if64/...: layout fix in PNP template for packets WATO: diff --git a/pnp-templates/check_mk-if.php b/pnp-templates/check_mk-if.php index 17a359e..d0cf9a2 100644 --- a/pnp-templates/check_mk-if.php +++ b/pnp-templates/check_mk-if.php @@ -162,17 +162,17 @@ $def[2] = "DEF:inu=$RRDFILE[2]:$DS[2]:MAX ". "DEF:innu=$RRDFILE[3]:$DS[3]:MAX ". "CDEF:in=inu,innu,+ ". - "AREA:inu#00ffc0:\"in unicast \" ". - "GPRINT:inu:LAST:\"%8.2lf/s last \" ". - "GPRINT:inu:AVERAGE:\"%8.2lf/s avg \" ". - "GPRINT:inu:MAX:\"%8.2lf/s max\\n\" ". - "AREA:innu#00c080:\"in broadcast/multicast \":STACK ". - "GPRINT:innu:LAST:\"%8.2lf/s last \" ". - "GPRINT:innu:AVERAGE:\"%8.2lf/s avg \" ". - "GPRINT:innu:MAX:\"%8.2lf/s max\\n\" ". + "AREA:inu#00ffc0:\"in unicast \" ". + "GPRINT:inu:LAST:\"%9.1lf/s last \" ". + "GPRINT:inu:AVERAGE:\"%9.1lf/s avg \" ". + "GPRINT:inu:MAX:\"%9.1lf/s max\\n\" ". + "AREA:innu#00c080:\"in broadcast/multicast \":STACK ". + "GPRINT:innu:LAST:\"%9.1lf/s last \" ". + "GPRINT:innu:AVERAGE:\"%9.1lf/s avg \" ". + "GPRINT:innu:MAX:\"%9.1lf/s max\\n\" ". "VDEF:inperc=in,95,PERCENTNAN ". - "LINE:inperc#00cf00:\"95% percentile incoming \" ". - "GPRINT:inperc:\"%8.2lf/s\\n\" ". + "LINE:inperc#00cf00:\"in 95% percentile \" ". + "GPRINT:inperc:\"%9.1lf/s\\n\" ". # outgoing "DEF:outu=$RRDFILE[7]:$DS[7]:MAX ". @@ -180,17 +180,17 @@ $def[2] = "CDEF:minusoutu=0,outu,- ". "CDEF:minusoutnu=0,outnu,- ". "CDEF:minusout=minusoutu,minusoutnu,+ ". - "AREA:minusoutu#00c0ff:\"out unicast \" ". - "GPRINT:outu:LAST:\"%8.2lf/s last \" ". - "GPRINT:outu:AVERAGE:\"%8.2lf/s avg \" ". - "GPRINT:outu:MAX:\"%8.2lf/s max\\n\" ". - "AREA:minusoutnu#0080c0:\"out broadcast/multicast \":STACK ". - "GPRINT:outnu:LAST:\"%8.2lf/s last \" ". - "GPRINT:outnu:AVERAGE:\"%8.2lf/s avg \" ". - "GPRINT:outnu:MAX:\"%8.2lf/s max\\n\" ". + "AREA:minusoutu#00c0ff:\"out unicast \" ". + "GPRINT:outu:LAST:\"%9.1lf/s last \" ". + "GPRINT:outu:AVERAGE:\"%9.1lf/s avg \" ". + "GPRINT:outu:MAX:\"%9.1lf/s max\\n\" ". + "AREA:minusoutnu#0080c0:\"out broadcast/multicast\":STACK ". + "GPRINT:outnu:LAST:\"%9.1lf/s last \" ". + "GPRINT:outnu:AVERAGE:\"%9.1lf/s avg \" ". + "GPRINT:outnu:MAX:\"%9.1lf/s max\\n\" ". "VDEF:outperc=minusout,5,PERCENTNAN ". - "LINE:outperc#0000cf:\"95% percentile outgoing\" ". - "GPRINT:outperc:\"%8.2lf/s\\n\" ". + "LINE:outperc#0000cf:\"out 95% percentile \" ". + "GPRINT:outperc:\"%9.1lf/s\\n\" ". ""; # Graph 3: errors and discards

10 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2013