Checkmk git commits October 2016

checkmk-commits@lists.checkmk.com

10 participants
276 discussions

Cleaned up different kind of output to use cmk_base.console functions

by Lars Michelsen

Module: check_mk Branch: master Commit: d5ef71cdb4ea249a8ef61975fcb1f5152e6b3a13 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d5ef71cdb4ea24… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 19 17:47:02 2016 +0200 Cleaned up different kind of output to use cmk_base.console functions --- cmk_base/console.py | 78 +++++++++++++++++++++++++++++++++++ lib/log.py | 4 ++ modules/check_mk.py | 103 +++++++++++++++++++++-------------------------- modules/check_mk_base.py | 97 ++++++++++++++++++-------------------------- modules/discovery.py | 62 ++++++++++++++-------------- modules/inventory.py | 38 ++++++++--------- modules/nagios.py | 31 +++++++------- modules/snmp.py | 17 ++++---- tests/lib/test_log.py | 8 ++++ 9 files changed, 248 insertions(+), 190 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d5ef71cdb4…

7 years, 11 months

fixed postmulti again

by Simon Betz

Module: check_mk Branch: master Commit: c3a8629da4c51550cbacb8d117a697d0cd9802c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3a8629da4c515… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Oct 19 15:40:35 2016 +0200 fixed postmulti again --- agents/check_mk_agent.linux | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index ffd9455..0e8fcbb 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -667,9 +667,10 @@ elif [ -x /usr/sbin/ssmtp ] ; then fi +# postfix would write to stderr but only if it's a tty if type postmulti >/dev/null ; then echo "<<<postfix_mailq_status:sep(58)>>>" - script -c 'postmulti -p status' + script -qfc 'postmulti -p status' /dev/null fi

7 years, 11 months

Revert "fixed postmulti again"

by Simon Betz

Module: check_mk Branch: master Commit: 2e31bd27de2664aa6651ef78bd25a02e8b1ba89b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e31bd27de2664… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Oct 19 15:39:06 2016 +0200 Revert "fixed postmulti again" This reverts commit b2df58e8077ab79de8c3182a2514f0b17363070b. --- agents/check_mk_agent.linux | 3 +- agents/plugins/mk_postgres | 639 ++++++++++++++++++-------------------------- 2 files changed, 256 insertions(+), 386 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2e31bd27de…

7 years, 11 months

fixed postmulti again

by Simon Betz

Module: check_mk Branch: master Commit: b2df58e8077ab79de8c3182a2514f0b17363070b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2df58e8077ab7… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Oct 19 15:33:47 2016 +0200 fixed postmulti again --- agents/check_mk_agent.linux | 3 +- agents/plugins/mk_postgres | 639 ++++++++++++++++++++++++++------------------ 2 files changed, 386 insertions(+), 256 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b2df58e807…

7 years, 11 months

Fixed broken nagios precompiled checks after yesterdays refactoring

by Lars Michelsen

Module: check_mk Branch: master Commit: f250e1873cc14e0a8f2f62bdf1e9b54858e60413 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f250e1873cc14e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 19 13:21:28 2016 +0200 Fixed broken nagios precompiled checks after yesterdays refactoring --- modules/nagios.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/nagios.py b/modules/nagios.py index 1b27163..9235150 100644 --- a/modules/nagios.py +++ b/modules/nagios.py @@ -983,10 +983,6 @@ if os.path.islink(%(dst)r): # Register default Check_MK signal handler output.write("register_sigint_handler()\n") - # TODO: can we avoid adding this module if no predictive monitoring - # is being used? - output.write(stripped_python_file(cmk.paths.modules_dir + "/prediction.py")) - # initialize global variables output.write(""" # very simple commandline parsing: only -v and -d are supported

7 years, 11 months

3965 FIX Nagios: Improved handling of broken core config

by Lars Michelsen

Module: check_mk Branch: master Commit: b465fedec21f358155f5aed0042bb18b94854ce4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b465fedec21f35… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 19 13:19:29 2016 +0200 3965 FIX Nagios: Improved handling of broken core config In case of configuration validation issues, the broken config, which will be replaced by the former config on validation issues, is copied to /omd/sites/[site]/tmp/check_mk/check_mk_objects.cfg.broken for diagnose actions. --- .werks/3965 | 12 ++++++++++++ ChangeLog | 1 + modules/automation.py | 7 ++++++- modules/check_mk.py | 5 +++++ 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/.werks/3965 b/.werks/3965 new file mode 100644 index 0000000..20cecaf --- /dev/null +++ b/.werks/3965 @@ -0,0 +1,12 @@ +Title: Nagios: Improved handling of broken core config +Level: 1 +Component: core +Compatible: compat +Version: 1.4.0i2 +Date: 1476875916 +Class: fix + +In case of configuration validation issues, the broken config, which +will be replaced by the former config on validation issues, is copied +to /omd/sites/[site]/tmp/check_mk/check_mk_objects.cfg.broken for +diagnose actions. diff --git a/ChangeLog b/ChangeLog index fd5524d..13d5533 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.4.0i2: Core & Setup: * 3648 FIX: Fixed log file parsing of host states... + * 3965 FIX: Nagios: Improved handling of broken core config... Checks & Agents: * 3841 cups_queues: thresholds are now configurable in WATO... diff --git a/modules/automation.py b/modules/automation.py index 0768f98..ae3e026 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -502,11 +502,16 @@ def automation_restart(job = "restart"): do_precompile_hostchecks() do_core_action(job) else: + broken_config_path = "%s/check_mk_objects.cfg.broken" % cmk.paths.tmp_dir + file(broken_config_path, "w").write(file(cmk.paths.nagios_objects_file).read()) + if backup_path: os.rename(backup_path, objects_file) else: os.remove(objects_file) - raise MKAutomationError("Configuration for monitoring core is invalid. Rolling back.") + raise MKAutomationError( + "Configuration for monitoring core is invalid. Rolling back. " + "The broken file has been copied to \"%s\" for analysis." % broken_config_path) except Exception, e: if backup_path and os.path.exists(backup_path): diff --git a/modules/check_mk.py b/modules/check_mk.py index 9c7eccc..fe9f34e 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3868,6 +3868,11 @@ def do_restart(only_reload = False): do_core_action(only_reload and "reload" or "restart") else: sys.stderr.write("Configuration for monitoring core is invalid. Rolling back.\n") + + broken_config_path = "%s/check_mk_objects.cfg.broken" % cmk.paths.tmp_dir + file(broken_config_path, "w").write(file(cmk.paths.nagios_objects_file).read()) + sys.stderr.write("The broken file has been copied to \"%s\" for analysis.\n" % broken_config_path) + if backup_path: os.rename(backup_path, cmk.paths.nagios_objects_file) else:

7 years, 11 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: ed0cc4c4aab737be6a5dfd3bd65373ff4d634b50 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed0cc4c4aab737… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 19 13:18:28 2016 +0200 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 210cd2d..6cd1cb4 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3965 +3985

7 years, 11 months

3828 FIX agent_netapp: improved error reporting. fixed exception when snapmirror-get-status returns no values

by Andreas Boesl

Module: check_mk Branch: master Commit: d4e83a2890597ef219f76fc6b8e3b42f31f36c98 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d4e83a2890597e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Oct 19 11:57:32 2016 +0200 3828 FIX agent_netapp: improved error reporting. fixed exception when snapmirror-get-status returns no values --- .werks/3828 | 9 +++++++++ ChangeLog | 1 + agents/special/agent_netapp | 15 +++++++++++---- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/.werks/3828 b/.werks/3828 new file mode 100644 index 0000000..91cfc7c --- /dev/null +++ b/.werks/3828 @@ -0,0 +1,9 @@ +Title: agent_netapp: improved error reporting. fixed exception when snapmirror-get-status returns no values +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i2 +Date: 1476871000 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 1ad77a9..fd5524d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ * 3827 FIX: windows agent: fixed 3 bugs which broke the skype section * 3650 FIX: Fixed bash versionitis, unbreaking cached check results.... * 3960 FIX: if.include: fixed wrong order if interface groups are configured + * 3828 FIX: agent_netapp: improved error reporting. fixed exception when snapmirror-get-status returns no values Multisite: * 3959 Two new filters for the comment view: author and comment text field diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index 6651602..23e0d1d 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -170,8 +170,11 @@ else: # The following code in the else: block completely replaces the used functionality of NaServer/NaElements import base64 import requests - from requests.packages.urllib3.exceptions import InsecureRequestWarning - requests.packages.urllib3.disable_warnings(InsecureRequestWarning) + try: + from requests.packages.urllib3.exceptions import InsecureRequestWarning + requests.packages.urllib3.disable_warnings(InsecureRequestWarning) + except: + pass from lxml import etree from StringIO import StringIO @@ -213,6 +216,9 @@ else: xml_declaration = True, encoding = "UTF-8") + def add_error_message(self, message): + self.error_messages.add_message(message) + # Converts: ['perf-object-get-instances', [['objectname', 'nfsv3'], ['instance-uuids', [['instance-uuid', '5']]]]] # into a xml etree: # <perf-object-get-instances> @@ -263,7 +269,7 @@ else: if self.debug: print "######## GOT RESPONSE #######" if self.last_response.status != "passed": - print "Error: Unable to parse content of response: %s" % self.last_response.content + print "Error: Unable to parse content of response: %s" % self.last_response.raw_response_text else: print prettify(self.last_response.content.get_node()) @@ -1130,7 +1136,7 @@ try: server.set_vfiler(vfiler) response = server.invoke("snapmirror-get-status") data = response.children_get() - if not data: + if not data or len(data) <= 1: continue data = data[1] print format_config(data, "snapvault", "source-location", @@ -1193,6 +1199,7 @@ try: except Exception, e: # Shouldn't happen at all... + server.add_error_message("Agent Exception (contact developer): %s" % e) if opt_debug: raise finally:

7 years, 11 months

undo changes in host/service match conditions

by Marcel Arentz

Module: check_mk Branch: master Commit: 8813f9ac1679977c053928347d3e24e20750a3ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8813f9ac167997… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Oct 19 11:45:23 2016 +0200 undo changes in host/service match conditions --- web/htdocs/wato.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 0205f46..7174435 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7429,8 +7429,8 @@ def event_rule_match_conditions(flavour): ListChoice( title = _("Match host event type"), help = _("Select the host event types and transitions this rule should handle. Note: " - "If you activate this option and do not also specify host event " - "types then this rule will never hold for host notifications!"), + "If you activate this option and do not also specify service event " + "types then this rule will never hold for service notifications!"), choices = [ ( 'rd', _("UP") + u" ➤ " + _("DOWN")), ( 'dr', _("DOWN") + u" ➤ " + _("UP")), @@ -7446,8 +7446,8 @@ def event_rule_match_conditions(flavour): ListChoice( title = _("Match service event type"), help = _("Select the service event types and transitions this rule should handle. Note: " - "If you activate this option and do not also specify service event " - "types then this rule will never hold for service notifications!"), + "If you activate this option and do not also specify host event " + "types then this rule will never hold for host notifications!"), choices = [ ( 'rw', _("OK") + u" ➤ " + _("WARN")), ( 'rr', _("OK") + u" ➤ " + _("OK")),

7 years, 11 months

fixed missing files for wk3826

by Andreas Boesl

Module: check_mk Branch: master Commit: 3ea2a050a9a5184230ef03a09415bbdedfc291da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ea2a050a9a518… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Oct 19 10:29:27 2016 +0200 fixed missing files for wk3826 --- agents/special/agent_netapp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index dfc8aad..6651602 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -184,10 +184,10 @@ else: class ErrorMessages(): def __init__(self): - self.messages = [] + self.messages = set([]) def add_message(self, message): - self.messages.append(message) + self.messages.add(message) def format_messages(self): return "\n".join(self.messages)

7 years, 11 months

← Newer
1
...
9
10
11
12
13
14
15
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2016