Checkmk git commits February 2012

checkmk-commits@lists.checkmk.com

3 participants
223 discussions

Check_MK Git: check_mk: WATO: move comment to top of hosts.mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 927dad26b2fdbade44afd26223985437e8daf4b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=927dad26b2fdba… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 22 23:23:00 2012 +0100 WATO: move comment to top of hosts.mk --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7cbd719..1795a19 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -602,6 +602,7 @@ def save_hosts(folder = None): make_nagios_directories(dirname) out = create_user_file(filename, 'w') + out.write("# Written by WATO\n# encoding: utf-8\n\n") hosts = folder.get(".hosts", []) if len(hosts) == 0: @@ -671,7 +672,6 @@ def save_hosts(folder = None): custom_macros[nag_varname] = {} custom_macros[nag_varname][hostname] = nagstring - out.write("# Written by WATO\n# encoding: utf-8\n\n") if len(all_hosts) > 0: out.write("all_hosts += [\n") for entry in all_hosts:

12 years, 5 months

Check_MK Git: check_mk: Replicated WATO/automation: load plugins in index. py!

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 271d610d62e4884aa4ad26aaaf45a5e2ebd6340f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=271d610d62e488… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 22 20:24:56 2012 +0100 Replicated WATO/automation: load plugins in index.py! --- web/htdocs/index.py | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 6cffb43..42e7c03 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -157,6 +157,16 @@ def connect_to_livestatus(html): # Default auth domain is read. Please set to None to switch off authorization html.live.set_auth_domain('read') +# Call the load_plugins() function in all modules +def load_all_plugins(): + for module in [ views, sidebar, dashboard, wato, bi, mobile ]: + try: + module.load_plugins # just check if this function exists + module.load_plugins() + except AttributeError: + pass + except Exception: + raise # Main entry point for all HTTP-requests (called directly by mod_apache) def handler(req, profiling = True): @@ -222,6 +232,7 @@ def handler(req, profiling = True): # here. Automation calls bybass the normal authentication stuff if req.myfile == "automation": try: + load_all_plugins() handler() except Exception, e: html.write(str(e)) @@ -265,15 +276,7 @@ def handler(req, profiling = True): load_language(html.var("lang", config.get_language())) # All plugins might have to be reloaded due to a language change - # FIXME: Hier werden alle Module geladen, obwohl diese gar nicht immer alle benötigt würden - for module in [ views, sidebar, dashboard, wato, bi, mobile ]: - try: - module.load_plugins # just check if this function exists - module.load_plugins() - except AttributeError: - pass - except Exception: - raise + load_all_plugins() # User allowed to login at all? if not config.may("use"):

12 years, 5 months

Check_MK Git: check_mk: WATO: do not bail out if conf.d/wato is missing

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e1530f2a62f1dd0eb094098a170d98832a3b653a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1530f2a62f1dd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 22 19:49:26 2012 +0100 WATO: do not bail out if conf.d/wato is missing --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 91a2022..7cbd719 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -456,7 +456,7 @@ def load_folder(dir, name="", path="", parent=None, childs = True): folder[".siteid"] = default_site() # Now look subdirectories - if childs: + if childs and os.path.exists(dir): for entry in os.listdir(dir): if entry[0] == '.': # entries '.' and '..' continue

12 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0636

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e2bb791aeb6bbe4d314dee05bef7a25bb024ccbc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2bb791aeb6bbe… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 22 19:44:00 2012 +0100 Updated bug entries #0636 --- .bugs/636 | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/.bugs/636 b/.bugs/636 new file mode 100644 index 0000000..48bf20a --- /dev/null +++ b/.bugs/636 @@ -0,0 +1,11 @@ +Title: Add missing field to contact configuration +Component: wato +State: open +Date: 2012-02-22 19:40:24 +Targetversion: 1.2.0 +Class: todo + +For example the mobile number field is missing. This +is sometime a showstopper since it is not possible to +manually add further attributes. We even could think +about letting the user add custom attributes here.

12 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0635

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 85b6b8de8fff98e4fcd2f801181df7bcd2bb761c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85b6b8de8fff98… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 22 19:36:19 2012 +0100 Updated bug entries #0635 --- .bugs/635 | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/.bugs/635 b/.bugs/635 new file mode 100644 index 0000000..9bf1f40 --- /dev/null +++ b/.bugs/635 @@ -0,0 +1,11 @@ +Title: Password changes are not replicated +Component: wato +State: open +Date: 2012-02-22 19:32:35 +Targetversion: 1.2.0 +Class: todo + +When a user changes his password, then that change is not automatically +replicated to the slave sites in replicated mode. I think we'd really +need to do some isolated replication only of htpasswd in that case - +automatically.

12 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0634

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 26554280eed74a3d5091a412f4a654de4113ac83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26554280eed74a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 22 19:26:37 2012 +0100 Updated bug entries #0634 --- .bugs/634 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/.bugs/634 b/.bugs/634 new file mode 100644 index 0000000..f492721 --- /dev/null +++ b/.bugs/634 @@ -0,0 +1,9 @@ +Title: Documentation about distributed WATO +Component: docu +State: open +Date: 2012-02-22 19:26:04 +Targetversion: 1.2.0 +Class: todo + +When we finalize the version 1.2.0 we surely need some +documentation about distributed WATO.

12 years, 5 months

Check_MK Git: check_mk: FIX: check_mk-hp_blade_psu.php: allow more than 4 power supplies

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c3e12c3b2253b26993cca8a341fd0e336b21ae91 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3e12c3b2253b2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 22 19:07:19 2012 +0100 FIX: check_mk-hp_blade_psu.php: allow more than 4 power supplies --- ChangeLog | 1 + pnp-templates/check_mk-hp_blade_psu.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4a06866..ef1fc26 100644 --- a/ChangeLog +++ b/ChangeLog @@ -56,6 +56,7 @@ * ntp: do not check 'when' anymore since it can produce false alarms. * postfix_mailq: handle output with 'Total requests:' in last line + * FIX: check_mk-hp_blade_psu.php: allow more than 4 power supplies Multisite: * Added several missing localization strings diff --git a/pnp-templates/check_mk-hp_blade_psu.php b/pnp-templates/check_mk-hp_blade_psu.php index 57a9d2d..ef5c11f 100644 --- a/pnp-templates/check_mk-hp_blade_psu.php +++ b/pnp-templates/check_mk-hp_blade_psu.php @@ -53,7 +53,7 @@ $def[0] = ''; $i = 0; foreach($files AS $file) { - $color = $colors[$i]; + $color = $colors[$i % 4]; $name = str_replace('_', ' ', str_replace('.rrd', '', $file)); $def[0] .= "DEF:var$i=$path/$file:$DS[1]:AVERAGE " ;

12 years, 5 months

Check_MK Git: check_mk: postfix_mailq: handle alternative agent output

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c6c784a3962c8c8fb16285108ca76e5956976177 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c6c784a3962c8c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 22 18:51:43 2012 +0100 postfix_mailq: handle alternative agent output --- ChangeLog | 1 + checks/postfix_mailq | 21 ++++++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 60b24ed..1196ce3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -53,6 +53,7 @@ output from agent now. * ntp: do not check 'when' anymore since it can produce false alarms. + * postfix_mailq: handle output with 'Total requests:' in last line Multisite: * Added several missing localization strings diff --git a/checks/postfix_mailq b/checks/postfix_mailq index 661112e..986ab06 100644 --- a/checks/postfix_mailq +++ b/checks/postfix_mailq @@ -51,6 +51,16 @@ # lm(a)larsmichelsen.com # # -- 1 Kbytes in 1 Request. +# +# Yet another one (I believe, this is from sendmail, though:) +# <<<postfix_mailq>>> +# 8BITMIME (Deferred: Connection refused by mail.gargl.com.) +# <franz(a)gargle.com> +# q1L4ovDO002485 3176 Tue Feb 21 05:50 MAILER-DAEMON +# (Deferred: 451 Try again later) +# <wrdlpfrmpft(a)karl-valentin.com> +# Total requests: 2 +# # WARN num, CRIT num postfix_mailq_default_levels = (10, 20) @@ -73,9 +83,14 @@ def check_postfix_mailq(item, params, info): if " ".join(line[-2:]) == 'is empty': return (0, 'OK - The mailqueue is empty ', [ ('length', 0, params[0], params[1]), ('size', '0') ]) - elif line[0] == '--': - size = postfix_mailq_to_bytes(float(line[1]), line[2]) - len = int(line[4]) + elif line[0] == '--' or line[0:2] == [ 'Total', 'requests:']: + if line[0] == '--': + size = postfix_mailq_to_bytes(float(line[1]), line[2]) + len = int(line[4]) + else: + size = 0 + len = int(line[2]) + perfdata = [ ('length', len, params[0], params[1]), ('size', '%d' % size) ]

12 years, 5 months

Check_MK Git: check_mk: Make cmk -v host honor option --checks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0a36bcc56c23ea7430f19cb072e5a83a2e2b4f24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a36bcc56c23ea… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 22 18:51:55 2012 +0100 Make cmk -v host honor option --checks --- ChangeLog | 2 ++ modules/check_mk.py | 10 ++++++++-- modules/check_mk_base.py | 9 ++++++--- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1196ce3..4a06866 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,8 @@ (such as BINTEC routers) * Check API allows a check to get node information * FIX: fix problem with check includes in subchecks + * Option --checks now also applies to ad-hoc check (e.g. + cmk --checks=mrpe,df -v somehost) WATO: * Much more checks are configurable via WATO now diff --git a/modules/check_mk.py b/modules/check_mk.py index 9a7e5ed..5faee0a 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3511,7 +3511,7 @@ OPTIONS: --usewalk use snmpwalk stored with --snmpwalk --debug never catch Python exceptions --procs N start up to N processes in parallel during --scan-parents - --checks A,.. restrict inventory to specified checks (tcp/snmp/check type) + --checks A,.. restrict checks/inventory to specified checks (tcp/snmp/check type) NOTES: -I can be restricted to certain check types. Write '--checks df -I' if you @@ -4566,5 +4566,11 @@ if __name__ == "__main__": print "Cannot resolve hostname '%s'." % hostname sys.exit(2) - do_check(hostname, ipaddress) + # honor --checks= also when checking (makes testing easier) + if inventory_checks: + check_types = inventory_checks.split(",") + else: + check_types = None + + do_check(hostname, ipaddress, check_types) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 5856bb0..86cb88e 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -689,7 +689,7 @@ def save_counters(hostname): # This is the main check function - the central entry point to all and # everything -def do_check(hostname, ipaddress): +def do_check(hostname, ipaddress, only_check_types = None): if opt_verbose: sys.stderr.write("Check_mk version %s\n" % check_mk_version) @@ -698,7 +698,7 @@ def do_check(hostname, ipaddress): try: load_counters(hostname) - agent_version, num_success, error_sections, problems = do_all_checks_on_host(hostname, ipaddress) + agent_version, num_success, error_sections, problems = do_all_checks_on_host(hostname, ipaddress, only_check_types) num_errors = len(error_sections) save_counters(hostname) if problems: @@ -808,7 +808,7 @@ def convert_check_info(): # Loops over all checks for a host, gets the data, calls the check # function that examines that data and sends the result to Nagios -def do_all_checks_on_host(hostname, ipaddress): +def do_all_checks_on_host(hostname, ipaddress, only_check_types = None): global g_aggregated_service_results g_aggregated_service_results = {} global g_hostname @@ -819,6 +819,9 @@ def do_all_checks_on_host(hostname, ipaddress): problems = [] for checkname, item, params, description, info in check_table: + if only_check_types != None and checkname not in only_check_types: + continue + # In case of a precompiled check table info is the aggrated # service name. In the non-precompiled version there are the dependencies if type(info) == str:

12 years, 5 months

Check_MK Git: check_mk: WATO: Better error message on wrong parameters

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f649b59714fec9dd9adcabf23f889acf5cfdd926 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f649b59714fec9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 22 18:30:22 2012 +0100 WATO: Better error message on wrong parameters --- web/htdocs/wato.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b629d8b..91a2022 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2045,6 +2045,7 @@ def show_service_table(host, firsttime): if config.debug: raise paramtext = _("Invalid check parameter: %s!") % e + paramtext += _(" The parameter is: %r") % (params,) title = "Check parameters for this service: " + paramtext html.write('<a href="%s"><img title="%s" class=icon src="images/icon_rulesets.png"></a>' %

12 years, 5 months

← Newer
1
2
3
4
5
6
7
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2012