Checkmk git commits March 2015

checkmk-commits@lists.checkmk.com

7 participants
320 discussions

Check_MK Git: check_mk: #1865 FIX mkeventd: fixed exception when executing a shell script as action

by Goetz Golla

Module: check_mk Branch: master Commit: 664519906748f82fa1ac91c78a0acd26dddad661 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=664519906748f8… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Wed Mar 4 17:32:33 2015 +0100 #1865 FIX mkeventd: fixed exception when executing a shell script as action --- .werks/1865 | 9 +++++++++ ChangeLog | 1 + mkeventd/bin/mkeventd | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/1865 b/.werks/1865 new file mode 100644 index 0000000..a0a46d2 --- /dev/null +++ b/.werks/1865 @@ -0,0 +1,9 @@ +Title: mkeventd: fixed exception when executing a shell script as action +Level: 1 +Component: ec +Compatible: compat +Version: 1.2.7i1 +Date: 1425486701 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 31464d0..d82195d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -347,6 +347,7 @@ * 1813 FIX: Fixed bug in event console rule editor when no contact groups configured * 1974 FIX: Event console views were randomly ignoring host filters... * 1861 FIX: exception in mkeventd when archiving certain event log lines + * 1865 FIX: mkeventd: fixed exception when executing a shell script as action HW/SW-Inventory: * 1846 Keep track of changes of software and hardware... diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index f9257e7..65fd75a 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -3208,7 +3208,7 @@ def substitute_event_tags(text, event): for key, value in substs: if type(value) == tuple: - value = " ".join(value) + value = " ".join(map(str,value)) elif type(value) not in [ str, unicode ]: value = str(value)

9 years, 6 months

Check_MK Git: check_mk: #2044 IBM SVC checks: renamed services, remove bogus IBM SVC

by Mathias Kettner

Module: check_mk Branch: master Commit: 02737e3a18beb2e185588e2103a99e598b9bf55a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02737e3a18beb2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 4 16:19:54 2015 +0100 #2044 IBM SVC checks: renamed services, remove bogus IBM SVC A couple of IBM SVC checks have been renamed. Note: this only hold for new installations. Existing installations will not be touched. You can activate the new names nevertheless by activating them in your global settings in <i>Operation Mode of Check_MK / Use new service descriptions</i>. If you do this then RRD files will be created from scratch and existing rules might now match anymore. --- .werks/2044 | 14 ++++++++++++++ ChangeLog | 1 + 2 files changed, 15 insertions(+) diff --git a/.werks/2044 b/.werks/2044 new file mode 100644 index 0000000..5a2bfc1 --- /dev/null +++ b/.werks/2044 @@ -0,0 +1,14 @@ +Title: IBM SVC checks: renamed services, remove bogus IBM SVC +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1425482277 +Class: feature + +A couple of IBM SVC checks have been renamed. Note: this only hold for +new installations. Existing installations will not be touched. You can activate +the new names nevertheless by activating them in your global settings +in <i>Operation Mode of Check_MK / Use new service descriptions</i>. If you +do this then RRD files will be created from scratch and existing rules +might now match anymore. diff --git a/ChangeLog b/ChangeLog index fc34f49..17af9ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -107,6 +107,7 @@ * 2053 New windows plugin: windows_if.ps1, renders wmic_if.ps1 obsolete... * 2043 ibm_svc_mdiskgrp: Fix computation of capacity, show and check provisioning... NOTE: Please refer to the migration notes! + * 2044 IBM SVC checks: renamed services, remove bogus IBM SVC... * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0...

9 years, 6 months

Check_MK Git: check_mk: #2043 ibm_svc_mdiskgrp: Fix computation of capacity, show and check provisioning

by Mathias Kettner

Module: check_mk Branch: master Commit: 9107d9dbf37099f7e836b2f440fbfccedf7149cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9107d9dbf37099… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 4 16:17:54 2015 +0100 #2043 ibm_svc_mdiskgrp: Fix computation of capacity, show and check provisioning The check <tt>ibm_svc_mdiskgrp</tt> now also shows the provisioning. You can now set levels on the provisioning. Note: This is an incompatible change since a new WATO rule set has been introduced in order to add the new parameter for the provisioning levels. So if you already have configured levels for your checks you need to re-do this configuration with the new WATO rule set. --- .werks/2043 | 13 +++++++ ChangeLog | 2 ++ checks/df.include | 4 +-- checks/ibm_svc_mdiskgrp | 52 ++++++++++++++++++++++------ checks/ibm_svc_system | 2 +- checks/ibm_svc_systemstats | 8 ++--- modules/check_mk.py | 32 ++++++++++------- web/htdocs/metrics.py | 52 +++++++++++++++++----------- web/htdocs/wato.py | 6 ++++ web/plugins/metrics/check_mk.py | 19 ++++++++-- web/plugins/wato/check_mk_configuration.py | 34 ++++++++++-------- web/plugins/wato/check_parameters.py | 24 +++++++++++++ 12 files changed, 181 insertions(+), 67 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9107d9dbf3…

9 years, 6 months

Check_MK Git: check_mk: removed a print statement

by Goetz Golla

Module: check_mk Branch: master Commit: 96af7a4542c1098714bd915ce30fb580bea208a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96af7a4542c109… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Wed Mar 4 15:57:09 2015 +0100 removed a print statement --- checks/akcp_sensor.include | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/akcp_sensor.include b/checks/akcp_sensor.include index 9a05d8c..c79b3a3 100644 --- a/checks/akcp_sensor.include +++ b/checks/akcp_sensor.include @@ -153,7 +153,6 @@ def check_akcp_sensor_temp(item, params, info): map(float, (low_crit, low_warn, high_warn, high_crit)) else: unit_normalised = unit.lower() - print low_crit, low_warn, high_warn, high_crit # Devices with "F" or "C" have the levels in degrees * 10 low_crit, low_warn, high_warn, high_crit = \ map(lambda t: (float(t) / 10), (low_crit, low_warn, high_warn, high_crit))

9 years, 6 months

Check_MK Git: check_mk: #1864 akcp_exp_drycontact, akcp_exp_temp : change to service output and levels

by Goetz Golla

Module: check_mk Branch: master Commit: a0570436b265e782f93bea6cfbc52d4249f69162 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a0570436b265e7… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Wed Mar 4 15:55:58 2015 +0100 #1864 akcp_exp_drycontact, akcp_exp_temp : change to service output and levels akcp_exp_drycontact now displays the status message as configured on the device itself, if available. akcp_exp_temp now uses the correct scaling for the temperature levels extracted from the device. --- .werks/1864 | 9 ++ ChangeLog | 1 + checks/akcp_exp_drycontact | 9 +- checks/akcp_exp_humidity | 18 ++-- checks/akcp_exp_smoke | 3 +- checks/akcp_exp_temp | 7 +- checks/akcp_exp_water | 2 +- checks/akcp_sensor.include | 200 +++++++++++++++++++++++++++-------------- checks/akcp_sensor_drycontact | 6 +- checks/akcp_sensor_humidity | 6 +- checks/akcp_sensor_temp | 11 +-- 11 files changed, 172 insertions(+), 100 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a0570436b2…

9 years, 6 months

Check_MK Git: check_mk: #2042 Services are now sorted in a natural way, this affects services containing numbers

by Mathias Kettner

Module: check_mk Branch: master Commit: 12d5ffae54e48ac66007355e55b394d8f5314f1f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12d5ffae54e48a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 4 14:57:05 2015 +0100 #2042 Services are now sorted in a natural way, this affects services containing numbers Previously services would be sorted alphabetically, e.g. <tt>foo1</tt>, <tt>foo10</tt>, <tt>foo11</tt>, ... <tt>foo2</tt>, <tt>foo3</tt>, etc. Now numbers within the descriptions are being detected by a smart algorithm and the sorting is then <tt>foo1</tt>, <tt>foo2</tt>, ... , <tt>foo9</tt>, <tt>foo10</tt>, <tt>foo11</tt>, just as you would expect. --- .werks/2042 | 13 +++++++++++++ ChangeLog | 1 + web/plugins/views/sorters.py | 7 ++----- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.werks/2042 b/.werks/2042 new file mode 100644 index 0000000..465cdba --- /dev/null +++ b/.werks/2042 @@ -0,0 +1,13 @@ +Title: Services are now sorted in a natural way, this affects services containing numbers +Level: 2 +Component: multisite +Compatible: compat +Version: 1.2.7i1 +Date: 1425477221 +Class: feature + +Previously services would be sorted alphabetically, e.g. <tt>foo1</tt>, +<tt>foo10</tt>, <tt>foo11</tt>, ... <tt>foo2</tt>, <tt>foo3</tt>, etc. +Now numbers within the descriptions are being detected by a smart algorithm +and the sorting is then <tt>foo1</tt>, <tt>foo2</tt>, ... , <tt>foo9</tt>, +<tt>foo10</tt>, <tt>foo11</tt>, just as you would expect. diff --git a/ChangeLog b/ChangeLog index dcf70e1..9903b9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -238,6 +238,7 @@ * 1979 Relative timestamps display warnings when they should be in future but are in past * 1937 cpu.loads: performance graph now displays number of CPUs * 2040 Allow commands for setting downtimes and acknowledging on BI aggregates... + * 2042 Services are now sorted in a natural way, this affects services containing numbers... * 1781 FIX: Fix broken grouping by host/service group in availability * 1783 FIX: Finish the view "History of Scheduled Downtimes"... * 1206 FIX: Hostname not longer shown as column in host views diff --git a/web/plugins/views/sorters.py b/web/plugins/views/sorters.py index 0317d5c..e724b31 100644 --- a/web/plugins/views/sorters.py +++ b/web/plugins/views/sorters.py @@ -142,11 +142,8 @@ def cmp_service_name_equiv(r): return 0 def cmp_service_name(column, r1, r2): - o = cmp(cmp_service_name_equiv(r1[column]), cmp_service_name_equiv(r2[column])) - if o == 0: - return cmp_simple_string(column, r1, r2) - else: - return o + return cmp(cmp_service_name_equiv(r1[column]), cmp_service_name_equiv(r2[column])) or \ + cmp_num_split(column, r1, r2) # name title column sortfunction declare_simple_sorter("svcdescr", _("Service description"), "service_description", cmp_service_name)

9 years, 6 months

Check_MK Git: check_mk: hp_procurve_mem: fixed crash due to new memory.include

by Mathias Kettner

Module: check_mk Branch: master Commit: aa9a35dd446af50a131160680959848ddc821108 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa9a35dd446af5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 4 14:53:33 2015 +0100 hp_procurve_mem: fixed crash due to new memory.include --- checks/hp_procurve_mem | 2 +- checks/memory.include | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/hp_procurve_mem b/checks/hp_procurve_mem index 0ea0aeb..27bd55d 100644 --- a/checks/hp_procurve_mem +++ b/checks/hp_procurve_mem @@ -42,7 +42,7 @@ def inventory_hp_procurve_mem(info): def check_hp_procurve_mem(item, params, info): if len(info) == 1: mem_total, mem_used = [ int(mem) for mem in info[0] ] - return check_memory(mem_used, mem_total, params) + return check_memory_simple(mem_used, mem_total, params) check_info["hp_procurve_mem"] = { diff --git a/checks/memory.include b/checks/memory.include index 4b474f3..b8d48fc 100644 --- a/checks/memory.include +++ b/checks/memory.include @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -def check_memory(used, total, params): +def check_memory_simple(used, total, params): # Convert old-style tuple params to dict if params: if type(params) == tuple:

9 years, 6 months

Check_MK Git: check_mk: #2055 FIX agent_vsphere, licenses check: now really configurable on / off

by Andreas Boesl

Module: check_mk Branch: master Commit: ab6c7ee4c39a6a41658546820e638af228350566 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab6c7ee4c39a6a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Mar 4 13:53:56 2015 +0100 #2055 FIX agent_vsphere, licenses check: now really configurable on / off The licenses of the ESX systems were always checked, regardless of the configuration option. --- .werks/2055 | 10 ++++++++++ ChangeLog | 1 + agents/special/agent_vsphere | 37 +++++++++++++++++++------------------ 3 files changed, 30 insertions(+), 18 deletions(-) diff --git a/.werks/2055 b/.werks/2055 new file mode 100644 index 0000000..55cdc21 --- /dev/null +++ b/.werks/2055 @@ -0,0 +1,10 @@ +Title: agent_vsphere, licenses check: now really configurable on / off +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1425473556 + +The licenses of the ESX systems were always checked, regardless of the configuration option. diff --git a/ChangeLog b/ChangeLog index 9f1ba8a..dcf70e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -224,6 +224,7 @@ * 2087 FIX: netapp_api_temp: Fixed exception when dealing with old discovered checks... * 2051 FIX: windows agent: no longer outputs stderr of local and plugin scripts... * 2088 FIX: cisco_cpu: Dealing with non CPU utilization information correctly... + * 2055 FIX: agent_vsphere, licenses check: now really configurable on / off... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index e64884c..503daeb 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -699,24 +699,25 @@ if not error: ########################### # Licenses ########################### - reply_code, reply_msg, reply_headers, licenses_response = query_server(telegram_list["licenseassigned"]) - license_hosts = get_pattern('<returnval>(.*?)</returnval>', licenses_response) - licenses = {} - for host in license_hosts: - license_info = get_pattern("<licenseKey>(.*?)</licenseKey>.*?<name>(.*?)</name><total>(.*?)</total><used>(.*?)</used>", host) - if not license_info: - continue - key, name, total, used = license_info[0] - # We merge all entries with the same name, duplicate keys are ignored since they provide the same data - licenses.setdefault(name, {"used_keys": [], "total": 0, "used": 0}) - if key not in licenses[name]["used_keys"]: - licenses[name]["total"] += int(total) - licenses[name]["used"] += int(used) - licenses[name]["used_keys"].append(key) - - print "<<<esx_vsphere_licenses:sep(9)>>>" - for license, values in licenses.items(): - print "%s\t%s %s" % (license, values["used"], values["total"]) + if "licenses" in query_objects: + reply_code, reply_msg, reply_headers, licenses_response = query_server(telegram_list["licenseassigned"]) + license_hosts = get_pattern('<returnval>(.*?)</returnval>', licenses_response) + licenses = {} + for host in license_hosts: + license_info = get_pattern("<licenseKey>(.*?)</licenseKey>.*?<name>(.*?)</name><total>(.*?)</total><used>(.*?)</used>", host) + if not license_info: + continue + key, name, total, used = license_info[0] + # We merge all entries with the same name, duplicate keys are ignored since they provide the same data + licenses.setdefault(name, {"used_keys": [], "total": 0, "used": 0}) + if key not in licenses[name]["used_keys"]: + licenses[name]["total"] += int(total) + licenses[name]["used"] += int(used) + licenses[name]["used_keys"].append(key) + + print "<<<esx_vsphere_licenses:sep(9)>>>" + for license, values in licenses.items(): + print "%s\t%s %s" % (license, values["used"], values["total"]) ############################# # Determine available host systems

9 years, 6 months

Check_MK Git: check_mk: notify.log: log host name and service for each new notification

by Mathias Kettner

Module: check_mk Branch: master Commit: a6945e24673286bd44232f4d143a3d91da088a07 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6945e24673286… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Mar 4 11:43:41 2015 +0100 notify.log: log host name and service for each new notification --- modules/notify.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/modules/notify.py b/modules/notify.py index c3b4e6b..b636611 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -205,9 +205,11 @@ def notify_notify(raw_context, analyse=False): notify_log("----------------------------------------------------------------------") if analyse: - notify_log("Analysing notification context with %s variables" % len(raw_context)) + notify_log("Analysing notification (%s) context with %s variables" % ( + find_host_service(raw_context), len(raw_context))) else: - notify_log("Got raw notification context with %s variables" % len(raw_context)) + notify_log("Got raw notification (%s) context with %s variables" % ( + find_host_service(raw_context), len(raw_context))) # Add some further variable for the conveniance of the plugins @@ -1400,13 +1402,14 @@ def create_spoolfile(data): # 3. Notifications to *got* forwarded. Contain neither of both. # Spool files of type 1 are not handled here! def handle_spoolfile(spoolfile): + notify_log("----------------------------------------------------------------------") try: data = eval(file(spoolfile).read()) if "plugin" in data: plugin_context = data["context"] plugin = data["plugin"] - notify_log("Got spool file for local delivery via %s" % ( - plugin or "plain mail")) + notify_log("Got spool file (%s) for local delivery via %s" % ( + find_host_service(plugin_context), (plugin or "plain mail"))) return call_notification_script(plugin, plugin_context) else: @@ -1873,6 +1876,13 @@ def substitute_context(template, context): # | Some generic helper functions | # '----------------------------------------------------------------------' +def find_host_service(context): + host = context.get("HOSTNAME", "UNKNOWN") + service = context.get("SERVICEDESC") + if service: + return host + ";" + service + else: + return host def livestatus_fetch_query(query): sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)

9 years, 6 months

Check_MK Git: check_mk: memory.include: Now works again

by Konstantin Büttner

Module: check_mk Branch: master Commit: 5f575bdcd67239583c0a810c58e859cf9f194e2f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f575bdcd67239… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Mar 4 11:37:19 2015 +0100 memory.include: Now works again --- checks/memory.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/memory.include b/checks/memory.include index 4a1a8b0..4b474f3 100644 --- a/checks/memory.include +++ b/checks/memory.include @@ -41,10 +41,10 @@ def check_memory(used, total, params): levelstext = "" + status = 0 # No levels imposed if params["levels"][0] == "ignore": warn_abs, crit_abs = None, None - status = 0 # Absolute or percentual levels else:

9 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2015