Checkmk git commits February 2013

checkmk-commits@lists.checkmk.com

3 participants
346 discussions

Check_MK Git: check_mk: FIX: fix user database corruption in case of a race condition

by Mathias Kettner

Module: check_mk Branch: master Commit: d65c0a577722552019482271dbc1cdacc94b16f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d65c0a57772255… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 26 15:53:44 2013 +0100 FIX: fix user database corruption in case of a race condition Conflicts: ChangeLog --- ChangeLog | 1 + web/htdocs/userdb.py | 46 +++++++++++++++++++++------------------------- 2 files changed, 22 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5f4185e..d0e730d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -70,6 +70,7 @@ * FIX: fixed focus bug in transform valuespec class * FIX: stop doing snapin refreshes after they have been removed * FIX: sidebar snapins which refresh do not register for restart detection anymore + * FIX: fix user database corruption in case of a race condition * Changed sidebar snapin reload to a global interval (option: sidebar_update_interval), defaults to 30 seconds * Sidebar snapins are now bulk updated with one HTTP request each interval diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 8c3096c..075a467 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -140,22 +140,27 @@ def reset_user_attributes(): user_attributes = {} def load_users(): - # First load monitoring contacts from Check_MK's world filename = root_dir + "contacts.mk" - if os.path.exists(filename): - try: - vars = { "contacts" : {} } - execfile(filename, vars, vars) - contacts = vars["contacts"] - except Exception, e: - if config.debug: - raise MKGeneralException(_("Cannot read configuration file %s: %s" % - (filename, e))) - else: - html.log('load_users: Problem while loading contacts (%s - %s). ' - 'Initializing structure...' % (filename, e)) - contacts = {} - else: + + # Make sure that the file exists without modifying it, *if* it exists. + # Note the lock will be released at end of page request automatically. + file(filename, "a") + aquire_lock(filename) + + # First load monitoring contacts from Check_MK's world. If this is + # the first time, then the file will be empty, which is no problem. + # Execfile will the simply leave contacts = {} unchanged. + try: + vars = { "contacts" : {} } + execfile(filename, vars, vars) + contacts = vars["contacts"] + except Exception, e: + if config.debug: + raise MKGeneralException(_("Cannot read configuration file %s: %s" % + (filename, e))) + else: + html.log('load_users: Problem while loading contacts (%s - %s). ' + 'Initializing structure...' % (filename, e)) contacts = {} # Now add information about users from the Web world @@ -261,6 +266,7 @@ def load_users(): def split_dict(d, keylist, positive): return dict([(k,v) for (k,v) in d.items() if (k in keylist) == positive]) + def save_users(profiles): custom_values = user_attributes.keys() @@ -300,19 +306,9 @@ def save_users(profiles): if p in multisite_keys + multisite_attributes(profile.get('connector'))]) filename = root_dir + "contacts.mk" - locked = False - if os.path.exists(filename): - # When the file exists, lock the file before opening (and truncating) it - aquire_lock(filename) - locked = True # Check_MK's monitoring contacts out = create_user_file(filename, "w") - - # In create mode lock the file after creation - if not locked: - aquire_lock(filename) - out.write("# Written by Multisite UserDB\n# encoding: utf-8\n\n") out.write("contacts.update(\n%s\n)\n" % pprint.pformat(contacts)) out.close()

11 years, 6 months

Check_MK Git: check_mk: sap.value: Fixed missing var

by Lars Michelsen

Module: check_mk Branch: master Commit: 8ea224071278f2b921d686fb08a55e6ae380b714 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ea224071278f2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 26 12:02:11 2013 +0100 sap.value: Fixed missing var --- checks/sap | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/checks/sap b/checks/sap index 10d3971..a0a868c 100644 --- a/checks/sap +++ b/checks/sap @@ -24,6 +24,15 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# This map converts between the SAP color codes (key values) and the +# nagios state codes +sap_nagios_state_map = [ + 0, # GRAY (inactive or no current info available) -> OK + 0, # GREEN -> OK + 1, # YELLOW -> WARNING + 2, # RED -> CRITICAL +] + def inventory_sap_dialog(info): inv = [] for line in info:

11 years, 6 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 84c816173f6b3ecc8fc6e0766552158946d487c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84c816173f6b3e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 26 12:04:15 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 6 months

Check_MK Git: check_mk: Table statehist: Improved detection of vanished hosts and services.

by Andreas Boesl

Module: check_mk Branch: master Commit: ffd99a1fceee14bd5cb36ed8ddf16a9b2be78fde URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ffd99a1fceee14… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 26 10:09:50 2013 +0100 Table statehist: Improved detection of vanished hosts and services. Now able to detect and remove nonsense check plugin output --- ChangeLog | 4 + livestatus/src/LogEntry.cc | 8 +++ livestatus/src/LogEntry.h | 2 + livestatus/src/TableStateHistory.cc | 117 ++++++++++++++++++++++------------- livestatus/src/TableStateHistory.h | 3 +- 5 files changed, 91 insertions(+), 43 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ffd99a1fce…

11 years, 6 months

Check_MK Git: check_mk: check_ldap: removed debug output

by Mathias Kettner

Module: check_mk Branch: master Commit: 11c013f8e334f8bf813bc710909943ef0673900b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11c013f8e334f8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 26 10:03:07 2013 +0100 check_ldap: removed debug output --- checks/check_ldap | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/checks/check_ldap b/checks/check_ldap index da811db..7e1872f 100644 --- a/checks/check_ldap +++ b/checks/check_ldap @@ -25,7 +25,6 @@ # Boston, MA 02110-1301 USA. def check_ldap_arguments(params): - print params name, basedn, settings = params args = ' -b %s' % quote_shell_string(basedn)

11 years, 6 months

Check_MK Git: check_mk: FIX: check_ldap: added missing version option

by Mathias Kettner

Module: check_mk Branch: master Commit: eff0e4366f2dd4ba99f9af0386176bd634500855 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eff0e4366f2dd4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 26 09:59:29 2013 +0100 FIX: check_ldap: added missing version option --- ChangeLog | 1 + checks/check_ldap | 8 ++++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index d4ee3ee..18b6c7e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -54,6 +54,7 @@ * FIX: jolokia_metrics.mem: renamed parameter totalheap to total * FIX: megaraid_bbu: deal with broken output ("Adpater") * FIX: check_ldap: added missing host address (check didn't work at all) + * FIX: check_ldap: added missing version option -2, -3, -3 -T (TLS) * Linux agent: limit netstat to 10 seconds * ps: Allow %1, %2, .. instead of %s in process_inventory. That allows reordering of matched groups diff --git a/checks/check_ldap b/checks/check_ldap index 89b516b..da811db 100644 --- a/checks/check_ldap +++ b/checks/check_ldap @@ -25,6 +25,7 @@ # Boston, MA 02110-1301 USA. def check_ldap_arguments(params): + print params name, basedn, settings = params args = ' -b %s' % quote_shell_string(basedn) @@ -48,6 +49,13 @@ def check_ldap_arguments(params): if "port" in settings: args += ' -p %d' % settings["port"] + if "version" in settings: + args += { + "v2" : " -2", + "v3" : " -3", + "v3tls" : " -3 -T", + }[settings["version"]] + if settings.get("ssl"): args += ' --ssl'

11 years, 6 months

Check_MK Git: check_mk: FIX: fix passive commands without freshness

by Mathias Kettner

Module: check_mk Branch: master Commit: 0da4cf21f99776bc43cb4e7bd8ec98b03c766c94 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0da4cf21f99776… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 25 16:28:59 2013 +0100 FIX: fix passive commands without freshness --- modules/check_mk.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index a7ec05e..07fa1b4 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1939,6 +1939,8 @@ define service { " freshness_threshold\t\t%d\n" % (60 * entry["freshness"]["interval"]) command_line = "echo %s && exit %d" % ( quote_shell_string(entry["freshness"]["output"]), entry["freshness"]["state"]) + else: + freshness = "" custom_commands_to_define.add(command_name)

11 years, 6 months

Check_MK Git: check_mk: check_disk_smb: WATO formalization for active check check_disk_smb

by Mathias Kettner

Module: check_mk Branch: master Commit: 6942fc6300b4782fa9a87ff1b4bcdbbe7809d2f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6942fc6300b478… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 25 16:09:08 2013 +0100 check_disk_smb: WATO formalization for active check check_disk_smb --- ChangeLog | 1 + checks/check_disk_smb | 54 ++++++++++++++++++++++++++++++ web/plugins/wato/active_checks.py | 65 ++++++++++++++++++++++++++++++++++++- 3 files changed, 119 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5afa85d..d4ee3ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,7 @@ * sap.dialog: Monitors SAP dialog statistics like the response time * sap.value: Simply processes information provided by SAP to Nagios * openvpn_clients: new check for OpenVPN connections + * check_disk_smb: WATO formalization for active check check_disk_smb BI: * Integrated availability computing, including nifty time warp feature diff --git a/checks/check_disk_smb b/checks/check_disk_smb new file mode 100644 index 0000000..efb5a7c --- /dev/null +++ b/checks/check_disk_smb @@ -0,0 +1,54 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +def check_disk_smb_arguments(params): + args = ' -a $HOSTADDRESS$ -s %s' % quote_shell_string(params["share"]) + args += ' -w%d%% -c%d%%' % params["levels"] + + if "workgroup" in params: + args += ' -W %s' % quote_shell_string(params["workgroup"]) + + if "port" in params: + args += ' -p %d' % params["port"] + + if "auth" in params: + args += ' -u %s -p %s' % tuple(map(quote_shell_string, params["auth"])) + + if "host" in params: + args += ' -H %s' % quote_shell_string(params["host"]) + else: + args += ' -H $HOSTADDRESS$' + + return args + + +active_check_info['disk_smb'] = { + "command_line" : '$USER1$/check_disk_smb $ARG1$', + "argument_function" : check_disk_smb_arguments, + "service_description" : lambda params: "SMB Share " + params["share"], + "has_perfdata" : True, +} + diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index ff5778e..e18d2de 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -86,7 +86,6 @@ register_rule(group, ), match = 'all') - register_rule(group, "active_checks:tcp", Tuple( @@ -730,6 +729,70 @@ register_rule(group, match = 'all' ) +register_rule(group, + "active_checks:disk_smb", + Dictionary( + title = _("Check access to SMB share"), + help = _("This ruleset helps you to configure the classical Nagios " + "plugin <tt>check_disk_smb</tt> that checks the access to " + "filesystem shares that are exported via SMB/CIFS."), + elements = [ + ( "share", + TextUnicode( + title = _("SMB share to check"), + size = 32, + allow_empty = False, + )), + ( "workgroup", + TextUnicode( + title = _("Workgroup"), + help = _("Workgroup or domain used (defaults to <tt>WORKGROUP</tt>)"), + size = 32, + allow_empty = False, + )), + ( "host", + TextAscii( + title = _("NetBIOS name of the server"), + help = _("If omitted then the IP address is being used."), + size = 32, + allow_empty = False, + )), + ( "port", + Integer( + title = _("TCP Port"), + help = _("TCP port number to connect to. Usually either 139 or 445."), + default_value = 445, + minvalue = 1, + maxvalue = 65535, + )), + ( "levels", + Tuple( + title = _("Levels for used disk space"), + elements = [ + Percentage(title = _("Warning at"), default_value = 85, unit=_("% used space")), + Percentage(title = _("Critical at"), default_value = 95, unit=_("% used space")), + ] + )), + ( "auth", + Tuple( + title = _("Authorization"), + elements = [ + TextAscii( + title = _("Username"), + allow_empty = False, + size = 24), + Password( + title = _("Password"), + allow_empty = False, + size = 12), + ], + )), + ], + required_keys = [ "share", "levels" ], + ), + match = 'all') + + register_rule(group, "custom_checks", Dictionary(

11 years, 6 months

Check_MK Git: check_mk: FIX: check_ldap: added missing host address ( check didn't work at all)

by Mathias Kettner

Module: check_mk Branch: master Commit: c0b7cf242b5ec57a5c93b2e990368d4c4d65cbca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0b7cf242b5ec5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 25 13:12:30 2013 +0100 FIX: check_ldap: added missing host address (check didn't work at all) Conflicts: ChangeLog --- ChangeLog | 1 + checks/check_ldap | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index d97c57e..5afa85d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -52,6 +52,7 @@ * FIX: megaraid_pdisk: deal with special output of Open-E * FIX: jolokia_metrics.mem: renamed parameter totalheap to total * FIX: megaraid_bbu: deal with broken output ("Adpater") + * FIX: check_ldap: added missing host address (check didn't work at all) * Linux agent: limit netstat to 10 seconds * ps: Allow %1, %2, .. instead of %s in process_inventory. That allows reordering of matched groups diff --git a/checks/check_ldap b/checks/check_ldap index 41001fb..89b516b 100644 --- a/checks/check_ldap +++ b/checks/check_ldap @@ -51,6 +51,8 @@ def check_ldap_arguments(params): if settings.get("ssl"): args += ' --ssl' + args += ' -H $HOSTADDRESS$' + return args

11 years, 6 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: fab34a07267c9597e3ae69d0130d79ab3ce796bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fab34a07267c95… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 25 12:50:33 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2013