Checkmk git commits June 2013

checkmk-commits@lists.checkmk.com

4 participants
186 discussions

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 53dcaed05b80b251562bcc44ee56ad0fbdf4b54d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53dcaed05b80b2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 20 15:24:31 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years

Check_MK Git: check_mk: Some cleanups in new thermal check

by Lars Michelsen

Module: check_mk Branch: master Commit: 2576a0dba819083420b7a7c9f3693383d2419f84 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2576a0dba81908… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 20 14:22:58 2013 +0200 Some cleanups in new thermal check --- ChangeLog | 2 +- agents/check_mk_agent.linux | 2 +- checks/thermal | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index e1b957b..318118c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,7 +29,7 @@ * cluster hosts: removed agent version output from Check_MK service (this was misleading for different agent versions on multiple nodes) * job check: better handling of unexpected agent output - * thermal: Added check for linux thermal sensors (e.g. acpi) + * lnx_thermal: Added check for linux thermal sensors (e.g. acpi) Multisite: * User accounts can now be locked after a specified amount of auth diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 724a777..d956815 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -465,7 +465,7 @@ fi # Gather thermal information provided e.g. by acpi # At the moment only supporting thermal sensors if ls /sys/class/thermal/thermal_zone* >/dev/null 2>&1; then - echo '<<<thermal>>>' + echo '<<<lnx_thermal>>>' for F in /sys/class/thermal/thermal_zone*; do echo -n "${F##*/} " cat $F/{mode,type,temp,trip_point_*} | tr \\n " " diff --git a/checks/thermal b/checks/thermal index e9435ee..b22a849 100644 --- a/checks/thermal +++ b/checks/thermal @@ -24,17 +24,17 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# <<<thermal>>> +# <<<lnx_thermal>>> # thermal_zone0 enabled acpitz 57000 127000 critical # thermal_zone1 enabled acpitz 65000 100000 critical 95500 passive -# <<<thermal>>> +# <<<lnx_thermal>>> # thermal_zone0 enabled acpitz 47000 90000 critical 79000 passive -def inventory_thermal(info): +def inventory_lnx_thermal(info): return [ (l[0].replace('thermal_zone', ''), None) for l in info ] -def check_thermal(item, params, info): +def check_lnx_thermal(item, params, info): for line in info: if line[0].replace('thermal_zone', '') == item: # ['thermal_zone0', 'enabled', 'acpitz', '51000', '90000', 'critical', '79000', 'passive'] @@ -62,9 +62,9 @@ def check_thermal(item, params, info): return (state, 'Temperature is %dC%s' % (cur, detail_txt), [ ( 'temperature', cur ) ]) return (3, 'No data found for sensor "thermal_zone%s"' % item) -check_info['thermal'] = { +check_info['lnx_thermal'] = { "inventory_function" : inventory_thermal, "check_function" : check_thermal, - "service_description" : "Thermal Sensor %s", + "service_description" : "Temperature %s", "has_perfdata" : True, }

11 years

Check_MK Git: check_mk: Updated bug entries #0924

by Lars Michelsen

Module: check_mk Branch: master Commit: a5fdf17b4ef29525434f1e65ded6caeb73bacc33 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5fdf17b4ef295… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 20 14:22:47 2013 +0200 Updated bug entries #0924 --- .bugs/924 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.bugs/924 b/.bugs/924 new file mode 100644 index 0000000..d093039 --- /dev/null +++ b/.bugs/924 @@ -0,0 +1,12 @@ +Title: The WATO progress bar in activate changes is sync and might timeout +Component: wato +State: open +Date: 2013-06-20 13:58:40 +Targetversion: 1.2.3 +Class: nastiness + +The progress bar is updated by a ajax request which waits for the configuration to be activated. +This is a problem in setups where activating takes more than the timeouts of the system/site apache. +In that case the progres bar fills up to 100% width but never changes the state to "finished". It +stays on "activating...". The ajax request is terminated with 502 http code. This seems not to +be handled correctly in the dialog.

11 years

Check_MK Git: check_mk: thermal: Added check for linux thermal sensors (e.g . acpi)

by Lars Michelsen

Module: check_mk Branch: master Commit: 3dcc0e7bccb786db5f47a73284ad2f3a4ca435f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3dcc0e7bccb786… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jun 20 13:44:01 2013 +0200 thermal: Added check for linux thermal sensors (e.g. acpi) --- ChangeLog | 1 + agents/check_mk_agent.linux | 11 +++++++ checks/thermal | 70 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+) diff --git a/ChangeLog b/ChangeLog index 2ec8c4d..e1b957b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ * cluster hosts: removed agent version output from Check_MK service (this was misleading for different agent versions on multiple nodes) * job check: better handling of unexpected agent output + * thermal: Added check for linux thermal sensors (e.g. acpi) Multisite: * User accounts can now be locked after a specified amount of auth diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 2ef7e6e..724a777 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -462,6 +462,17 @@ if cd /var/lib/check_mk_agent/job; then head -n -0 -v * fi +# Gather thermal information provided e.g. by acpi +# At the moment only supporting thermal sensors +if ls /sys/class/thermal/thermal_zone* >/dev/null 2>&1; then + echo '<<<thermal>>>' + for F in /sys/class/thermal/thermal_zone*; do + echo -n "${F##*/} " + cat $F/{mode,type,temp,trip_point_*} | tr \\n " " + echo + done +fi + # MK's Remote Plugin Executor if [ -e "$MK_CONFDIR/mrpe.cfg" ] then diff --git a/checks/thermal b/checks/thermal new file mode 100644 index 0000000..e9435ee --- /dev/null +++ b/checks/thermal @@ -0,0 +1,70 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +# <<<thermal>>> +# thermal_zone0 enabled acpitz 57000 127000 critical +# thermal_zone1 enabled acpitz 65000 100000 critical 95500 passive + +# <<<thermal>>> +# thermal_zone0 enabled acpitz 47000 90000 critical 79000 passive + +def inventory_thermal(info): + return [ (l[0].replace('thermal_zone', ''), None) for l in info ] + +def check_thermal(item, params, info): + for line in info: + if line[0].replace('thermal_zone', '') == item: + # ['thermal_zone0', 'enabled', 'acpitz', '51000', '90000', 'critical', '79000', 'passive'] + state = 0 + tp_reached = [] + + # convert values from millidegree + cur = saveint(line[3]) / 1000 + + # parse trip points + if len(line) > 4: + trip_points = dict(zip(line[5::2], map(lambda x: saveint(x) / 1000, line[4::2]))) + for tp_num, (tp_name, level) in enumerate(trip_points.items()): + if cur > level: + if tp_name in [ 'hot', 'critical' ]: + state = max(state, 2) + else: + state = max(state, 1) + tp_reached.append("%s (%d)" % (tp_name, tp_num)) + + detail_txt = '' + if tp_reached: + detail_txt = ' (Trip Points reached: %s)' % ', '.join(tp_reached) + + return (state, 'Temperature is %dC%s' % (cur, detail_txt), [ ( 'temperature', cur ) ]) + return (3, 'No data found for sensor "thermal_zone%s"' % item) + +check_info['thermal'] = { + "inventory_function" : inventory_thermal, + "check_function" : check_thermal, + "service_description" : "Thermal Sensor %s", + "has_perfdata" : True, +}

11 years

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

by Andreas Boesl

Module: check_mk Branch: master Commit: 2147f0e292461f7ed06ec4d2953faa98600a2b24 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2147f0e292461f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jun 19 12:52:05 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk Conflicts: web/htdocs/wato.py ---

11 years

Check_MK Git: check_mk: * Assigning a service to a cluster host no longer requires a reinventory

by Andreas Boesl

Module: check_mk Branch: master Commit: b1bfe8def4b52aaf1e5ba81c87a99a2b53f2e99f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1bfe8def4b52a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jun 19 12:03:22 2013 +0200 * Assigning a service to a cluster host no longer requires a reinventory * Setting a check_type or service to ignore no longer requires a reinventory Note: If the ignore rule is removed the services will reappear * Config creation: The ignore services rule now also applies to custom, active and legacy checks * Fix: Inventory screen: Now shows custom checks * Inventory screen: Host inventory also displays its clustered services * Rules: Renamed "Ignored services" to "Disabled services" Renamed "Ignored checks" to "Disabled checks" --- ChangeLog | 9 +++++++++ modules/automation.py | 27 ++++++++++++++++++++++----- modules/check_mk.py | 22 ++++++++++++++++++++-- web/htdocs/wato.py | 6 ++++-- web/plugins/wato/check_mk_configuration.py | 8 ++++---- 5 files changed, 59 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index efa5c6b..2ec8c4d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,11 @@ * New option -B for just generating the configuration * Introduced persistent host address lookup cache to prevent issues loading an unchanged configuration after a single address is not resolvable anymore + * Assigning a service to a cluster host no longer requires a reinventory + * Setting a check_type or service to ignore no longer requires a reinventory + Note: If the ignore rule is removed the services will reappear + * Config creation: The ignore services rule now also applies to custom, active + and legacy checks Checks & Agents: * esx_hostystem multipath: criticize standby paths only if not equal to active paths @@ -34,6 +39,10 @@ its far better than nothing. * logwatch: Logwatch icon no longer uses notes_url * check_mk-if.pnp: fixed bug with pnp template on esx hosts without perfdata + * Fix: Inventory screen: Now shows custom checks + * Inventory screen: Host inventory also displays its clustered services + * Rules: Renamed "Ignored services" to "Disabled services" + Renamed "Ignored checks" to "Disabled checks" WATO: * Allow to configure check-/retry_interval in second precision diff --git a/modules/automation.py b/modules/automation.py index 7f390f8..f7eb9fa 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -158,11 +158,21 @@ def automation_try_inventory(args): services.append(entry) already_added.add((entry[1], entry[6])) # make it unique + # Find manual checks for this cluster + cluster_checks = get_check_table(hostname) + for (ct, item), (params, descr, deps) in cluster_checks.items(): + if (ct, descr) not in already_added: + services.append(("manual", ct, None, item, repr(params), params, descr, 0, "", None)) + already_added.add( (ct, descr) ) # make it unique + else: new_services = automation_try_inventory_node(hostname) for entry in new_services: - if host_of_clustered_service(hostname, entry[6]) == hostname: + host = host_of_clustered_service(hostname, entry[6]) + if host == hostname: services.append(entry) + else: + services.append(("clustered",) + entry[1:]) return services @@ -241,6 +251,11 @@ def automation_try_inventory_node(hostname): for cmd, descr, perf in legchecks: found[('legacy', descr)] = ( 'legacy', 'None' ) + # Add custom checks and active checks with artificial type 'custom' + custchecks = host_extra_conf(hostname, custom_checks) + for entry in custchecks: + found[('custom', entry['service_description'])] = ( 'custom', 'None' ) + # Similar for 'active_checks', but here we have parameters for acttype, rules in active_checks.items(): act_info = active_check_info[acttype] @@ -249,12 +264,11 @@ def automation_try_inventory_node(hostname): descr = act_info["service_description"](params) found[(acttype, descr)] = ( 'active', repr(params) ) - # Collect current status information about all existing checks table = [] for (ct, item), (state_type, paramstring) in found.items(): params = None - if state_type not in [ 'legacy', 'active' ]: + if state_type not in [ 'legacy', 'active', 'custom' ]: # apply check_parameters try: if type(paramstring) == str: @@ -316,16 +330,19 @@ def automation_try_inventory_node(hostname): else: descr = item exitcode = None - output = "WAITING - Legacy check, cannot be done offline" + output = "WAITING - %s check, cannot be done offline" % state_type.title() perfdata = [] if state_type == "active": params = eval(paramstring) - if state_type in [ "legacy", "active" ]: + if state_type in [ "legacy", "active", "custom" ]: checkgroup = None + if service_ignored(hostname, None, descr): + state_type = "ignored" else: checkgroup = check_info[ct]["group"] + table.append((state_type, ct, checkgroup, item, paramstring, params, descr, exitcode, output, perfdata)) if not table and (tcp_error or snmp_error): diff --git a/modules/check_mk.py b/modules/check_mk.py index 1dcdc0c..3a61c5c 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1787,6 +1787,14 @@ def create_nagios_servicedefs(outfile, hostname): # ___) | # |____/ 3. Services + + def do_omit_service(hostname, description): + if service_ignored(hostname, None, description): + return True + if hostname != host_of_clustered_service(hostname, description): + return True + return False + host_checks = get_check_table(hostname).items() host_checks.sort() # Create deterministic order aggregated_services_conf = set([]) @@ -1949,6 +1957,9 @@ define servicedependency { if len(legchecks) > 0: outfile.write("\n\n# Legacy checks\n") for command, description, has_perfdata in legchecks: + if do_omit_service(hostname, description): + continue + if description in used_descriptions: cn, it = used_descriptions[description] raise MKGeneralException( @@ -1995,6 +2006,10 @@ define service { has_perfdata = act_info.get('has_perfdata', False) description = act_info["service_description"](params) + + if do_omit_service(hostname, description): + continue + # compute argument, and quote ! and \ for Nagios args = act_info["argument_function"](params).replace("\\", "\\\\").replace("!", "\\!") @@ -2040,6 +2055,9 @@ define service { command_name = entry.get("command_name", "check-mk-custom") command_line = entry.get("command_line", "") + if do_omit_service(hostname, description): + continue + if command_line: plugin_name = command_line.split()[0] if command_line[0] not in [ '$', '/' ]: @@ -2598,11 +2616,11 @@ def check_inventory(hostname): def service_ignored(hostname, checktype, service_description): - if checktype in ignored_checktypes: + if checktype and checktype in ignored_checktypes: return True if in_boolean_serviceconf_list(hostname, service_description, ignored_services): return True - if checktype_ignored_for_host(hostname, checktype): + if checktype and checktype_ignored_for_host(hostname, checktype): return True return False diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 565bc8c..2220a87 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2216,11 +2216,13 @@ def show_service_table(host, firsttime): ( _("Available (missing) services"), "new", firsttime ), ( _("Already configured services"), "old", True, ), ( _("Obsolete services (being checked, but should be ignored)"), "obsolete", True ), - ( _("Ignored services (configured away by admin)"), "ignored", False ), + ( _("Disabled services (configured away by admin)"), "ignored", None), ( _("Vanished services (checked, but no longer exist)"), "vanished", True ), ( _("Active checks"), "active", None ), ( _("Manual services (defined in main.mk)"), "manual", None ), - ( _("Legacy services (defined in main.mk)"), "legacy", None ) + ( _("Legacy services (defined in main.mk)"), "legacy", None ), + ( _("Custom checks (defined via rule)"), "custom", None ), + ( _("Clustered services (located on cluster host)"), "clustered", None ) ]: first = True trclass = "even" diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index df44668..2ae1c3d 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1480,8 +1480,8 @@ register_rule(group, register_rule(group, "ignored_services", - title = _("Ignored services"), - help = _("Services that are declared as ignored by this rule set will not be added " + title = _("Disabled services"), + help = _("Services that are declared as disabled by this rule set will not be added " "to a host during inventory (automatic service detection). Services that already " "exist will continued to be monitored but be marked as obsolete in the service " "list of a host."), @@ -1490,8 +1490,8 @@ register_rule(group, register_rule(group, "ignored_checks", CheckTypeSelection( - title = _("Ignored checks"), - help = _("This ruleset is similar to 'Ignored services', but selects checks to be ignored " + title = _("Disabled checks"), + help = _("This ruleset is similar to 'Disabled services', but selects checks to be disabled " "by their type. This allows you to disable certain technical implementations " "such as filesystem checks via SNMP on hosts that also have the Check_MK agent " "installed."),

11 years

Check_MK Git: check_mk: * Assigning a service to a cluster host no longer requires a reinventory

by Andreas Boesl

Module: check_mk Branch: master Commit: 0afaa8ccc8a8baa8cb5e28939c0b1658d6fc2a6a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0afaa8ccc8a8ba… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jun 19 12:03:22 2013 +0200 * Assigning a service to a cluster host no longer requires a reinventory * Setting a check_type or service to ignore no longer requires a reinventory Note: If the ignore rule is removed the services will reappear * Config creation: The ignore services rule now also applies to custom, active and legacy checks * Fix: Inventory screen: Now shows custom checks * Inventory screen: Host inventory also displays its clustered services * Rules: Renamed "Ignored services" to "Disabled services" Renamed "Ignored checks" to "Disabled checks" --- ChangeLog | 9 +++++++++ modules/automation.py | 27 ++++++++++++++++++++++----- modules/check_mk.py | 22 ++++++++++++++++++++-- web/htdocs/wato.py | 6 ++++-- web/plugins/wato/check_mk_configuration.py | 8 ++++---- 5 files changed, 59 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index efa5c6b..2ec8c4d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,11 @@ * New option -B for just generating the configuration * Introduced persistent host address lookup cache to prevent issues loading an unchanged configuration after a single address is not resolvable anymore + * Assigning a service to a cluster host no longer requires a reinventory + * Setting a check_type or service to ignore no longer requires a reinventory + Note: If the ignore rule is removed the services will reappear + * Config creation: The ignore services rule now also applies to custom, active + and legacy checks Checks & Agents: * esx_hostystem multipath: criticize standby paths only if not equal to active paths @@ -34,6 +39,10 @@ its far better than nothing. * logwatch: Logwatch icon no longer uses notes_url * check_mk-if.pnp: fixed bug with pnp template on esx hosts without perfdata + * Fix: Inventory screen: Now shows custom checks + * Inventory screen: Host inventory also displays its clustered services + * Rules: Renamed "Ignored services" to "Disabled services" + Renamed "Ignored checks" to "Disabled checks" WATO: * Allow to configure check-/retry_interval in second precision diff --git a/modules/automation.py b/modules/automation.py index 7f390f8..f7eb9fa 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -158,11 +158,21 @@ def automation_try_inventory(args): services.append(entry) already_added.add((entry[1], entry[6])) # make it unique + # Find manual checks for this cluster + cluster_checks = get_check_table(hostname) + for (ct, item), (params, descr, deps) in cluster_checks.items(): + if (ct, descr) not in already_added: + services.append(("manual", ct, None, item, repr(params), params, descr, 0, "", None)) + already_added.add( (ct, descr) ) # make it unique + else: new_services = automation_try_inventory_node(hostname) for entry in new_services: - if host_of_clustered_service(hostname, entry[6]) == hostname: + host = host_of_clustered_service(hostname, entry[6]) + if host == hostname: services.append(entry) + else: + services.append(("clustered",) + entry[1:]) return services @@ -241,6 +251,11 @@ def automation_try_inventory_node(hostname): for cmd, descr, perf in legchecks: found[('legacy', descr)] = ( 'legacy', 'None' ) + # Add custom checks and active checks with artificial type 'custom' + custchecks = host_extra_conf(hostname, custom_checks) + for entry in custchecks: + found[('custom', entry['service_description'])] = ( 'custom', 'None' ) + # Similar for 'active_checks', but here we have parameters for acttype, rules in active_checks.items(): act_info = active_check_info[acttype] @@ -249,12 +264,11 @@ def automation_try_inventory_node(hostname): descr = act_info["service_description"](params) found[(acttype, descr)] = ( 'active', repr(params) ) - # Collect current status information about all existing checks table = [] for (ct, item), (state_type, paramstring) in found.items(): params = None - if state_type not in [ 'legacy', 'active' ]: + if state_type not in [ 'legacy', 'active', 'custom' ]: # apply check_parameters try: if type(paramstring) == str: @@ -316,16 +330,19 @@ def automation_try_inventory_node(hostname): else: descr = item exitcode = None - output = "WAITING - Legacy check, cannot be done offline" + output = "WAITING - %s check, cannot be done offline" % state_type.title() perfdata = [] if state_type == "active": params = eval(paramstring) - if state_type in [ "legacy", "active" ]: + if state_type in [ "legacy", "active", "custom" ]: checkgroup = None + if service_ignored(hostname, None, descr): + state_type = "ignored" else: checkgroup = check_info[ct]["group"] + table.append((state_type, ct, checkgroup, item, paramstring, params, descr, exitcode, output, perfdata)) if not table and (tcp_error or snmp_error): diff --git a/modules/check_mk.py b/modules/check_mk.py index 1dcdc0c..3a61c5c 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1787,6 +1787,14 @@ def create_nagios_servicedefs(outfile, hostname): # ___) | # |____/ 3. Services + + def do_omit_service(hostname, description): + if service_ignored(hostname, None, description): + return True + if hostname != host_of_clustered_service(hostname, description): + return True + return False + host_checks = get_check_table(hostname).items() host_checks.sort() # Create deterministic order aggregated_services_conf = set([]) @@ -1949,6 +1957,9 @@ define servicedependency { if len(legchecks) > 0: outfile.write("\n\n# Legacy checks\n") for command, description, has_perfdata in legchecks: + if do_omit_service(hostname, description): + continue + if description in used_descriptions: cn, it = used_descriptions[description] raise MKGeneralException( @@ -1995,6 +2006,10 @@ define service { has_perfdata = act_info.get('has_perfdata', False) description = act_info["service_description"](params) + + if do_omit_service(hostname, description): + continue + # compute argument, and quote ! and \ for Nagios args = act_info["argument_function"](params).replace("\\", "\\\\").replace("!", "\\!") @@ -2040,6 +2055,9 @@ define service { command_name = entry.get("command_name", "check-mk-custom") command_line = entry.get("command_line", "") + if do_omit_service(hostname, description): + continue + if command_line: plugin_name = command_line.split()[0] if command_line[0] not in [ '$', '/' ]: @@ -2598,11 +2616,11 @@ def check_inventory(hostname): def service_ignored(hostname, checktype, service_description): - if checktype in ignored_checktypes: + if checktype and checktype in ignored_checktypes: return True if in_boolean_serviceconf_list(hostname, service_description, ignored_services): return True - if checktype_ignored_for_host(hostname, checktype): + if checktype and checktype_ignored_for_host(hostname, checktype): return True return False diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 565bc8c..b99d9ef 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2216,11 +2216,13 @@ def show_service_table(host, firsttime): ( _("Available (missing) services"), "new", firsttime ), ( _("Already configured services"), "old", True, ), ( _("Obsolete services (being checked, but should be ignored)"), "obsolete", True ), - ( _("Ignored services (configured away by admin)"), "ignored", False ), + ( _("Ignored services (configured away by admin)"), "ignored", None), ( _("Vanished services (checked, but no longer exist)"), "vanished", True ), ( _("Active checks"), "active", None ), ( _("Manual services (defined in main.mk)"), "manual", None ), - ( _("Legacy services (defined in main.mk)"), "legacy", None ) + ( _("Legacy services (defined in main.mk)"), "legacy", None ), + ( _("Custom checks (defined via rule)"), "custom", None ), + ( _("Clustered services (located on cluster host)"), "clustered", None ) ]: first = True trclass = "even" diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index df44668..2ae1c3d 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1480,8 +1480,8 @@ register_rule(group, register_rule(group, "ignored_services", - title = _("Ignored services"), - help = _("Services that are declared as ignored by this rule set will not be added " + title = _("Disabled services"), + help = _("Services that are declared as disabled by this rule set will not be added " "to a host during inventory (automatic service detection). Services that already " "exist will continued to be monitored but be marked as obsolete in the service " "list of a host."), @@ -1490,8 +1490,8 @@ register_rule(group, register_rule(group, "ignored_checks", CheckTypeSelection( - title = _("Ignored checks"), - help = _("This ruleset is similar to 'Ignored services', but selects checks to be ignored " + title = _("Disabled checks"), + help = _("This ruleset is similar to 'Disabled services', but selects checks to be disabled " "by their type. This allows you to disable certain technical implementations " "such as filesystem checks via SNMP on hosts that also have the Check_MK agent " "installed."),

11 years

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

by Mathias Kettner

Module: check_mk Branch: master Commit: 0d20c1316f08296abf6560239d3fd7c4322893e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d20c1316f0829… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 19 11:53:43 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years

Check_MK Git: check_mk: keepalive: fix further cache variable

by Mathias Kettner

Module: check_mk Branch: master Commit: 0b0160c80cbc93cb1130f9fc69ee79ea77f2bb31 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b0160c80cbc93… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 19 11:53:41 2013 +0200 keepalive: fix further cache variable --- modules/check_mk_base.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index f79969f..7d795fb 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -962,7 +962,8 @@ def cleanup_globals(): g_broken_snmp_hosts = set([]) global g_inactive_timerperiods g_inactive_timerperiods = None - + global g_walk_cache + g_walk_cache = {} # Diagnostic function for detecting global variables that have

11 years

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 50232b595a29f5e596f598d915ec4042d862b7f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50232b595a29f5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 19 10:05:15 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years

← Newer
1
...
7
8
9
10
11
12
13
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2013