Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64439 discussions

Check_MK Git: check_mk: FIX: active checks were disabled for custom active checks

by Mathias Kettner

Module: check_mk Branch: master Commit: a33841c40062afd990f16425625822c5ecfafe6d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a33841c40062af… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 27 12:19:57 2013 +0100 FIX: active checks were disabled for custom active checks --- modules/check_mk.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 52ef4a8..684c79c 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1967,7 +1967,7 @@ define service { active_checks_enabled\t\t%d %s%s} """ % (template, hostname, description, simulate_command(command), - (command_line and not "freshness") and 1 or 0, extraconf, freshness)) + (command_line and not freshness) and 1 or 0, extraconf, freshness)) # Levels for host check if is_cluster(hostname):

11 years, 7 months

Check_MK Git: check_mk: Added skeleton for empty check

by Mathias Kettner

Module: check_mk Branch: master Commit: 7b98d47e5880afc87984d6de678ad21408d6f0ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b98d47e5880af… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 27 09:02:54 2013 +0100 Added skeleton for empty check --- doc/skeleton_check | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/doc/skeleton_check b/doc/skeleton_check new file mode 100644 index 0000000..be9172f --- /dev/null +++ b/doc/skeleton_check @@ -0,0 +1,43 @@ +#!/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. + +# Example output from agent: +# Put here the example output from your TCP-Based agent. If the +# check is SNMP-Based, then remove this section + +def inventory_foobars(info): + return [] + +def check_foobar(item, _no_params, info): + return 3, "UNKNOWN - Check no implemented" + +check_info["foobar"] = { + "check_function" : check_foobar, + "inventory_function" : inventory_foobar, + "service_description" : "FOOBAR", + "has_perfdata" : False, +} +

11 years, 7 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: ff79eb7650aafe71c5fae633fdafe804bb0b95f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff79eb7650aafe… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 27 09:02:59 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 7 months

Check_MK Git: check_mk: FIX: check_mk: improved support of utf-8 characters in extra_service_conf

by Andreas Boesl

Module: check_mk Branch: master Commit: ff327e6c5ff242e84fab36b308afef19ed80060e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff327e6c5ff242… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 26 18:02:21 2013 +0100 FIX: check_mk: improved support of utf-8 characters in extra_service_conf --- ChangeLog | 1 + modules/check_mk.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d0e730d..6e72926 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,7 @@ * FIX: allow unicode encoded extra_service_conf * FIX: no default PING service if custom checks are defined * FIX: check_mk_base: fixed rounding error in get_bytes_human_readable + * FIX: check_mk: improved support of utf-8 characters in extra_service_conf * New configuration variable contactgroup_members Checks & Agents: diff --git a/modules/check_mk.py b/modules/check_mk.py index 07fa1b4..52ef4a8 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1253,7 +1253,7 @@ def extra_service_conf_of(hostname, description): if define_servicegroups: servicegroups_to_define.update(sergr) conf += extra_conf_of(extra_service_conf, hostname, description) - return conf + return conf.encode("utf-8") def extra_summary_service_conf_of(hostname, description): return extra_conf_of(extra_summary_service_conf, hostname, description) @@ -1747,7 +1747,7 @@ def create_nagios_servicedefs(outfile, hostname): } """ % ( template, hostname, description, logwatch, - extra_service_conf_of(hostname, description).encode("utf-8"), checkname )) + extra_service_conf_of(hostname, description), checkname )) checknames_to_define.add(checkname) have_at_least_one_service = True @@ -1809,7 +1809,7 @@ define service { host_name\t\t\t%s %s service_description\t\tCheck_MK } -""" % (active_service_template, hostname, extra_service_conf_of(hostname, "Check_MK").encode("utf-8"))) +""" % (active_service_template, hostname, extra_service_conf_of(hostname, "Check_MK"))) # Inventory checks - if user has configured them. Not for clusters. if inventory_check_interval and not is_cluster(hostname): outfile.write("""

11 years, 7 months

Check_MK Git: check_mk: FixedValue: support Unicode

by Mathias Kettner

Module: check_mk Branch: master Commit: a16d8128350d064fbb6b478de97aec3a85b865eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a16d8128350d06… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 26 16:21:34 2013 +0100 FixedValue: support Unicode --- web/htdocs/valuespec.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index a229732..a2526ea 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -122,6 +122,8 @@ class FixedValue(ValueSpec): def value_to_text(self, value): if self._totext != None: return self._totext + elif type(value) == unicode: + return value else: return str(value)

11 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits