Checkmk git commits December 2012

checkmk-commits@lists.checkmk.com

3 participants
128 discussions

Check_MK Git: check_mk: Avoid duplicate verification of monitoring config on cmk -R/-O

by Mathias Kettner

Module: check_mk Branch: master Commit: 3c55b0f794ad779d5f7e8734c2d316c3c0acc131 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c55b0f794ad77… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 19 18:01:40 2012 +0100 Avoid duplicate verification of monitoring config on cmk -R/-O --- ChangeLog | 2 ++ modules/check_mk.py | 8 +++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0ec8b7a..c447731 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ * Added HOSTTAGS to notification macros which contains all Check_MK-Tags separated by spaces * Output better error message in case of old inventory function + * Do object cache precompile for monitoring core on cmk -R/-O + * Avoid duplicate verification of monitoring config on cmk -R/-O Notifications: * Fix flexible notifications on non-OMD systems diff --git a/modules/check_mk.py b/modules/check_mk.py index 4429a6c..f79f889 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3919,7 +3919,7 @@ def do_update(): def do_check_nagiosconfig(): - command = nagios_binary + " -v " + nagios_config_file + " 2>&1" + command = nagios_binary + " -vp " + nagios_config_file + " 2>&1" sys.stdout.write("Validating Nagios configuration...") if opt_verbose: sys.stderr.write("Running '%s'" % command) @@ -3941,10 +3941,8 @@ def do_restart_nagios(only_reload): action = only_reload and "load" or "start" sys.stdout.write("Re%sing Nagios..." % action) sys.stdout.flush() - if omd_root: - command = "omd re%s core 2>&1" % action - else: - command = nagios_startscript + " re%s 2>&1" % action + os.putenv("CORE_NOVERIFY", "yes") + command = nagios_startscript + " re%s 2>&1" % action process = os.popen(command, "r") output = process.read()

11 years, 9 months

Check_MK Git: check_mk: FIX: remove javascript code from non-HTML output

by Mathias Kettner

Module: check_mk Branch: master Commit: 5f0c4fd2c5c76f0198ca3a9e2eb51b2aa693eedf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f0c4fd2c5c76f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 19 17:05:07 2012 +0100 FIX: remove javascript code from non-HTML output --- web/htdocs/views.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 65c4ea9..a9367e7 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1413,7 +1413,8 @@ def render_view(view, rows, datasource, group_painters, painters, selected = get_selected_rows(view, rows, html.var("selected_rows")) headinfo = "%d/%s" % (len(selected), headinfo) - html.javascript("update_headinfo('%s');" % headinfo) + if html.output_format == "html": + html.javascript("update_headinfo('%s');" % headinfo) # Play alarm sounds, if critical events have been displayed if 'S' in display_options and view.get("play_sounds"):

11 years, 9 months

Check_MK Git: check_mk: New script for fetching services via multisite ( not finished)

by Mathias Kettner

Module: check_mk Branch: master Commit: d5fd3d95325ae6969c34137f0507e4d3a9112450 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d5fd3d95325ae6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 19 17:05:17 2012 +0100 New script for fetching services via multisite (not finished) --- doc/treasures/multisite_to_local | 137 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 137 insertions(+), 0 deletions(-) diff --git a/doc/treasures/multisite_to_local b/doc/treasures/multisite_to_local new file mode 100755 index 0000000..b2a0fde --- /dev/null +++ b/doc/treasures/multisite_to_local @@ -0,0 +1,137 @@ +#!/usr/bin/python +# encoding: utf-8 + +# Fetches the current state of all services of a host via Multisite and +# outputs a <<<local>>> section reflecting these states. This script is +# intended to be used as a datasource program. +# +# Still missing: +# - Output of performance data (not included in standard view) +# - Assignment of corrent PNP template (need original check command) + +import os, sys, getopt, time, urllib + +omd_site = os.getenv("OMD_SITE") +omd_root = os.getenv("OMD_ROOT") + +def convert_from_multisite(response): + headers = response[0] + return [ dict(zip(headers, line)) for line in response[1:] ] + +def bail_out(reason): + sys.stderr.write(reason + "\n") + sys.exit(1) + +def verbose(text): + if opt_verbose: + sys.stdout.write(text + "\n") + +def usage(): + sys.stdout.write("""Usage: multisite_to_local [OPTIONS] HOST + +This program is intended to be used as a datasource program. +It fetches the current state of all services of a host +from a remote Multisite and create a <<<local>>> section +from it. That way all those services can be added to the +monitoring of another OMD site. + +URL is the +/check_mk/ e.g. http://someserver.abc/prod/check_mk/ + +Options: + -h, --help Show this help and exit + -v, --verbose Show what's going on + -u, --user U Name of automation user (default: "automation") + -U, --url U Multisite URL of the remote server including + -S, --secret S Automation secret (default: public) +""") + + +short_options = 'hvu:U:S:' +long_options = [ "help", "verbose", "user=", "url=", "secret=" ] + +opt_verbose = False +opt_user = "automation" +opt_secret = None +opt_url = None +if omd_site: + opt_url = "http://localhost/" + omd_site + "/check_mk/" + +try: + opts, args = getopt.getopt(sys.argv[1:], short_options, long_options) +except getopt.GetoptError, err: + sys.stderr.write("%s\n\n" % err) + usage() + sys.exit(1) + +for o,a in opts: + # Docu modes + if o in [ '-h', '--help' ]: + usage() + sys.exit(0) + + # Modifiers + elif o in [ '-v', '--verbose']: + opt_verbose = True + elif o in [ '-u', '--user']: + opt_user = a + elif o in [ '-S', '--secret']: + opt_secret = a + elif o in [ '-U', '--url']: + opt_url = a + +if omd_site and not opt_secret: + try: + opt_secret = file(omd_root + "/var/check_mk/web/" + opt_user + + "/automation.secret").read().strip() + except Exception, e: + bail_out("Cannot read automation secret from user %s: %s" % + (opt_user, e)) + +if not opt_url: + bail_out("Please specify the URL to Check_MK Multisite with -U.") + +if not opt_url.endswith("/check_mk/"): + bail_out("The automation URL must end with /check_mk/") + +if not args: + bail_out("Please specify the host to query services for") + +arg_host = args[0] + +verbose("Host: " + arg_host) +verbose("Multisite-URL: " + opt_url) +verbose("User: " + opt_user) +verbose("Secret: " + opt_secret) + +def make_url(base, variables): + vartext = "&".join([ "%s=%s" % e for e in variables ]) + return base + "?" + vartext + +variables = [ + ( "_username", opt_user ), + ( "_secret", opt_secret ), + ( "host", arg_host ), + ( "view_name", "host" ), + ( "output_format", "python" ), +] + + +url = make_url(opt_url + "view.py", variables) +verbose("URL: " + url) +try: + pipe = urllib.urlopen(url) + answer = pipe.read() + services = convert_from_multisite(eval(answer)) +except Exception, e: + bail_out("Cannot call Multisite URL: %s" % e) + +sys.stdout.write('<<<local>>>\n') + +for service in services: + state = { "OK" : 0, "WARN" : 1, "CRIT" : 2, "UNKNOWN" : 3}.get(service['service_state']) + if state != None: # skip pending services + sys.stdout.write("%d %s - %s\n" % ( + state, + service["service_description"].replace(" ", "_"), + service["svc_plugin_output"]))

11 years, 9 months

Check_MK Git: check_mk: Fix option handling in downtime script

by Mathias Kettner

Module: check_mk Branch: master Commit: 8030097bb533547014c62fa64ae7b724039e73b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8030097bb53354… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 19 16:40:54 2012 +0100 Fix option handling in downtime script --- doc/treasures/downtime | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/treasures/downtime b/doc/treasures/downtime index 1cffd1b..99a0a75 100755 --- a/doc/treasures/downtime +++ b/doc/treasures/downtime @@ -93,8 +93,8 @@ for o,a in opts: opt_verbose = True elif o in [ '-a', '--all']: opt_all = True - elif o in [ '-r', '--remove']: - opt_mode = 'remove' + elif o in [ '-s', '--set']: + opt_mode = 'set' elif o in [ '-r', '--remove']: opt_mode = 'remove' elif o in [ '-c', '--comment']: @@ -106,7 +106,7 @@ for o,a in opts: elif o in [ '-S', '--secret']: opt_secret = a elif o in [ '-U', '--url']: - opt_ = a + opt_url = a if omd_site and not opt_secret: try:

11 years, 9 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: 0a6e2d8b7760eaee558a6f07a8df5b60ca032f6e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a6e2d8b7760ea… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 19 16:40:56 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 9 months

Check_MK Git: check_mk: fixed typo: ldap.py

by Andreas Boesl

Module: check_mk Branch: master Commit: 5497f2ab6995451eb4b98e5986cee3232d8d78c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5497f2ab699545… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Dec 19 14:26:02 2012 +0100 fixed typo: ldap.py --- web/plugins/userdb/ldap.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index dbf38c8..7c57aec 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -245,7 +245,7 @@ def ldap_get_user_dn(username, no_escape = False): if result: if no_escape: return result[0][0] - else + else: return result[0][0].replace('\\', '\\\\') def ldap_get_users(add_filter = None):

11 years, 9 months

Check_MK Git: check_mk: fix: ldap logins with ', ' in distinguished name

by Andreas Boesl

Module: check_mk Branch: master Commit: 5510a337be9e465114a73de8d2a44d39e5bcfbc9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5510a337be9e46… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Dec 19 13:54:24 2012 +0100 fix: ldap logins with ',' in distinguished name --- ChangeLog | 1 + web/plugins/userdb/ldap.py | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8de3cbb..0ec8b7a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,6 +63,7 @@ * FIX: Reloading of sidebar after activate changes * FIX: Main Frame without sidebar: reload after activate changes * FIX: output_format json: handle newlines correctly + * FIX: handle ldap logins with ',' in distinguished name WATO: * FIX: Fixed generated manual check definitions for checks without items diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 7aa41fb..dbf38c8 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -232,7 +232,7 @@ def ldap_replace_macros(tmpl): def ldap_user_id_attr(): return config.ldap_userspec.get('user_id', ldap_attr('user_id')) -def ldap_get_user_dn(username): +def ldap_get_user_dn(username, no_escape = False): # Check wether or not the user exists in the directory # It's only ok when exactly one entry is found. # Returns the DN in this case. @@ -243,7 +243,10 @@ def ldap_get_user_dn(username): ) if result: - return result[0][0].replace('\\', '\\\\') + if no_escape: + return result[0][0] + else + return result[0][0].replace('\\', '\\\\') def ldap_get_users(add_filter = None): columns = [ @@ -516,7 +519,7 @@ def ldap_login(username, password): ldap_connect() # Returns None when the user is not found or not uniq, else returns the # distinguished name of the user as string which is needed for the login. - user_dn = ldap_get_user_dn(username) + user_dn = ldap_get_user_dn(username, True) if not user_dn: return None # The user does not exist. Skip this connector.

11 years, 9 months

Check_MK Git: check_mk: Updated bug entries #0663

by Andreas Boesl

Module: check_mk Branch: master Commit: 358848c0ce9636ba2ff4db7da548591040c71482 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=358848c0ce9636… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Dec 19 14:09:23 2012 +0100 Updated bug entries #0663 --- .bugs/663 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/.bugs/663 b/.bugs/663 new file mode 100644 index 0000000..b755ea1 --- /dev/null +++ b/.bugs/663 @@ -0,0 +1,9 @@ +Title: crontab omd required package +Component: core +State: open +Date: 2012-12-19 14:08:16 +Targetversion: future +Class: todo + +crontab is not a default package in centos6.2 and maybe other distributions +missing crontab -> problem \ No newline at end of file

11 years, 9 months

Check_MK Git: check_mk: zpool_status: fixed crash when spares devices where available

by Andreas Boesl

Module: check_mk Branch: master Commit: b4936e01632394a3a3f7e485ac1444437e0d4db5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b4936e01632394… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Dec 19 12:12:30 2012 +0100 zpool_status: fixed crash when spares devices where available --- ChangeLog | 1 + checks/zpool_status | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3a01224..8de3cbb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,7 @@ * Add: flexible notifcations: filter by hostname * FIX: fixed missing localisation in check_parameteres.py * FIX: userdb/ldap.py: fixed invalid call site.getsitepackages() for python 2.6 + * FIX: zpool_status: fixed crash when spare devices were available Multisite: diff --git a/checks/zpool_status b/checks/zpool_status index 1c76baf..a72581c 100644 --- a/checks/zpool_status +++ b/checks/zpool_status @@ -89,6 +89,10 @@ def check_zpool_status(_no_item, _no_params, info): start_pool = False pool_messages[last_pool] = " ".join(line[1:]) continue + + if line[0] == "spares": + start_pool = False + continue if start_pool == True: if line[1] != "ONLINE":

11 years, 9 months

Check_MK Git: check_mk: ldap.py: fixed invalide site.

by Andreas Boesl

getsitepackages call for python 2.6 Message-ID: <50d0a2d7.fX0D2Fi2LEM7ptnl%ab(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 8db2b2bd005213df46000797df838298cbaf5f5e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8db2b2bd005213… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Dec 18 18:07:29 2012 +0100 ldap.py: fixed invalide site.getsitepackages call for python 2.6 --- ChangeLog | 2 ++ web/plugins/userdb/ldap.py | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index cd1e07d..3a01224 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,8 @@ * FIX: apache_status: fixed bug with missing 'url', wrote man page * Add: flexible notifcations: filter by hostname * FIX: fixed missing localisation in check_parameteres.py + * FIX: userdb/ldap.py: fixed invalid call site.getsitepackages() for python 2.6 + Multisite: * Implemented LDAP integration of Multisite. You can now authenticate your diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 44d8b6b..7aa41fb 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -33,8 +33,16 @@ import time, copy # There seem to be some initialization problems with mod_pythan as the sys.path # is correct when excuting python from the command line as site user. # Try to workaround the problem now... + import site, sys -sys.path.extend(site.getsitepackages()) +try: + sys.path.extend(site.getsitepackages()) +except: # Workaround, python 2.6 ( debian squeeze ) + sys.path.extend(["/usr/local/lib/python2.6/dist-packages"]) + sys.path.extend(["/usr/lib/python2.6/dist-packages"]) + pass + + try: # docs: http://www.python-ldap.org/doc/html/index.html

11 years, 9 months

← Newer
1
2
3
4
5
6
7
8
9
...
13
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2012