Checkmk git commits July 2015

checkmk-commits@lists.checkmk.com

8 participants
287 discussions

Check_MK Git: check_mk: esx_vsphere_counters: improved item handling. now uses instance name as fallback if no human readable name is available

by Andreas Boesl

Module: check_mk Branch: master Commit: 13afa378f018382329476ebe245eb3a62b19f5f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13afa378f01838… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jul 31 17:31:59 2015 +0200 esx_vsphere_counters: improved item handling. now uses instance name as fallback if no human readable name is available --- checks/esx_vsphere_counters | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/checks/esx_vsphere_counters b/checks/esx_vsphere_counters index bb8e3f1..f292a4c 100644 --- a/checks/esx_vsphere_counters +++ b/checks/esx_vsphere_counters @@ -130,18 +130,27 @@ def parse_esx_vsphere_counters(info): parsed[counter][instance].append((value, unit)) return parsed +# esx datastores are either shown by human readable name (if available) or by the uid +def esx_vsphere_counters_get_item_mapping(parsed): + map_instance_to_item = {} + for instance in parsed.get("datastore.read").keys(): + map_instance_to_item[instance] = instance + + for instance, values in parsed.get("datastore.name").items(): + if instance in map_instance_to_item and values[0][0] != "": + map_instance_to_item[instance] = values[0][0] + return map_instance_to_item + def inventory_esx_vsphere_counters_datastoreio(parsed): - return inventory_diskstat_generic(map(lambda x: [None, x[0][0]], - parsed.get("datastore.name").values())) + return inventory_diskstat_generic(map(lambda x: [None, x], + esx_vsphere_counters_get_item_mapping(parsed).values())) def check_esx_vsphere_counters_datastoreio(item, params, parsed): if not parsed: raise MKCounterWrapped("Counter data is missing") datastores = {} - map_instance_to_name = {} - for instance, values in parsed.get("datastore.name").items(): - map_instance_to_name[instance] = values[0][0] + item_mapping = esx_vsphere_counters_get_item_mapping(parsed) for new_name, name, scaling in [ ("read_throughput", "datastore.read", 1024), ("write_throughput", "datastore.write", 1024), @@ -151,7 +160,7 @@ def check_esx_vsphere_counters_datastoreio(item, params, parsed): field_data = parsed.get(name, {}) for instance, values in field_data.items(): - item_name = map_instance_to_name[instance] + item_name = item_mapping[instance] datastores.setdefault(item_name, {}) datastores[item_name][new_name] = int(values[0][0]) * scaling

8 years, 10 months

Check_MK Git: check_mk: further update of #2413: prevents errors with certain ESX datasource configurations

by Andreas Boesl

Module: check_mk Branch: master Commit: 5b71ed3455dcce023fe8a784c3bf41ff70c56989 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b71ed3455dcce… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jul 31 17:06:19 2015 +0200 further update of #2413: prevents errors with certain ESX datasource configurations --- agents/special/agent_vsphere | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 5597595..2c7c455 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -846,16 +846,16 @@ if not error: ########################### # Datastores ########################### - datastores = {} # We also need the datastore info later in the virtualmachines section - if "datastore" in query_objects: - reply_code, reply_msg, reply_headers, datastores_response = query_server(telegram_list["datastores"]) - elements = get_pattern('<objects><obj type="Datastore">(.*?)</obj>(.*?)</objects>', datastores_response) - for datastore, content in elements: - entries = get_pattern('<name>(.*?)</name><val xsi:type.*?>(.*?)</val>', content) - datastores[datastore] = {} - for name, value in entries: - datastores[datastore][name] = value + datastores = {} # We need the datastore info later on in the virtualmachines and counter sections + reply_code, reply_msg, reply_headers, datastores_response = query_server(telegram_list["datastores"]) + elements = get_pattern('<objects><obj type="Datastore">(.*?)</obj>(.*?)</objects>', datastores_response) + for datastore, content in elements: + entries = get_pattern('<name>(.*?)</name><val xsi:type.*?>(.*?)</val>', content) + datastores[datastore] = {} + for name, value in entries: + datastores[datastore][name] = value + if "datastore" in query_objects: output("<<<esx_vsphere_datastores:sep(9)>>>") for key in sorted(datastores.keys()): data = datastores[key]

8 years, 10 months

Check_MK Git: check_mk: update for #2413: datastores are now displayed with human readable name

by Andreas Boesl

Module: check_mk Branch: master Commit: 7e49038b0edc70357d8ac2c50b0d1a0050657e1e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e49038b0edc70… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jul 31 17:00:51 2015 +0200 update for #2413: datastores are now displayed with human readable name --- agents/special/agent_vsphere | 26 ++++++++++++++++++++++++++ checks/esx_vsphere_counters | 13 +++++++++---- 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index f329d86..5597595 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -349,6 +349,28 @@ def get_counters(esx_version_num): # 'disk.totalReadLatency': 131085, # 'disk.totalWriteLatency': 131089, # 'disk.usage': 131073, + # datastore counters +# 'datastore.datastoreIops': 655367, +# 'datastore.datastoreMaxQueueDepth': 655376, +# 'datastore.datastoreNormalReadLatency': 655372, +# 'datastore.datastoreNormalWriteLatency': 655373, +# 'datastore.datastoreReadBytes': 655368, +# 'datastore.datastoreReadIops': 655370, +# 'datastore.datastoreReadLoadMetric': 655377, +# 'datastore.datastoreReadOIO': 655374, +# 'datastore.datastoreWriteBytes': 655369, +# 'datastore.datastoreWriteIops': 655371, +# 'datastore.datastoreWriteLoadMetric': 655378, +# 'datastore.datastoreWriteOIO': 655375, +# 'datastore.maxTotalLatency': 655379, +# 'datastore.numberReadAveraged': 655360, +# 'datastore.numberWriteAveraged': 655361, +# 'datastore.read': 655362, +# 'datastore.sizeNormalizedDatastoreLatency': 655366, +# 'datastore.totalReadLatency': 655364, +# 'datastore.totalWriteLatency': 655365, +# 'datastore.write': 655363, + 655362,655363,655370,655371,655366, # disk.read/write/deviceLatency/numberRead/numberWrite 131078, 131079, 131091, 131076, 131077, @@ -923,6 +945,10 @@ if not error: desc = counters_syntax[value["id"]] counters_output[ (desc["group"], desc["name"], value["instance"]) ] = ( value["value"], desc["unit"] ) + # Add datastore name to counters + for key, values in datastores.items(): + counters_output[ ("datastore", "name", key) ] = (values.get("name"), "string") + for key in sorted(counters_output.keys()): value = counters_output[key] output("%s.%s|%s|%s|%s" % (key + value)) diff --git a/checks/esx_vsphere_counters b/checks/esx_vsphere_counters index fd75930..bb8e3f1 100644 --- a/checks/esx_vsphere_counters +++ b/checks/esx_vsphere_counters @@ -131,14 +131,18 @@ def parse_esx_vsphere_counters(info): return parsed def inventory_esx_vsphere_counters_datastoreio(parsed): - return inventory_diskstat_generic(map(lambda x: [None, x], - parsed.get("datastore.read").keys())) + return inventory_diskstat_generic(map(lambda x: [None, x[0][0]], + parsed.get("datastore.name").values())) def check_esx_vsphere_counters_datastoreio(item, params, parsed): if not parsed: raise MKCounterWrapped("Counter data is missing") datastores = {} + map_instance_to_name = {} + for instance, values in parsed.get("datastore.name").items(): + map_instance_to_name[instance] = values[0][0] + for new_name, name, scaling in [ ("read_throughput", "datastore.read", 1024), ("write_throughput", "datastore.write", 1024), ("read_ios", "datastore.datastoreReadIops", 1), @@ -147,8 +151,9 @@ def check_esx_vsphere_counters_datastoreio(item, params, parsed): field_data = parsed.get(name, {}) for instance, values in field_data.items(): - datastores.setdefault(instance, {}) - datastores[instance][new_name] = int(values[0][0]) * scaling + item_name = map_instance_to_name[instance] + datastores.setdefault(item_name, {}) + datastores[item_name][new_name] = int(values[0][0]) * scaling return check_diskstat_dict(item, params, datastores)

8 years, 10 months

Check_MK Git: check_mk: Renamed file

by Konstantin Büttner

Module: check_mk Branch: master Commit: 74565fd7ef45c25267fa0b218662021356f550dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74565fd7ef45c2… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Jul 31 15:24:06 2015 +0200 Renamed file --- inventory/{esx_vpshere_hostsystem => esx_vsphere_hostsystem} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/inventory/esx_vpshere_hostsystem b/inventory/esx_vsphere_hostsystem similarity index 100% rename from inventory/esx_vpshere_hostsystem rename to inventory/esx_vsphere_hostsystem

8 years, 10 months

Check_MK Git: check_mk: #2415 FIX check_mail, check_mail_loop:

by Andreas Boesl

fixed incorrect POP3 ssl setting (thanks to Bernhard Schmidt) Message-ID: <55bb6bd8.Axd+tfp6o970fKSW%ab(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 527c77321a601d1e1230c7031c77f35993d95e22 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=527c77321a601d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jul 31 14:35:50 2015 +0200 #2415 FIX check_mail, check_mail_loop: fixed incorrect POP3 ssl setting (thanks to Bernhard Schmidt) The logic in the POP3 WATO configuration is wrong, it sets ssl to True when "Use no encryption" is selected and to False when "Encrypt POP3 communication using SSL" is selected. --- .werks/2415 | 12 ++++++++++++ ChangeLog | 1 + web/plugins/wato/active_checks.py | 4 ++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/2415 b/.werks/2415 new file mode 100644 index 0000000..cc4855c --- /dev/null +++ b/.werks/2415 @@ -0,0 +1,12 @@ +Title: check_mail, check_mail_loop: fixed incorrect POP3 ssl setting (thanks to Bernhard Schmidt) +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1438345949 + +The logic in the POP3 WATO configuration is wrong, it sets ssl to True +when "Use no encryption" is selected and to False when "Encrypt POP3 +communication using SSL" is selected. diff --git a/ChangeLog b/ChangeLog index bb78549..d1c3876 100644 --- a/ChangeLog +++ b/ChangeLog @@ -94,6 +94,7 @@ * 1276 FIX: brocade_mlx_temperature: Fixed the shown Temperature Values * 2490 FIX: synology_disks: treat SSDs with state "not initialized" as OK if state does not change later * 2414 FIX: logwatch: now really ignores ignored logwatch lines... + * 2415 FIX: check_mail, check_mail_loop: fixed incorrect POP3 ssl setting (thanks to Bernhard Schmidt)... Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 59c72c9..309245b 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -135,7 +135,7 @@ mail_receiving_params = [ title = _('SSL Encryption'), default_value = (False, 110), choices = [ - (True, _('Use no encryption'), + (False, _('Use no encryption'), Optional(Integer( allow_empty = False, default_value = 110, @@ -143,7 +143,7 @@ mail_receiving_params = [ title = _('TCP Port'), help = _('By default the standard POP3 Port 110 is used.'), )), - (False, _('Encrypt POP3 communication using SSL'), + (True, _('Encrypt POP3 communication using SSL'), Optional(Integer( allow_empty = False, default_value = 995,

8 years, 10 months

Check_MK Git: check_mk: removed typo in manpage raritan_emx

by Simon Betz

Module: check_mk Branch: master Commit: de5a450ee9be2749ac78a9fbc299c05851ae40de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de5a450ee9be27… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jul 31 13:33:15 2015 +0200 removed typo in manpage raritan_emx --- checkman/raritan_emx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/checkman/raritan_emx b/checkman/raritan_emx index 771a4c8..8e5ca45 100644 --- a/checkman/raritan_emx +++ b/checkman/raritan_emx @@ -8,12 +8,11 @@ description: for each Rack connected to a Raritan EMX devices. No configuration is needed, the devices sends the state by himself - item: Rack ID, Sensor Type, Sensor Name perfdata: - Tempreature + Temperature FAN Speed inventory:

8 years, 10 months

Check_MK Git: check_mk: #2414 FIX logwatch: now really ignores ignored logwatch lines

by Andreas Boesl

Module: check_mk Branch: master Commit: 1a8120a9675361c32560980ab9b146771033ce69 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a8120a9675361… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Jul 31 10:35:20 2015 +0200 #2414 FIX logwatch: now really ignores ignored logwatch lines When a logwatch line is set to ignored through a logwatch pattern it is now correctly removed from the status file of the logwatch check. --- .werks/2414 | 11 +++++++++++ ChangeLog | 1 + checks/logwatch | 3 +++ 3 files changed, 15 insertions(+) diff --git a/.werks/2414 b/.werks/2414 new file mode 100644 index 0000000..5edf420 --- /dev/null +++ b/.werks/2414 @@ -0,0 +1,11 @@ +Title: logwatch: now really ignores ignored logwatch lines +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1438331344 +Class: fix + +When a logwatch line is set to ignored through a logwatch pattern +it is now correctly removed from the status file of the logwatch check. + diff --git a/ChangeLog b/ChangeLog index 2c6a82c..bb78549 100644 --- a/ChangeLog +++ b/ChangeLog @@ -93,6 +93,7 @@ * 2500 FIX: qlogic_fcport: Can now deal with missing port status information... * 1276 FIX: brocade_mlx_temperature: Fixed the shown Temperature Values * 2490 FIX: synology_disks: treat SSDs with state "not initialized" as OK if state does not change later + * 2414 FIX: logwatch: now really ignores ignored logwatch lines... Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/logwatch b/checks/logwatch index 5cc609a..8ea1e32 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -475,6 +475,9 @@ def check_logwatch_generic(item, params, loglines, found, groups=False): except KeyError: state_counts[level] = 1 + if level == "I": + continue + block_lines.append(level + ' ' + text) # The last section is finished here. Add it to the list of reclassified lines if the

8 years, 10 months

Check_MK Git: check_mk: Updated bug entries #2339

by Mathias Kettner

Module: check_mk Branch: master Commit: dfdce5b36a359fb193ba83ae21557f027d1465c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dfdce5b36a359f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 30 17:26:43 2015 +0200 Updated bug entries #2339 --- .bugs/2339 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.bugs/2339 b/.bugs/2339 new file mode 100644 index 0000000..8284d17 --- /dev/null +++ b/.bugs/2339 @@ -0,0 +1,14 @@ +Title: waitmax (32 Bit) und 64 Bit Ubuntu Multiarch segfaults +Component: checks +State: open +Date: 2015-07-30 17:25:38 +Targetversion: future +Class: bug + +Solution could be: use /usr/bin/timeout where available. This should nowadays +always be available. And only fall back to waitmax if missing. This could +be done by an alias in the agent itself. + +if which timeout ; then + alias waitmax='timeout' +fi

8 years, 10 months

Check_MK Git: check_mk: Fix exception in WATO when activating changes while an error occurs

by Mathias Kettner

Module: check_mk Branch: master Commit: 4f36d64822a445523643d3fbf295f61ee7758234 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f36d64822a445… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 30 17:20:06 2015 +0200 Fix exception in WATO when activating changes while an error occurs --- modules/automation.py | 1 + web/htdocs/wato.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/automation.py b/modules/automation.py index 9051ed5..4349118 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -455,6 +455,7 @@ def automation_delete_host(args): os.system("rm -rf '%s'" % path) def automation_restart(job = "restart", use_rushd = True): + # make sure, Nagios does not inherit any open # filedescriptors. This really happens, e.g. if # check_mk is called by WATO via Apache. Nagios inherits diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5c32900..127efb3 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11739,7 +11739,7 @@ def ajax_replication(): # Pre 1.2.7i3 sites return True on success and a string on error. # 1.2.7i3 and later return a ist of warning messages on success. # [] means OK and no warnings. The error handling is unchanged - if result == True: + if result == True or result == None: result = [] if type(result) == list:

8 years, 10 months

Check_MK Git: check_mk: Remove test crash code from cpu load check

by Mathias Kettner

Module: check_mk Branch: master Commit: 261f401cd0003dde2059654bcf7140d409c993f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=261f401cd0003d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 30 17:07:14 2015 +0200 Remove test crash code from cpu load check --- checks/cpu_load.include | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/cpu_load.include b/checks/cpu_load.include index 9c0387d..85107c2 100644 --- a/checks/cpu_load.include +++ b/checks/cpu_load.include @@ -32,7 +32,6 @@ # load is a triple of three floats: average load of # the last 1, 5 or 15 minutes def check_cpu_load_generic(params, load, num_cpus=1): - raise Exception("XXXX") # Prepare performance data if type(params) == tuple: warn, crit = [ p*num_cpus for p in params ]

8 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2015