Checkmk git commits February 2016

checkmk-commits@lists.checkmk.com

7 participants
402 discussions

Fixed nasty output of popd command in lnx_bonding section

by Lars Michelsen

Module: check_mk Branch: master Commit: d3ef011bb910d04178d8a1cc03f3a13b327f3f55 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3ef011bb910d0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 1 14:44:14 2016 +0100 Fixed nasty output of popd command in lnx_bonding section --- agents/check_mk_agent.linux | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 26492ca..1dd64e1 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -305,7 +305,9 @@ fi # Current state of bonding interfaces if [ -e /proc/net/bonding ] ; then echo '<<<lnx_bonding:sep(58)>>>' - pushd /proc/net/bonding > /dev/null ; head -v -n 1000 * ; popd + pushd /proc/net/bonding > /dev/null + head -v -n 1000 * + popd > /dev/null fi # Same for Open vSwitch bonding

8 years, 8 months

winperf_if: check whether dhcp is enabled (plugin) could crash the check

by Sebastian Herbord

Module: check_mk Branch: master Commit: 7f57464d0c9573ebd274c1f77d935bbe5b6f1d66 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f57464d0c9573… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Feb 1 14:38:33 2016 +0100 winperf_if: check whether dhcp is enabled (plugin) could crash the check the crash occured if description/alias was used for the item name --- checks/winperf_if | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/checks/winperf_if b/checks/winperf_if index 290465c..b4cf44b 100644 --- a/checks/winperf_if +++ b/checks/winperf_if @@ -310,7 +310,13 @@ def check_if_dhcp(item, _no_params, info, nic_names, nic_index): as_dict = dict(zip(header, map(lambda x: x.rstrip(), line))) name = winperf_if_normalize_nic_name(as_dict["Description"], nic_names) idx = nic_index.get(name) - if idx == int(item): + + try: + match = idx == int(item) + except ValueError: + match = name == item + + if match: if as_dict["DHCPEnabled"]: return 1, "dhcp enabled" else:

8 years, 8 months

Fix syntax in comment - fixes folding

by Mathias Kettner

Module: check_mk Branch: master Commit: 73f7efd33e31b1025c89c9b912a00791ced8a6f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=73f7efd33e31b1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 1 14:35:27 2016 +0100 Fix syntax in comment - fixes folding --- web/plugins/sidebar/shipped.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index a4b93cf..c66a4b5 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -134,6 +134,7 @@ sidebar_snapins["views"] = { "allowed" : [ "user", "admin", "guest" ], } +#. # .--Dashboards----------------------------------------------------------. # | ____ _ _ _ | # | | _ \ __ _ ___| |__ | |__ ___ __ _ _ __ __| |___ |

8 years, 8 months

Fixed z-index of popupmenu (was under Perf-O-Meters)

by Mathias Kettner

Module: check_mk Branch: master Commit: 91d97178a2fee9b9af8605e6631593fbe1e36b7c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91d97178a2fee9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 1 12:38:54 2016 +0100 Fixed z-index of popupmenu (was under Perf-O-Meters) --- web/htdocs/pages.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 3975eb8..073ffa3 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -1025,7 +1025,7 @@ body.main .popup_menu { position: absolute; top: 15px; left: 15px; - z-index: 10; + z-index: 50; padding: 5px 8px; min-width: 300px;

8 years, 8 months

Made code for rendering the popup menu more flexible

by Mathias Kettner

Module: check_mk Branch: master Commit: d8b5ffdd859ba136c15ef99ffb1bb5e495394d26 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8b5ffdd859ba1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 1 12:39:22 2016 +0100 Made code for rendering the popup menu more flexible --- web/htdocs/pagetypes.py | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/web/htdocs/pagetypes.py b/web/htdocs/pagetypes.py index a951588..20d1907 100644 --- a/web/htdocs/pagetypes.py +++ b/web/htdocs/pagetypes.py @@ -973,14 +973,28 @@ class Container: # The popup for "Add to ...", e.g. for adding a graph to a report # or dashboard. This is needed for page types with the aspect "ElementContainer". @classmethod - def render_addto_popup(self): + def render_addto_popup(self, added_type): + if not self.may_contain(added_type): + return + pages = self.pages() if pages: - html.write('<li><span>%s:</span></li>' % self.phrase("add_to")) + self.render_addto_popup_title(self.phrase("add_to")) for page in pages: - html.write('<li><a href="javascript:void(0)" ' - 'onclick="pagetype_add_to_container(\'%s\', \'%s\'); reload_sidebar();"><img src="images/icon_%s.png"> %s</a></li>' % - (self.type_name(), page.name(), self.type_name(), page.title())) + self.render_addto_popup_entry(self.type_name(), page.name(), page.title()) + + + # Helper functions for layouting the add-to popup + @classmethod + def render_addto_popup_title(self, title): + html.write('<li><span>%s:</span></li>' % title) + + + @classmethod + def render_addto_popup_entry(self, type_name, name, title): + html.write('<li><a href="javascript:void(0)" ' + 'onclick="pagetype_add_to_container(\'%s\', \'%s\'); reload_sidebar();"><img src="images/icon_%s.png"> %s</a></li>' % + (type_name, name, type_name, title)) # Callback for the Javascript function pagetype_add_to_container(). The @@ -997,9 +1011,11 @@ class Container: page_type = page_types[page_type_name] target_page, need_sidebar_reload = page_type.add_element_via_popup(page_name, element_type, create_info) + # Redirect user to tha page this displays the thing we just added to if target_page: - # Redirect user to that page - html.write(target_page.page_url()) + if type(target_page) != str: + target_page = target_page.page_url() + html.write(target_page) html.write("\n%s" % (need_sidebar_reload and "true" or "false")) @@ -1069,7 +1085,7 @@ def page_handlers(): return page_handlers -def render_addto_popup(add_type): +def render_addto_popup(added_type): for page_type in page_types.values(): - if issubclass(page_type, Container) and page_type.may_contain(add_type): - page_type.render_addto_popup() + if issubclass(page_type, Container): + page_type.render_addto_popup(added_type)

8 years, 8 months

New helper function for rendering color icons for graphs

by Mathias Kettner

Module: check_mk Branch: master Commit: f9168f92fdf4baca5da0cad36548e351d8115f2a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9168f92fdf4ba… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 1 10:57:12 2016 +0100 New helper function for rendering color icons for graphs --- web/htdocs/metrics.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 95a43af..844dd1a 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -281,6 +281,8 @@ def mix_colors(a, b): in zip(a, b) ]) +def render_color_icon(color): + return "<div class=color style=\"background-color: %s\"></div>" % color #. # .--Evaluation----------------------------------------------------------. @@ -1416,7 +1418,7 @@ def render_metrics_table(translated_metrics, host_name, service_description): output = "<table class=metricstable>" for metric_name, metric in sorted(translated_metrics.items(), cmp=lambda a,b: cmp(a[1]["title"], b[1]["title"])): output += "<tr>" - output += "<td class=color><div class=color style=\"background-color: %s\"></div></td>" % metric["color"] + output += "<td class=color>%s</td>" % render_color_icon(metric["color"]) output += "<td>%s:</td>" % metric["title"] output += "<td class=value>%s</td>" % metric["unit"]["render"](metric["value"]) if cmk_graphs_possible():

8 years, 8 months

unit_info: make sure that description is always present

by Mathias Kettner

Module: check_mk Branch: master Commit: c7632096b20c53cd6dc45c2a51328f1b1788380d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7632096b20c53… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 1 10:57:00 2016 +0100 unit_info: make sure that description is always present --- web/htdocs/metrics.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 7ed4f70..95a43af 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -67,9 +67,14 @@ def load_plugins(force): load_web_plugins("metrics", globals()) loaded_with_language = current_language + fixup_unit_into() + + +def fixup_unit_into(): # create back link from each unit to its id. for unit_id, unit in unit_info.items(): unit["id"] = unit_id + unit.setdefault("description", unit["title"]) #.

8 years, 8 months

bluecoat_sensors.temp: Fixed missing group - Parameters can now be configured

by Lars Michelsen

Module: check_mk Branch: master Commit: ba356cc24379a2246d7ab20cc8d653c61b50213d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ba356cc24379a2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 1 11:55:41 2016 +0100 bluecoat_sensors.temp: Fixed missing group - Parameters can now be configured --- checks/bluecoat_sensors | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/checks/bluecoat_sensors b/checks/bluecoat_sensors index 8d5c40e..7d99fc7 100644 --- a/checks/bluecoat_sensors +++ b/checks/bluecoat_sensors @@ -32,9 +32,6 @@ # celsius(5) # rpm(6) -# TODO: Put temperature into a sub check. Otherwise it is not -# configurable via WATO. - def inventory_bluecoat_sensors(info, temp): for name, reading, status, scale, unit in info: # temperature sensor is unit 5. @@ -43,13 +40,6 @@ def inventory_bluecoat_sensors(info, temp): def check_bluecoat_sensors(item, params, info, temp): - - # other(1) - # truthvalue(2) - # specialEnum(3) - # volts(4) - # celsius(5) - # rpm(6) for name, reading, status, scale, unit in info: # if the service was discovered before the update, # the temp-subcheck will not have discovered anything as it didn't @@ -59,8 +49,9 @@ def check_bluecoat_sensors(item, params, info, temp): name = name.replace(" temperature", "") if name == item: value = float(reading) * 10 ** float(scale) - if unit == '5': - return check_temperature(value, {}, "bluecoat_sensors_%s" % item, status != '1' and 2 or 0) + if temp and unit == '5': + return check_temperature(value, params, + "bluecoat_sensors_%s" % item, status != '1' and 2 or 0) elif unit == '4': varname = "voltage" unitname = " V" @@ -93,5 +84,6 @@ check_info["bluecoat_sensors.temp"] = { 'service_description' : 'Temperature %s', 'has_perfdata' : True, 'includes' : [ "temperature.include" ], + 'group' : "temperature", }

8 years, 8 months

#2942 FIX juniper_cpu_util: new check replaces juniper_cpu which was reporting incorrect values

by Sebastian Herbord

Module: check_mk Branch: master Commit: dd805e53cc2e7dfda36c3478e780ce5667da54ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd805e53cc2e7d… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Feb 1 11:29:24 2016 +0100 #2942 FIX juniper_cpu_util: new check replaces juniper_cpu which was reporting incorrect values The juniper_cpu check was reporting cpu load as utilization. The load readings from the juniper device can't be used as the number of cpu cores is unknown. juniper_cpu has been obsoleted, will no longer report data and will disappear upon re-discovery. juniper_cpu_util takes its place and reports the actual utilization. --- .werks/2942 | 14 ++++++++++++ ChangeLog | 2 ++ checkman/juniper_cpu | 6 +++-- checkman/juniper_cpu_util | 11 +++++++++ checks/juniper_cpu | 42 +++++----------------------------- checks/juniper_cpu_util | 56 +++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 93 insertions(+), 38 deletions(-) diff --git a/.werks/2942 b/.werks/2942 new file mode 100644 index 0000000..4ce0eea --- /dev/null +++ b/.werks/2942 @@ -0,0 +1,14 @@ +Title: juniper_cpu_util: new check replaces juniper_cpu which was reporting incorrect values +Level: 1 +Component: checks +Compatible: incomp +Version: 1.2.7i4 +Date: 1454322353 +Class: fix + +The juniper_cpu check was reporting cpu load as utilization. The load readings from the +juniper device can't be used as the number of cpu cores is unknown. + +juniper_cpu has been obsoleted, will no longer report data and will disappear upon +re-discovery. +juniper_cpu_util takes its place and reports the actual utilization. diff --git a/ChangeLog b/ChangeLog index 66b8167..81f2c89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -234,6 +234,8 @@ * 2972 FIX: df: Filesystem trends: Outputting less senseless time left in case of nearly 0 growth * 3034 FIX: cups_queues: Fixed bug when no user name available for a print job * 2940 FIX: dell_om_disks: non-raid state is no longer treated as a critical problem... + * 2942 FIX: juniper_cpu_util: new check replaces juniper_cpu which was reporting incorrect values... + NOTE: Please refer to the migration notes! Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checkman/juniper_cpu b/checkman/juniper_cpu index 2cf0690..783f1cc 100644 --- a/checkman/juniper_cpu +++ b/checkman/juniper_cpu @@ -4,7 +4,9 @@ catalog: hw/network/juniper license: GPL distribution: check_mk description: - Check CPU utilization of the last 1/5/15 minutes in percent on Juniper devices. + This check is obsoleted by juniper_cpu_util! + The check was reporting load readings, not utilization! Those load readings + aren't actualy usable as the number of cores processing that load isn't known. perfdata: util1: The CPU utilization of the last 1 minutes in percent. @@ -12,7 +14,7 @@ perfdata: util15: The CPU utilization of the last 15 minutes in percent. inventory: - One service for each Routing Engine will be creted + Since this check is obsolete, no items are discovered [parameters] warning (int): The percentage of CPU utilization that triggers a warning level. diff --git a/checkman/juniper_cpu_util b/checkman/juniper_cpu_util new file mode 100644 index 0000000..2176029 --- /dev/null +++ b/checkman/juniper_cpu_util @@ -0,0 +1,11 @@ +title: CPU utilization of juniper devices +agents: snmp +catalog: hw/network/juniper +license: GPL +distribution: check_mk +description: + Check CPU utilizationin percent on Juniper devices. + This check replaces the older and broken juniper_cpu check. + +inventory: + One service for each Routing Engine will be creted diff --git a/checks/juniper_cpu b/checks/juniper_cpu index cf05d91..daa1d45 100644 --- a/checks/juniper_cpu +++ b/checks/juniper_cpu @@ -27,46 +27,16 @@ juniper_cpu_default_levels = ( 80.0, 90.0 ) def inventory_juniper_cpu(info): - return [ (x[0], "juniper_cpu_default_levels" ) for x in info if x[0].startswith("Routing Engine") ] + return [] def check_juniper_cpu(item, params, info): for line in info: if line[0] == item: - try: - util1, util5, util15 = map(int, line[1:]) - except ValueError: - return 3, "CPU information not provided by device" - - warn, crit = params - label1, label5, label15 = "", "", "" - state = 0 - if util1 >= crit: - state = 2 - label1 = "(!!)" - elif util1 >= warn: - state = 1 - label1 = "(!)" - if util5 >= crit: - state = 2 - label5 = "(!!)" - elif util5 >= warn: - state = max(state,1) - label5 = "(!)" - if util15 >= crit: - state = 2 - label15 = "(!!)" - elif util15 >= warn: - state = max(state,1) - label15 = "(!)" - - perf = [( "util1", util1, warn, crit ), - ( "util5", util5, warn, crit ), - ( "util15", util15, warn, crit )] - - - message = "%d%% 1 min%s, %d%% 5 min%s, %d%% 15 min%s" % \ - ( util1, label1, util5, label5, util15, label15 ) - return state, message, perf + # this check was using cpu load readings falsely reporting them + # as utilization. Since the device doesn't seem to report the number + # of available cpu cores, load monitoring isn't properly doable + return 3, "This check is obsolete and has been replaced, " \ + "please re-discover service on this host" check_info["juniper_cpu"] = { "check_function" : check_juniper_cpu, diff --git a/checks/juniper_cpu_util b/checks/juniper_cpu_util new file mode 100644 index 0000000..8f43e5e --- /dev/null +++ b/checks/juniper_cpu_util @@ -0,0 +1,56 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2016 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + + +factory_settings['juniper_cpu_util_default_levels'] = { + 'levels': (80.0, 90.0) +} + + +def inventory_juniper_cpu_util(info): + for line in info: + if line[0].startswith("Routing Engine"): + yield line[0], {} + +def check_juniper_cpu_util(item, params, info): + for name, util in info: + if name == item: + return check_cpu_util(int(util), params) + + +check_info['juniper_cpu_util'] = { + 'check_function' : check_juniper_cpu_util, + 'inventory_function' : inventory_juniper_cpu_util, + 'service_description' : "CPU utilization %s", + 'has_perfdata' : True, + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.2636.1.1.1.2"), + 'snmp_info' : (".1.3.6.1.4.1.2636.3.1.13.1",[ + 5, #jnxOperatingDescr + 8, #jnxOperatingCPU + ]), + 'includes' : "cpu_util.include", + 'default_levels_variable' : "juniper_cpu_util_default_levels" +}

8 years, 8 months

fixed several temperature checks that were missing the unique_name parameter

by Sebastian Herbord

Module: check_mk Branch: master Commit: 71bc22c2b47e092f3f69548eb1f20ca31b6c4fcf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71bc22c2b47e09… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Feb 1 11:02:58 2016 +0100 fixed several temperature checks that were missing the unique_name parameter --- checks/artec_temp | 2 +- checks/avaya_88xx | 2 +- checks/emc_isilon_temp | 2 +- checks/etherbox2_temp | 2 +- checks/hp_msa_disk | 2 +- checks/hp_msa_psu | 2 +- checks/ipr400_temp | 2 +- checks/janitza_umg | 3 ++- checks/juniper_temp | 2 +- checks/ups_modulys_battery | 7 +++++-- 10 files changed, 15 insertions(+), 11 deletions(-) diff --git a/checks/artec_temp b/checks/artec_temp index 9ebedb3..c32ffd5 100644 --- a/checks/artec_temp +++ b/checks/artec_temp @@ -38,7 +38,7 @@ def inventory_artec_temp(info): def check_artec_temp(item, params, info): - return check_temperature(int(info[0][0]), params) + return check_temperature(int(info[0][0]), params, "artec_%s" % item) check_info['artec_temp'] = { diff --git a/checks/avaya_88xx b/checks/avaya_88xx index f10c55e..173e9ce 100644 --- a/checks/avaya_88xx +++ b/checks/avaya_88xx @@ -65,7 +65,7 @@ def check_avaya_88xx(item, params, parsed): if len(sensors) < int(item): return - return check_temperature(int(sensors[int(item)]), params) + return check_temperature(int(sensors[int(item)]), params, "avaya_88xx_%s" % item) check_info["avaya_88xx"] = { 'parse_function': parse_avaya_88xx, diff --git a/checks/emc_isilon_temp b/checks/emc_isilon_temp index 4a39e49..a8a7e3e 100644 --- a/checks/emc_isilon_temp +++ b/checks/emc_isilon_temp @@ -34,7 +34,7 @@ def inventory_isilon_temp(info, is_cpu): def check_isilon_temp(item, params, info): for sensor_name, value in info: if item == isilon_temp_item_name(sensor_name): - return check_temperature(float(value), params) + return check_temperature(float(value), params, "isilon_%s" % item) # Expected sensor names: # "Temp Until CPU Throttle (CPU 0)" diff --git a/checks/etherbox2_temp b/checks/etherbox2_temp index e8f4eff..43098f49c 100644 --- a/checks/etherbox2_temp +++ b/checks/etherbox2_temp @@ -71,7 +71,7 @@ def inventory_etherbox2_temp(parsed): def check_etherbox2_temp(item, params, parsed): if item in parsed: - return check_temperature(parsed[item], params) + return check_temperature(parsed[item], params, "etherbox2_%s" % item) check_info['etherbox2_temp'] = { diff --git a/checks/hp_msa_disk b/checks/hp_msa_disk index da3590c..d98cfaa 100644 --- a/checks/hp_msa_disk +++ b/checks/hp_msa_disk @@ -216,7 +216,7 @@ def check_hp_msa_disk_temp(item, params, parsed): for key, values in parsed.items(): disks.append( (key, float( values["temperature-numeric"] )) ) - return check_temperature_list(disks, params) + return check_temperature_list(disks, params, "hp_msa_disk_temp_%s" % item) check_info['hp_msa_disk.temp'] = { diff --git a/checks/hp_msa_psu b/checks/hp_msa_psu index 4955e37..0bf4dbd 100644 --- a/checks/hp_msa_psu +++ b/checks/hp_msa_psu @@ -159,7 +159,7 @@ def inventory_hp_msa_psu_temp(parsed): def check_hp_msa_psu_temp(item, params, parsed): if item in parsed: - return check_temperature(float(parsed[item]["dctemp"]), params) + return check_temperature(float(parsed[item]["dctemp"]), params, "hp_msa_psu_temp_%s" % item) check_info['hp_msa_psu.temp'] = { diff --git a/checks/ipr400_temp b/checks/ipr400_temp index 6f71f23..200f957 100644 --- a/checks/ipr400_temp +++ b/checks/ipr400_temp @@ -35,7 +35,7 @@ def inventory_ipr400_temp(info): yield "Ambient", None def check_ipr400_temp(item, params, info): - return check_temperature(int(info[0][0]), params) + return check_temperature(int(info[0][0]), params, "ipr400_temp_%s" % item) check_info["ipr400_temp"] = { "check_function" : check_ipr400_temp, diff --git a/checks/janitza_umg b/checks/janitza_umg index 8faaedf..f0a4f64 100644 --- a/checks/janitza_umg +++ b/checks/janitza_umg @@ -189,7 +189,8 @@ def inventory_janitza_umg_temp(parsed): def check_janitza_umg_temp(item, params, parsed): idx = int(item) - 1 if len(parsed["Temperature"]) > idx: - return check_temperature(float(parsed["Temperature"][idx]) / 10.0, params) + return check_temperature(float(parsed["Temperature"][idx]) / 10.0, params, + "janitza_umg_%s" % item) check_info['janitza_umg.temp'] = { diff --git a/checks/juniper_temp b/checks/juniper_temp index 1ce8351..9abd078 100644 --- a/checks/juniper_temp +++ b/checks/juniper_temp @@ -53,7 +53,7 @@ def inventory_juniper_temp(parsed): def check_juniper_temp(item, params, parsed): if item in parsed: - return check_temperature(parsed[item], params) + return check_temperature(parsed[item], params, "juniper_temp_%s" % item) check_info['juniper_temp'] = { diff --git a/checks/ups_modulys_battery b/checks/ups_modulys_battery index d7ace50..c1daaf7 100644 --- a/checks/ups_modulys_battery +++ b/checks/ups_modulys_battery @@ -58,7 +58,10 @@ def check_ups_modulys_battery(item, params, info): if elapsed_sec == 0: yield 0, "on mains" else: - yield 0, "discharging for %d minutes" % (elapsed_sec / 60) # TODO: Echt OK? + # we already have configurable levels on remaining capacity which + # would be superfluous if we reported the discharging state itself + # as a problem. Thus this reports "OK" + yield 0, "discharging for %d minutes" % (elapsed_sec / 60) # test 2: battery health if condition == 1: @@ -112,7 +115,7 @@ def inventory_ups_modulys_battery_temp(info): def check_ups_modulys_battery_temp(item, params, info): for condition, elapsed_sec, remaining_min, capacity, temperature in info: - return check_temperature(int(temperature), params) + return check_temperature(int(temperature), params, "ups_modulys_battery_temp_%s" % item) check_info["ups_modulys_battery.temp"] = {

8 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2016