Checkmk git commits November 2018

checkmk-commits@lists.checkmk.com

15 participants
465 discussions

if_fortigate: YAPF after pick from 1.5.0

by Konstantin Büttner

Module: check_mk Branch: master Commit: 6e164a3f49615c8aaf17ff4a5baf1fde56cf0a34 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e164a3f49615c… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Nov 19 11:16:01 2018 +0100 if_fortigate: YAPF after pick from 1.5.0 Change-Id: I9f02e5fbced557b263bf405db1ed42ab095bc962 --- checks/if_fortigate | 68 +++++++++++++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/checks/if_fortigate b/checks/if_fortigate index 725628d..b0d5542 100644 --- a/checks/if_fortigate +++ b/checks/if_fortigate @@ -34,37 +34,39 @@ def check_if_fortigate(item, params, parsed): check_info["if_fortigate"] = { - 'parse_function' : parse_if64, - 'inventory_function' : inventory_if_fortigate, - 'check_function' : check_if_fortigate, - 'service_description' : 'Interface %s', - 'snmp_info' : ( ".1.3.6.1.2.1", [ - "2.2.1.1", # ifIndex 0 - "2.2.1.2", # ifDescr 1 - "2.2.1.3", # ifType 2 - "2.2.1.5", # ifSpeed 3 - "2.2.1.8", # ifOperStatus 4 - "31.1.1.1.6", # ifHCInOctets 5 - "31.1.1.1.7", # ifHCInUcastPkts 6 - "31.1.1.1.8", # ifHCInMulticastPkts 7 - "31.1.1.1.9", # ifHCInBroadcastPkts 8 - "2.2.1.13", # ifInDiscards 9 - "2.2.1.14", # ifInErrors 10 - "31.1.1.1.10", # ifHCOutOctets 11 - "31.1.1.1.11", # ifHCOutUcastPkts 12 - "31.1.1.1.12", # ifHCOutMulticastPkts 13 - "31.1.1.1.13", # ifHCOutBroadcastPkts 14 - "2.2.1.19", # ifOutDiscards 15 - "2.2.1.20", # ifOutErrors 16 - "2.2.1.21", # ifOutQLen 17 - "31.1.1.1.18", # ifAlias 18 - BINARY("2.2.1.6"), # ifPhysAddress 19 - "31.1.1.1.15", # ifHighSpeed -1 (parse_if64 assumes this is the last element) - ]), - 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.12356"), - 'has_perfdata' : True, - 'includes' : [ "if.include", "if64.include" ], - 'group' : 'if', - 'node_info' : True, - 'default_levels_variable' : 'if_default_levels', + 'parse_function': parse_if64, + 'inventory_function': inventory_if_fortigate, + 'check_function': check_if_fortigate, + 'service_description': 'Interface %s', + 'snmp_info': ( + ".1.3.6.1.2.1", + [ + "2.2.1.1", # ifIndex 0 + "2.2.1.2", # ifDescr 1 + "2.2.1.3", # ifType 2 + "2.2.1.5", # ifSpeed 3 + "2.2.1.8", # ifOperStatus 4 + "31.1.1.1.6", # ifHCInOctets 5 + "31.1.1.1.7", # ifHCInUcastPkts 6 + "31.1.1.1.8", # ifHCInMulticastPkts 7 + "31.1.1.1.9", # ifHCInBroadcastPkts 8 + "2.2.1.13", # ifInDiscards 9 + "2.2.1.14", # ifInErrors 10 + "31.1.1.1.10", # ifHCOutOctets 11 + "31.1.1.1.11", # ifHCOutUcastPkts 12 + "31.1.1.1.12", # ifHCOutMulticastPkts 13 + "31.1.1.1.13", # ifHCOutBroadcastPkts 14 + "2.2.1.19", # ifOutDiscards 15 + "2.2.1.20", # ifOutErrors 16 + "2.2.1.21", # ifOutQLen 17 + "31.1.1.1.18", # ifAlias 18 + BINARY("2.2.1.6"), # ifPhysAddress 19 + "31.1.1.1.15", # ifHighSpeed -1 (parse_if64 assumes this is the last element) + ]), + 'snmp_scan_function': lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.12356"), + 'has_perfdata': True, + 'includes': ["if.include", "if64.include"], + 'group': 'if', + 'node_info': True, + 'default_levels_variable': 'if_default_levels', }

5 years, 10 months

6638 FIX if_fortigate: Fix incorrect usage of Name as Alias

by Konstantin Büttner

Module: check_mk Branch: master Commit: 0fd5c2f047487b96173ffcf94f5552649ac87fde URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0fd5c2f047487b… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Nov 19 11:12:28 2018 +0100 6638 FIX if_fortigate: Fix incorrect usage of Name as Alias Werk #4539 introduced special handling for interfaces of Fortigate firewalls, but incorrectly substituted the ifName for the ifAlias, leading to incompatibilities for users using the alias as an item. Rediscovery is required to get the proper alias back as an item. If you do not use the alias, this does not affect you. Change-Id: I85d394291ce800fe012d91fe59b8e0841674a6ad --- .werks/6638 | 16 +++++++++++++ checks/if_fortigate | 68 ++++++++++++++++++++++++++--------------------------- 2 files changed, 49 insertions(+), 35 deletions(-) diff --git a/.werks/6638 b/.werks/6638 new file mode 100644 index 0000000..a3eadcf --- /dev/null +++ b/.werks/6638 @@ -0,0 +1,16 @@ +Title: if_fortigate: Fix incorrect usage of Name as Alias +Level: 1 +Component: checks +Class: fix +Compatible: incomp +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1542291923 + +Werk #4539 introduced special handling for interfaces of +Fortigate firewalls, but incorrectly substituted the ifName +for the ifAlias, leading to incompatibilities for users +using the alias as an item. Rediscovery is required +to get the proper alias back as an item. If you do not +use the alias, this does not affect you. diff --git a/checks/if_fortigate b/checks/if_fortigate index fe32c31..725628d 100644 --- a/checks/if_fortigate +++ b/checks/if_fortigate @@ -34,39 +34,37 @@ def check_if_fortigate(item, params, parsed): check_info["if_fortigate"] = { - 'parse_function': parse_if64, - 'inventory_function': inventory_if_fortigate, - 'check_function': check_if_fortigate, - 'service_description': 'Interface %s', - 'snmp_info': ( - ".1.3.6.1.2.1", - [ - "2.2.1.1", # ifIndex 0 - "2.2.1.2", # ifDescr 1 - "2.2.1.3", # ifType 2 - "2.2.1.5", # ifSpeed 3 - "2.2.1.8", # ifOperStatus 4 - "31.1.1.1.6", # ifHCInOctets 5 - "31.1.1.1.7", # ifHCInUcastPkts 6 - "31.1.1.1.8", # ifHCInMulticastPkts 7 - "31.1.1.1.9", # ifHCInBroadcastPkts 8 - "2.2.1.13", # ifInDiscards 9 - "2.2.1.14", # ifInErrors 10 - "31.1.1.1.10", # ifHCOutOctets 11 - "31.1.1.1.11", # ifHCOutUcastPkts 12 - "31.1.1.1.12", # ifHCOutMulticastPkts 13 - "31.1.1.1.13", # ifHCOutBroadcastPkts 14 - "2.2.1.19", # ifOutDiscards 15 - "2.2.1.20", # ifOutErrors 16 - "2.2.1.21", # ifOutQLen 17 - "31.1.1.1.1", # ifName 18 - BINARY("2.2.1.6"), # ifPhysAddress 19 - "31.1.1.1.15", # ifHighSpeed -1 (parse_if64 assumes this is the last element) - ]), - 'snmp_scan_function': lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.12356"), - 'has_perfdata': True, - 'includes': ["if.include", "if64.include"], - 'group': 'if', - 'node_info': True, - 'default_levels_variable': 'if_default_levels', + 'parse_function' : parse_if64, + 'inventory_function' : inventory_if_fortigate, + 'check_function' : check_if_fortigate, + 'service_description' : 'Interface %s', + 'snmp_info' : ( ".1.3.6.1.2.1", [ + "2.2.1.1", # ifIndex 0 + "2.2.1.2", # ifDescr 1 + "2.2.1.3", # ifType 2 + "2.2.1.5", # ifSpeed 3 + "2.2.1.8", # ifOperStatus 4 + "31.1.1.1.6", # ifHCInOctets 5 + "31.1.1.1.7", # ifHCInUcastPkts 6 + "31.1.1.1.8", # ifHCInMulticastPkts 7 + "31.1.1.1.9", # ifHCInBroadcastPkts 8 + "2.2.1.13", # ifInDiscards 9 + "2.2.1.14", # ifInErrors 10 + "31.1.1.1.10", # ifHCOutOctets 11 + "31.1.1.1.11", # ifHCOutUcastPkts 12 + "31.1.1.1.12", # ifHCOutMulticastPkts 13 + "31.1.1.1.13", # ifHCOutBroadcastPkts 14 + "2.2.1.19", # ifOutDiscards 15 + "2.2.1.20", # ifOutErrors 16 + "2.2.1.21", # ifOutQLen 17 + "31.1.1.1.18", # ifAlias 18 + BINARY("2.2.1.6"), # ifPhysAddress 19 + "31.1.1.1.15", # ifHighSpeed -1 (parse_if64 assumes this is the last element) + ]), + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.12356"), + 'has_perfdata' : True, + 'includes' : [ "if.include", "if64.include" ], + 'group' : 'if', + 'node_info' : True, + 'default_levels_variable' : 'if_default_levels', }

5 years, 10 months

added WK 6686 FIX WATO snapshot maintenace: Fixed bug which prevented cleanup of statefiles in tmp dir

by Andreas Boesl

Module: check_mk Branch: master Commit: 90a7d2e59fae54e211cd94ef42c713a93312fa3d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90a7d2e59fae54… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 19 11:13:16 2018 +0100 added WK 6686 FIX WATO snapshot maintenace: Fixed bug which prevented cleanup of statefiles in tmp dir Change-Id: Ifb2fbe8626c985c80fa747e8651000d4fb69723f --- .werks/6686 | 10 ++++++++++ cmk/gui/watolib.py | 6 ++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/6686 b/.werks/6686 new file mode 100644 index 0000000..411be22 --- /dev/null +++ b/.werks/6686 @@ -0,0 +1,10 @@ +Title: WATO snapshot maintenace: Fixed bug which prevented cleanup of statefiles in tmp dir +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1542298205 +Class: fix + +Due to this bug there could be lots of directories/files in <tt>~/tmp/check_mk/wato/activation</tt>. diff --git a/cmk/gui/watolib.py b/cmk/gui/watolib.py index a424101..1781d20 100644 --- a/cmk/gui/watolib.py +++ b/cmk/gui/watolib.py @@ -100,7 +100,7 @@ from cmk.gui.i18n import _u, _ from cmk.gui.globals import html from cmk.gui.htmllib import HTML from cmk.gui.log import logger -from cmk.gui.exceptions import MKGeneralException, MKAuthException, MKUserError +from cmk.gui.exceptions import MKGeneralException, MKAuthException, MKUserError, RequestTimeout from cmk.gui.valuespec import ( Dictionary, Integer, @@ -5553,7 +5553,9 @@ class ActivateChangesManager(ActivateChanges): try: try: manager.load_activation(activation_id) - except MKUserError: + except RequestTimeout: + raise + except Exception: # Not existant anymore! delete = True raise

5 years, 10 months

fixed trailing newline

by Andreas Boesl

Module: check_mk Branch: master Commit: 030fb9b5a66802e13ba0245c6241d2c3c3b94f93 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=030fb9b5a66802… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 19 11:14:28 2018 +0100 fixed trailing newline Change-Id: I9c5a710efac4163b332c2f5be1296361b74e478d --- cmk/exceptions.py | 1 - 1 file changed, 1 deletion(-) diff --git a/cmk/exceptions.py b/cmk/exceptions.py index cd25954..7f47532 100644 --- a/cmk/exceptions.py +++ b/cmk/exceptions.py @@ -89,4 +89,3 @@ class MKBailOut(Exception): # which have a timeout set. class MKTimeout(MKException): pass -

5 years, 10 months

if there is no unpacking we need to add the path

by Alex Zurhake

Module: check_mk Branch: master Commit: fc342e9f4b76852495d8a4d708458c06dd453bb6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc342e9f4b7685… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Mon Nov 19 11:15:33 2018 +0100 if there is no unpacking we need to add the path Change-Id: I31351481dcd226677b0c1a6f8ce15fcc3516e60a --- omd/packages/libgsf/libgsf.make | 1 + 1 file changed, 1 insertion(+) diff --git a/omd/packages/libgsf/libgsf.make b/omd/packages/libgsf/libgsf.make index 3d54070..63eab33 100644 --- a/omd/packages/libgsf/libgsf.make +++ b/omd/packages/libgsf/libgsf.make @@ -20,6 +20,7 @@ $(LIBGSF_BUILD): $(LIBGSF_UNPACK) $(TOUCH) $@ else $(LIBGSF_BUILD): + mkdir -p $(BUILD_HELPER_DIR) $(TOUCH) $@ endif

5 years, 10 months

store.py now explicitely checks for MKTimeout exceptions

by Andreas Boesl

Module: check_mk Branch: master Commit: b8168c71d82c7f174bd568cdb9811be94cbfe0d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8168c71d82c7f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 19 11:08:59 2018 +0100 store.py now explicitely checks for MKTimeout exceptions Change-Id: I44cc36b7c1edf28404b45ce49a1f74cb71f32910 --- cmk/store.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cmk/store.py b/cmk/store.py index 941cc1d..9b83960 100644 --- a/cmk/store.py +++ b/cmk/store.py @@ -35,7 +35,7 @@ import pprint import tempfile import time -from cmk.exceptions import MKGeneralException +from cmk.exceptions import MKGeneralException, MKTimeout from cmk.i18n import _ # TODO: Make all methods handle paths the same way. e.g. mkdir() and makedirs() @@ -104,6 +104,8 @@ def load_mk_file(path, default=None, lock=False): else: raise + except MKTimeout: + raise except Exception, e: # TODO: How to handle debug mode or logging? raise MKGeneralException(_("Cannot read configuration file \"%s\": %s") % (path, e)) @@ -143,6 +145,8 @@ def load_data_from_file(path, default=None, lock=False): raise + except MKTimeout: + raise except Exception, e: if lock: release_lock(path) @@ -215,6 +219,8 @@ def save_file(path, content, mode=0660): os.rename(tmp_path, path) + except MKTimeout: + raise except Exception, e: # In case an exception happens during saving cleanup the tempfile created for writing try:

5 years, 10 months

Moved cmk_base.exceptions.MKTimeout to cmk.exceptions

by Andreas Boesl

Module: check_mk Branch: master Commit: 9fb709fc4be2856effd0ac3259fd4a1a819093f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9fb709fc4be285… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 19 11:06:27 2018 +0100 Moved cmk_base.exceptions.MKTimeout to cmk.exceptions Change-Id: I61ee5af744532777b6cb57c08aee7c7df27d0bbc --- cmk/exceptions.py | 8 ++++++++ cmk/gui/exceptions.py | 4 ++-- cmk_base/automations/__init__.py | 2 +- cmk_base/checking.py | 4 ++-- cmk_base/classic_snmp.py | 4 ++-- cmk_base/core.py | 3 +-- cmk_base/data_sources/abstract.py | 4 ++-- cmk_base/data_sources/programs.py | 3 ++- cmk_base/decorator.py | 4 ++-- cmk_base/discovery.py | 4 ++-- cmk_base/exceptions.py | 7 ------- 11 files changed, 24 insertions(+), 23 deletions(-) diff --git a/cmk/exceptions.py b/cmk/exceptions.py index 7b6c430..cd25954 100644 --- a/cmk/exceptions.py +++ b/cmk/exceptions.py @@ -82,3 +82,11 @@ class MKBailOut(Exception): def __str__(self): return self.reason + + +# This exception is raised when a previously configured timeout is reached. +# It is used during keepalive mode. It is also used by the automations +# which have a timeout set. +class MKTimeout(MKException): + pass + diff --git a/cmk/gui/exceptions.py b/cmk/gui/exceptions.py index 96c4faf..cf991ce 100644 --- a/cmk/gui/exceptions.py +++ b/cmk/gui/exceptions.py @@ -29,10 +29,10 @@ from typing import Optional # pylint: disable=unused-import import cmk.gui.http_status from cmk.gui.i18n import _ -from cmk.exceptions import MKGeneralException, MKException +from cmk.exceptions import MKGeneralException, MKException, MKTimeout -class RequestTimeout(MKException): +class RequestTimeout(MKTimeout): """Is raised from the alarm signal handler (handle_request_timeout()) to abort page processing before the system apache times out.""" pass diff --git a/cmk_base/automations/__init__.py b/cmk_base/automations/__init__.py index 8f98e2b..1e6fea4 100644 --- a/cmk_base/automations/__init__.py +++ b/cmk_base/automations/__init__.py @@ -29,13 +29,13 @@ import sys import pprint import cmk.debug +from cmk.exceptions import MKTimeout from cmk.plugin_loader import load_plugins import cmk_base.utils import cmk_base.config as config import cmk_base.console as console import cmk_base.profiling as profiling -from cmk_base.exceptions import MKTimeout import cmk_base.check_api as check_api diff --git a/cmk_base/checking.py b/cmk_base/checking.py index 45ba3f5..dc4608e 100644 --- a/cmk_base/checking.py +++ b/cmk_base/checking.py @@ -42,7 +42,7 @@ import cmk import cmk.defines as defines import cmk.tty as tty import cmk.cpu_tracking as cpu_tracking -from cmk.exceptions import MKGeneralException +from cmk.exceptions import MKGeneralException, MKTimeout from cmk.regex import regex import cmk_base.utils @@ -53,7 +53,7 @@ import cmk_base.ip_lookup as ip_lookup import cmk_base.data_sources as data_sources import cmk_base.item_state as item_state import cmk_base.check_table as check_table -from cmk_base.exceptions import MKTimeout, MKParseFunctionError +from cmk_base.exceptions import MKParseFunctionError import cmk_base.check_utils import cmk_base.decorator import cmk_base.check_api_utils as check_api_utils diff --git a/cmk_base/classic_snmp.py b/cmk_base/classic_snmp.py index 26a8c27..6ddbba7 100644 --- a/cmk_base/classic_snmp.py +++ b/cmk_base/classic_snmp.py @@ -36,11 +36,11 @@ except NameError: unicode = str # pylint: disable=redefined-builtin import cmk.tty as tty -from cmk.exceptions import MKGeneralException +from cmk.exceptions import MKGeneralException, MKTimeout import cmk_base.console as console import cmk_base.config as config -from cmk_base.exceptions import MKSNMPError, MKTimeout +from cmk_base.exceptions import MKSNMPError #. # .--SNMP interface------------------------------------------------------. diff --git a/cmk_base/core.py b/cmk_base/core.py index 9907a3c..da835fb 100644 --- a/cmk_base/core.py +++ b/cmk_base/core.py @@ -33,13 +33,12 @@ import sys import cmk.paths import cmk.debug import cmk.tty as tty -from cmk.exceptions import MKGeneralException +from cmk.exceptions import MKGeneralException, MKTimeout import cmk_base.console as console import cmk_base.config as config import cmk_base.core_config as core_config import cmk_base.nagios_utils -from cmk_base.exceptions import MKTimeout from cmk_base import config_cache import cmk_base.cleanup diff --git a/cmk_base/data_sources/abstract.py b/cmk_base/data_sources/abstract.py index 507cc0a..af411ac 100644 --- a/cmk_base/data_sources/abstract.py +++ b/cmk_base/data_sources/abstract.py @@ -36,7 +36,7 @@ import cmk.paths import cmk.store as store import cmk.tty as tty import cmk.cpu_tracking as cpu_tracking -from cmk.exceptions import MKGeneralException, MKTerminate +from cmk.exceptions import MKGeneralException, MKTerminate, MKTimeout import cmk_base.utils import cmk_base.console as console @@ -44,7 +44,7 @@ import cmk_base.config as config import cmk_base.ip_lookup as ip_lookup import cmk_base.check_api_utils as check_api_utils from cmk_base.exceptions import MKAgentError, MKEmptyAgentData, MKSNMPError, \ - MKTimeout, MKIPAddressLookupError + MKIPAddressLookupError from .host_sections import HostSections diff --git a/cmk_base/data_sources/programs.py b/cmk_base/data_sources/programs.py index 41dce4f..8bda013 100644 --- a/cmk_base/data_sources/programs.py +++ b/cmk_base/data_sources/programs.py @@ -30,10 +30,11 @@ import subprocess import collections import cmk.paths +from cmk.exceptions import MKTimeout import cmk_base.config as config import cmk_base.core_config as core_config -from cmk_base.exceptions import MKAgentError, MKTimeout +from cmk_base.exceptions import MKAgentError from .abstract import CheckMKAgentDataSource diff --git a/cmk_base/decorator.py b/cmk_base/decorator.py index 40f3e91..b2ae97f 100644 --- a/cmk_base/decorator.py +++ b/cmk_base/decorator.py @@ -26,12 +26,12 @@ import cmk import cmk.defines as defines -from cmk.exceptions import MKGeneralException +from cmk.exceptions import MKGeneralException, MKTimeout import cmk_base.config as config import cmk_base.console as console import cmk_base.crash_reporting -from cmk_base.exceptions import MKTimeout, MKAgentError, MKSNMPError, MKIPAddressLookupError +from cmk_base.exceptions import MKAgentError, MKSNMPError, MKIPAddressLookupError try: import cmk_base.cee.keepalive as keepalive diff --git a/cmk_base/discovery.py b/cmk_base/discovery.py index fd8b690..a94f3a9 100644 --- a/cmk_base/discovery.py +++ b/cmk_base/discovery.py @@ -33,7 +33,7 @@ import signal from cmk.regex import regex import cmk.tty as tty import cmk.paths -from cmk.exceptions import MKGeneralException +from cmk.exceptions import MKGeneralException, MKTimeout import cmk_base.crash_reporting import cmk_base.config as config @@ -45,7 +45,7 @@ import cmk_base.checking as checking import cmk_base.data_sources as data_sources import cmk_base.check_table as check_table import cmk_base.core -from cmk_base.exceptions import MKParseFunctionError, MKTimeout +from cmk_base.exceptions import MKParseFunctionError import cmk_base.cleanup import cmk_base.check_utils import cmk_base.decorator diff --git a/cmk_base/exceptions.py b/cmk_base/exceptions.py index 8d1d891..4cf1897 100644 --- a/cmk_base/exceptions.py +++ b/cmk_base/exceptions.py @@ -74,10 +74,3 @@ class MKSNMPError(Exception): class MKSkipCheck(Exception): pass - - -# This exception is raised when a previously configured timeout is reached. -# It is used during keepalive mode. It is also used by the automations -# which have a timeout set. -class MKTimeout(Exception): - pass

5 years, 10 months

Fixed format of check parameters

by Lars Michelsen

Module: check_mk Branch: master Commit: ba0b011cf16698946e18f1e3308f755162b85ecc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba0b011cf16698… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 19 10:56:48 2018 +0100 Fixed format of check parameters Change-Id: I59310ec617523e463215eda803d37b148e52cbe8 --- cmk/gui/plugins/wato/check_parameters.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/cmk/gui/plugins/wato/check_parameters.py b/cmk/gui/plugins/wato/check_parameters.py index 99ba669..1699ab7 100644 --- a/cmk/gui/plugins/wato/check_parameters.py +++ b/cmk/gui/plugins/wato/check_parameters.py @@ -1430,14 +1430,16 @@ register_rule( ), title=_("Regular expression matching command line"), label=_("Command line:"), - help=_("This regex must match the beginning of the complete " - "command line of the process including arguments. " - "When using groups, matches will be instantiated " - "during process discovery. e.g. (py.*) will match python, python_dev " - "and python_test and discover 3 services. At check time, because " - "python is a substring of python_test and python_dev it will aggregate" - "all process that start with python. If that is not the intended behavior " - "please use a delimiter like '$' or '\\b' around the group, e.g. (py.*)$"), + help= + _("This regex must match the beginning of the complete " + "command line of the process including arguments. " + "When using groups, matches will be instantiated " + "during process discovery. e.g. (py.*) will match python, python_dev " + "and python_test and discover 3 services. At check time, because " + "python is a substring of python_test and python_dev it will aggregate" + "all process that start with python. If that is not the intended behavior " + "please use a delimiter like '$' or '\\b' around the group, e.g. (py.*)$" + ), forth=lambda x: x[1:], # remove ~ back=lambda x: "~" + x, # prefix ~ ),

5 years, 10 months

6858 FIX Do not log "Legacy perfometer rendered" messages to web.log by default

by Lars Michelsen

Module: check_mk Branch: master Commit: 7abb4001fcb83473206e84d49c160079eb6b7a1d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7abb4001fcb834… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 9 17:44:30 2018 +0100 6858 FIX Do not log "Legacy perfometer rendered" messages to web.log by default This log message is currently only used for internal cleanups but was logged to the web.log web performing regular GUI actions in the default log level. These messages are now only logged when increasing the "web" log level to informational. Change-Id: I97a1de238259dc5ff8cc68b17f68c68d9e451e79 --- .werks/6858 | 14 ++++++++++++++ cmk/gui/plugins/views/perfometer.py | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/6858 b/.werks/6858 new file mode 100644 index 0000000..f44fe8d --- /dev/null +++ b/.werks/6858 @@ -0,0 +1,14 @@ +Title: Do not log "Legacy perfometer rendered" messages to web.log by default +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1541781768 + +This log message is currently only used for internal cleanups but was logged +to the web.log web performing regular GUI actions in the default log level. +These messages are now only logged when increasing the "web" log level to +informational. diff --git a/cmk/gui/plugins/views/perfometer.py b/cmk/gui/plugins/views/perfometer.py index 99e947a..e9f5745 100644 --- a/cmk/gui/plugins/views/perfometer.py +++ b/cmk/gui/plugins/views/perfometer.py @@ -86,7 +86,7 @@ class Perfometer(object): return None, None # Legacy Perf-O-Meters: find matching Perf-O-Meter function - logger.warning("Legacy perfometer rendered for %s / %s / %s" % \ + logger.info("Legacy perfometer rendered for %s / %s / %s" % \ (self._row["host_name"], self._row["service_description"], self._row["service_check_command"])) return self._render_legacy_perfometer()

5 years, 10 months

fix openhardwaremonitor

by Alex Zurhake

Module: check_mk Branch: master Commit: 9b0cf6d81e181f0c16c2fe686ca17348937f6406 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b0cf6d81e181f… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Mon Nov 19 10:48:04 2018 +0100 fix openhardwaremonitor Change-Id: Ia6148942ca9089da2ae26b00f3497b94d9580e64 --- Makefile | 5 +++++ omd/packages/openhardwaremonitor/openhardwaremonitor.make | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 154b09c..3d4d18b 100644 --- a/Makefile +++ b/Makefile @@ -257,6 +257,11 @@ $(DISTNAME).tar.gz: mk-livestatus-$(VERSION).tar.gz .werks/werks $(JAVASCRIPT_MI @echo " FINISHED. " @echo "==============================================================================" +omd/packages/openhardwaremonitor/OpenHardwareMonitorCLI.exe: + $(MAKE) -C omd openhardwaremonitor-dist + +omd/packages/openhardwaremonitor/OpenHardwareMonitorLib.dll: omd/packages/openhardwaremonitor/OpenHardwareMonitorCLI.exe + .werks/werks: $(WERKS) PYTHONPATH=. python scripts/precompile-werks.py .werks .werks/werks cre diff --git a/omd/packages/openhardwaremonitor/openhardwaremonitor.make b/omd/packages/openhardwaremonitor/openhardwaremonitor.make index efefbf5..9242cbc 100644 --- a/omd/packages/openhardwaremonitor/openhardwaremonitor.make +++ b/omd/packages/openhardwaremonitor/openhardwaremonitor.make @@ -24,7 +24,7 @@ $(OPENHARDWAREMONITOR)-dist: $(OPENHARDWAREMONITOR_DIST) # . #$(OPENHARDWAREMONITOR_DIR)/Bin/Release/OpenHardwareMonitorCLI.exe $(OPENHARDWAREMONITOR_DIR)/Bin/Release/OpenHardwareMonitorLib.dll: $(OPENHARDWAREMONITOR_UNPACK) $(OPENHARDWAREMONITOR_DIR)/OpenHardwareMonitorCLI $(OPENHARDWAREMONITOR_DIR)/OpenHardwareMonitor.sln -$(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitorCLI.exe $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitorLib.dll: $(OPENHARDWAREMONITOR_UNPACK) $(OPENHARDWAREMONITOR_DIR)/OpenHardwareMonitorCLI $(OPENHARDWAREMONITOR_DIR)/OpenHardwareMonitor.sln +$(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitorCLI.exe: $(OPENHARDWAREMONITOR_UNPACK) $(OPENHARDWAREMONITOR_DIR)/OpenHardwareMonitorCLI $(OPENHARDWAREMONITOR_DIR)/OpenHardwareMonitor.sln # The strange "cat" below is necessary because the extremely ancient Mono # versions coming with even the latest Ubuntus still contain the rather severe # bug https://github.com/mono/mono/issues/6752. ("...System.Exception: Magic @@ -36,6 +36,8 @@ $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitorCLI.exe $(PACKAGE_DIR)/ cp $(OPENHARDWAREMONITOR_DIR)/Bin/Release/OpenHardwareMonitorCLI.exe $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR) cp $(OPENHARDWAREMONITOR_DIR)/Bin/Release/OpenHardwareMonitorLib.dll $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR) +$(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitorLib.dll: $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitorCLI.exe + $(OPENHARDWAREMONITOR_DIR)/OpenHardwareMonitorCLI: $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitorCLI cp -r $< $(OPENHARDWAREMONITOR_DIR)/ @@ -55,7 +57,7 @@ $(OPENHARDWAREMONITOR)-setup: mono-complete \ mono-xbuild -$(OPENHARDWAREMONITOR_DIST): $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitorCLI.exe $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitorLib.dll +$(OPENHARDWAREMONITOR_DIST): $(PACKAGE_DIR)/$(OPENHARDWAREMONITOR)/OpenHardwareMonitorCLI.exe $(TOUCH) $@ $(OPENHARDWAREMONITOR)-clean-ohm: clean

5 years, 10 months

← Newer
1
...
15
16
17
18
19
20
21
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2018