Checkmk git commits June 2018

checkmk-commits@lists.checkmk.com

10 participants
179 discussions

6204 Monitor Frozen Attribute of Veritas Cluster

by Moritz Kiemer

Module: check_mk Branch: master Commit: d83c0339e39e5bca6774446f65c3d27c85861556 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d83c0339e39e5b… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Jun 12 14:12:17 2018 +0200 6204 Monitor Frozen Attribute of Veritas Cluster Change-Id: I3d273837da2eb3123d850366af7d40cb9cfd0ba4 --- .werks/6204 | 14 + agents/check_mk_agent.linux | 1 + checkman/veritas_vcs | 8 +- checkman/veritas_vcs.resource | 14 +- checkman/veritas_vcs.servicegroup | 23 +- checkman/veritas_vcs.system | 13 +- checks/veritas_vcs | 333 +++++++++-------- tests/unit/checks/test_veritas_vcs_check.py | 545 ++++++++++++++++++++++++++-- web/plugins/wato/check_parameters.py | 35 ++ 9 files changed, 782 insertions(+), 204 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d83c0339e3…

6 years, 3 months

Updated werk

by Simon Betz

Module: check_mk Branch: master Commit: d8dba60296c8794dc6042ff097bc93be1c4a4127 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8dba60296c879… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jun 26 11:17:58 2018 +0200 Updated werk Change-Id: I2713ab055337f72c9d8874751fc40c8b29bc414a --- .werks/5935 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/5935 b/.werks/5935 index 8f22bd3..655a049 100644 --- a/.werks/5935 +++ b/.werks/5935 @@ -5,6 +5,6 @@ Compatible: compat Edition: cee Version: 1.5.0i4 Date: 1522747385 -Class: feature +Class: fix

6 years, 3 months

6144 FIX win_eventlog: Fixed handling of optional parameter 'Vista API'

by Simon Betz

Module: check_mk Branch: master Commit: a6f32b835d79058fe789f3f1a8379b8805a21511 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6f32b835d7905… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jun 26 11:14:45 2018 +0200 6144 FIX win_eventlog: Fixed handling of optional parameter 'Vista API' Change-Id: Ic12fe3aa53554319d95a35fc295ad4358b0afab0 --- .werks/6144 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.werks/6144 b/.werks/6144 new file mode 100644 index 0000000..00d6769 --- /dev/null +++ b/.werks/6144 @@ -0,0 +1,10 @@ +Title: win_eventlog: Fixed handling of optional parameter 'Vista API' +Level: 1 +Component: agents +Compatible: compat +Edition: cee +Version: 1.6.0i1 +Date: 1530004430 +Class: fix + +

6 years, 3 months

6143 FIX mssql_backup: Fixed crash if check gots old-style parameters

by Simon Betz

Module: check_mk Branch: master Commit: 814898d914e0b32e30a0f8fb8507a6f3e15b4140 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=814898d914e0b3… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jun 26 10:54:26 2018 +0200 6143 FIX mssql_backup: Fixed crash if check gots old-style parameters Change-Id: I3eddea73fa940f1bfb064f4a82856578ac88e85e --- .werks/6143 | 10 ++++++++++ checks/mssql_backup | 27 ++++++--------------------- web/plugins/wato/check_parameters.py | 25 +------------------------ 3 files changed, 17 insertions(+), 45 deletions(-) diff --git a/.werks/6143 b/.werks/6143 new file mode 100644 index 0000000..f2e398b --- /dev/null +++ b/.werks/6143 @@ -0,0 +1,10 @@ +Title: mssql_backup: Fixed crash if check gots old-style parameters +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1530003130 +Class: fix + + diff --git a/checks/mssql_backup b/checks/mssql_backup index e20e094..f2ad4a4 100644 --- a/checks/mssql_backup +++ b/checks/mssql_backup @@ -46,19 +46,6 @@ # MSSQL_SQL0x msdb 2016-07-08 20:20:43 D # MSSQL_SQL0x msdb 2016-07-11 20:20:07 I -# Might be None to have no thresholds or a tuple of two ints -# (<warn age in seconds>, <crit age in seconds>) -factory_settings["mssql_backup_default_levels"] = { - "database": (0, 0), - "database_diff": (0, 0), - "log": (0, 0), - "file_or_filegroup": (0, 0), - "file_diff": (0, 0), - "partial": (0, 0), - "partial_diff": (0, 0), - "unspecific": (0, 0) -} - def parse_mssql_backup(info): @@ -126,22 +113,21 @@ def check_mssql_backup(item, params, parsed): continue found_instance = True - if type(params) != dict: + if not isinstance(params, dict): params = {"database": params} if backup_type_name == "": # use "database" parameters as default for old agent output age_warn, age_crit = params["database"] else: backup_type_var = backup_type_name.strip().replace(" ", "_") - age_warn, age_crit = params[backup_type_var] + age_warn, age_crit = params.get(backup_type_var, (None, None)) state = 0 sec_ago = time.time() - timestamp - if age_warn > 0 and age_crit > 0: - if sec_ago >= age_crit: - state = 2 - elif sec_ago >= age_warn: - state = 1 + if age_crit is not None and sec_ago >= age_crit: + state = 2 + elif age_warn is not None and sec_ago >= age_warn: + state = 1 perfdata = [(perfkey, sec_ago, age_warn, age_crit)] infotext = 'Last %sbackup was at %s (%s ago)' % ( @@ -167,7 +153,6 @@ check_info['mssql_backup'] = { 'parse_function': parse_mssql_backup, 'check_function': check_mssql_backup, 'inventory_function': inventory_mssql_backup, - 'default_levels_variable': 'mssql_backup_default_levels', 'service_description': 'MSSQL %s Backup', 'has_perfdata': True, 'group': 'mssql_backup', diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index db4aaf7..4748f70 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -10290,29 +10290,6 @@ register_check_parameters( "dict" ) -#register_check_parameters( -# subgroup_applications, -# "mssql_backup", -# _("MSSQL Time since last Backup"), -# Optional( -# Tuple( -# elements = [ -# Age(title = _("Warning if older than")), -# Age(title = _("Critical if older than")) -# ] -# ), -# title = _("Specify time since last successful backup"), -# ), -# TextAscii( -# title = _("Service descriptions"), -# allow_empty = False), -# match_type = "first", -#) -#Old rule: -#checkgroup_parameters['mssql_backup'] = [ -# ( (8640000, 33696000), [], ALL_HOSTS, ALL_SERVICES, {} ), -#] = checkgroup_parameters['mssql_backup'] - register_check_parameters( subgroup_applications, "mssql_backup", @@ -10376,7 +10353,7 @@ register_check_parameters( ] ), - forth = lambda params: (params if type(params) == dict + forth = lambda params: (params if isinstance(params, dict) else {'database': (params[0], params[1])}) ), TextAscii(

6 years, 3 months

6142 FIX qnap_disks: Fixed undetected error if SMART information is missing

by Simon Betz

Module: check_mk Branch: master Commit: dc77fc89e3998fa8680609aea56ab2bb3c39289a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc77fc89e3998f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jun 26 10:08:22 2018 +0200 6142 FIX qnap_disks: Fixed undetected error if SMART information is missing Change-Id: Ia6c16ed530b01ce6273f37b040971e6e777ee9e2 --- .werks/6142 | 10 ++++++++++ checks/qnap_disks | 26 +++++++++++++++++++------- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/.werks/6142 b/.werks/6142 new file mode 100644 index 0000000..d0af018 --- /dev/null +++ b/.werks/6142 @@ -0,0 +1,10 @@ +Title: qnap_disks: Fixed undetected error if SMART information is missing +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1530000435 +Class: fix + + diff --git a/checks/qnap_disks b/checks/qnap_disks index 79bc311..ab6dda9 100644 --- a/checks/qnap_disks +++ b/checks/qnap_disks @@ -24,18 +24,31 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + def inventory_qnap_disks(info): return [ (x[0], None) for x in info if x[2] != "-5"] + def check_qnap_disks(item, _no_params, info): + map_states = { + "0" : (0, "ready"), + "-4": (2, "unknown"), + "-5": (2, "no disk"), + "-6": (2, "invalid"), + "-9": (2, "read write error"), + } + for desc, temp, status, model, size, cond in info: if desc == item: - msg = "Model: %s, Temperatur: %s, Size: %s" % \ - ( model, temp, size ) - if int(status) != 0: - return 2, "Status: %s (Code: %s) %s" % ( cond, status, msg) - return 0, msg - return 3, "Disk not longer found in output" + state, state_readable = map_states.get(status, (3, "unknown")) + yield state, "Status: %s (%s)" % (state_readable, cond) + + if "--" in cond: + yield 1, "SMART Information missing" + + yield 0 , "Model: %s, Temperatur: %s, Size: %s" % \ + (model, temp, size) + check_info["qnap_disks"] = { "check_function" : check_qnap_disks, @@ -52,4 +65,3 @@ check_info["qnap_disks"] = { "snmp_scan_function" : lambda oid: oid('.1.3.6.1.2.1.1.1.0').startswith('Linux TS-') \ or oid('.1.3.6.1.2.1.1.1.0').startswith('NAS QR802') } -

6 years, 3 months

6141 FIX mssql_databases: Fixed creating rule with 'Map Database States' parameters and moved state bubble to right place

by Simon Betz

Module: check_mk Branch: master Commit: 6a8b0d7f99235ae1401d634504d89410b8fa4733 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6a8b0d7f99235a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jun 26 09:15:51 2018 +0200 6141 FIX mssql_databases: Fixed creating rule with 'Map Database States' parameters and moved state bubble to right place Change-Id: Ic70d2cad31eacbf5685469333ec07011fbd16138 --- .werks/6141 | 11 +++++++++++ checks/mssql_databases | 7 +++++-- web/plugins/wato/check_parameters.py | 2 +- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.werks/6141 b/.werks/6141 new file mode 100644 index 0000000..5f6f6dd --- /dev/null +++ b/.werks/6141 @@ -0,0 +1,11 @@ +Title: mssql_databases: Fixed creating rule with 'Map Database States' parameters and moved state bubble to right place +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1529997221 + + diff --git a/checks/mssql_databases b/checks/mssql_databases index 275e7a8..3e5cc4e 100644 --- a/checks/mssql_databases +++ b/checks/mssql_databases @@ -69,8 +69,11 @@ def check_mssql_databases(item, params, parsed): if item in parsed: data = parsed[item] - db_state = params.get("map_db_states", {}).get(data["Status"], 0) - yield db_state, 'Status: %s, Recovery: %s' % (data["Status"], data["Recovery"]) + db_state = data["Status"] + state = params.get("map_db_states", {}).get( + db_state.replace(" ", "_").upper(), 0) + yield state, 'Status: %s' % db_state + yield 0, 'Recovery: %s' % data["Recovery"] for what in ["close", "shrink"]: state, state_readable = map_states[data["auto_%s" % what]] diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 581f854..db4aaf7 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2948,7 +2948,7 @@ register_check_parameters( ("OFFLINE", MonitoringState(title=_("Database Offline"))), ("RESTORING", MonitoringState(title=_("Database Files are restored"))), ("RECOVERING", MonitoringState(title=_("Database is being recovered"))), - ("RECOVERY PENDING", MonitoringState(title=_("Database must be recovered"))), + ("RECOVERY_PENDING", MonitoringState(title=_("Database must be recovered"))), ("SUSPECT", MonitoringState(title=_("Database Suspect"))), ("EMERGENCY", MonitoringState(title=_("Database changed to emergency"))), ],

6 years, 3 months

Increased robustness: All sections except tablespaces got the pipe separator

by Simon Betz

Module: check_mk Branch: master Commit: e8ea483adcd771db0a4cb37be8277b3b1a228aa2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8ea483adcd771… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jun 25 11:48:42 2018 +0200 Increased robustness: All sections except tablespaces got the pipe separator Change-Id: Icf311ed90ee0b5748a5958bc10a0463c02b979b4 --- agents/windows/plugins/mssql.vbs | 59 ++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index 69b0bdf..3c159f6 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -81,9 +81,9 @@ Set sources = CreateObject("Scripting.Dictionary") Dim service, i, version, edition, value_types, value_names, value_raw, cluster_name Set WMI = GetObject("winmgmts:{impersonationLevel=impersonate}!\\.\root\cimv2") -' Make sure that always all sections are present, even in case of an error. -' Note: the section <<<mssql_instance>>> section shows the general state -' of a database instance. If that section fails for an instance then all +' Make sure that always all sections are present, even in case of an error. +' Note: the section <<<mssql_instance>>> section shows the general state +' of a database instance. If that section fails for an instance then all ' other sections do not contain valid data anyway. ' ' Don't move this to another place. We need the steps above to decide whether or @@ -91,14 +91,14 @@ Set WMI = GetObject("winmgmts:{impersonationLevel=impersonate}!\\.\root\cimv2") Dim sections, section_id Set sections = CreateObject("Scripting.Dictionary") sections.add "instance", "<<<mssql_instance:sep(124)>>>" -sections.add "databases", "<<<mssql_databases>>>" -sections.add "counters", "<<<mssql_counters>>>" +sections.add "databases", "<<<mssql_databases:sep(124)>>>" +sections.add "counters", "<<<mssql_counters:sep(124)>>>" sections.add "tablespaces", "<<<mssql_tablespaces>>>" -sections.add "blocked_sessions", "<<<mssql_blocked_sessions>>>" -sections.add "backup", "<<<mssql_backup>>>" -sections.add "transactionlogs", "<<<mssql_transactionlogs>>>" -sections.add "datafiles", "<<<mssql_datafiles>>>" -sections.add "clusters", "<<<mssql_clusters>>>" +sections.add "blocked_sessions", "<<<mssql_blocked_sessions:sep(124)>>>" +sections.add "backup", "<<<mssql_backup:sep(124)>>>" +sections.add "transactionlogs", "<<<mssql_transactionlogs:sep(124)>>>" +sections.add "datafiles", "<<<mssql_datafiles:sep(124)>>>" +sections.add "clusters", "<<<mssql_cluster:sep(124)>>" ' Has been deprecated with 1.4.0i1. Keep this for nicer transition for some versions. sections.add "versions", "<<<mssql_versions:sep(124)>>>" @@ -289,7 +289,7 @@ For Each instance_id In instances.Keys: Do ' Continue trick instanceName = "None" End If value = Trim(RS("cntr_value")) - addOutput( objectName & " " & counterName & " " & instanceName & " " & value ) + addOutput( objectName & "|" & counterName & "|" & instanceName & "|" & value ) RS.MoveNext Loop RS.Close @@ -304,7 +304,7 @@ For Each instance_id In instances.Keys: Do ' Continue trick wait_duration_ms = Trim(RS("wait_duration_ms")) wait_type = Trim(RS("wait_type")) blocking_session_id = Trim(RS("blocking_session_id")) - addOutput(session_id & " " & wait_duration_ms & " " & wait_type & " " & blocking_session_id) + addOutput(session_id & "|" & wait_duration_ms & "|" & wait_type & "|" & blocking_session_id) RS.MoveNext Loop RS.Close @@ -401,8 +401,8 @@ For Each instance_id In instances.Keys: Do ' Continue trick backup_machine_name = Trim(RS("machine_name")) If lastBackupDate <> "" and (replica_id = "" or is_primary_replica = "True") Then - addOutput("MSSQL_" & instance_id & " " & Replace(dbName, " ", "_") & _ - " " & lastBackupDate & " " & backup_type) + addOutput("MSSQL_" & instance_id & "|" & Replace(dbName, " ", "_") & _ + "|" & Replace(lastBackupDate, " ", "|") & "|" & backup_type) End If RS.MoveNext @@ -421,10 +421,10 @@ For Each instance_id In instances.Keys: Do ' Continue trick " case when max_size = '-1' then '1' else '0' end as Unlimited" &_ " FROM sys.database_files WHERE type_desc = 'LOG'", CONN Do While Not RS.Eof - addOutput( instance_id & " " & Replace(dbName, " ", "_") & " " & Replace(RS("name"), " ", "_") & _ - " " & Replace(RS("physical_name"), " ", "_") & " " & _ - RS("MaxSize") & " " & RS("AllocatedSize") & " " & RS("UsedSize")) & _ - " " & RS("Unlimited") + addOutput( instance_id & "|" & Replace(dbName, " ", "_") & "|" & Replace(RS("name"), " ", "_") & _ + "|" & Replace(RS("physical_name"), " ", "_") & "|" & _ + RS("MaxSize") & "|" & RS("AllocatedSize") & "|" & RS("UsedSize")) & _ + "|" & RS("Unlimited") RS.MoveNext Loop RS.Close @@ -441,10 +441,10 @@ For Each instance_id In instances.Keys: Do ' Continue trick " case when max_size = '-1' then '1' else '0' end as Unlimited" &_ " FROM sys.database_files WHERE type_desc = 'ROWS'", CONN Do While Not RS.Eof - addOutput( instance_id & " " & Replace(dbName, " ", "_") & " " & Replace(RS("name"), " ", "_") & _ - " " & Replace(RS("physical_name"), " ", "_") & " " & _ - RS("MaxSize") & " " & RS("AllocatedSize") & " " & RS("UsedSize")) & _ - " " & RS("Unlimited") + addOutput( instance_id & "|" & Replace(dbName, " ", "_") & "|" & Replace(RS("name"), " ", "_") & _ + "|" & Replace(RS("physical_name"), " ", "_") & "|" & _ + RS("MaxSize") & "|" & RS("AllocatedSize") & "|" & RS("UsedSize")) & _ + "|" & RS("Unlimited") RS.MoveNext Loop RS.Close @@ -460,8 +460,8 @@ For Each instance_id In instances.Keys: Do ' Continue trick "FROM master.dbo.sysdatabases", CONN Do While Not RS.Eof ' instance db_name status recovery auto_close auto_shrink - addOutput( instance_id & " " & Replace(Trim(RS("name")), " ", "_") & " " & Trim(RS("Status")) & _ - " " & Trim(RS("Recovery")) & " " & Trim(RS("auto_close")) & " " & Trim(RS("auto_shrink")) ) + addOutput( instance_id & "|" & Replace(Trim(RS("name")), " ", "_") & "|" & Trim(RS("Status")) & _ + "|" & Trim(RS("Recovery")) & "|" & Trim(RS("auto_close")) & "|" & Trim(RS("auto_shrink")) ) RS.MoveNext Loop RS.Close @@ -470,7 +470,7 @@ For Each instance_id In instances.Keys: Do ' Continue trick Dim active_node, nodes For Each dbName in dbNames.Keys : Do RS.Open "USE [" & dbName & "];", CONN - + ' Skip non cluster instances RS.Open "SELECT SERVERPROPERTY('IsClustered') AS is_clustered", CONN If RS("is_clustered") = 0 Then @@ -478,13 +478,13 @@ For Each instance_id In instances.Keys: Do ' Continue trick Exit Do End If RS.Close - + nodes = "" RS.Open "SELECT nodename FROM sys.dm_os_cluster_nodes", CONN Do While Not RS.Eof If nodes <> "" Then nodes = nodes & "," - End If + End If nodes = nodes & RS("nodename") RS.MoveNext Loop @@ -497,8 +497,8 @@ For Each instance_id In instances.Keys: Do ' Continue trick RS.MoveNext Loop RS.Close - - addOutput(instance_id & " " & Replace(dbName, " ", "_") & " " & active_node & " " & nodes) + + addOutput(instance_id & "|" & Replace(dbName, " ", "_") & "|" & active_node & "|" & nodes) Loop While False: Next CONN.Close @@ -512,4 +512,3 @@ Set RS = nothing Set CONN = nothing Set FSO = nothing Set SHO = nothing -

6 years, 3 months

6237 FIX Inventory plugin esx_vsphere_hostsystem: fixed crash during HW/ SW inventory

by Andreas

Module: check_mk Branch: master Commit: 25f992a64014d500c63d1024b457cb5c71b324da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25f992a64014d5… Author: Andreas <ab(a)mathias-kettner.de> Date: Mon Jun 25 19:11:54 2018 +0200 6237 FIX Inventory plugin esx_vsphere_hostsystem: fixed crash during HW/SW inventory Change-Id: Ib90093e3840816b821a0a89200e271d86c6766ea --- .werks/6237 | 11 +++++++++++ inventory/esx_vsphere_hostsystem | 1 + 2 files changed, 12 insertions(+) diff --git a/.werks/6237 b/.werks/6237 new file mode 100644 index 0000000..519dc7b --- /dev/null +++ b/.werks/6237 @@ -0,0 +1,11 @@ +Title: Inventory plugin esx_vsphere_hostsystem: fixed crash during HW/SW inventory +Level: 1 +Component: inv +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1529946673 + + diff --git a/inventory/esx_vsphere_hostsystem b/inventory/esx_vsphere_hostsystem index 8feb578..b738617 100644 --- a/inventory/esx_vsphere_hostsystem +++ b/inventory/esx_vsphere_hostsystem @@ -45,6 +45,7 @@ def inv_esx_vsphere_hostsystem_parse(info, inv_items=None): inv_items = {} result = {} + info, _ = info for line in info: key = line[0] for pattern, settings in inv_items.items():

6 years, 3 months

6236 FIX cmk --convert-rrds: fixed broken command

by Andreas

Module: check_mk Branch: master Commit: 85c84b42ecc97feec2f40bb79423ccef0306e94d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85c84b42ecc97f… Author: Andreas <ab(a)mathias-kettner.de> Date: Mon Jun 25 18:40:53 2018 +0200 6236 FIX cmk --convert-rrds: fixed broken command The last major update of rrdtool broke some previously working command in the python c-binding. As a result, the <tt>cmk --convert-rrds</tt> command failed with <tt>ERROR: 'xff'</tt>. Change-Id: If8ed196ec75e5942b5b5d0b91f96c21405ebb74f --- .werks/6236 | 13 +++++++++++++ omd/packages/rrdtool/Makefile | 4 ++++ .../patches/0001-xff_field_missing_from_rrdinfo.diff | 17 +++++++++++++++++ 3 files changed, 34 insertions(+) diff --git a/.werks/6236 b/.werks/6236 new file mode 100644 index 0000000..b0d7191 --- /dev/null +++ b/.werks/6236 @@ -0,0 +1,13 @@ +Title: cmk --convert-rrds: fixed broken command +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1529944624 +Class: fix + +The last major update of rrdtool broke some previously working command in the python c-binding. +As a result, the <tt>cmk --convert-rrds</tt> command failed with <tt>ERROR: 'xff'</tt>. + + diff --git a/omd/packages/rrdtool/Makefile b/omd/packages/rrdtool/Makefile index d248e93..2c31c75 100644 --- a/omd/packages/rrdtool/Makefile +++ b/omd/packages/rrdtool/Makefile @@ -19,6 +19,10 @@ CONFIGUREOPTS := \ build: check-python check-python-modules rm -rf $(DIR) tar xzf $(DIR).tar.gz + for p in patches/*.diff ; do \ + echo "applying $$p..." ; \ + patch -p1 -b -d $(DIR) < $$p ; \ + done # set perl environment to match the other perl modules echo "install --install_base $(DESTDIR)$(OMD_ROOT)/lib/perl5" > .modulebuildrc # The MS_ASYNC/mtime check is broken and often leads to non-killable sync syscalls. diff --git a/omd/packages/rrdtool/patches/0001-xff_field_missing_from_rrdinfo.diff b/omd/packages/rrdtool/patches/0001-xff_field_missing_from_rrdinfo.diff new file mode 100644 index 0000000..37557f8 --- /dev/null +++ b/omd/packages/rrdtool/patches/0001-xff_field_missing_from_rrdinfo.diff @@ -0,0 +1,17 @@ +--- a/bindings/python/rrdtoolmodule.c.orig 2018-06-25 18:25:52.726510964 +0200 ++++ b/bindings/python/rrdtoolmodule.c 2018-06-25 18:26:11.341983601 +0200 +@@ -213,11 +213,9 @@ + + switch (data->type) { + case RD_I_VAL: +- if (isnan(data->value.u_val)) { +- Py_INCREF(Py_None); +- val = Py_None; +- } else +- PyFloat_FromDouble(data->value.u_val); ++ val = isnan(data->value.u_val) ++ ? (Py_INCREF(Py_None), Py_None) ++ : PyFloat_FromDouble(data->value.u_val); + break; + + case RD_I_CNT:

6 years, 3 months

6115 FIX Use the correct matching behaviour and avoid a crash while baking agents for some agent bakery rules

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 4073cc5cac5a63a5e5ab8e81d49f4fb2a25addba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4073cc5cac5a63… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Jun 22 19:07:31 2018 +0200 6115 FIX Use the correct matching behaviour and avoid a crash while baking agents for some agent bakery rules Previously, the agent bakery rulesets "Perform Real-Time Checks", "Agent updater (Linux, Windows)", "ORACLE Databases (Linux, Solaris, AIX)", and "Plugins, local checks and MRPE for non-root users" did not have the correct matching behaviour. Now, the correct behaviour which is shown in the decription for "Matching" in the GUI is used. If you have multiple rules for any of those rulesets please make sure to bake the agents again, and deploy the newly baked agents to the affected hosts. This Werk also fixes a crash of "Bake agents" for rules with the matching behaviour "Each parameter is defined by the first matching rule where that parameter is set (checked)". Change-Id: I60454ddbde9b2d655f14931f37fa6a0383abdacd --- .werks/6115 | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.werks/6115 b/.werks/6115 new file mode 100644 index 0000000..7f1a876 --- /dev/null +++ b/.werks/6115 @@ -0,0 +1,21 @@ +Title: Use the correct matching behaviour and avoid a crash while baking agents for some agent bakery rules +Level: 1 +Component: wato +Compatible: incomp +Edition: cee +Version: 1.6.0i1 +Date: 1529685871 +Class: fix + +Previously, the agent bakery rulesets "Perform Real-Time Checks", "Agent +updater (Linux, Windows)", "ORACLE Databases (Linux, Solaris, AIX)", and +"Plugins, local checks and MRPE for non-root users" did not have the correct +matching behaviour. Now, the correct behaviour which is shown in the decription +for "Matching" in the GUI is used. + +If you have multiple rules for any of those rulesets please make sure to bake +the agents again, and deploy the newly baked agents to the affected hosts. + +This Werk also fixes a crash of "Bake agents" for rules with the matching +behaviour "Each parameter is defined by the first matching rule where that +parameter is set (checked)".

6 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2018