Checkmk git commits April 2013

checkmk-commits@lists.checkmk.com

3 participants
237 discussions

Check_MK Git: check_mk: livestatus.log: show utf-8 decoding problems only with debug logging >=2

by Andreas Boesl

Module: check_mk Branch: master Commit: 3b45f3b35faf32151d96b1fecb2cbe4ef2be02a2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b45f3b35faf32… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 23 13:44:29 2013 +0200 livestatus.log: show utf-8 decoding problems only with debug logging >=2 --- ChangeLog | 1 + livestatus/src/Query.cc | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d4885e3..df5cb2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -83,6 +83,7 @@ * Table statehist: Improved detection of vanished hosts and services. Now able to detect and remove nonsense check plugin output * FIX: able to handle equal comment_id between host and service + * livestatus.log: show utf-8 decoding problems only with debug logging >=2 BI: * Integrated availability computing, including nifty time warp feature diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index fb5e639..bfd941c 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -1029,7 +1029,8 @@ void Query::outputString(const char *value) // three-byte sequences (avoid buffer overflow!) if ((*r & 0xF0) == 0xE0) { if (chars_left < 3) { - logger(LG_INFO, "Ignoring invalid UTF-8 sequence in string '%s'", value); + if (g_debug_level >= 2) + logger(LG_INFO, "Ignoring invalid UTF-8 sequence in string '%s'", value); break; // end of string. No use in continuing } else { @@ -1044,7 +1045,8 @@ void Query::outputString(const char *value) // four-byte sequences else if ((*r & 0xF8) == 0xF0) { if (chars_left < 4) { - logger(LG_INFO, "Ignoring invalid UTF-8 sequence in string '%s'", value); + if (g_debug_level >= 2) + logger(LG_INFO, "Ignoring invalid UTF-8 sequence in string '%s'", value); break; // end of string. No use in continuing } else {

11 years, 2 months

Check_MK Git: check_mk: New config variable check_mk_exit_status

by Mathias Kettner

Module: check_mk Branch: master Commit: 30c4bf61d7807130dc6681ff61740e052d288437 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=30c4bf61d78071… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 23 10:23:28 2013 +0200 New config variable check_mk_exit_status --- ChangeLog | 2 ++ modules/check_mk.py | 10 +++++++ modules/check_mk_base.py | 27 +++++++++-------- web/plugins/wato/check_mk_configuration.py | 44 ++++++++++++++++++++++++++-- 4 files changed, 68 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index f2d531c..d4885e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,8 @@ * New variable snmp_check_interval which can be used to customize the check intervals of SNMP based checks * setup: Added missing vars rrd_path and rrdcached_sock + * new variable check_mk_exit_status: allows to make Check_MK service OK, + even if host in not reachable. Multisite: * New availability view for arbitrary host/service collections diff --git a/modules/check_mk.py b/modules/check_mk.py index aed0ad3..f5483df 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1080,6 +1080,13 @@ def snmp_port_spec(hostname): else: return ":%d" % port +def exit_code_spec(hostname): + spec = {} + specs = host_extra_conf(hostname, check_mk_exit_status) + for entry in specs[::-1]: + spec.update(entry) + return spec + def service_description(check_type, item): if check_type not in check_info: @@ -2894,6 +2901,9 @@ no_inventory_possible = None output.write("def agent_port_of(hostname):\n return %d\n\n" % agent_port_of(hostname)) output.write("def snmp_port_spec(hostname):\n return %r\n\n" % snmp_port_spec(hostname)) + # Exit code of Check_MK in case of various errors + output.write("def exit_code_spec(hostname):\n return %r\n\n" % exit_code_spec(hostname)) + # Piggyback translations output.write("def get_piggyback_translation(hostname):\n return %r\n\n" % get_piggyback_translation(hostname)) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 7dfd799..d78200d 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -871,25 +871,28 @@ def do_check(hostname, ipaddress, only_check_types = None): start_time = time.time() + # Exit state in various situations is confiugrable since 1.2.3i1 + exit_spec = exit_code_spec(hostname) + try: load_counters(hostname) 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: - output = "CRIT - %s, " % problems - status = 2 + output = "%s, " % problems + status = exit_spec.get("connection", 2) elif num_errors > 0 and num_success > 0: - output = "WARN - Missing agent sections: %s - " % ", ".join(error_sections) - status = 1 + output = "Missing agent sections: %s - " % ", ".join(error_sections) + status = exit_spec.get("missing_sections", 1) elif num_errors > 0: - output = "CRIT - Got no information from host, " - status = 2 + output = "Got no information from host, " + status = exit_spec.get("empty_output", 2) elif agent_min_version and agent_version < agent_min_version: - output = "WARN - old plugin version %s (should be at least %s), " % (agent_version, agent_min_version) - status = 1 + output = "old plugin version %s (should be at least %s), " % (agent_version, agent_min_version) + status = exit_spec.get("wrong_version", 1) else: - output = "OK - " + output = "" if agent_version != None: output += "Agent version %s, " % agent_version status = 0 @@ -897,8 +900,8 @@ def do_check(hostname, ipaddress, only_check_types = None): except MKGeneralException, e: if opt_debug: raise - output = "UNKNOWN - %s, " % e - status = 3 + output = "%s, " % e + status = exit_spec.get("exception", 3) if aggregate_check_mk: try: @@ -919,7 +922,7 @@ def do_check(hostname, ipaddress, only_check_types = None): else: output += "execution time %.1f sec|execution_time=%.3f\n" % (run_time, run_time) - sys.stdout.write(output) + sys.stdout.write(nagios_state_names[status] + " - " + output) sys.exit(status) def check_unimplemented(checkname, params, info): diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index efbe7a2..4c7eab9 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1655,12 +1655,50 @@ group = "agent/" + _("Check_MK Agent") register_rule(group, "agent_ports", Integer( - help = _("This variable allows to specify the TCP port to " - "be used to connect to the agent on a per-host-basis. "), minvalue = 1, maxvalue = 65535, default_value = 6556), - title = _("TCP port for connection to Check_MK agent") + title = _("TCP port for connection to Check_MK agent"), + help = _("This variable allows to specify the TCP port to " + "be used to connect to the agent on a per-host-basis. "), +) + +register_rule(group, + "check_mk_exit_status", + Dictionary( + elements = [ + ( "connection", + MonitoringState( + default_value = 2, + title = _("State in case of connection problems")), + ), + ( "missing_sections", + MonitoringState( + default_value = 1, + title = _("State if just <i>some</i> agent sections are missing")), + ), + ( "empty_output", + MonitoringState( + default_value = 2, + title = _("State in case of empty agent output")), + ), + ( "wrong_version", + MonitoringState( + default_value = 1, + title = _("State in case of wrong agent version")), + ), + ( "exception", + MonitoringState( + default_value = 3, + title = _("State in case of unhandled exception")), + ), + ], + ), + title = _("Status of the Check_MK service"), + help = _("This ruleset specifies the total status of the Check_MK service in " + "case of various error situations. One use case is the monitoring " + "of hosts that are not always up. You can have Check_MK an OK status " + "here if the host is not reachable."), ) register_rule(group,

11 years, 2 months

Check_MK Git: check_mk: Introduce new variable check_mk_exit_status ( first step)

by Mathias Kettner

Module: check_mk Branch: master Commit: 955d56a8f3f4a4114909011ada6db79ba386441b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=955d56a8f3f4a4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 23 09:45:49 2013 +0200 Introduce new variable check_mk_exit_status (first step) --- modules/check_mk.py | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/check_mk.py b/modules/check_mk.py index 6ea6d97..aed0ad3 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -322,6 +322,7 @@ scanparent_hosts = [ ( ALL_HOSTS ) ] host_attributes = {} # needed by WATO, ignored by Check_MK ping_levels = [] # special parameters for host/PING check_command host_check_commands = [] # alternative host check instead of check_icmp +check_mk_exit_status = [] # Rule for specifying CMK's exit status in case of various errors check_periods = [] snmp_check_interval = []

11 years, 2 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 83ae1cfb2d135c95c58bad1f8d1e1b40e8752901 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83ae1cfb2d135c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 22 20:13:08 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 2 months

Check_MK Git: check_mk: Added new check: job monitoring

by Lars Michelsen

Module: check_mk Branch: master Commit: 46746fc781a50b20694ed6230a9bbc22fb94f402 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=46746fc781a50b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 22 07:14:02 2013 +0200 Added new check: job monitoring --- ChangeLog | 13 ++--- agents/check_mk_agent.linux | 6 ++ agents/mk-job | 61 +++++++++++++++++++ check_mk.spec | 8 +++ checkman/job | 38 ++++++++++++ checks/job | 136 +++++++++++++++++++++++++++++++++++++++++++ doc/helpers/headrify | 2 +- 7 files changed, 256 insertions(+), 8 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=46746fc781…

11 years, 2 months

Check_MK Git: check_mk: TextAscii: new attriute read_only

by Mathias Kettner

Module: check_mk Branch: master Commit: 4cf1ab8c8a745a0f50edba0d17f509ee4a7fc94a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4cf1ab8c8a745a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Apr 21 16:16:03 2013 +0200 TextAscii: new attriute read_only --- web/htdocs/htmllib.py | 2 ++ web/htdocs/valuespec.py | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 2628705..4e79c67 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -562,6 +562,8 @@ class html: addprops += " style=\"%s%s\"" % (add_style, args["style"]) elif add_style: addprops += " style=\"%s\"" % add_style + if args.get("read_only"): + addprops += " readonly" if submit != None: if not id: diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index ac559e6..3f61f76 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -311,6 +311,7 @@ class TextAscii(ValueSpec): self._size = kwargs.get("size", 25) self._strip = kwargs.get("strip", True) self._allow_empty = kwargs.get("allow_empty", True) + self._read_only = kwargs.get("read_only") self._none_is_empty = kwargs.get("none_is_empty", False) self._regex = kwargs.get("regex") self._regex_error = kwargs.get("regex_error", @@ -328,7 +329,8 @@ class TextAscii(ValueSpec): if self._label: html.write(self._label) html.write(" ") - html.text_input(varprefix, str(value), size = self._size) + html.text_input(varprefix, str(value), size = self._size, + read_only = self._read_only) def value_to_text(self, value): if value == None:

11 years, 2 months

Check_MK Git: check_mk: forms: allow POST method

by Mathias Kettner

Module: check_mk Branch: master Commit: 92872a1fa41e12799cb221946f99181d55b6c537 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92872a1fa41e12… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Apr 20 21:48:02 2013 +0200 forms: allow POST method --- web/htdocs/forms.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index 832d1ef..933b034 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -43,7 +43,7 @@ def get_input(valuespec, varprefix): def edit_dictionary(entries, value, focus=None, hover_help=True, validate=None, buttontext=None, title=None, - buttons = None): + buttons = None, method="GET"): new_value = value.copy() if html.var("filled_in") == "form" and html.check_transaction(): messages = [] @@ -68,7 +68,7 @@ def edit_dictionary(entries, value, focus=None, hover_help=True, else: return new_value - html.begin_form("form") + html.begin_form("form", method=method) header(title and title or _("Properties")) first = True for name, vs in entries:

11 years, 2 months

Check_MK Git: check_mk: VS Alternative: new argument style, supports " dropdown"

by Mathias Kettner

Module: check_mk Branch: master Commit: a18ade022806612cad98d613c36a51b29bca525f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a18ade02280661… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Apr 20 11:46:20 2013 +0200 VS Alternative: new argument style, supports "dropdown" As an alternative to "radio". --- web/htdocs/valuespec.py | 36 ++++++++++++++++++++++++++++++++++++ web/htdocs/wato.py | 1 + 2 files changed, 37 insertions(+) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 1b66856..ac559e6 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1710,6 +1710,7 @@ class Alternative(ValueSpec): ValueSpec.__init__(self, **kwargs) self._elements = kwargs["elements"] self._match = kwargs.get("match") # custom match function + self._style = kwargs.get("style", "radio") # alternative: "dropdown" # Return the alternative (i.e. valuespec) # that matches the datatype of a given value. We assume @@ -1726,6 +1727,41 @@ class Alternative(ValueSpec): pass def render_input(self, varprefix, value): + if self._style == "radio": + self.render_input_radio(varprefix, value) + else: + self.render_input_dropdown(varprefix, value) + + def render_input_dropdown(self, varprefix, value): + mvs = self.matching_alternative(value) + options = [] + sel_option = html.var(varprefix + "_use") + for nr, vs in enumerate(self._elements): + if not sel_option and vs == mvs: + sel_option = str(nr) + options.append((str(nr), vs.title())) + onchange="valuespec_cascading_change(this, '%s', %d);" % (varprefix, len(options)) + html.select(varprefix + "_use", options, sel_option, onchange) + html.write(" ") + + for nr, vs in enumerate(self._elements): + if str(nr) == sel_option: + disp = "" + cur_val = value + else: + disp = "none" + cur_val = vs.default_value() + + html.write('<span id="%s_%s_sub" style="display: %s">' % + (varprefix, nr, disp)) + html.help(vs.help()) + vs.render_input(varprefix + "_%d" % nr, cur_val) + html.write("</span>") + + + + + def render_input_radio(self, varprefix, value): mvs = self.matching_alternative(value) for nr, vs in enumerate(self._elements): if html.has_var(varprefix + "_use"): diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ad979f4..455f96b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11233,6 +11233,7 @@ def Levels(**kwargs): title = title, help = help, show_titles = False, + style = "dropdown", elements = [ FixedValue( None,

11 years, 2 months

Check_MK Git: check_mk: check_mk_agent.cc: fix indentation bugs

by Mathias Kettner

Module: check_mk Branch: master Commit: 323e0e1d1d4e158f09a42dccb7ae167af3a18925 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=323e0e1d1d4e15… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 19 17:10:27 2013 +0200 check_mk_agent.cc: fix indentation bugs --- agents/windows/check_mk_agent.cc | 66 +++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 019fd26..93f1ff2 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -3096,42 +3096,42 @@ void output(SOCKET &out, const char *format, ...) write_to_socket = true; if (do_tcp) { - while (write_to_socket && !should_terminate) { - int result = send(out, outbuffer, len, 0); - if (result == SOCKET_ERROR) { - debug("send() failed"); - int error = WSAGetLastError(); - if (error == WSAEINTR) { - debug("INTR. Nochmal..."); - continue; - } - else if (error == WSAEINPROGRESS) { - debug("INPROGRESS. Nochmal..."); - continue; - } - else if (error == WSAEWOULDBLOCK) { - debug("WOULDBLOCK. Komisch. Breche ab..."); - break; - } - else { - debug("Anderer Fehler. Gebe auf\n"); - break; - } - } - else if (result == 0) - debug("send() returned 0"); - else if (result != len) { - debug("send() sent too few bytes"); - len -= result; - } - else - len = 0; + while (write_to_socket && !should_terminate) { + int result = send(out, outbuffer, len, 0); + if (result == SOCKET_ERROR) { + debug("send() failed"); + int error = WSAGetLastError(); + if (error == WSAEINTR) { + debug("INTR. Nochmal..."); + continue; + } + else if (error == WSAEINPROGRESS) { + debug("INPROGRESS. Nochmal..."); + continue; + } + else if (error == WSAEWOULDBLOCK) { + debug("WOULDBLOCK. Komisch. Breche ab..."); + break; + } + else { + debug("Anderer Fehler. Gebe auf\n"); + break; + } + } + else if (result == 0) + debug("send() returned 0"); + else if (result != len) { + debug("send() sent too few bytes"); + len -= result; + } + else + len = 0; - break; - } + break; + } } else { - fwrite(outbuffer, len, 1, stdout); + fwrite(outbuffer, len, 1, stdout); len = 0; } }

11 years, 2 months

Check_MK Git: check_mk: Fixed bug in notify.py: fake-host mode

by Mathias Kettner

Module: check_mk Branch: master Commit: 521a89d232bf818e6042bea1ed15907cf5c0a976 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=521a89d232bf81… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 19 15:21:51 2013 +0200 Fixed bug in notify.py: fake-host mode --- modules/notify.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/notify.py b/modules/notify.py index 6b4cdc0..36f2f72 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -352,7 +352,7 @@ def do_notify(args): context['SERVICEURL'] = '/check_mk/view.py?view_name=service&host=%s&service=%s' % \ (urlencode(context['HOSTNAME']), urlencode(context['SERVICEDESC'])) - if mode in [ 'fake-service', 'fake_host' ]: + if mode in [ 'fake-service', 'fake-host' ]: sys.exit(call_notification_script(plugin, [], context, True)) if 'LASTHOSTSTATECHANGE' in context:

11 years, 2 months

← Newer
1
...
4
5
6
7
8
9
10
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2013