Checkmk git commits September 2018

checkmk-commits@lists.checkmk.com

12 participants
371 discussions

6492 mk_oracle: Add pre- or postfix to TNS alias

by Simon Betz

Module: check_mk Branch: master Commit: 922a5193dfc6ef56e48f4df302c0cbdc99a35c93 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=922a5193dfc6ef… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Sep 10 13:24:44 2018 +0200 6492 mk_oracle: Add pre- or postfix to TNS alias The SIDs are extracted from the process list via "ps -ef". Some of the extracted SIDs may have a pre- or postfix in tnsnames.ora, eg. <code> PRE_SID.POST = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(Host = HOSTNAME)(Port = PORT)) (CONNECT_DATA = (SID = SID)(GLOBAL_NAME = SID.POSTFIX)) ) </code> Change-Id: If6294f231dd03f8d89e7c0bdab2c676e65c06f05 --- .werks/6492 | 30 ++++++++++++++++++++++++++++++ agents/plugins/mk_oracle | 33 +++++++++++++++++++++++++++++++-- 2 files changed, 61 insertions(+), 2 deletions(-) diff --git a/.werks/6492 b/.werks/6492 new file mode 100644 index 0000000..8d5ff2d --- /dev/null +++ b/.werks/6492 @@ -0,0 +1,30 @@ +Title: mk_oracle: Add pre- or postfix to TNS alias +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1536577925 +Class: feature + +The SIDs are extracted from the process list via "ps -ef". +Some of the extracted SIDs may have a pre- or postfix in +tnsnames.ora, eg. + +<code> +PRE_SID.POST = + (DESCRIPTION = + (ADDRESS = (PROTOCOL = TCP)(Host = HOSTNAME)(Port = PORT)) + (CONNECT_DATA = (SID = SID)(GLOBAL_NAME = SID.POSTFIX)) + ) +</code> + + +The pre- or postfix can be configured in mk_oracle.cfg, eg. + +<code> +PREFIX='GLOBAL_PRE_' # for all SIDs +PREFIX_SID='SPECIFIC_PRE_' # for the specific SID 'SID' +</code> + +The same works for 'POSTFIX'. diff --git a/agents/plugins/mk_oracle b/agents/plugins/mk_oracle index c3cf270..c0d0961 100755 --- a/agents/plugins/mk_oracle +++ b/agents/plugins/mk_oracle @@ -1787,7 +1787,36 @@ mk_ora_db_connect () { TNSPINGOK=no if [ -f "${TNS_ADMIN}/tnsnames.ora" ]; then - if "${ORACLE_HOME}/bin/tnsping" "${TNSALIAS}" >/dev/null 2>&1; then + if [ "${ORADBUSER:0:2}" = '/@' ]; then + P_TNSALIAS_P=$(eval echo "${ORADBUSER:2}") + else + P_TNSALIAS_P=$ORACLE_SID + fi + + if [ -n "$P_TNSALIAS_P" ]; then + PREFIX_SID="PREFIX_$sid" + PREFIX_SID=${!PREFIX_SID} + if [ -n "$PREFIX_SID" ]; then + P_TNSALIAS_P="$PREFIX_SID$P_TNSALIAS_P" + elif [ -n "$PREFIX" ]; then + P_TNSALIAS_P="$PREFIX$P_TNSALIAS_P" + else + P_TNSALIAS_P="$P_TNSALIAS_P" + fi + + POSTFIX_SID="POSTFIX_$sid" + POSTFIX_SID=${!POSTFIX_SID} + if [ -n "$POSTFIX_SID" ]; then + P_TNSALIAS_P="$P_TNSALIAS_P$POSTFIX_SID" + elif [ -n "$POSTFIX" ]; then + P_TNSALIAS_P="$P_TNSALIAS_P$POSTFIX" + else + P_TNSALIAS_P="$P_TNSALIAS_P" + fi + fi + + if "${ORACLE_HOME}"/bin/tnsping "${P_TNSALIAS_P}" >/dev/null 2>&1; then + TNSALIAS="$P_TNSALIAS_P" TNSPINGOK=yes else unset TNSALIAS @@ -1812,7 +1841,7 @@ mk_ora_db_connect () { TNSALIAS=${TNSALIAS:-"(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=${DBHOST:-"localhost"})(PORT=${DBPORT:-1521}))(CONNECT_DATA=(SID=${ORACLE_SID})(SERVER=DEDICATED)(UR=A)))"} # ORADBUSER = '/'? => ignore DBPASSWORD and use the wallet - if [ "${ORADBUSER}" = '/' ]; then + if [ "${ORADBUSER:0:1}" = '/' ]; then # connect with / and wallet ORADBUSER="" DBPASSWORD=""

6 years

SLES15: Add build support for this platform

by Lars Michelsen

Module: check_mk Branch: master Commit: c8ea58cbcc1db46201b96c168a8d9a09ce76565b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8ea58cbcc1db4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 7 09:13:55 2018 +0200 SLES15: Add build support for this platform Change-Id: I7baea63031030db6dc474d6cec9c1bffe523d162 --- .werks/6557 | 10 ++ omd/distro | 6 ++ omd/distros/SLES_15.mk | 116 +++++++++++++++++++++ .../0006-check_mysql-define-own-mysql-port.dif | 98 +++++++++++++++++ omd/packages/python-modules/Makefile | 6 ++ .../python-modules/src/cryptography-2.3.1.tar.gz | Bin 0 -> 449577 bytes 6 files changed, 236 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c8ea58cbcc…

6 years

6485 FIX fsc_sc2_voltage: Do not discover not-available voltage units

by Simon Betz

Module: check_mk Branch: master Commit: 59954e6567f694fbcc00f8ba0b92aa0e9fb35160 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59954e6567f694… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Sep 4 15:00:59 2018 +0200 6485 FIX fsc_sc2_voltage: Do not discover not-available voltage units Units which are not-available have voltage values 0 V. This may lead to WARN or CRIT because lower or upper device levels are checked. Change-Id: I1717fc1f28744adff8844fc99edd3fb396e62c9b --- .werks/6485 | 12 ++++++++++++ checks/fsc_sc2_voltage | 33 ++++++++++++++++++++++++++------- 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/.werks/6485 b/.werks/6485 new file mode 100644 index 0000000..a0af6e0 --- /dev/null +++ b/.werks/6485 @@ -0,0 +1,12 @@ +Title: fsc_sc2_voltage: Do not discover not-available voltage units +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1536065883 +Class: fix + +Units which are not-available have voltage values 0 V. +This may lead to WARN or CRIT because lower or upper device +levels are checked. diff --git a/checks/fsc_sc2_voltage b/checks/fsc_sc2_voltage index 3bd6e2e..b17774e 100644 --- a/checks/fsc_sc2_voltage +++ b/checks/fsc_sc2_voltage @@ -72,22 +72,40 @@ def parse_fsc_sc2_voltage(info): + # dev_state: + # sc2VoltageStatus OBJECT-TYPE + # SYNTAX INTEGER + # { + # unknown(1), + # not-available(2), + # ok(3), + # too-low(4), + # too-high(5), + # sensor-failed(6) + # } + # ACCESS read-only + # STATUS mandatory + # DESCRIPTION "Voltage status" + # ::= { sc2Voltages 4 } + parsed = {} - for designation, value, min_value, max_value in info: + for designation, dev_state, value, min_value, max_value in info: + if dev_state == "2": + continue try: value = float(value)/1000.0 min_value = float(min_value)/1000.0 max_value = float(max_value)/1000.0 except ValueError: - dev_state = 3, 'Could not get all values' - parsed.setdefault(designation, {"device_state": dev_state}) + state_info = 3, 'Could not get all values' + parsed.setdefault(designation, {"device_state": state_info}) else: - dev_state = value + state_info = value if value < min_value: - dev_state = value, (2, 'too low, deceeds %.2f V' % min_value) + state_info = value, (2, 'too low, deceeds %.2f V' % min_value) elif value >= max_value: - dev_state = value, (2, 'too high, exceeds %.2f V' % max_value) - parsed.setdefault(designation, {"voltage": dev_state}) + state_info = value, (2, 'too high, exceeds %.2f V' % max_value) + parsed.setdefault(designation, {"voltage": state_info}) return parsed @@ -98,6 +116,7 @@ check_info['fsc_sc2_voltage'] = { 'service_description' : 'Voltage %s', 'snmp_info' : ('.1.3.6.1.4.1.231.2.10.2.2.10.6.3.1', [ '3', #sc2VoltageDesignation + '4', #sc2VoltageStatus '5', #sc2VoltageCurrentValue '7', #sc2VoltageMinimumLevel '8', #sc2VoltageMaximumLevel

6 years

wmi.include: simplify wmi_determine_status a bit

by Tom Baerwinkel

Module: check_mk Branch: master Commit: dd7e3960501f02fd2bee4c78f72d9f6bcc80ea9e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd7e3960501f02… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Sep 3 15:21:38 2018 +0200 wmi.include: simplify wmi_determine_status a bit Change-Id: Ieb26a4b016c4eb298c16ea4427791bd5da860616 --- checks/wmi.include | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/checks/wmi.include b/checks/wmi.include index 1f6e986..da04cd4 100644 --- a/checks/wmi.include +++ b/checks/wmi.include @@ -308,11 +308,7 @@ def wmi_make_perfvar(varname, value, perfscale, levels, min_value=None, max_valu def wmi_determine_status(value, levels): - def worst_status(*args): - order = [0, 1, 3, 2] - return sorted(args, key=lambda x: order[x], reverse=True)[0] - - statuses, levels_text = [0], "" + status, levels_text = 0, "" if levels: if 'upper' in levels: upper_status = 0 @@ -321,20 +317,22 @@ def wmi_determine_status(value, levels): elif value >= levels['upper'][0]: upper_status = 1 - if upper_status != 0: - statuses.append(upper_status) - levels_text = " (warn/crit at %s/%s)" % levels['upper'] + if upper_status: + status = max(status, upper_status) + levels_text += " (warn/crit at %s/%s)" % levels['upper'] + if 'lower' in levels: lower_status = 0 - if value <= levels['lower'][1]: + if value < levels['lower'][1]: lower_status = 2 - elif value <= levels['lower'][0]: + elif value < levels['lower'][0]: lower_status = 1 - if lower_status != 0: - statuses.append(lower_status) - levels_text = " (warn/crit below %s/%s)" % levels['lower'] - return worst_status(*statuses), levels_text + if lower_status: + status = max(status, lower_status) + levels_text += " (warn/crit below %s/%s)" % levels['lower'] + + return status, levels_text # to make wato rules simpler, levels are allowed to be passed as tuples if the level

6 years

wmi.include: fix two possible exceptions during parsing and inventory

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 482e439fa06475a83bd3034b5ffab6c04479702a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=482e439fa06475… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Sep 3 10:44:50 2018 +0200 wmi.include: fix two possible exceptions during parsing and inventory Change-Id: Ice8cfb9cab3730f1a689ac3df78172881f977857 --- checks/wmi.include | 12 ++++++------ .../datasets/wmi_include_empty_info_regression.py | 12 ++++++++++++ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/checks/wmi.include b/checks/wmi.include index 7ddede6..1f6e986 100644 --- a/checks/wmi.include +++ b/checks/wmi.include @@ -167,6 +167,8 @@ class WMITable(object): def parse_wmi_table(info, key="Name"): + parsed = {} + try: # read input line by line. rows with [] start the table name. # Each table has to start with a header line @@ -181,7 +183,6 @@ def parse_wmi_table(info, key="Name"): timestamp, frequency = int(line[1]), int(line[2]) line = info_iter.next() - parsed = {} while line is not None: check_wmi_timeout(line) @@ -249,7 +250,7 @@ def inventory_wmi_table(tables, **kwargs): # only happen if required_tables was set return [] - potential_instances = None + potential_instances = set() if kwargs.get("skip_intersection", False): # Unfortunately there are tables which do NOT provide any # names. In this case we fallback to old behaviour. @@ -263,10 +264,10 @@ def inventory_wmi_table(tables, **kwargs): # inventarize one item per instance that exists in all tables for required_table in required_tables: table_rows = tables[required_table].row_labels() - if potential_instances is None: - potential_instances = set(table_rows) - else: + if potential_instances: potential_instances &= set(table_rows) + else: + potential_instances = set(table_rows) # if there are multiple instances, don't include the summary line as it is redundant if len(potential_instances) > 1: @@ -479,4 +480,3 @@ def wmi_yield_raw_fraction(table, row, column, label, perfvar, levels=None): ) #. - diff --git a/tests/unit/checks/generictests/datasets/wmi_include_empty_info_regression.py b/tests/unit/checks/generictests/datasets/wmi_include_empty_info_regression.py new file mode 100644 index 0000000..ccd9730 --- /dev/null +++ b/tests/unit/checks/generictests/datasets/wmi_include_empty_info_regression.py @@ -0,0 +1,12 @@ + + +checkname = 'wmi_webservices' + + +info = [] + + +discovery = {} + + +checks = {}

6 years

6409 FIX wmi.include: don't throw exepctions in the parse function

by Tom Baerwinkel

Module: check_mk Branch: master Commit: a36eb3a6c9b9bc107b9eeaf12a1cfa71a3795dd9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a36eb3a6c9b9bc… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue Sep 4 09:24:47 2018 +0200 6409 FIX wmi.include: don't throw exepctions in the parse function In previous versions the parse function provided in wmi.include (used in different WMI checks like e.g. wmi_cpuload) raised a MKCounterWrapped exception if a WMI timeout occured. This leads to a crash during the service discovery when a timeout occurs. Now the parse function always returns valid data. If a timeout occurs an empty table is added to the parsed data. The inventory function can then easily check for empty tables. If on the other hand the check function tries to access an empty table a MKCounterWrapped exception is raised. CMK-868 Change-Id: I22bb9470feb3e4aa9ed47df2c068f4fa78258290 --- .werks/6409 | 20 ++++++++++++++++++++ checks/wmi.include | 41 ++++++++++++++++++++++++++--------------- 2 files changed, 46 insertions(+), 15 deletions(-) diff --git a/.werks/6409 b/.werks/6409 new file mode 100644 index 0000000..cafb750 --- /dev/null +++ b/.werks/6409 @@ -0,0 +1,20 @@ +Title: wmi.include: don't throw exepctions in the parse function +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1536044950 +Class: fix + +In previous versions the parse function provided in wmi.include +(used in different WMI checks like e.g. wmi_cpuload) raised +a MKCounterWrapped exception if a WMI timeout occured. This +leads to a crash during the service discovery when a timeout +occurs. + +Now the parse function always returns valid data. If a timeout +occurs an empty table is added to the parsed data. The inventory +function can then easily check for empty tables. If on the other +hand the check function tries to access an empty table a +MKCounterWrapped exception is raised. diff --git a/checks/wmi.include b/checks/wmi.include index da04cd4..adb8e13 100644 --- a/checks/wmi.include +++ b/checks/wmi.include @@ -47,6 +47,12 @@ # '----------------------------------------------------------------------' +class NullTable(object): + """Represents an empty table caused by a WMI timeout.""" + def __getattr__(self, name): + raise MKCounterWrapped('WMI query timed out') + + class WMITable(object): """ Represents a 2-dimensional table of performance metrics. @@ -168,55 +174,56 @@ class WMITable(object): def parse_wmi_table(info, key="Name"): parsed = {} + info_iter = iter(info) try: # read input line by line. rows with [] start the table name. # Each table has to start with a header line - info_iter = iter(info) line = info_iter.next() - # Did main section get WMI timeout? - check_wmi_timeout(line) - timestamp, frequency = None, None if line[0] == "sampletime": timestamp, frequency = int(line[1]), int(line[2]) line = info_iter.next() - while line is not None: - check_wmi_timeout(line) - + while True: if len(line) == 1 and line[0].startswith("["): # multi-table input tablename = regex(r"\[(.*)\]").search(line[0]).group(1) # Did subsection get WMI timeout? line = info_iter.next() - check_wmi_timeout(line) else: # single-table input tablename = "" + if is_wmi_timeout(line): + parsed[tablename] = NullTable() + line = info_iter.next() + continue + if tablename not in parsed: parsed[tablename] = WMITable(tablename, line, key, timestamp, frequency) current = parsed[tablename] # read table content line = info_iter.next() - while line is not None and not line[0].startswith("["): - check_wmi_timeout(line) + while not line[0].startswith("["): + if is_wmi_timeout(line): + parsed[tablename] = NullTable() + line = info_iter.next() + continue current.add_row(line) line = info_iter.next() - except StopIteration: + except (StopIteration, ValueError): # regular end of block pass return parsed -def check_wmi_timeout(line): - if line[0] == "WMItimeout": - raise MKCounterWrapped("WMI query timed out") +def is_wmi_timeout(line): + return line[0] == "WMItimeout" #. @@ -229,6 +236,7 @@ def check_wmi_timeout(line): # | | # '----------------------------------------------------------------------' + def wmi_filter_global_only(tables, row): return all(table.get(row, "Name") == "_Global_" for table in tables.values()) @@ -243,9 +251,11 @@ def wmi_filter_global_only(tables, row): # | |___/ | # '----------------------------------------------------------------------' + def inventory_wmi_table(tables, **kwargs): required_tables = kwargs.get('required_tables', tables.keys()) - if not set(required_tables) <= set(tables.keys()): + if (not set(required_tables) <= set(tables.keys()) or + any(isinstance(table, NullTable) for table in tables.itervalues())): # if table is missing, nothing gets inventorized. This can # only happen if required_tables was set return [] @@ -291,6 +301,7 @@ def inventory_wmi_table(tables, **kwargs): # | | # '----------------------------------------------------------------------' + # determine time at which a sample was taken def get_wmi_time(table, row): timestamp = table.timestamp() or table.get(row, "Timestamp_PerfTime")

6 years

Remove unused wmi.include for the check openhardwaremonitor

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 16559c78eb2d34eac6dcb9a0cf23cc94e7d9f72a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=16559c78eb2d34… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Sep 3 14:35:03 2018 +0200 Remove unused wmi.include for the check openhardwaremonitor Change-Id: Ie5afe5fe5b34fd296915d715329b506e0e357152 --- checks/openhardwaremonitor | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/openhardwaremonitor b/checks/openhardwaremonitor index 826b8df..c1e1e4f 100644 --- a/checks/openhardwaremonitor +++ b/checks/openhardwaremonitor @@ -138,7 +138,6 @@ check_info['openhardwaremonitor'] = { 'parse_function' : parse_openhardwaremonitor, 'has_perfdata' : True, 'service_description' : "Clock %s", - 'includes' : ['wmi.include'] }

6 years

Add tests for WMI timeouts

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 9efff1f965d896a3a9bf3b4b01acd91aebe1500a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9efff1f965d896… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Sep 7 12:28:58 2018 +0200 Add tests for WMI timeouts Change-Id: I1edb4f9bdc23dabfbd4ffe25e5795b01be061a81 --- tests/unit/checks/test_wmi_check.py | 41 +++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/tests/unit/checks/test_wmi_check.py b/tests/unit/checks/test_wmi_check.py new file mode 100644 index 0000000..78dce72 --- /dev/null +++ b/tests/unit/checks/test_wmi_check.py @@ -0,0 +1,41 @@ +import pytest + +from checktestlib import ( + DiscoveryResult, + CheckResult, + assertDiscoveryResultsEqual, +) + +from cmk_base.check_api import MKCounterWrapped + +pytestmark = pytest.mark.checks + +info_wmi_timeout = [[u'WMItimeout']] + +info_subsection_wmi_timeout = [ + [u'[system_perf]'], + [u'WMItimeout'], + [u'[computer_system]'], + [u'name', u'unimportant', u'data'], +] + + +(a)pytest.mark.parametrize("check_name,info,expected", [ + ('wmi_webservices', info_wmi_timeout, []), + ('wmi_cpuload', info_subsection_wmi_timeout, []), +]) +def test_wmi_cpu_load_discovery(check_manager, check_name, info, expected): + check = check_manager.get_check(check_name) + discovery_result = DiscoveryResult(check.run_discovery(check.run_parse(info))) + discovery_expected = DiscoveryResult(expected) + assertDiscoveryResultsEqual(discovery_result, discovery_expected) + + +(a)pytest.mark.parametrize("check_name,info,expected", [ + ('wmi_webservices', info_wmi_timeout, None), + ('wmi_cpuload', info_subsection_wmi_timeout, None), +]) +def test_wmi_cpuload_timeout_exceptions(check_manager, check_name, info, expected): + check = check_manager.get_check(check_name) + with pytest.raises(MKCounterWrapped): + CheckResult(check.run_check(None, {}, check.run_parse(info)))

6 years

Fix SLES 15 build.

by Sven Panne

Module: check_mk Branch: master Commit: 8cedb8fdd69c191c829f16fd4247b0bc15b0b34e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8cedb8fdd69c19… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Sep 10 10:57:52 2018 +0200 Fix SLES 15 build. Change-Id: I19e71e32d875efb9e0c43d37db5afe3affb688b7 --- .../heirloom-pkgtools/patches/0002-scriptvfy.l.dif | 3 ++- .../heirloom-pkgtools/patches/0008-libfl.dif | 26 +++++++++++----------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/omd/packages/heirloom-pkgtools/patches/0002-scriptvfy.l.dif b/omd/packages/heirloom-pkgtools/patches/0002-scriptvfy.l.dif index 66af731..3747c02 100644 --- a/omd/packages/heirloom-pkgtools/patches/0002-scriptvfy.l.dif +++ b/omd/packages/heirloom-pkgtools/patches/0002-scriptvfy.l.dif @@ -1,7 +1,7 @@ diff -ru heirloom-pkgtools-070227/libinst/scriptvfy.l heirloom-pkgtools-070227-patched/libinst/scriptvfy.l --- heirloom-pkgtools-070227/libinst/scriptvfy.l 2007-02-25 19:39:47.000000000 +0100 +++ heirloom-pkgtools-070227-patched/libinst/scriptvfy.l 2008-12-12 19:27:26.000000000 +0100 -@@ -43,9 +43,16 @@ +@@ -43,9 +43,17 @@ %p 3500 %s WHROOT %{ @@ -15,6 +15,7 @@ diff -ru heirloom-pkgtools-070227/libinst/scriptvfy.l heirloom-pkgtools-070227-p +char *yysptr = yysbuf; +int yylineno; +#define U(x) x ++int yywrap(void) { return 1; } #define input() (((yytchar=yysptr>yysbuf?U(*--yysptr):getc(scr_fp))==10?(yylineno++,yytchar):yytchar)==EOF?0:yytchar) #define unput(p) ungetc(p, scr_fp) diff --git a/omd/packages/heirloom-pkgtools/patches/0008-libfl.dif b/omd/packages/heirloom-pkgtools/patches/0008-libfl.dif index fbf28fb..be67e6d 100644 --- a/omd/packages/heirloom-pkgtools/patches/0008-libfl.dif +++ b/omd/packages/heirloom-pkgtools/patches/0008-libfl.dif @@ -6,7 +6,7 @@ diff -Nur heirloom-pkgtools-070227.orig/pkgcmds/installf/Makefile.mk heirloom-pk PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ - -L$(CCSDIR)/lib -ll -+ -L$(CCSDIR)/lib -lfl ++ -L$(CCSDIR)/lib BIN = installf OBJ = dofinal.o installf.o main.o removef.o ../../version/version.o @@ -18,7 +18,7 @@ diff -Nur heirloom-pkgtools-070227.orig/pkgcmds/pkgadd/Makefile.mk heirloom-pkgt PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ - -L$(CCSDIR)/lib -ll -+ -L$(CCSDIR)/lib -lfl ++ -L$(CCSDIR)/lib BIN = pkgadd OBJ = check.o main.o presvr4.o quit.o ../../version/version.o @@ -30,7 +30,7 @@ diff -Nur heirloom-pkgtools-070227.orig/pkgcmds/pkgadm/Makefile.mk heirloom-pkgt PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ - -L$(CCSDIR)/lib -ll -+ -L$(CCSDIR)/lib -lfl ++ -L$(CCSDIR)/lib BIN = pkgadm OBJ = addcert.o certs.o listcert.o lock.o main.o pkgadm_contents.o \ @@ -42,7 +42,7 @@ diff -Nur heirloom-pkgtools-070227.orig/pkgcmds/pkgchk/Makefile.mk heirloom-pkgt PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ - -L$(CCSDIR)/lib -ll -+ -L$(CCSDIR)/lib -lfl ++ -L$(CCSDIR)/lib BIN = pkgchk OBJ = checkmap.o ckentry.o main.o ../../version/version.o @@ -54,7 +54,7 @@ diff -Nur heirloom-pkgtools-070227.orig/pkgcmds/pkgcond/Makefile.mk heirloom-pkg PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ - -L$(CCSDIR)/lib -ll -+ -L$(CCSDIR)/lib -lfl ++ -L$(CCSDIR)/lib BIN = pkgcond OBJ = main.o ../../version/version.o @@ -66,7 +66,7 @@ diff -Nur heirloom-pkgtools-070227.orig/pkgcmds/pkginstall/Makefile.mk heirloom- PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ - -L$(CCSDIR)/lib -ll -+ -L$(CCSDIR)/lib -lfl ++ -L$(CCSDIR)/lib BIN = pkginstall OBJ = backup.o check.o cppath.o dockspace.o getinst.o instvol.o main.o \ @@ -78,7 +78,7 @@ diff -Nur heirloom-pkgtools-070227.orig/pkgcmds/pkgmk/Makefile.mk heirloom-pkgto PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ - -L$(CCSDIR)/lib -ll -+ -L$(CCSDIR)/lib -lfl ++ -L$(CCSDIR)/lib BIN = pkgmk OBJ = main.o mkpkgmap.o quit.o splpkgmap.o ../../version/version.o @@ -90,7 +90,7 @@ diff -Nur heirloom-pkgtools-070227.orig/pkgcmds/pkgname/Makefile.mk heirloom-pkg PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ - -L$(CCSDIR)/lib -ll -+ -L$(CCSDIR)/lib -lfl ++ -L$(CCSDIR)/lib BIN = pkgname OBJ = pkgname.o ../../version/version.o @@ -102,7 +102,7 @@ diff -Nur heirloom-pkgtools-070227.orig/pkgcmds/pkgparam/Makefile.mk heirloom-pk PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ - -L$(CCSDIR)/lib -ll -+ -L$(CCSDIR)/lib -lfl ++ -L$(CCSDIR)/lib BIN = pkgparam OBJ = pkgparam.o ../../version/version.o @@ -114,7 +114,7 @@ diff -Nur heirloom-pkgtools-070227.orig/pkgcmds/pkgremove/Makefile.mk heirloom-p PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ - -L$(CCSDIR)/lib -ll -+ -L$(CCSDIR)/lib -lfl ++ -L$(CCSDIR)/lib BIN = pkgremove OBJ = check.o delmap.o main.o predepend.o quit.o special.o wsreg_pkgrm.o ../../version/version.o @@ -126,7 +126,7 @@ diff -Nur heirloom-pkgtools-070227.orig/pkgcmds/pkgrm/Makefile.mk heirloom-pkgto PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ - -L$(CCSDIR)/lib -ll -+ -L$(CCSDIR)/lib -lfl ++ -L$(CCSDIR)/lib BIN = pkgrm OBJ = check.o main.o presvr4.o quit.o ../../version/version.o @@ -138,7 +138,7 @@ diff -Nur heirloom-pkgtools-070227.orig/pkgcmds/pkgscripts/Makefile.mk heirloom- PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ - -L$(CCSDIR)/lib -ll -+ -L$(CCSDIR)/lib -lfl ++ -L$(CCSDIR)/lib BIN = cmdexec OBJ = cmdexec.o ../../version/version.o @@ -150,7 +150,7 @@ diff -Nur heirloom-pkgtools-070227.orig/pkgcmds/pkgtrans/Makefile.mk heirloom-pk PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \ -L../../libadm -ladm -L../../libpkgdb -lpkgdb \ - -L$(CCSDIR)/lib -ll -+ -L$(CCSDIR)/lib -lfl ++ -L$(CCSDIR)/lib BIN = pkgtrans OBJ = main.o ../../version/version.o

6 years

6554 FIX Raw Edition: Improved handling of configuration errors

by Lars Michelsen

Module: check_mk Branch: master Commit: ba4877b1b4447e7dca5c3665d2554a501b5cb030 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba4877b1b4447e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 10 09:54:09 2018 +0200 6554 FIX Raw Edition: Improved handling of configuration errors While creating a configuration for the Nagios core (e.g. using "cmk -U" or during "omd update") exceptions may be raised which are caused by configuration issues. When using the Nagios core Check_MK does not produce a half written object file anymore. In case of such an error Check_MK throws away everything and keeps the old file. You can then start the site with the old configuration and fix the configuration issue while the monitoring is running with the old config. Change-Id: Ie46ea15fec29875e7d949ba1f56b16dc4801ba71 --- .werks/6554 | 19 +++++++++++++++++++ cmk_base/core_nagios.py | 33 +++++++++++++++++++++++++++++++-- omd/packages/omd/CORE.hook | 2 +- 3 files changed, 51 insertions(+), 3 deletions(-) diff --git a/.werks/6554 b/.werks/6554 new file mode 100644 index 0000000..d772d59 --- /dev/null +++ b/.werks/6554 @@ -0,0 +1,19 @@ +Title: Raw Edition: Improved handling of configuration errors +Level: 2 +Component: core +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1536324895 + + +While creating a configuration for the Nagios core (e.g. using "cmk -U" or during "omd update") +exceptions may be raised which are caused by configuration issues. + +When using the Nagios core Check_MK does not produce a half written object file anymore. In case +of such an error Check_MK throws away everything and keeps the old file. + +You can then start the site with the old configuration and fix the configuration issue while the +monitoring is running with the old config. diff --git a/cmk_base/core_nagios.py b/cmk_base/core_nagios.py index 5bc77c9..13fa92d 100644 --- a/cmk_base/core_nagios.py +++ b/cmk_base/core_nagios.py @@ -30,6 +30,8 @@ import os import subprocess import sys import py_compile +import tempfile +import errno import cmk.paths import cmk.tty as tty @@ -47,8 +49,34 @@ import cmk_base.check_api_utils as check_api_utils class NagiosCore(core_config.MonitoringCore): def create_config(self): - with file(cmk.paths.nagios_objects_file, "w") as out: - create_config(out, None) + """Tries to create a new Check_MK object configuration file for the Nagios core + + During create_config() exceptions may be raised which are caused by configuration issues. + Don't produce a half written object file. Simply throw away everything and keep the old file. + + The user can then start the site with the old configuration and fix the configuration issue + while the monitoring is running. + """ + tmp_path = None + try: + with tempfile.NamedTemporaryFile("w", dir=os.path.dirname(cmk.paths.nagios_objects_file), + prefix=".%s.new" % os.path.basename(cmk.paths.nagios_objects_file), + delete=False) as tmp: + tmp_path = tmp.name + os.chmod(tmp.name, 0660) + create_config(tmp, hostnames=None) + os.rename(tmp.name, cmk.paths.nagios_objects_file) + + except Exception, e: + # In case an exception happens cleanup the tempfile created for writing + try: + if tmp_path: + os.unlink(tmp_path) + except IOError, e: + if e.errno == errno.ENOENT: # No such file or directory + pass + + raise def precompile(self): console.output("Precompiling host checks...") @@ -56,6 +84,7 @@ class NagiosCore(core_config.MonitoringCore): console.output(tty.ok + "\n") + # .--Create config-------------------------------------------------------. # | ____ _ __ _ | # | / ___|_ __ ___ __ _| |_ ___ ___ ___ _ __ / _(_) __ _ | diff --git a/omd/packages/omd/CORE.hook b/omd/packages/omd/CORE.hook index cbe1345..9b488d9 100755 --- a/omd/packages/omd/CORE.hook +++ b/omd/packages/omd/CORE.hook @@ -67,7 +67,7 @@ case "$1" in make_link nagios $OMD_ROOT/etc/init.d/core # Refresh Check_MK Configuration after changing back from CMC if [ -e $OMD_ROOT/var/check_mk/core/config ] ; then - cmk -U >/dev/null 2>&1 + cmk -U >/dev/null fi elif [ "$2" == "icinga" ] then

6 years

← Newer
1
...
25
26
27
28
29
30
31
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2018