Checkmk git commits January 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

Check_MK Git: check_mk: #1523 lnx_thermal: Now supports setting levels

by Konstantin Büttner

Module: check_mk Branch: master Commit: c50d2f849df4ee85d41f8de554e6124d3f05a068 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c50d2f849df4ee… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Jan 19 17:53:40 2015 +0100 #1523 lnx_thermal: Now supports setting levels lnx_thermal can now be configured via the Temperature WATO Rule. Default behaviour uses trip points if present, otherwise user defined levels. Due to a changed item name, re-inventory is required. --- .werks/1523 | 11 +++++++++++ ChangeLog | 2 ++ checkman/lnx_thermal | 38 +++++++++++++++++++++++++------------- 3 files changed, 38 insertions(+), 13 deletions(-) diff --git a/.werks/1523 b/.werks/1523 new file mode 100644 index 0000000..576a76a --- /dev/null +++ b/.werks/1523 @@ -0,0 +1,11 @@ +Title: lnx_thermal: Now supports setting levels +Level: 1 +Component: checks +Compatible: incomp +Version: 1.2.7i1 +Date: 1421686301 +Class: feature + +lnx_thermal can now be configured via the Temperature WATO Rule. +Default behaviour uses trip points if present, otherwise user defined levels. +Due to a changed item name, re-inventory is required. diff --git a/ChangeLog b/ChangeLog index 0cf7f34..7284b35 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,8 @@ * 1849 netscaler_dnsrates: new check for DNS statistics of Citrix Netscaler Loadbalancers * 1850 netscaler_health.fan, netscaler_health.psus, netscaler_health.temp: new checks to monitor the health of Citrix Netscaler Loadbalancers * 1214 ups_bat_temp,ups_capacity,ups_in_freq,ups_in_voltage,ups_out_load,ups_out_voltage: Checks now detect more UPS Devices... + * 1523 lnx_thermal: Now supports setting levels... + NOTE: Please refer to the migration notes! * 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... diff --git a/checkman/lnx_thermal b/checkman/lnx_thermal index 0418214..390f013 100644 --- a/checkman/lnx_thermal +++ b/checkman/lnx_thermal @@ -4,25 +4,37 @@ catalog: os/hardware license: GPL distribution: check_mk description: - This check uses the temperature information provided by the kernel in + This check monitors the temperature provided by the kernel in /sys/class/thermal/thermal_zone* and reports values in °C - The measured value is matched against levels delivered by the kernel. - Returns {CRIT} if the kernel reports {hot} or {critical} state, - {WARN} on any other non ok state and {OK} if the temperature is - considered to be within normal operation temperature levels. - item: - The ID of the thermal zone - -examples: - # adding a check for /sys/class/thermal/thermal_zone0 - checks += [ - ( "localhost", "lnx_thermal", "0", None ) - ] + "Zone "+(The ID of the thermal zone) perfdata: One value: The current temperature in °C inventory: Creates one check for earch thermal zone. + +[parameters] +This checks parameters are a dictionary with the +following (optional) keys: + + {"levels"}: A tuple (warn, crit) containing the upper levels. Default: (70, 80) + + {"levels_lower"}: A tuple (warn, crit) containing the lower levels. No defaults. + + {"output_unit"}: "c", "f" or "k", the check will output the temperature in the +specified unit. If this is not set, output is in degrees Celsius. + + {"input_unit"}: "c, "f" or "k". By default, the check interprets the sensor value +according to the unit sent by the device. This key allows to override that. Tread +lightly, as this may lead to a misinterpreted temperature. Should only be used if +the device reports its unit incorrectly. + + {"device_levels_handling"]: How the check treats the device's internal levels +versus the ones you specify yourself. The following options are supported: "best" +results in the best status between yours and the device's levels, "worst" in the +worst, "usr" ignore's the device's levels, "dev" ignores yours, usrdefault and +devdefault uses your/the devices set of levels if present, otherwise the other +respectively. Default setting is "devdefault"

9 years, 8 months

Check_MK Git: check_mk: #1852 FIX solaris_multipath: this check now works with inventory to remember the number of total paths

by Goetz Golla

Module: check_mk Branch: master Commit: b6e0de08afa697b1bf1a42cb11a5b5843d009951 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6e0de08afa697… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Jan 19 17:50:00 2015 +0100 #1852 FIX solaris_multipath: this check now works with inventory to remember the number of total paths Since the current number of total paths has been reported to decrease when paths are lost, the check has been modified to remember the total number of paths during inventory and compare the current number of active paths with this remembered value. See also: the check man page. --- .werks/1852 | 11 +++++++++++ ChangeLog | 2 ++ checkman/solaris_multipath | 25 +++++++++++++++++-------- checks/solaris_multipath | 36 +++++++++++++++++++++++------------- 4 files changed, 53 insertions(+), 21 deletions(-) diff --git a/.werks/1852 b/.werks/1852 new file mode 100644 index 0000000..fa1dea2 --- /dev/null +++ b/.werks/1852 @@ -0,0 +1,11 @@ +Title: solaris_multipath: this check now works with inventory to remember the number of total paths +Level: 1 +Component: checks +Compatible: incomp +Version: 1.2.7i1 +Date: 1421685959 +Class: fix + +Since the current number of total paths has been reported to decrease when paths are lost, the check +has been modified to remember the total number of paths during inventory and compare the current number of +active paths with this remembered value. See also: the check man page. diff --git a/ChangeLog b/ChangeLog index 0cf7f34..9c35fdd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -81,6 +81,8 @@ * 1814 FIX: agent_ibmsvc: Fixed missing executable flag * 1817 FIX: The Check_MK service did not result in CRITICAL/WARNING states when using Nagios as core... * 1844 FIX: oracle_crs_res: fix computation of node a ressource is running on... + * 1852 FIX: solaris_multipath: this check now works with inventory to remember the number of total paths... + NOTE: Please refer to the migration notes! Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checkman/solaris_multipath b/checkman/solaris_multipath index 6eb2a61..da56a64 100644 --- a/checkman/solaris_multipath +++ b/checkman/solaris_multipath @@ -4,18 +4,27 @@ catalog: os/storage license: GPL distribution: check_mk description: - This check monitors the state of multipathed SCSI devices on - Solaris 10 systems using the {"mpathadm"} utility. - It alerts if missing paths are reported by the OS. - The check will only return a {"WARNING"} if at least 50% of the paths to a - LUN are working. - The alert will return {"CRITICAL"} if less than 50% of the paths - to a LUN are working. + This check monitors the state of multipathed SCSI devices on Solaris 10 + systems using the {"mpathadm"} utility. It alerts if missing paths are + reported by the OS. + + Missing paths are determined by comparing the total number of paths with + the current number of paths. The total number of paths is taken from the + time the last inventory was made. + + The check will return a {"WARNING"} if at least 50% of the paths to + a LUN are working. The alert will return {"CRITICAL"} if less than 50% + of the paths to a LUN are working. + + The check will also return a {"WARNING"} if the number of total paths was + not yet inventorized, or if the number of total paths has increased since + last inventory. item: A service the WWID of the LUN. inventory: - One service is created for each LUN that is reported by mpathadm + One service is created for each LUN that is reported by mpathadm. The total + number of paths for each created service is also remembered during inventory. diff --git a/checks/solaris_multipath b/checks/solaris_multipath index 7c22a33..f5f0210 100644 --- a/checks/solaris_multipath +++ b/checks/solaris_multipath @@ -24,31 +24,41 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# Example output: # <<<solaris_multipath>>> # /dev/rdsk/c4t600601608CB02A00DCFD2EEB19A0E111d0s2 4 4 - def inventory_solaris_multipath(info): - inventory = [] for device, total, ok in info: item = device.split('/')[-1] - inventory.append( (item, None) ) - return inventory - + yield item, '{ "total": %s }' % total -def check_solaris_multipath(item, _no_params, info): +def check_solaris_multipath(item, params, info): for device, total, ok in info: if item == device.split('/')[-1]: - total = int(total) + + itotal = params.get("total") # total from last service discovery ok = int(ok) - if total == ok: - return 0, "%d paths up" % total - elif float(ok) / total <= 0.5: # critical if only half of paths ok - return 2, "only %d/%d paths up" % (ok, total) + total = int(total) + + + if not itotal: + state = 1 + infotext = "%d of %d paths up, but total paths not yet inventorized, redo service discovery" % (ok, total) else: - return 1, "only %d/%d paths up" % (ok, total) + itotal = int(itotal) + infotext = "%d of %d paths up" % (ok, itotal) + if total > itotal: + state = 1 + infotext += ", but total paths increased to %d, redo service discovery" % total + elif itotal == ok: + state = 0 + elif itotal >= ok * 2: # less than half of paths ok + state = 2 + else: + state = 1 - return 3, "Path not found" + return state, infotext check_info["solaris_multipath"] = {

9 years, 8 months

Check_MK Git: check_mk: temperature.include: Fixed exception

by Konstantin Büttner

Module: check_mk Branch: master Commit: e4c3c5f7a43b7f384987ee35bbbb49d518d874c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e4c3c5f7a43b7f… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Jan 19 17:17:41 2015 +0100 temperature.include: Fixed exception --- checks/temperature.include | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/temperature.include b/checks/temperature.include index ad59dae..b281112 100644 --- a/checks/temperature.include +++ b/checks/temperature.include @@ -156,7 +156,7 @@ def check_temperature(reading, params, dev_unit = "c", elif dlh == "dev": warn, crit, warn_lower, crit_lower = dev_warn, dev_crit, dev_warn_lower, dev_crit_lower - # The following for cases are all identical, if either *only* device levels or *only* + # The following four cases are all identical, if either *only* device levels or *only* # user levels exist (or no levels at all). # Use least critical of your and device's levels. If just one of both is defined, @@ -191,7 +191,7 @@ def check_temperature(reading, params, dev_unit = "c", if dev_levels_lower: warn_lower, crit_lower = dev_levels_lower else: - warn, crit = usr_warn_lower, usr_crit_lower + warn_lower, crit_lower = usr_warn_lower, usr_crit_lower # Now finally compute status. Hooray! status = check_temp_levels(temp, warn, crit, warn_lower, crit_lower)

9 years, 8 months

Check_MK Git: check_mk: lnx_thermal: Now has default levels

by Konstantin Büttner

Module: check_mk Branch: master Commit: 9d4c5b4973e30150284e20698614622367569cca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d4c5b4973e301… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Jan 19 16:59:50 2015 +0100 lnx_thermal: Now has default levels --- checks/lnx_thermal | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/checks/lnx_thermal b/checks/lnx_thermal index 959f00d..b7eb019 100644 --- a/checks/lnx_thermal +++ b/checks/lnx_thermal @@ -35,6 +35,11 @@ # thermal_zone0 enabled acpitz 38000 98000 critical # thermal_zone1 pkg-temp-0 44000 0 passive 0 passive +factory_settings["lnx_thermal_default_levels"] = { + "levels" : (70, 80), + "device_levels_handling" : "devdefault", +} + def inventory_lnx_thermal(info): return [ (l[0].replace('thermal_zone', 'Zone '), {}) for l in info ] @@ -91,5 +96,6 @@ check_info['lnx_thermal'] = { "service_description" : "Temperature %s", "has_perfdata" : True, "group" : "temperature", + "default_levels_variable" : "lnx_thermal_default_levels", "includes" : [ "temperature.include" ], }

9 years, 8 months

Check_MK Git: check_mk: Minor code cleanup

by Mathias Kettner

Module: check_mk Branch: master Commit: 9234334ecd425b4d1c697143f4a0291be7aa3edb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9234334ecd425b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jan 19 16:29:24 2015 +0100 Minor code cleanup --- checks/lnx_thermal | 12 ++++++------ checks/temperature.include | 3 ++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/checks/lnx_thermal b/checks/lnx_thermal index 2297bcb..959f00d 100644 --- a/checks/lnx_thermal +++ b/checks/lnx_thermal @@ -36,12 +36,12 @@ # thermal_zone1 pkg-temp-0 44000 0 passive 0 passive def inventory_lnx_thermal(info): - return [ (l[0].replace('thermal_zone', 'Zone '), None) for l in info ] + return [ (l[0].replace('thermal_zone', 'Zone '), {}) for l in info ] def check_lnx_thermal(item, params, info): for line in info: - if line[0].replace('thermal_zone', '') == item: + if line[0].replace('thermal_zone', 'Zone ') == item: # ['thermal_zone0', 'enabled', 'acpitz', '51000', '90000', 'critical', '79000', 'passive'] state = 0 tp_reached = [] @@ -56,13 +56,13 @@ def check_lnx_thermal(item, params, info): pass # -> regular line # convert values from millidegree - temp = int(line[3]) / 1000 + temp = int(line[3]) / 1000.0 # parse trip points dev_warn = None dev_crit = None if len(line) > 4: - trip_points = dict(zip(line[5::2], map(lambda x: int(x) / 1000, line[4::2]))) + trip_points = dict(zip(line[5::2], map(lambda x: int(x) / 1000.0, line[4::2]))) for tp_num, (tp_name, level) in enumerate(trip_points.items()): # ignore active cooling device trip points (means enabling a fan or similar) if tp_name == 'active': @@ -75,14 +75,14 @@ def check_lnx_thermal(item, params, info): # If only one relevant trip point is found, use that for both warn and crit if (dev_warn != None) != (dev_crit != None): - dev_warn = dev_crit = min(dev_warn, dev_crit) + dev_warn = dev_crit = max(dev_warn, dev_crit) if dev_warn and dev_crit: dev_levels = (dev_warn, dev_crit) else: dev_levels = None - return check_temperature(temp, params, None, dev_levels) + return check_temperature(temp, params, dev_levels=dev_levels) check_info['lnx_thermal'] = { diff --git a/checks/temperature.include b/checks/temperature.include index 67b8464..ad59dae 100644 --- a/checks/temperature.include +++ b/checks/temperature.include @@ -160,7 +160,8 @@ def check_temperature(reading, params, dev_unit = "c", # user levels exist (or no levels at all). # Use least critical of your and device's levels. If just one of both is defined, - # take that (min and max deal correctly with None here). + # take than max deals correctly with None here. min does not work because None < int + # TODO FIXME HIRN elif dlh == "best": warn, crit = max(usr_warn, dev_warn), max(usr_crit, dev_crit) warn_lower, crit_lower = min(usr_warn_lower, dev_warn_lower), min(usr_crit_lower, dev_crit_lower)

9 years, 8 months

Check_MK Git: check_mk: netscaler_health: code review

by Goetz Golla

Module: check_mk Branch: master Commit: 86f472f54fb0a4c5d57de145e24898affcfc6d59 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=86f472f54fb0a4… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Jan 19 16:23:33 2015 +0100 netscaler_health: code review --- ...{netscaler_health.psus => netscaler_health.psu} | 0 checks/netscaler_health | 80 ++++++++------------ 2 files changed, 33 insertions(+), 47 deletions(-) diff --git a/checkman/netscaler_health.psus b/checkman/netscaler_health.psu similarity index 100% rename from checkman/netscaler_health.psus rename to checkman/netscaler_health.psu diff --git a/checks/netscaler_health b/checks/netscaler_health index b155c33..c6b7624 100644 --- a/checks/netscaler_health +++ b/checks/netscaler_health @@ -29,36 +29,20 @@ # Example Output: # .1.3.6.1.4.1.5951.4.1.1.41.7.1.1.12.1 "CPUFan0Speed" # .1.3.6.1.4.1.5951.4.1.1.41.7.1.1.12.2 "CPUFan1Speed" -# .1.3.6.1.4.1.5951.4.1.1.41.7.1.1.14.1 "BatteryVoltage" # .1.3.6.1.4.1.5951.4.1.1.41.7.1.1.14.2 "SystemFanSpeed" -# .1.3.6.1.4.1.5951.4.1.1.41.7.1.1.14.3 "VoltageSensor2" -# .1.3.6.1.4.1.5951.4.1.1.41.7.1.1.15 "CPU0CoreVoltage" -# .1.3.6.1.4.1.5951.4.1.1.41.7.1.1.15 "CPU0Temperature" -# .1.3.6.1.4.1.5951.4.1.1.41.7.1.1.15 "CPU1CoreVoltage" -# .1.3.6.1.4.1.5951.4.1.1.41.7.1.1.15 "CPU1Temperature" -# .1.3.6.1.4.1.5951.4.1.1.41.7.1.1.15 "SystemFan1Speed" -# .1.3.6.1.4.1.5951.4.1.1.41.7.1.1.15 "SystemFan2Speed" -# .1.3.6.1.4.1.5951.4.1.1.41.7.1.1.16 "IntelCPUVttPower" -# .1.3.6.1.4.1.5951.4.1.1.41.7.1.1.18 "+5.0VSupplyVoltage" -# .1.3.6.1.4.1.5951.4.1.1.41.7.1.1.18 "-5.0VSupplyVoltage" -# .1.3.6.1.4.1.5951.4.1.1.41.7.1.1.19 "+12.0VSupplyVoltage" -# .1.3.6.1.4.1.5951.4.1.1.41.7.1.1.19 "-12.0VSupplyVoltage" -# .1.3.6.1.4.1.5951.4.1.1.41.7.1.1.19 "InternalTemperature" -# .1.3.6.1.4.1.5951.4.1.1.41.7.1.1.21 "Main3.3VSupplyVoltage" -# .1.3.6.1.4.1.5951.4.1.1.41.7.1.1.24 "Standby3.3VSupplyVoltage" -# .1.3.6.1.4.1.5951.4.1.1.41.7.1.1.25 "PowerSupply1FailureStatus" -# .1.3.6.1.4.1.5951.4.1.1.41.7.1.1.25 "PowerSupply2FailureStatus" -# .1.3.6.1.4.1.5951.4.1.1.41.7.1.1.27 "PowerSupply5vStandbyVoltage" +# .1.3.6.1.4.1.5951.4.1.1.41.7.1.1.14.3 "CPU0Temperature" +# .1.3.6.1.4.1.5951.4.1.1.41.7.1.1.14.4 "CPU1Temperature" +# .1.3.6.1.4.1.5951.4.1.1.41.7.1.1.19.3 "InternalTemperature" +# .1.3.6.1.4.1.5951.4.1.1.41.7.1.1.25.2 "PowerSupply1FailureStatus" +# .1.3.6.1.4.1.5951.4.1.1.41.7.1.1.25.7 "PowerSupply2FailureStatus" # .1.3.6.1.4.1.5951.4.1.1.41.7.1.2.12.1 9975 # .1.3.6.1.4.1.5951.4.1.1.41.7.1.2.12.2 9750 -# .1.3.6.1.4.1.5951.4.1.1.41.7.1.2.14.1 3104 # .1.3.6.1.4.1.5951.4.1.1.41.7.1.2.14.2 9825 -# .1.3.6.1.4.1.5951.4.1.1.41.7.1.2.14.3 3343 -# .1.3.6.1.4.1.5951.4.1.1.41.7.1.2.15 1183 -# .1.3.6.1.4.1.5951.4.1.1.41.7.1.2.15 60 -# .1.3.6.1.4.1.5951.4.1.1.41.7.1.2.15 0 -# .1.3.6.1.4.1.5951.4.1.1.41.7.1.2.15 0 -# .1.3.6.1.4.1.5951.4.1.1.41.7.1.2.15 9900 +# .1.3.6.1.4.1.5951.4.1.1.41.7.1.2.14.3 60 +# .1.3.6.1.4.1.5951.4.1.1.41.7.1.2.14.4 72 +# .1.3.6.1.4.1.5951.4.1.1.41.7.1.2.19.3 32 +# .1.3.6.1.4.1.5951.4.1.1.41.7.1.2.25.2 0 +# .1.3.6.1.4.1.5951.4.1.1.41.7.1.2.25.7 9900 netscaler_health_scan = lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5951.1") @@ -79,22 +63,23 @@ netscaler_health_info = (".1.3.6.1.4.1.5951.4.1.1.41.7.1", [ # nsSysHealthTable factory_settings["netscaler_health_fan_default_levels"] = { "lower": (3500, 3000), + "upper": (None, None), } def inventory_netscaler_health_fan(info): for name, value in info: if name.endswith("Speed"): - yield name[:-5], None + yield name[:-5], {} def check_netscaler_health_fan(item, params, info): for name, value in info: if name[:-5] == item: value=int(value) - infotext = "speed is %d RPM" % value + infotext = "speed is %d rpm" % value state = 0 - lower_warn, lower_crit = params.get("lower", ("", "") ) - upper_warn, upper_crit = params.get("upper", ("", "") ) + lower_warn, lower_crit = params["lower"] + upper_warn, upper_crit = params["upper"] if lower_crit and value <= lower_crit: state = 2 infotext += " (lower levels at %d/%d rpm)" % (lower_warn, lower_crit) @@ -137,7 +122,7 @@ factory_settings["netscaler_health_temp_default_levels"] = { def inventory_netscaler_health_temp(info): for name, value in info: if name.endswith("Temperature") and value != "0": - yield name[:-11], None + yield name[:-11], {} def check_netscaler_health_temp(item, params, info): for name, value in info: @@ -158,16 +143,17 @@ check_info["netscaler_health.temp"] = { } #. -# .--Power supply--------------------------------------------------------. +# .--psu-----------------------------------------------------------------. # | | -# | _ __ ___ _ _ ___ | -# | | '_ \/ __| | | / __| | -# | | |_) \__ \ |_| \__ \ | -# | | .__/|___/\__,_|___/ | -# | |_| | +# | _ __ ___ _ _ | +# | | '_ \/ __| | | | | +# | | |_) \__ \ |_| | | +# | | .__/|___/\__,_| | +# | |_| | # +----------------------------------------------------------------------+ -def inventory_netscaler_health_psus(info): + +def inventory_netscaler_health_psu(info): for name, state in info: r = regex('PowerSupply([\d])(Failure|)Status') m = r.match(name) @@ -176,23 +162,23 @@ def inventory_netscaler_health_psus(info): yield m.group(1), None -def check_netscaler_health_psus(item, _no_params, info): - ps_status_map = ( (3, "not supported"), # 0 +def check_netscaler_health_psu(item, _no_params, info): + psu_status_map = ( (3, "not supported"), # 0 (2, "not present"), # 1 (2, "failed"), # 2 (0, "normal"), # 3 ) for name, state in info: - if name.startswith("PowerSupply" + item) and name.endswith("Status") \ - or name.endswith("FailureStatus"): - return ps_status_map[int(state)] + if name.startswith("PowerSupply" + item) and (name.endswith("Status") \ + or name.endswith("FailureStatus")): + return psu_status_map[int(state)] -check_info["netscaler_health.psus"] = { - "check_function" : check_netscaler_health_psus, - "inventory_function" : inventory_netscaler_health_psus, - "service_description" : "Power supply %s", +check_info["netscaler_health.psu"] = { + "check_function" : check_netscaler_health_psu, + "inventory_function" : inventory_netscaler_health_psu, + "service_description" : "Power Supply %s", "snmp_info" : netscaler_health_info, "snmp_scan_function" : netscaler_health_scan, }

9 years, 8 months

Check_MK Git: check_mk: Updated bug entries #2285

by Lars Michelsen

Module: check_mk Branch: master Commit: ddca7dd545804cbc266df716efe2815653cc6a84 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ddca7dd545804c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jan 19 16:05:30 2015 +0100 Updated bug entries #2285 --- .bugs/2285 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/2285 b/.bugs/2285 new file mode 100644 index 0000000..953d192 --- /dev/null +++ b/.bugs/2285 @@ -0,0 +1,8 @@ +Title: "Add to visual" in views does not honor user provided filter vars +Component: multisite +State: open +Date: 2015-01-19 16:04:58 +Targetversion: 1.2.5i1 +Class: nastiness + +It only cares about the filter values configured in the view.

9 years, 8 months

Check_MK Git: check_mk: lnx_thermal: Now supports setting levels.

by Konstantin Büttner

Module: check_mk Branch: master Commit: 0bd3b269b54c24ea2323b32fb8e9a0247f9c35b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0bd3b269b54c24… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Jan 19 15:56:50 2015 +0100 lnx_thermal: Now supports setting levels. --- checks/lnx_thermal | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/checks/lnx_thermal b/checks/lnx_thermal index b2c8322..2297bcb 100644 --- a/checks/lnx_thermal +++ b/checks/lnx_thermal @@ -36,9 +36,10 @@ # thermal_zone1 pkg-temp-0 44000 0 passive 0 passive def inventory_lnx_thermal(info): - return [ (l[0].replace('thermal_zone', ''), None) for l in info ] + return [ (l[0].replace('thermal_zone', 'Zone '), None) for l in info ] -def check_lnx_thermal(item, _no_params, info): + +def check_lnx_thermal(item, params, info): for line in info: if line[0].replace('thermal_zone', '') == item: # ['thermal_zone0', 'enabled', 'acpitz', '51000', '90000', 'critical', '79000', 'passive'] @@ -55,32 +56,40 @@ def check_lnx_thermal(item, _no_params, info): pass # -> regular line # convert values from millidegree - cur = int(line[3]) / 1000 + temp = int(line[3]) / 1000 # parse trip points + dev_warn = None + dev_crit = None if len(line) > 4: trip_points = dict(zip(line[5::2], map(lambda x: int(x) / 1000, line[4::2]))) for tp_num, (tp_name, level) in enumerate(trip_points.items()): # ignore active cooling device trip points (means enabling a fan or similar) if tp_name == 'active': continue - if level != 0 and cur > level: + if level != 0: if tp_name in [ 'hot', 'critical' ]: - state = max(state, 2) + dev_crit = level else: - state = max(state, 1) - tp_reached.append("%s (%d)" % (tp_name, tp_num)) + dev_warn = level + + # If only one relevant trip point is found, use that for both warn and crit + if (dev_warn != None) != (dev_crit != None): + dev_warn = dev_crit = min(dev_warn, dev_crit) + + if dev_warn and dev_crit: + dev_levels = (dev_warn, dev_crit) + else: + dev_levels = None - detail_txt = '' - if tp_reached: - detail_txt = ' (Trip Points reached: %s)' % ', '.join(tp_reached) + return check_temperature(temp, params, None, dev_levels) - return (state, 'Temperature is %d °C%s' % (cur, detail_txt), [ ( 'temperature', cur ) ]) - return (3, 'No data found for sensor "thermal_zone%s"' % item) check_info['lnx_thermal'] = { "inventory_function" : inventory_lnx_thermal, "check_function" : check_lnx_thermal, "service_description" : "Temperature %s", "has_perfdata" : True, + "group" : "temperature", + "includes" : [ "temperature.include" ], }

9 years, 8 months

Check_MK Git: check_mk: temperature.include: Fixed syntax error

by Konstantin Büttner

Module: check_mk Branch: master Commit: ba6b1a30d47abc81ae7c91ecc9bdeefea5542e69 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba6b1a30d47abc… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Jan 19 15:24:05 2015 +0100 temperature.include: Fixed syntax error --- checks/temperature.include | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/checks/temperature.include b/checks/temperature.include index 3294544..67b8464 100644 --- a/checks/temperature.include +++ b/checks/temperature.include @@ -46,14 +46,6 @@ def celsius_to_fahrenheit(tempc): def check_temperature(reading, params, dev_unit = "c", dev_levels = None, dev_levels_lower = None, dev_status = None): - # Format number according to its datatype - def render_temp(n): - t = from_celsius(n, output_unit)) - if type(n) == int: - return "%d" % t - else: - return "%.1f" % t - def from_celsius(tempc, unit): if unit == "f": return celsius_to_fahrenheit(tempc) @@ -72,6 +64,14 @@ def check_temperature(reading, params, dev_unit = "c", else: return reading + # Format number according to its datatype + def render_temp(n): + t = from_celsius(n, output_unit) + if type(n) == int: + return "%d" % t + else: + return "%.1f" % t + def check_temp_levels(temp, warn, crit, warn_lower, crit_lower): if crit != None and temp >= crit: status = 2

9 years, 8 months

Check_MK Git: check_mk: Changed Werk 1213

by Bastian Kuhn

Module: check_mk Branch: master Commit: b6a0f4fb841c5856d6076bf4144b7b7dce38fd86 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6a0f4fb841c58… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jan 19 14:55:40 2015 +0100 Changed Werk 1213 --- .werks/1213 | 5 ++--- ChangeLog | 2 +- modules/notify.py | 4 ++++ notifications/asciimail | 1 - 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.werks/1213 b/.werks/1213 index 33c573c..d734c0e 100644 --- a/.werks/1213 +++ b/.werks/1213 @@ -1,4 +1,4 @@ -Title: New Macro $SERVICEDESC_FOR_URL$ for asciimail +Title: New Notification macros $SERVICEFORURL$ and $HOSTFORURL$ Level: 1 Component: notifications Class: feature @@ -7,7 +7,6 @@ State: unknown Version: 1.2.7i1 Date: 1421430462 -The new macrco $SERVICEDESC_FOR_URL$ can be used in the body of asciimails. The Macro replaces -whitespaces in the servicename with %20. This makes it possible to create custom urls who can e.g. be used +The two new macrcos can be used in notifications to create custom urls who can e.g. be used to ackknowledge services. diff --git a/ChangeLog b/ChangeLog index 0f3d229..0cf7f34 100644 --- a/ChangeLog +++ b/ChangeLog @@ -122,7 +122,7 @@ Notifications: * 1662 notification plugin spectrum: finalized script. now able to handle host notications - * 1213 New Macro $SERVICEDESC_FOR_URL$ for asciimail... + * 1213 New Notification macros $SERVICEFORURL$ and $HOSTFORURL$... * 1661 FIX: mknotifyd: improved performance when receiving forwarded notifications * 1664 FIX: mknotifyd: further performance improvements for notification forwarding * 1205 FIX: RBN: Fixed match contactgroup condition... diff --git a/modules/notify.py b/modules/notify.py index a94d260..bc28896 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -1757,6 +1757,10 @@ def complete_raw_context(raw_context): if key.endswith("STATE"): raw_context[key[:-5] + "SHORTSTATE"] = value[:4] + if raw_context["WHAT"] == "SERVICE": + raw_context['SERVICEFORURL'] = urllib.quote(raw_context['SERVICEDESC']) + raw_context['HOSTFORURL'] = urllib.quote(raw_context['HOSTNAME']) + convert_context_to_unicode(raw_context) diff --git a/notifications/asciimail b/notifications/asciimail index 9de5fa0..5d6b203 100644 --- a/notifications/asciimail +++ b/notifications/asciimail @@ -159,7 +159,6 @@ def construct_content(context): tmpl_body += context["PARAMETER_SERVICE_BODY"] else: tmpl_body += tmpl_service_body - context['SERVICEDESC_FOR_URL'] = context['SERVICEDESC'].replace(' ','%20') context['SUBJECT'] = substitute_context(tmpl, context) body = substitute_context(tmpl_body, context)

9 years, 8 months

← Newer
1
...
17
18
19
20
21
22
23
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2015