Checkmk git commits April 2016

checkmk-commits@lists.checkmk.com

8 participants
356 discussions

by Mathias Kettner

Module: check_mk Branch: master Commit: e1823892ba28bbf9f69591e349d5a682c9428d09 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1823892ba28bb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 19 12:07:35 2016 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 81b84ec..1d3a8c6 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3413 +3423

8 years, 2 months

3386 FIX AIX agent: Cached local scripts / plugins need to be configured in seconds

by Lars Michelsen

Module: check_mk Branch: master Commit: 85ad58757d3e10734bb738712e373e1aa3c825e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85ad58757d3e10… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 19 11:22:43 2016 +0200 3386 FIX AIX agent: Cached local scripts / plugins need to be configured in seconds When using cached executin of local scripts or agent plugins (putting scripts in subdirectories named like the execution interval) with the AIX agent, the directory names were interpreted as minutes which was not consistent with the other agents. This has now been changed to be consistently interpreted as seconds. You will have to rename your directories to the current name multiplied with 60 to execute the plugins again in the expected interval. --- .werks/3386 | 16 ++++++++++++++++ ChangeLog | 2 ++ agents/check_mk_agent.aix | 4 +++- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.werks/3386 b/.werks/3386 new file mode 100644 index 0000000..46fa75d --- /dev/null +++ b/.werks/3386 @@ -0,0 +1,16 @@ +Title: AIX agent: Cached local scripts / plugins need to be configured in seconds +Level: 2 +Component: checks +Compatible: incomp +Version: 1.2.9i1 +Date: 1461057535 +Class: fix + +When using cached executin of local scripts or agent plugins (putting scripts +in subdirectories named like the execution interval) with the AIX agent, the +directory names were interpreted as minutes which was not consistent with the +other agents. + +This has now been changed to be consistently interpreted as seconds. You will +have to rename your directories to the current name multiplied with 60 to +execute the plugins again in the expected interval. diff --git a/ChangeLog b/ChangeLog index 3dcd5bb..bd461ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -159,6 +159,8 @@ * 3399 FIX: statgrab_mem, hr_mem: Fix display of total installed memory in graph * 3384 FIX: eltek_battery: Fixed broken check due to wrong spelled include file * 3400 FIX: local: do not crash in P mode if performance data contains a unit of measurement + * 3386 FIX: AIX agent: Cached local scripts / plugins need to be configured in seconds... + NOTE: Please refer to the migration notes! Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index db5e022..6dd5136 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -91,10 +91,12 @@ function waitmax function run_cached { NAME=$1 + # Be aware: Maxage was expected to be given in minutes but this was + # confusing because all other agents use seconds here. So this has + # been changed to be compatible. MAXAGE=$2 shift 2 CMDLINE=$* - MAXAGE=$MAXAGE*60 if [ ! -e $MK_VARDIR/cache ] ; then mkdir -p $MK_VARDIR/cache ; fi CACHE_FILE=$MK_VARDIR/cache/$NAME.cache

8 years, 2 months

Marking agents need to be baked when changing agent related rules

by Lars Michelsen

Module: check_mk Branch: master Commit: 1cb47c0532c2a084c7c48492a54478144f4426de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1cb47c0532c2a0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 19 10:59:41 2016 +0200 Marking agents need to be baked when changing agent related rules --- web/htdocs/wato.py | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 451978a..40f14c4 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1782,8 +1782,9 @@ def rename_host_in_rulesets(folder, oldname, newname): rules[nr] = newrule changed_rulesets.append(varname) changed = True + if changed: - save_rulesets(folder, rulesets) + save_changed_ruleset(varname, folder, rulesets) folder.mark_hosts_dirty() for subfolder in folder.subfolders().values(): @@ -11701,6 +11702,9 @@ def change_host_tags_in_rules(folder, operations, mode): ruleset[nr] = construct_rule(rulespec, value, tag_specs, host_list, item_list, rule_options) need_save = True + if has_agent_bakery() and is_affecting_baked_agents(varname): + need_to_bake_agents() + rules_to_delete = list(rules_to_delete) rules_to_delete.sort() for nr in rules_to_delete[::-1]: @@ -12229,7 +12233,7 @@ def mode_edit_ruleset(phase): % (rulenr + 1, rule_folder.alias_path())) if c: del rules[rulenr] - save_rulesets(rule_folder, rulesets) + save_changed_ruleset(varname, rule_folder, rulesets) rule_folder.mark_hosts_dirty() log_pending(AFFECTED, None, "edit-ruleset", _("Deleted rule in ruleset '%s'") % rulespec["title"]) @@ -12243,7 +12247,7 @@ def mode_edit_ruleset(phase): if not html.check_transaction(): return None # browser reload rules[rulenr:rulenr] = [rules[rulenr]] - save_rulesets(rule_folder, rulesets) + save_changed_ruleset(varname, rule_folder, rulesets) rule_folder.mark_hosts_dirty() log_pending(AFFECTED, None, "edit-ruleset", @@ -12263,7 +12267,7 @@ def mode_edit_ruleset(phase): rules.insert(0, rule) else: rules.append(rule) - save_rulesets(rule_folder, rulesets) + save_changed_ruleset(varname, rule_folder, rulesets) rule_folder.mark_hosts_dirty() log_pending(AFFECTED, None, "edit-ruleset", _("Changed order of rules in ruleset %s") % rulespec["title"]) @@ -12455,6 +12459,12 @@ def show_rule_in_table(rulespec, tag_specs, host_list, item_list, varname, value html.write(html.attrencode(desc)) +def save_changed_ruleset(varname, rule_folder, rulesets): + if has_agent_bakery() and is_affecting_baked_agents(varname): + need_to_bake_agents() + save_rulesets(rule_folder, rulesets) + + def create_rule(rulespec, hostname=None, item=NO_ITEM): new_rule = [] valuespec = rulespec["valuespec"] @@ -12846,7 +12856,7 @@ def mode_edit_rule(phase, new = False): rules.append(rule) else: rules[rulenr] = rule - save_rulesets(folder, rulesets) + save_changed_ruleset(varname, folder, rulesets) folder.mark_hosts_dirty() if new: @@ -12858,11 +12868,11 @@ def mode_edit_rule(phase, new = False): else: # Move rule to new folder if not new: del rules[rulenr] - save_rulesets(folder, rulesets) + save_changed_ruleset(varname, folder, rulesets) rulesets = load_rulesets(new_rule_folder) rules = rulesets.setdefault(varname, []) rules.append(rule) - save_rulesets(new_rule_folder, rulesets) + save_changed_ruleset(varname, new_rule_folder, rulesets) folder.mark_hosts_dirty() new_rule_folder.mark_hosts_dirty() log_pending(AFFECTED, None, "edit-rule", _("Changed properties of rule %s, moved rule from " @@ -14106,7 +14116,7 @@ def create_sample_config(): config.wato_aux_tags = wato_aux_tags # Initial baking of agents (when bakery is available) - if 'bake_agents' in globals(): + if has_agent_bakery(): try: bake_agents() except: @@ -14117,6 +14127,10 @@ def create_sample_config(): import werks werks.acknowledge_all_werks() + +def has_agent_bakery(): + return 'bake_agents' in globals() + #. # .--Pattern Editor------------------------------------------------------. # | ____ _ _ _____ _ _ _ |

8 years, 2 months

Added a not about BI not using hard states in availability

by Mathias Kettner

Module: check_mk Branch: master Commit: e30e46c7680fdf15731677414ca573cf6482f6c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e30e46c7680fdf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 19 10:21:55 2016 +0200 Added a not about BI not using hard states in availability --- web/plugins/wato/bi.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web/plugins/wato/bi.py b/web/plugins/wato/bi.py index 119126b..6b30aad 100644 --- a/web/plugins/wato/bi.py +++ b/web/plugins/wato/bi.py @@ -637,7 +637,9 @@ class ModeBI(WatoMode): help = _("Hard states can only differ from soft states if at least one host or service " "of the BI aggregate has more than 1 maximum check attempt. For example if you " "set the maximum check attempts of a service to 3 and the service is CRIT " - "just since one check then it's soft state is CRIT, but its hard state is still OK."), + "just since one check then it's soft state is CRIT, but its hard state is still OK. " + "<b>Note:</b> When computing the availbility of a BI aggregate this option " + "has no impact. For that purpose always the soft (i.e. real) states will be used."), ) ), ( "downtime_aggr_warn",

8 years, 2 months

3385 FIX Fixed not updated discovery service after grouped auto discovery

by Lars Michelsen

Module: check_mk Branch: master Commit: ec5cff82a53abfe1d011bf186693a9c762cd411b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec5cff82a53abf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 19 10:21:31 2016 +0200 3385 FIX Fixed not updated discovery service after grouped auto discovery When the automatic service discovery and activation updates the services of a host the "Check_MK Discovery" service remained in the state it was before the discovery. This has now been fixed by triggering a refresh of the discovery services. --- .werks/3385 | 13 +++++++++++++ ChangeLog | 1 + modules/automation.py | 18 ------------------ modules/check_mk.py | 18 ++++++++++++++++++ modules/discovery.py | 3 +++ 5 files changed, 35 insertions(+), 18 deletions(-) diff --git a/.werks/3385 b/.werks/3385 new file mode 100644 index 0000000..c84e919 --- /dev/null +++ b/.werks/3385 @@ -0,0 +1,13 @@ +Title: Fixed not updated discovery service after grouped auto discovery +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461054017 + +When the automatic service discovery and activation updates the services +of a host the "Check_MK Discovery" service remained in the state it was +before the discovery. This has now been fixed by triggering a refresh +of the discovery services. diff --git a/ChangeLog b/ChangeLog index fd0c969..3dcd5bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ * 3343 FIX: MKP: Verifying minimal version of packages during installation... * 3349 FIX: Added rule to disable Inline-SNMP per host... * 3123 FIX: fix for temperature services discovered pre-1.2.8 that caused errors on writing configuration + * 3385 FIX: Fixed not updated discovery service after grouped auto discovery... Checks & Agents: * 3183 aruba_wlc_aps: new check which monitors the provisioned accesspoints of an Aruba Network WLAN Controller diff --git a/modules/automation.py b/modules/automation.py index 18d7ee0..13deccd 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -254,24 +254,6 @@ def automation_get_autochecks(args): return result -def schedule_inventory_check(hostname): - try: - import socket - s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) - s.connect(livestatus_unix_socket) - now = int(time.time()) - if 'cmk-inventory' in use_new_descriptions_for: - command = "SCHEDULE_FORCED_SVC_CHECK;%s;Check_MK Discovery;%d" % (hostname, now) - else: - # FIXME: Remove this old name handling one day - command = "SCHEDULE_FORCED_SVC_CHECK;%s;Check_MK inventory;%d" % (hostname, now) - s.send("COMMAND [%d] %s\n" % (now, command)) - except Exception, e: - if opt_debug: - raise - - - # Determine the type of the check, and how the parameters are being # constructed def automation_analyse_service(args): diff --git a/modules/check_mk.py b/modules/check_mk.py index 8e6ff18..bff1197 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1493,6 +1493,24 @@ def restore_original_agent_caching_usage(): orig_cluster_max_cachefile_age = None orig_inventory_max_cachefile_age = None + +def schedule_inventory_check(hostname): + try: + import socket + s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + s.connect(livestatus_unix_socket) + now = int(time.time()) + if 'cmk-inventory' in use_new_descriptions_for: + command = "SCHEDULE_FORCED_SVC_CHECK;%s;Check_MK Discovery;%d" % (hostname, now) + else: + # TODO: Remove this old name handling one day + command = "SCHEDULE_FORCED_SVC_CHECK;%s;Check_MK inventory;%d" % (hostname, now) + s.send("COMMAND [%d] %s\n" % (now, command)) + except Exception, e: + if opt_debug: + raise + + #. # .--SNMP----------------------------------------------------------------. # | ____ _ _ __ __ ____ | diff --git a/modules/discovery.py b/modules/discovery.py index c4c5aeb..59f25ab 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -466,6 +466,9 @@ def discover_marked_hosts(): if redisc_params["activation"]: activation_required = True + # Now ensure that the discovery service is updated right after the changes + schedule_inventory_check(hostname) + # delete the file even in error case, otherwise we might be causing the same error # every time the cron job runs os.remove(host_flag_path)

8 years, 2 months

3402 FIX Using information from inventory in column tooltips now longer crashes

by Mathias Kettner

Module: check_mk Branch: master Commit: 12d569ee6d67e25edfd6fc22f36cbd477f011452 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12d569ee6d67e2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 19 09:41:54 2016 +0200 3402 FIX Using information from inventory in column tooltips now longer crashes --- .werks/3402 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/views.py | 7 +++++++ 3 files changed, 18 insertions(+) diff --git a/.werks/3402 b/.werks/3402 new file mode 100644 index 0000000..bedd345 --- /dev/null +++ b/.werks/3402 @@ -0,0 +1,10 @@ +Title: Using information from inventory in column tooltips now longer crashes +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461051685 + + diff --git a/ChangeLog b/ChangeLog index 6195bf1..fd0c969 100644 --- a/ChangeLog +++ b/ChangeLog @@ -212,6 +212,7 @@ * 3395 FIX: Fix performance issue when many BI aggregations are active... * 3398 FIX: Fix exception in Matrix layout if it contains certain complex columns * 3401 FIX: Fix sorting and grouping hosts by their IPv4 address + * 3402 FIX: Using information from inventory in column tooltips now longer crashes WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 783c5f9..78d201b 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1072,6 +1072,13 @@ def show_view(view, show_heading = False, show_buttons = True, columns = get_needed_columns(view, master_painters) join_columns = get_needed_columns(view, join_painters) + # Inventory data needed in any of the tool tips + for painter in master_painters: + tooltip_painter_name = painter[2] + if tooltip_painter_name: + if tooltip_painter_name.startswith("inv_"): + need_inventory_data = True + # Columns needed for sorters for s in sorters: if len(s) == 2:

8 years, 2 months

Fixed error during config compilation when using summary hosts with nagios core

by Lars Michelsen

Module: check_mk Branch: master Commit: f1c0639a9bc4fa5fc062d84796f8b9d8d84dc05d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f1c0639a9bc4fa… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 18 17:02:44 2016 +0200 Fixed error during config compilation when using summary hosts with nagios core --- modules/nagios.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/nagios.py b/modules/nagios.py index 47ca245..cd22a3a 100644 --- a/modules/nagios.py +++ b/modules/nagios.py @@ -217,7 +217,7 @@ def create_nagios_hostdefs(outfile, hostname, attrs): outfile.write(" host_name\t\t\t%s\n" % summary_hostname(hostname)) outfile.write(" use\t\t\t\t%s-summary\n" % (is_clust and cluster_template or host_template)) outfile.write(" alias\t\t\t\tSummary of %s\n" % alias) - outfile.write(" address\t\t\t%s\n" % (ip and ip or fallback_ip(hostname))) + outfile.write(" address\t\t\t%s\n" % (ip and ip or fallback_ip_for(hostname))) outfile.write(" _TAGS\t\t\t\t%s\n" % " ".join(tags_of_host(hostname))) outfile.write(" __REALNAME\t\t\t%s\n" % hostname) outfile.write(" parents\t\t\t%s\n" % hostname) @@ -244,7 +244,7 @@ def create_nagios_hostdefs(outfile, hostname, attrs): outfile.write(" contact_groups\t\t+%s\n" % make_utf8(",".join(cgrs))) if is_clust: - outfile.write(" _NODEIPS\t\t\t%s\n" % " ".join(node_ips)) + outfile.write(" _NODEIPS\t\t\t%s\n" % " ".join(attrs.get("_NODEIPS"))) outfile.write(extra_summary_host_conf_of(hostname)) outfile.write("}\n") outfile.write("\n")

8 years, 2 months

Added missing but needed import in check_mk.py: pprint

by Lars Michelsen

Module: check_mk Branch: master Commit: fcefc4816f6804791e71ecbbd05ab12e70c460dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fcefc4816f6804… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 18 17:01:53 2016 +0200 Added missing but needed import in check_mk.py: pprint --- 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 6a7ecf6..4e98004 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -34,6 +34,7 @@ import os import sys import time +import pprint import socket import getopt import re @@ -4356,7 +4357,6 @@ def do_scan_parents(hosts): # make monitoring host the parent of all hosts without real parent parent_rules.append( (monitoring_host, [host]) ) - import pprint out = file(outfilename, "w") out.write("# Automatically created by --scan-parents at %s\n\n" % time.asctime()) out.write("# Do not edit this file. If you want to convert an\n")

8 years, 2 months

Cleaned up counter wrap handling a bit

by Lars Michelsen

Module: check_mk Branch: master Commit: aa44a7a1e2cc2c65514ea342b71244df06671c5b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa44a7a1e2cc2c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 18 17:03:02 2016 +0200 Cleaned up counter wrap handling a bit --- modules/check_mk_base.py | 10 ++++++++-- modules/discovery.py | 3 +-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 84df17f..167fd94 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1149,10 +1149,16 @@ def reset_wrapped_counters(): g_last_counter_wrap = None +# TODO: Can we remove this? (check API) def last_counter_wrap(): return g_last_counter_wrap +def raise_counter_wrap(): + if g_last_counter_wrap: + raise g_last_counter_wrap # pylint: disable=raising-bad-type + + # Compute average by gliding exponential algorithm # itemname : unique ID for storing this average until the next check # this_time : timestamp of new value @@ -1490,8 +1496,7 @@ def do_all_checks_on_host(hostname, ipaddress, only_check_types = None, fetch_ag raise Exception(str(info)) result = sanitize_check_result(check_function(item, params, info), check_uses_snmp(checkname)) - if last_counter_wrap(): - raise last_counter_wrap() + raise_counter_wrap() # handle check implementations that do not yet support the @@ -1661,6 +1666,7 @@ def create_crash_dump_info_file(crash_dir, hostname, check_type, item, params, d # reporting it is totally ok to have some string representations of the objects. class RobustJSONEncoder(json.JSONEncoder): # Are there cases where no __str__ is available? if so, we should do something like %r + # pylint: disable=method-hidden def default(self, o): return "%s" % o diff --git a/modules/discovery.py b/modules/discovery.py index 95300f3..c4c5aeb 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -1044,8 +1044,7 @@ def get_check_preview(hostname, use_caches, do_snmp_scan, on_error): try: reset_wrapped_counters() result = sanitize_check_result(check_function(item, params, info), check_uses_snmp(check_type)) - if last_counter_wrap(): - raise last_counter_wrap() + raise_counter_wrap() except MKCounterWrapped, e: result = (None, "WAITING - Counter based check, cannot be done offline") except Exception, e:

8 years, 2 months

Added missing but mandatory locale_dir to shipped defaults file

by Lars Michelsen

Module: check_mk Branch: master Commit: a72d2a9428ddac2d843c880b572cb59f0078725e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a72d2a9428ddac… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 18 17:06:19 2016 +0200 Added missing but mandatory locale_dir to shipped defaults file --- defaults | 1 + 1 file changed, 1 insertion(+) diff --git a/defaults b/defaults index 65d91a4..cd7bdad 100644 --- a/defaults +++ b/defaults @@ -9,6 +9,7 @@ inventory_dir = 'inventory' check_manpages_dir = 'checkman' agents_dir = 'agents' modules_dir = 'modules' +locale_dir = 'locale' var_dir = 'var' log_dir = 'var/log' autochecksdir = 'var/autochecks'

8 years, 2 months

← Newer
1
...
13
14
15
16
17
18
19
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2016