Checkmk git commits September 2013

checkmk-commits@lists.checkmk.com

6 participants
227 discussions

Check_MK Git: check_mk: Updated bug entries #1049

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: ecb88d8e65f9890f45ea8c625bee3003ea9ea5c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ecb88d8e65f989… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Sep 12 10:32:09 2013 +0200 Updated bug entries #1049 --- .bugs/1049 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.bugs/1049 b/.bugs/1049 new file mode 100644 index 0000000..f2cdd0c --- /dev/null +++ b/.bugs/1049 @@ -0,0 +1,13 @@ +Title: Errormessage displayed when configuring distributed monitoring +Component: multisite +State: open +Date: 2013-09-12 10:27:16 +Targetversion: 1.2.3i2 +Class: bug + +in distributed monitoring a remote slave is configured +when clicking "save" butto multisite displays an error, where there seems to be none: +Internal error:: '.siteid' (Retry with debug mode) +but when klicking "Retry with debug mode" it works + +the connection is created correct within the first click on save

11 years, 1 month

Check_MK Git: check_mk: Removed failing line from logwatch example

by Mathias Kettner

Module: check_mk Branch: master Commit: 83234983942506e945b27a02449d27251a60a84e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83234983942506… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 12 08:51:32 2013 +0200 Removed failing line from logwatch example --- agents/logwatch.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/agents/logwatch.cfg b/agents/logwatch.cfg index 5a525b2..9c4045e 100644 --- a/agents/logwatch.cfg +++ b/agents/logwatch.cfg @@ -43,7 +43,6 @@ W device-mapper: thin:.*reached low water mark C device-mapper: thin:.*no free space C Error: (.*) - R There is a Error: \1 /var/log/auth.log W sshd.*Corrupted MAC on input

11 years, 1 month

Check_MK Git: check_mk: GIT handling: ignore untracked files

by Mathias Kettner

Module: check_mk Branch: master Commit: fc36940d75e0013a644212065a74b6941cd91a75 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc36940d75e001… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 11 16:54:48 2013 +0200 GIT handling: ignore untracked files --- web/htdocs/wato.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1780224..cbbd96f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -397,10 +397,10 @@ def do_git_commit(): file(defaults.default_config_dir + "/" + subdir + "/.gitignore", "w").write("*\n!wato\n!wato/*\n") git_command(["add", ".gitignore", "*.d/wato"]) - git_command(["commit", "--author", author, "-m", shell_quote(_("Initialized GIT for Check_MK"))]) + git_command(["commit", "--untracked-files=no", "--author", author, "-m", shell_quote(_("Initialized GIT for Check_MK"))]) # Only commit, if something is changed - if os.popen("cd '%s' && git status --porcelain" % defaults.default_config_dir).read().strip(): + if os.popen("cd '%s' && git status --untracked-files=no --porcelain" % defaults.default_config_dir).read().strip(): git_command(["add", "*.d/wato"]) message = ", ".join(g_git_messages) if not message:

11 years, 1 month

Check_MK Git: check_mk: Fixed sporadic exception when GIT and debug is enabled

by Mathias Kettner

Module: check_mk Branch: master Commit: 774e0446bc95bb3c88f481bd52273dc5aaeb06c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=774e0446bc95bb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 11 16:45:22 2013 +0200 Fixed sporadic exception when GIT and debug is enabled --- web/htdocs/wato.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a7e58a6..1780224 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -391,7 +391,7 @@ def do_git_commit(): git_command(["init"]) # Make sure that .gitignore-files are present and uptodate - file(defaults.default_config_dir + ".gitignore", "w").write("*\n!*.d\n!.gitignore\n") + file(defaults.default_config_dir + "/.gitignore", "w").write("*\n!*.d\n!.gitignore\n") for subdir in os.listdir(defaults.default_config_dir): if subdir.endswith(".d"): file(defaults.default_config_dir + "/" + subdir + "/.gitignore", "w").write("*\n!wato\n!wato/*\n") @@ -4154,8 +4154,6 @@ def check_mk_local_automation(command, args=[], indata=""): html.show_error("<h1>Cannot activate changes</h1>%s" % e) return - if config.debug: - log_audit(None, "automation", "Automation: %s" % " ".join(cmd)) try: # This debug output makes problems when doing bulk inventory, because # it garbles the non-HTML response output @@ -4174,7 +4172,6 @@ def check_mk_local_automation(command, args=[], indata=""): exitcode = p.wait() if exitcode != 0: if config.debug: - log_audit(None, "automation", "Automation command %s failed with exit code %d: %s" % (" ".join(cmd), exitcode, outdata)) raise MKGeneralException("Error running <tt>%s</tt> (exit code %d): <pre>%s</pre>%s" % (" ".join(cmd), exitcode, hilite_errors(outdata), outdata.lstrip().startswith('sudo:') and sudo_msg or '')) else: @@ -4186,12 +4183,8 @@ def check_mk_local_automation(command, args=[], indata=""): call_hook_activate_changes() try: - if config.debug: - log_audit(None, "automation", "Result from automation: %s" % outdata) return eval(outdata) except Exception, e: - if config.debug: - log_audit(None, "automation", "Automation command %s failed: invalid output: %s" % (" ".join(cmd), outdata)) raise MKGeneralException("Error running <tt>%s</tt>. Invalid output from webservice (%s): <pre>%s</pre>" % (" ".join(cmd), e, outdata))

11 years, 1 month

Check_MK Git: check_mk: Updated bug entries #1048

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 7cf6551ddc0dec4798a82d1d0fd5f345f2ba8103 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7cf6551ddc0dec… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Wed Sep 11 14:41:54 2013 +0200 Updated bug entries #1048 --- .bugs/1048 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.bugs/1048 b/.bugs/1048 new file mode 100644 index 0000000..b7f59ff --- /dev/null +++ b/.bugs/1048 @@ -0,0 +1,13 @@ +Title: Bug in staleness on dual config (SNMP + Agent) +Component: core +State: open +Date: 2013-09-11 14:37:12 +Targetversion: 1.2.3i2 +Class: bug + +Host is defined Dual (SNMP + Check-MK-Agent) +check interval for SNMP Checks is increased to e. g. 5 min, while checks of Agent run +default every minute +The problem is: Services checked by SNMP get stale too early +(in this case after 90 sec) +should get stale after 900 sec

11 years, 1 month

Check_MK Git: check_mk: Updated bug entries #1002

by Götz Golla

Module: check_mk Branch: master Commit: c669d74ad7c68c8d2d9a5fa90e91f77e87fbd8e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c669d74ad7c68c… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Wed Sep 11 13:32:58 2013 +0200 Updated bug entries #1002 --- .bugs/1002 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.bugs/1002 b/.bugs/1002 new file mode 100644 index 0000000..48608b1 --- /dev/null +++ b/.bugs/1002 @@ -0,0 +1,11 @@ +Title: Use triangle as indicator that a view is hidden (or not hidden) +Component: multisite +State: open +Date: 2013-09-11 13:19:55 +Targetversion: future +Class: nastiness + +In the WATO as well as the multisite GUI views/topic can be hidden by clicking on the title. +This may confuse a user in some occasions, because it may not be clear if the topic is hidden, or +no item were found under that topic. +Therefore a triangle as indicator if the topic is hidden or not should be very useful.

11 years, 1 month

Check_MK Git: check_mk: Removed "do not connect" option from site socket editor

by Lars Michelsen

Module: check_mk Branch: master Commit: 03a0f5e9170aae522cfaa87109835f3c68e06ca1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03a0f5e9170aae… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 11 11:05:31 2013 +0200 Removed "do not connect" option from site socket editor --- ChangeLog | 2 ++ web/htdocs/wato.py | 11 +++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d9b77a1..63b7269 100644 --- a/ChangeLog +++ b/ChangeLog @@ -167,6 +167,8 @@ and folders hierarchy. Those settings override the rule base config. * Require unique alias names in between the following elements: Host/Service/Contact Groups, Timeperiods and Roles + * Removed "do not connect" option from site socket editor. Use the + checkbox "Disable" to disable the site for multisite. * FIX: do validation of check items in rule editor * FIX: More consistent handling of folderpath select in rule editor * FIX: Now correctly handling depends_on_tags on page rendering for diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4c37207..a7e58a6 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6858,7 +6858,6 @@ def mode_edit_site(phase): label = _("Path:"), size = 40, allow_empty = False)), - ( "disabled", _("Do not connect")), ] if config.liveproxyd_enabled: conn_choices[2:2] = [ @@ -7189,12 +7188,20 @@ def load_sites(): vars = { "sites" : {} } execfile(sites_mk, vars, vars) + + # Be compatible to old "disabled" value in socket attribute. + # Can be removed one day. + for site in vars['sites'].values(): + if site.get('socket') == 'disabled': + site['disabled'] = True + del site['socket'] + return vars["sites"] except Exception, e: if config.debug: raise MKGeneralException(_("Cannot read configuration file %s: %s" % - (filename, e))) + (sites_mk, e))) return {}

11 years, 1 month

Check_MK Git: check_mk: Fixed error when disabling the livestatus connection for a remote site via config

by Lars Michelsen

Module: check_mk Branch: master Commit: 4e3455422943db3c7540a1d912d2fe5667e8a471 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e3455422943db… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Sep 11 08:32:15 2013 +0200 Fixed error when disabling the livestatus connection for a remote site via config --- web/htdocs/config.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 29ef0ed..b0ec771 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -385,7 +385,8 @@ def sitenames(): def allsites(): return dict( [(name, site(name)) for name in sitenames() - if not site(name).get("disabled", False)] ) + if not site(name).get("disabled", False) + and site(name)['socket'] != 'disabled' ] ) def site(name): s = sites.get(name, {}) @@ -405,6 +406,8 @@ def site_is_local(name): sock = s.get("socket") return not sock or sock == "unix:" + defaults.livestatus_unix_socket +# FIXME: Should this return True even if all sites but one are disabled? +# -> should we use allsites() instead of "sites" directly? def is_multisite(): if len(sites) > 1: return True

11 years, 1 month

Check_MK Git: check_mk: FIX: dmi_sysinfo: Handling ":" in value correctly

by Lars Michelsen

Module: check_mk Branch: master Commit: c275948bb13497c99dbd0f3013e74f1e9d39b79a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c275948bb13497… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 6 15:26:26 2013 +0200 FIX: dmi_sysinfo: Handling ":" in value correctly --- ChangeLog | 1 + checks/dmi_sysinfo | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bc26597..e62cb23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -330,6 +330,7 @@ * FIX: Cleaned up graph rendering of Check_MK services * FIX: zypper: deal with output from SLES 10 * FIX: zpool_status: Ignoring "No known data errors" text + * FIX: dmi_sysinfo: Handling ":" in value correctly Multisite: * FIX: LDAP: Disabling use of referrals in active directory configuration diff --git a/checks/dmi_sysinfo b/checks/dmi_sysinfo index 1833586..1d3bc66 100644 --- a/checks/dmi_sysinfo +++ b/checks/dmi_sysinfo @@ -36,7 +36,7 @@ def check_dmi_sysinfo(item, param, info): for line in info: line = " ".join(line) if ":" in line: - key, value = line.split(":") + key, value = line.split(":", 1) data[key.strip()] = value.strip() return (0, "Manufacturer: %s, Product-Name: %s, Version: %s, S/N: %s" % (

11 years, 1 month

Check_MK Git: check_mk: FIX: check_http: Fixed syntax error when monitoring certificates

by Lars Michelsen

Module: check_mk Branch: master Commit: 40487cb2c85045ceac3fde7902ba2831b351c331 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=40487cb2c85045… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 6 15:31:16 2013 +0200 FIX: check_http: Fixed syntax error when monitoring certificates --- ChangeLog | 1 + checks/check_http | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e62cb23..1eb21b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -331,6 +331,7 @@ * FIX: zypper: deal with output from SLES 10 * FIX: zpool_status: Ignoring "No known data errors" text * FIX: dmi_sysinfo: Handling ":" in value correctly + * FIX: check_http: Fixed syntax error when monitoring certificates Multisite: * FIX: LDAP: Disabling use of referrals in active directory configuration diff --git a/checks/check_http b/checks/check_http index ed8e361..a75e64a 100644 --- a/checks/check_http +++ b/checks/check_http @@ -48,7 +48,7 @@ def check_http_arguments(params): if "cert_host" in settings: omit_ip = True - args += '-H $HOSTADDRESS$' + args += ' -H $HOSTADDRESS$' args += ' -I %s' % quote_shell_string(settings['cert_host']) if "cert_days" in settings:

11 years, 1 month

← Newer
1
...
15
16
17
18
19
20
21
22
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2013