Checkmk git commits December 2013

checkmk-commits@lists.checkmk.com

6 participants
316 discussions

Check_MK Git: check_mk: manpage.template: added hint for catalog entries

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 59d0946d3671cd4d46d4a11bbbda56f91f206b6f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59d0946d3671cd… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Dec 12 10:19:13 2013 +0100 manpage.template: added hint for catalog entries --- doc/manpage.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/manpage.template b/doc/manpage.template index d62df76..08ef898 100644 --- a/doc/manpage.template +++ b/doc/manpage.template @@ -1,6 +1,6 @@ title: Dummy check man page - used as template for new check manuals agents: linux, windows, aix, solaris, hpux, vms, freebsd, snmp -catalog: +catalog: see modules/catalog.py for possible values license: GPL distribution: check_mk description:

10 years, 9 months

Check_MK Git: check_mk: upload file: using getter function to access html. uploads

by Andreas Boesl

Module: check_mk Branch: master Commit: 53309494e18a080248de76696605bcc986ae3231 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53309494e18a08… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Dec 11 17:03:49 2013 +0100 upload file: using getter function to access html.uploads --- 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 d74d5df..9c3b6d8 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5549,7 +5549,7 @@ def mode_snapshot(phase): # upload snapshot elif html.uploads.get("_upload_file"): - uploaded_file = html.uploads.get("_upload_file") + uploaded_file = html.uploaded_file("_upload_file") if uploaded_file[0] == "": raise MKUserError(None, _("Please select a file for upload.")) if html.check_transaction(): @@ -8438,7 +8438,7 @@ def automation_push_snapshot(): message += ", ".join([e[-1] for e in pending[:10]]) raise MKGeneralException(message) - tarcontent = html.uploads.get("snapshot") + tarcontent = html.uploaded_file("snapshot") if not tarcontent: raise MKGeneralException(_('Invalid call: The snapshot is missing.')) tarcontent = tarcontent[2]

10 years, 9 months

Check_MK Git: check_mk: File uploads (backup&restore, sync snapshots) no longer broken

by Andreas Boesl

Module: check_mk Branch: master Commit: 67fa428b3d6f3473e651670a71f7b26614326b17 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67fa428b3d6f34… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Dec 11 16:56:39 2013 +0100 File uploads (backup&restore, sync snapshots) no longer broken --- web/htdocs/wato.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 851a414..d74d5df 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5548,12 +5548,12 @@ def mode_snapshot(phase): return None, _("Created snapshot <tt>%s</tt>.") % filename # upload snapshot - elif html.has_var("_upload_file"): - if html.var("_upload_file") == "": + elif html.uploads.get("_upload_file"): + uploaded_file = html.uploads.get("_upload_file") + if uploaded_file[0] == "": raise MKUserError(None, _("Please select a file for upload.")) - return None if html.check_transaction(): - multitar.extract_from_buffer(html.var("_upload_file"), backup_paths) + multitar.extract_from_buffer(uploaded_file[2], backup_paths) log_pending(SYNCRESTART, None, "snapshot-restored", _("Restored from uploaded file")) return None, _("Successfully restored configuration.") @@ -8438,9 +8438,10 @@ def automation_push_snapshot(): message += ", ".join([e[-1] for e in pending[:10]]) raise MKGeneralException(message) - tarcontent = html.var('snapshot') + tarcontent = html.uploads.get("snapshot") if not tarcontent: raise MKGeneralException(_('Invalid call: The snapshot is missing.')) + tarcontent = tarcontent[2] multitar.extract_from_buffer(tarcontent, replication_paths)

10 years, 9 months

Check_MK Git: check_mk: Updated bug entries #2102

by Andreas Boesl

Module: check_mk Branch: master Commit: b41af4a0f86f76e616dbc38dca2470793f27549f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b41af4a0f86f76… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Dec 11 16:28:27 2013 +0100 Updated bug entries #2102 --- .bugs/2102 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.bugs/2102 b/.bugs/2102 new file mode 100644 index 0000000..f9ddb21 --- /dev/null +++ b/.bugs/2102 @@ -0,0 +1,12 @@ +Title: Multisite python profiler can not handle POST data. +Component: multisite +State: open +Date: 2013-12-11 16:22:53 +Targetversion: future +Class: bug + +Any POST data vanishs by the second run of the index.handler(apache._profiling_req) function +GET parameters of the same query are preserved. + +Enabling the global option "Profile Requests" successfully shuts down most of the formulars +which are using the POST method. This also applies to the snapshot synchronisation.

10 years, 9 months

Check_MK Git: check_mk: Reserved 20 bug IDS

by Andreas Boesl

Module: check_mk Branch: master Commit: 35e7db096a47a56ac872f354bafb6e4a30831190 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35e7db096a47a5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Dec 11 16:22:47 2013 +0100 Reserved 20 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index 3ebb7f7..ea2d7fd 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2102 +2122

10 years, 9 months

Check_MK Git: check_mk: updated werk

by Andreas Boesl

Module: check_mk Branch: master Commit: 255a7e9f5d39fad31fba4e772e76758fd6f14198 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=255a7e9f5d39fa… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Dec 11 16:17:56 2013 +0100 updated werk --- .werks/311 | 1 + 1 file changed, 1 insertion(+) diff --git a/.werks/311 b/.werks/311 index 904c324..c78638a 100644 --- a/.werks/311 +++ b/.werks/311 @@ -8,3 +8,4 @@ Class: fix The service inventory of cluster hosts via WATO failed all the time with an error message like "Inventory failed for this host: Error - host is unreachable, no usable cache file present". This error has been fixed with this change. +A WATO-inventory on a cluster node also no longer removes previously detected clustered services.

10 years, 9 months

Check_MK Git: check_mk: A WATO inventory on a cluster node no longer removes clustered services

by Andreas Boesl

Module: check_mk Branch: master Commit: b89804fd05f22ad0bbdf8d27abc7eadbe8c3e96f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b89804fd05f22a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Dec 11 16:16:31 2013 +0100 A WATO inventory on a cluster node no longer removes clustered services --- modules/automation.py | 2 +- web/htdocs/wato.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/automation.py b/modules/automation.py index f0d1092..9502457 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -430,7 +430,7 @@ def automation_set_autochecks(args): existing = automation_parse_autochecks_file(node) for ct, item, params, paramstring in existing: descr = service_description(ct, item) - if node == host_of_clustered_service(node, descr): + if hostname != host_of_clustered_service(node, descr): new_autochecks.append((ct, item, paramstring)) for (ct, item), paramstring in new_items.items(): new_autochecks.append((ct, item, paramstring)) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a09cb1d..851a414 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2463,6 +2463,8 @@ def mode_inventory(phase, firsttime): varname = "_%s_%s" % (ct, html.varencode(item)) if html.var(varname, "") != "": active_checks[(ct, item)] = paramstring + if st == "clustered": + active_checks[(ct, item)] = paramstring check_mk_automation(host[".siteid"], "set-autochecks", [hostname], active_checks) if host.get("inventory_failed"):

10 years, 9 months

Check_MK Git: check_mk: FIX Avoid duplicate reading of configuration file on --create-rrd

by Mathias Kettner

Module: check_mk Branch: master Commit: a26e8fd40d76d12ad3c03af8c82a7137ba1ef0af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a26e8fd40d76d1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 11 14:57:12 2013 +0100 FIX Avoid duplicate reading of configuration file on --create-rrd The Check_MK Micro Core calls Check_MK with <tt>cmk --create-rrd --keepalive</tt>. That read in the configuration files (<tt>main.mk</tt> etc.) twice. This could have lead to various anomalities such as duplicate hosts when you have removed the default <tt>all_hosts = </tt> from your <tt>main.mk</tt>. This has been fixed now. --- .werks/313 | 13 +++++++++++++ ChangeLog | 1 + modules/check_mk.py | 3 ++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/313 b/.werks/313 new file mode 100644 index 0000000..2a04457 --- /dev/null +++ b/.werks/313 @@ -0,0 +1,13 @@ +Title: Avoid duplicate reading of configuration file on --create-rrd +Level: 1 +Component: core +Class: fix +State: unknown +Version: 1.2.3i8 +Date: 1386770107 +Targetversion: future + +The Check_MK Micro Core calls Check_MK with <tt>cmk --create-rrd --keepalive</tt>. +That read in the configuration files (<tt>main.mk</tt> etc.) twice. This could have +lead to various anomalities such as duplicate hosts when you have removed the +default <tt>all_hosts = </tt> from your <tt>main.mk</tt>. This has been fixed now. diff --git a/ChangeLog b/ChangeLog index 4cdedaa..f45b32c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.2.3i8: Core & Setup: * 0087 FIX: Fixed possible locking issue when using datasource program with long output... + * 0313 FIX: Avoid duplicate reading of configuration file on --create-rrd... Checks & Agents: * 0306 esx_vsphere_counters: added missing ramdisk levels sfcbtickets diff --git a/modules/check_mk.py b/modules/check_mk.py index 1b56352..b515590 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -5524,7 +5524,8 @@ if __name__ == "__main__": "cmc-file=", "browse-man", "list-man", "update-dns-cache" ] non_config_options = ['-L', '--list-checks', '-P', '--package', '-M', '--notify', - '--man', '-V', '--version' ,'-h', '--help', '--automation'] + '--man', '-V', '--version' ,'-h', '--help', '--automation', + '--create-rrd' ] try: opts, args = getopt.getopt(sys.argv[1:], short_options, long_options)

10 years, 9 months

Check_MK Git: check_mk: datasource program call: Simplified code

by Lars Michelsen

Module: check_mk Branch: master Commit: f4fd2fd334d5cf974533ffd0ffbbc17c86ae085b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4fd2fd334d5cf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 11 11:45:56 2013 +0100 datasource program call: Simplified code --- modules/check_mk_base.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index b70543e..11028ab 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -618,12 +618,7 @@ def get_agent_info_program(commandline): sys.stderr.write("Calling external program %s\n" % commandline) try: p = subprocess.Popen(commandline, shell = True, stdout = subprocess.PIPE, stderr = subprocess.PIPE) - stdout = "" - stderr = "" - while p.poll() is None: - response = p.communicate() - stdout += response[0] - stderr += response[1] + stdout, stderr = p.communicate() exitstatus = p.returncode except Exception, e: raise MKAgentError("Could not execute '%s': %s" % (commandline, e))

10 years, 9 months

Check_MK Git: check_mk: FIX Fixed "Inventory failed" message when trying an inventory on clusters via WATO

by Lars Michelsen

Module: check_mk Branch: master Commit: 2a09d25fe622b00d228b3ff05602a92d8b2d3181 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a09d25fe622b0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 11 11:42:41 2013 +0100 FIX Fixed "Inventory failed" message when trying an inventory on clusters via WATO The service inventory of cluster hosts via WATO failed all the time with an error message like "Inventory failed for this host: Error - host is unreachable, no usable cache file present". This error has been fixed with this change. --- .werks/311 | 10 ++++++++++ ChangeLog | 1 + modules/automation.py | 2 ++ web/htdocs/wato.py | 2 +- 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/311 b/.werks/311 new file mode 100644 index 0000000..904c324 --- /dev/null +++ b/.werks/311 @@ -0,0 +1,10 @@ +Title: Fixed "Inventory failed" message when trying an inventory on clusters via WATO +Level: 2 +Component: wato +Version: 1.2.3i8 +Date: 1386758273 +Class: fix + +The service inventory of cluster hosts via WATO failed all the time with an error message +like "Inventory failed for this host: Error - host is unreachable, no usable cache file present". +This error has been fixed with this change. diff --git a/ChangeLog b/ChangeLog index 3e38996..1c919f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,7 @@ * 0019 FIX: Fixed wording in WATO rule for MSSQL check * 0242 FIX: Parameters for clustered services can now be configured on the cluster host... * 0309 FIX: Trying to prevent read/write conflicts with a large user base... + * 0311 FIX: Fixed "Inventory failed" message when trying an inventory on clusters via WATO... Reporting & Availability: * 0018 New option for displaying a legend for the colors used in the timeline... diff --git a/modules/automation.py b/modules/automation.py index 6b4da4a..f0d1092 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -181,6 +181,7 @@ def automation_try_inventory(args, leave_no_tcp=False, with_snmp_scan=False): elif args[0] == '@scan': args = args[1:] with_snmp_scan = True + leave_no_tcp = True hostname = args[0] @@ -191,6 +192,7 @@ def automation_try_inventory(args, leave_no_tcp=False, with_snmp_scan=False): already_added = set([]) for node in nodes_of(hostname): new_services = automation_try_inventory_node(node, leave_no_tcp=leave_no_tcp, with_snmp_scan=with_snmp_scan) + for entry in new_services: if host_of_clustered_service(node, entry[6]) == hostname: # 1: check, 6: Service description diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c08715d..a09cb1d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2491,7 +2491,7 @@ def show_service_table(host, firsttime): try: table = check_mk_automation(host[".siteid"], "try-inventory", cache_options + [hostname]) if len(table) == 0 and cache_options != []: - table = check_mk_automation(host[".siteid"], "try-inventory", [hostname]) + table = check_mk_automation(host[".siteid"], "try-inventory", [ '@scan', hostname ]) html.set_var("_scan", "on") except Exception, e: if config.debug:

10 years, 9 months

← Newer
1
...
19
20
21
22
23
24
25
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2013