Checkmk git commits May 2016

checkmk-commits@lists.checkmk.com

6 participants
231 discussions

Fixed ucb ps regex to make it work with solaris grep

by Lars Michelsen

Module: check_mk Branch: master Commit: 088cc6d3b90d18d27e80a324ca4c976ed3f9563e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=088cc6d3b90d18… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 12 08:48:09 2016 +0200 Fixed ucb ps regex to make it work with solaris grep --- agents/check_mk_agent.solaris | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 721b611..efd53c3 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -201,7 +201,7 @@ if [ -x /usr/ucb/ps ]; then STATS=${LINE%) *} PID=${STATS##*,} - CMD=$(echo "$UCB_PS" | grep "^\s*$PID " | head -n1 | \ + CMD=$(echo "$UCB_PS" | grep "^[ ]*$PID " | head -n1 | \ awk '{ s = ""; for (i = 5; i <= NF; i++) s = s $i " "; print s }') # Only use the ucb ps line when it's not empty (process might already been gone) and the # ps line is long enough the be potentially stripped.

8 years, 1 month

Fixed syntax error in previous commit

by Mathias Kettner

Module: check_mk Branch: master Commit: eb478e24b517e3f7967ab805b825f1dadfe1dfa1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eb478e24b517e3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 12 08:42:16 2016 +0200 Fixed syntax error in previous commit --- web/htdocs/logwatch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/logwatch.py b/web/htdocs/logwatch.py index e85bec9..822620d 100644 --- a/web/htdocs/logwatch.py +++ b/web/htdocs/logwatch.py @@ -318,7 +318,7 @@ def do_log_ack(site, host_name, file_name): html.footer() -dthis_nameef acknowledge_logfile(site, host_name, int_filename, display_name): +def acknowledge_logfile(site, host_name, int_filename, display_name): if not may_see(site, host_name): raise MKAuthException(_('Permission denied.')) os.remove(defaults.logwatch_dir + '/' + host_name + '/' + int_filename)

8 years, 1 month

Logwatch: refactored, create own function for acknowledging

by Mathias Kettner

Module: check_mk Branch: master Commit: 63759a3a6fb15a50ba94f6a31a4b06ca74789e88 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63759a3a6fb15a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 12 08:41:20 2016 +0200 Logwatch: refactored, create own function for acknowledging --- web/htdocs/logwatch.py | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/web/htdocs/logwatch.py b/web/htdocs/logwatch.py index da61ee0..e85bec9 100644 --- a/web/htdocs/logwatch.py +++ b/web/htdocs/logwatch.py @@ -251,31 +251,31 @@ def ack_button(site=None, host_name=None, int_filename=None): def do_log_ack(site, host_name, file_name): - todo = [] + logs_to_ack = [] if not host_name and not file_name: # all logs on all hosts - for site, this_host, logs in all_logs(): + for this_site, this_host, logs in all_logs(): for int_filename in logs: file_display = form_file_to_ext(int_filename) - todo.append((this_host, int_filename, file_display)) + logs_to_ack.append((this_site, this_host, int_filename, file_display)) ack_msg = _('all logfiles on all hosts') elif host_name and not file_name: # all logs on one host for int_filename in logfiles_of_host(site, host_name): file_display = form_file_to_ext(int_filename) - todo.append((host_name, int_filename, file_display)) + logs_to_ack.append((site, host_name, int_filename, file_display)) ack_msg = _('all logfiles of host %s') % html.attrencode(host_name) elif host_name and file_name: # one log on one host int_filename = form_file_to_int(file_name) - todo = [ (host_name, int_filename, form_file_to_ext(int_filename)) ] + logs_to_ack = [ (site, host_name, int_filename, form_file_to_ext(int_filename)) ] ack_msg = _('the log file %s on host %s') % \ (html.attrencode(file_name), html.attrencode(host_name)) else: - for site, this_host, logs in all_logs(): + for this_site, this_host, logs in all_logs(): file_display = form_file_to_ext(file_name) if file_name in logs: - todo.append((this_host, file_name, file_display)) + logs_to_ack.append((this_site, this_host, file_name, file_display)) ack_msg = _('log file %s on all hosts') % (html.attrencode(file_name)) @@ -304,11 +304,9 @@ def do_log_ack(site, host_name, file_name): if ack != '1': raise MKUserError('_ack', _('Invalid value for ack parameter.')) - for this_host, int_filename, display_name in todo: + for this_site, this_host, int_filename, display_name in logs_to_ack: try: - if not may_see(site, this_host): - raise MKAuthException(_('Permission denied.')) - os.remove(defaults.logwatch_dir + '/' + this_host + '/' + int_filename) + acknowledge_logfile(this_site, this_host, int_filename, display_name) html.message('%s%s' % ( _('Acknowledged %s') % ack_msg, _('Acknowledged all messages in %s.') % ack_msg @@ -320,6 +318,12 @@ def do_log_ack(site, host_name, file_name): html.footer() +dthis_nameef acknowledge_logfile(site, host_name, int_filename, display_name): + if not may_see(site, host_name): + raise MKAuthException(_('Permission denied.')) + os.remove(defaults.logwatch_dir + '/' + host_name + '/' + int_filename) + + #. # .--Parsing-------------------------------------------------------------. # | ____ _ |

8 years, 1 month

3574 FIX Fixed broken aggregations snapin when using aggregations based on hard states

by Lars Michelsen

Module: check_mk Branch: master Commit: 52da62dbc48df81b56bb1449873e0de4e45faa79 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52da62dbc48df8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 12 08:40:15 2016 +0200 3574 FIX Fixed broken aggregations snapin when using aggregations based on hard states When creating an aggregation which bases it's state computation on hard states, this lead to an exception in the sidebar snapin "classobj" not iterable. --- .werks/3574 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/bi.py | 15 ++++++++++----- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/.werks/3574 b/.werks/3574 new file mode 100644 index 0000000..003cb05 --- /dev/null +++ b/.werks/3574 @@ -0,0 +1,11 @@ +Title: Fixed broken aggregations snapin when using aggregations based on hard states +Level: 1 +Component: bi +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1463035142 + +When creating an aggregation which bases it's state computation on hard states, this +lead to an exception in the sidebar snapin "classobj" not iterable. diff --git a/ChangeLog b/ChangeLog index a9ed054..3986c6c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -383,6 +383,7 @@ * 3358 FIX: Fixed BI Boxes views when "Enable BI compilation diagnostics" enabled * 3439 FIX: Fixed processing of BI aggregations containing umlauts * 3440 FIX: Fixed possible BI exception "Unknown BI aggregation group ..."... + * 3574 FIX: Fixed broken aggregations snapin when using aggregations based on hard states... Reporting & Availability: * 3267 New availability option for reclassifying host state "unreachable"... diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 7024a9d..8cfb1e5 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -178,13 +178,18 @@ def aggregation_groups(): migrate_bi_configuration() # convert bi_packs into legacy variables # on demand: show all configured groups group_names = set([]) - for a in config.aggregations + config.host_aggregations: - if a[0] == config.DISABLED: + for entry in config.aggregations + config.host_aggregations: + if entry[0] == config.DISABLED: continue - if type(a[0]) == list: - group_names.update(a[0]) + + if entry[0] == config.HARD_STATES: + entry = entry[1:] + + if type(entry[0]) == list: + group_names.update(entry[0]) else: - group_names.add(a[0]) + group_names.add(entry[0]) + group_names = list(group_names) else:

8 years, 1 month

Distributed logwatch: avoid bogus success message on error

by Mathias Kettner

Module: check_mk Branch: master Commit: 60d4b4055196064a6ca788e24fc892de26773f07 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60d4b405519606… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 12 08:37:57 2016 +0200 Distributed logwatch: avoid bogus success message on error --- web/htdocs/logwatch.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/htdocs/logwatch.py b/web/htdocs/logwatch.py index 3d77f8a..da61ee0 100644 --- a/web/htdocs/logwatch.py +++ b/web/htdocs/logwatch.py @@ -309,14 +309,14 @@ def do_log_ack(site, host_name, file_name): if not may_see(site, this_host): raise MKAuthException(_('Permission denied.')) os.remove(defaults.logwatch_dir + '/' + this_host + '/' + int_filename) + html.message('%s%s' % ( + _('Acknowledged %s') % ack_msg, + _('Acknowledged all messages in %s.') % ack_msg + )) except Exception, e: html.show_error(_('The log file <tt>%s</tt> of host <tt>%s</tt> could not be deleted: %s.') % \ (html.attrencode(display_name), html.attrencode(this_host), e)) - html.message('%s%s' % ( - _('Acknowledged %s') % ack_msg, - _('Acknowledged all messages in %s.') % ack_msg - )) html.footer()

8 years, 1 month

Better error message on distributed logwatch if slave core is outdated

by Mathias Kettner

Module: check_mk Branch: master Commit: 263fa838460559897425a02980b909f1a146adce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=263fa838460559… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 12 08:29:49 2016 +0200 Better error message on distributed logwatch if slave core is outdated --- web/htdocs/logwatch.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/web/htdocs/logwatch.py b/web/htdocs/logwatch.py index 5a05518..3d77f8a 100644 --- a/web/htdocs/logwatch.py +++ b/web/htdocs/logwatch.py @@ -514,6 +514,11 @@ def logfiles_of_host(site, host_name): "Filter: name = %s\n" % lqencode(host_name)) if site: # Honor site hint if available sites.live().set_only_sites(None) + if file_names == None: # Not supported by that Livestatus version + raise MKGeneralException( + _("The monitoring core of the target site '%s' has the version '%s'. That " + "does not support fetching logfile information. Please upgrade " + "to a newer version.") % (site, sites.state(site)["program_version"])) return file_names

8 years, 1 month

Fixed typo in error message for unimplmented check

by Mathias Kettner

Module: check_mk Branch: master Commit: 3447f7968c6aabc037192729b4a720fd79bb4cee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3447f7968c6aab… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 11 15:30:33 2016 +0200 Fixed typo in error message for unimplmented check --- modules/check_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 5c4bb20..2bfae88 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2303,7 +2303,7 @@ def sanitize_service_description(descr): def service_description(hostname, check_type, item): if check_type not in check_info: if item: - return "Unimplmented check %s / %s" % (check_type, item) + return "Unimplemented check %s / %s" % (check_type, item) else: return "Unimplemented check %s" % check_type

8 years, 1 month

3471 FIX Repair ignoring discovery errors when bogus %s is contained in service description

by Mathias Kettner

Module: check_mk Branch: master Commit: 0d33acc9bbdcf86357a748074b9569e0a2121083 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d33acc9bbdcf8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 11 15:34:08 2016 +0200 3471 FIX Repair ignoring discovery errors when bogus %s is contained in service description This problem often appeard after an upgrade from 1.2.6 to 1.2.8 on monitored ESX servers. --- .werks/3471 | 10 ++++++++++ ChangeLog | 1 + modules/discovery.py | 39 +++++++++++++++++++++++++++++++++------ 3 files changed, 44 insertions(+), 6 deletions(-) diff --git a/.werks/3471 b/.werks/3471 new file mode 100644 index 0000000..31bddb1 --- /dev/null +++ b/.werks/3471 @@ -0,0 +1,10 @@ +Title: Repair ignoring discovery errors when bogus %s is contained in service description +Level: 2 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1462973569 + +This problem often appeard after an upgrade from 1.2.6 to 1.2.8 on monitored ESX servers. diff --git a/ChangeLog b/ChangeLog index 2d6af3e..a9ed054 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ * 3385 FIX: Fixed not updated discovery service after grouped auto discovery... * 3416 FIX: Avoid warning in cmc.log when rescheduling non-existing discovery check... * 3437 FIX: Improved performance of "activate changes", especially in distributed environments + * 3471 FIX: Repair ignoring discovery errors when bogus %s is contained in service description... Checks & Agents: * 3183 aruba_wlc_aps: new check which monitors the provisioned accesspoints of an Aruba Network WLAN Controller diff --git a/modules/discovery.py b/modules/discovery.py index bbfd17c..ee84837 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -940,19 +940,28 @@ def get_node_services(hostname, ipaddress, use_caches, do_snmp_scan, on_error): # Identify clustered services for (check_type, item), (check_source, paramstring) in services.items(): - descr = service_description(hostname, check_type, item) + try: + descr = service_description(hostname, check_type, item) + except Exception, e: + if on_error == "raise": + raise + elif on_error == "warn": + sys.stderr.write("Invalid service description: %s\n" % e) + else: + continue # ignore + if hostname != host_of_clustered_service(hostname, descr): if check_source == "vanished": del services[(check_type, item)] # do not show vanished clustered services here else: services[(check_type, item)] = ("clustered_" + check_source, paramstring) - merge_manual_services(services, hostname) + merge_manual_services(services, hostname, on_error) return services # To a list of discovered services add/replace manual and active # checks and handle ignoration -def merge_manual_services(services, hostname): +def merge_manual_services(services, hostname, on_error): # Find manual checks. These can override discovered checks -> "manual" manual_items = get_check_table(hostname, skip_autochecks=True) for (check_type, item), (params, descr, deps) in manual_items.items(): @@ -978,7 +987,16 @@ def merge_manual_services(services, hostname): # Handle disabled services -> "obsolete" and "ignored" for (check_type, item), (check_source, paramstring) in services.items(): - descr = service_description(hostname, check_type, item) + try: + descr = service_description(hostname, check_type, item) + except Exception, e: + if on_error == "raise": + raise + elif on_error == "warn": + sys.stderr.write("Invalid service description: %s\n" % e) + else: + continue # ignore + if service_ignored(hostname, check_type, descr): if check_source == "vanished": new_source = "obsolete" @@ -1015,7 +1033,7 @@ def get_cluster_services(hostname, use_caches, with_snmp_scan, on_error): # In all other cases either both must be "new" or "vanished" -> let it be # Now add manual and active serivce and handle ignored services - merge_manual_services(cluster_items, hostname) + merge_manual_services(cluster_items, hostname, on_error) return cluster_items @@ -1041,7 +1059,16 @@ def get_check_preview(hostname, use_caches, do_snmp_scan, on_error): except: raise MKGeneralException("Invalid check parameter string '%s'" % paramstring) - descr = service_description(hostname, check_type, item) + try: + descr = service_description(hostname, check_type, item) + except Exception, e: + if on_error == "raise": + raise + elif on_error == "warn": + sys.stderr.write("Invalid service description: %s\n" % e) + else: + continue # ignore + global g_service_description g_service_description = descr infotype = check_type.split('.')[0]

8 years, 1 month

3470 FIX mounts: Fix exception when displaying check parameters in WATO services list

by Mathias Kettner

Module: check_mk Branch: master Commit: 49a64f3d4824fcbf951a94361d3bf242fed52655 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=49a64f3d4824fc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 11 12:51:41 2016 +0200 3470 FIX mounts: Fix exception when displaying check parameters in WATO services list The reason for this exception was that the autodiscovery now creates Unicode strings while the WATO parameter definition only allowed normal strings. --- .werks/3470 | 11 +++++++++++ ChangeLog | 1 + web/plugins/wato/check_parameters.py | 4 +++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/3470 b/.werks/3470 new file mode 100644 index 0000000..a9ac90e --- /dev/null +++ b/.werks/3470 @@ -0,0 +1,11 @@ +Title: mounts: Fix exception when displaying check parameters in WATO services list +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1462963852 + +The reason for this exception was that the autodiscovery now creates Unicode +strings while the WATO parameter definition only allowed normal strings. diff --git a/ChangeLog b/ChangeLog index 6752478..2d6af3e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -213,6 +213,7 @@ * 3529 FIX: agent_netapp: fixed problem with older netapp versions (7Mode - Version 8.0)... * 3573 FIX: ps: Fixed possible wrong matching of ps and ucb ps commands * 3131 FIX: if64, if64adm: These checks now display the speed of interfaces slower than 1Mbit correctly... + * 3470 FIX: mounts: Fix exception when displaying check parameters in WATO services list... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 952083c..1247a6b 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2855,7 +2855,9 @@ register_check_parameters( help = _("Specify all expected mount options here. If the list of " "actually found options differs from this list, the check will go " "warning or critical. Just the option <tt>commit</tt> is being " - "ignored since it is modified by the power saving algorithms.")), + "ignored since it is modified by the power saving algorithms."), + valuespec = TextUnicode(), + ), TextAscii( title = _("Mount point"), allow_empty = False),

8 years, 1 month

Cleaned up hpux_tunables* man pages (had a man page for not existant check )

by Lars Michelsen

Module: check_mk Branch: master Commit: 8443234f2e449813b755862842e0db94e34f7720 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8443234f2e4498… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 11 11:28:30 2016 +0200 Cleaned up hpux_tunables* man pages (had a man page for not existant check) --- checkman/hpux_tunables | 61 ----------------------------------- checkman/hpux_tunables.maxfiles_lim | 32 ++++++++++++++---- checkman/hpux_tunables.nkthread | 31 ++++++++++++++---- checkman/hpux_tunables.nproc | 31 ++++++++++++++---- checkman/hpux_tunables.semmni | 31 ++++++++++++++---- checkman/hpux_tunables.semmns | 31 ++++++++++++++---- checkman/hpux_tunables.shmseg | 31 ++++++++++++++---- 7 files changed, 145 insertions(+), 103 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8443234f2e…

8 years, 1 month

← Newer
1
...
11
12
13
14
15
16
17
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2016