Checkmk git commits October 2014

checkmk-commits@lists.checkmk.com

6 participants
310 discussions

Check_MK Git: check_mk: Make styling of new dual list buttons more streamlined

by Mathias Kettner

Module: check_mk Branch: master Commit: 61d9fa8d2e97023748da4ea1618b0ff7ae9512d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61d9fa8d2e9702… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 31 16:46:19 2014 +0100 Make styling of new dual list buttons more streamlined --- web/htdocs/check_mk.css | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 34c105c..9e60aa1 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -462,9 +462,17 @@ table.vs_duallist td.head { table.vs_duallist a.control { display: inline-block; width: 14px; - border: 1px solid #fff; text-decoration: none; text-align: center; + float: right; + + background-color: #00F; + background-color: #497E95; + border-width: 1px; + border-style: solid; + border-color: #86A9B8 #22404D #22414D #86A9B8; + box-shadow: 0px 0px 1.5px #000; + border-radius: 3px; } table.vs_duallist a.control.add {

9 years, 7 months

Check_MK Git: check_mk: #1481: Fix broken layout of Host-,

by Mathias Kettner

Service- and Contactgroup filters Message-ID: <5453afb7.LV4S2wnzFR783aVr%mk(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: 51a29ad5503929f35cbf0c3a74b7b09e0603d33a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51a29ad5503929… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 31 16:48:35 2014 +0100 #1481: Fix broken layout of Host-, Service- and Contactgroup filters --- .werks/1481 | 9 +++++++++ ChangeLog | 1 + web/plugins/visuals/filters.py | 3 +++ 3 files changed, 13 insertions(+) diff --git a/.werks/1481 b/.werks/1481 new file mode 100644 index 0000000..045b774 --- /dev/null +++ b/.werks/1481 @@ -0,0 +1,9 @@ +Title: Fix broken layout of Host-, Service- and Contactgroup filters +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i7 +Date: 1414770459 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 44abddb..ec8160c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ Multisite: * 1164 FIX: Fixed links from servicegroup overviews to single servicegroups * 1166 FIX: Also prevting stylesheet update issues during version updates (just like for JS files) + * 1481 FIX: Fix broken layout of Host-, Service- and Contactgroup filters WATO: * 1165 FIX: Fixed exception in service discovery of logwatch event console forwarding checks... diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index 3a289c9..573fc49 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -194,6 +194,9 @@ class FilterGroupCombo(Filter): [ what + "group_name" ]) # rows needed to fetch for link information self.what = what + def double_height(self): + return True + def display(self): choices = all_groups(self.what.split("_")[-1]) if not self.enforce:

9 years, 7 months

Check_MK Git: check_mk: Reserved 5 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 6dc0ad73c4fc0ee7f58244d173bef4d6db7b6f35 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6dc0ad73c4fc0e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 31 16:49:10 2014 +0100 Reserved 5 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 3d9eda7..84abd85 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1482 +1487

9 years, 7 months

Check_MK Git: check_mk: #1482 FIX Fix exception when editing a visual of type single host group

by Mathias Kettner

Module: check_mk Branch: master Commit: 6c84a34d54ab2e9600a6d144306d4ca43a87d911 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c84a34d54ab2e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 31 16:50:09 2014 +0100 #1482 FIX Fix exception when editing a visual of type single host group Context editor was broken, because there were two filters with the same HTML variable name <tt>hostgroup</tt>. This has been fixed by renaming the name of the host group selection filter to <tt>host_group</tt>. --- .werks/1482 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/visuals.py | 10 +++++++--- web/plugins/visuals/filters.py | 4 ++-- 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/.werks/1482 b/.werks/1482 new file mode 100644 index 0000000..2797d3a --- /dev/null +++ b/.werks/1482 @@ -0,0 +1,12 @@ +Title: Fix exception when editing a visual of type single host group +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i7 +Date: 1414770553 +Class: fix + +Context editor was broken, because there were two filters with the +same HTML variable name <tt>hostgroup</tt>. This has been fixed +by renaming the name of the host group selection filter to <tt>host_group</tt>. + diff --git a/ChangeLog b/ChangeLog index ec8160c..69fd65b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ * 1164 FIX: Fixed links from servicegroup overviews to single servicegroups * 1166 FIX: Also prevting stylesheet update issues during version updates (just like for JS files) * 1481 FIX: Fix broken layout of Host-, Service- and Contactgroup filters + * 1482 FIX: Fix exception when editing a visual of type single host group... WATO: * 1165 FIX: Fixed exception in service discovery of logwatch event console forwarding checks... diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 4dd059f..ab59a2f 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -848,9 +848,13 @@ class Filter: # Is used to populate a value, for example loaded from persistance, into # the HTML context where it can be used by e.g. the display() method. def set_value(self, value): - val = {} - for varname in self.htmlvars: - html.set_var(varname, value.get(varname)) + try: + val = {} + for varname in self.htmlvars: + html.set_var(varname, value.get(varname)) + except: + html.debug("%r, %s" % (self, self.name)) + raise def get_filter(name): return multisite_filters[name] diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index 573fc49..7fe6150 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -184,13 +184,13 @@ class FilterGroupCombo(Filter): def __init__(self, what, title, enforce): self.enforce = enforce self.prefix = not self.enforce and "opt" or "" - htmlvars = [ self.prefix + what + "group" ] + htmlvars = [ self.prefix + what + "_group" ] if not enforce: htmlvars.append("neg_" + htmlvars[0]) Filter.__init__(self, self.prefix + what + "group", # name, e.g. "hostgroup" title, # title, e.g. "Hostgroup" what.split("_")[0], # info, e.g. "host" - htmlvars, # htmlvars, e.g. "hostgroup" + htmlvars, # htmlvars, e.g. "host_group" [ what + "group_name" ]) # rows needed to fetch for link information self.what = what

9 years, 7 months

Check_MK Git: check_mk: Updated bug entries #2222

by Mathias Kettner

Module: check_mk Branch: master Commit: 3525eb2caec37d9a3a4bdb69f04bcf1d3f457441 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3525eb2caec37d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 31 15:21:55 2014 +0100 Updated bug entries #2222 --- .bugs/2222 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/2222 b/.bugs/2222 new file mode 100644 index 0000000..15605ba --- /dev/null +++ b/.bugs/2222 @@ -0,0 +1,9 @@ +Title: Views for services of one host and for all services have icons at different positions +Component: multisite +State: open +Date: 2014-10-31 15:20:29 +Targetversion: future +Class: nastiness + +The position of the column "service icons" is not always the same. +Sometimes it's at the beginning, sometimes at the end.

9 years, 7 months

Check_MK Git: check_mk: Reserved 10 bug IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: bf029ea8edfae37d2ce7ba818975c2e8d397e5b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf029ea8edfae3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 31 15:20:26 2014 +0100 Reserved 10 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index c7dc989..1e51a82 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2222 +2232

9 years, 7 months

Check_MK Git: check_mk: #1199 climaveneta_alarm: New check to display the alarm states on Climaveneta devcies

by Bastian Kuhn

Module: check_mk Branch: master Commit: bf4e2b4f136827ad487e494873bf83528c0e9be3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf4e2b4f136827… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Oct 31 15:16:56 2014 +0100 #1199 climaveneta_alarm: New check to display the alarm states on Climaveneta devcies --- .werks/1199 | 9 ++++ ChangeLog | 1 + checkman/climaveneta_alarm | 13 ++++++ checks/climaveneta_alarm | 107 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 130 insertions(+) diff --git a/.werks/1199 b/.werks/1199 new file mode 100644 index 0000000..0c17eed --- /dev/null +++ b/.werks/1199 @@ -0,0 +1,9 @@ +Title: climaveneta_alarm: New check to display the alarm states on Climaveneta devcies +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1414764891 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 4e24e94..44abddb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * 1197 climaveneta_temp: New check for temperature sensors on Climaveneta clima devices * 1167 citrix_license/esx_license: Can now be configured to always show OK as state * 1198 climaveneta_fan: New check for fan speed on Climaveneta devices + * 1199 climaveneta_alarm: New check to display the alarm states on Climaveneta devcies * 1478 FIX: kernel.util, statgrab_cpu: fix computation of utilization... * 1480 FIX: brocade_vdx_status: disable check on some devices that do not support it... diff --git a/checkman/climaveneta_alarm b/checkman/climaveneta_alarm new file mode 100644 index 0000000..9c31ef0 --- /dev/null +++ b/checkman/climaveneta_alarm @@ -0,0 +1,13 @@ + +title: Climaveneta: Alarm States +agents: snmp +catalog: hw/environment/climaveneta +license: GPL +distribution: check_mk +description: + This check displays all Alarm states on Climaveneta mc01_o4cv devices. + No configuration is necessary. + +inventory: + One service will be created. + diff --git a/checks/climaveneta_alarm b/checks/climaveneta_alarm new file mode 100644 index 0000000..d39e4da --- /dev/null +++ b/checks/climaveneta_alarm @@ -0,0 +1,107 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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. + +climaveneta_alarms = { + #20 : "Global (general)", + 21 : "Maintenance Status", + 22 : "Password", + 23 : "High water 1erature", + 24 : "High water 2erature", + 25 : "Low room humidity", + 26 : "High room humidity", + 27 : "Low Roomerature", + 28 : "High roomerature", + 29 : "High air inleterature", + 30 : "High air outleterature", + 31 : "Room humid probe", + 32 : "Room probe", + 33 : "Inlet 1 probe", + 34 : "Inlet 2 probe", + 35 : "Inlet 3 probe", + 36 : "Inlet 4 probe", + 37 : "Outlet 1 probe", + 38 : "Outlet 2 probe", + 39 : "Outlet 3 probe", + 40 : "Outlet 4 probe", + 41 : "Water 1erature probe", + 42 : "Water 2erature probe", + 43 : "Door open", + 44 : "EEPROM", + 45 : "Fan 1 disconnected", + 46 : "Fan 2 disconnected", + 47 : "Fan 3 disconnected", + 48 : "Fan 4 disconnected", + 49 : "Dew point", + 50 : "Flooding", + 51 : "LAN", + 52 : "Dirty filter", + 53 : "Electronic thermostatic valve", + 54 : "Low pressure", + 55 : "High pressure", + 56 : "Air flow", + 57 : "Fire smoke", + 58 : "I/O expansion", + 59 : "Inverter", + 60 : "Envelop", + 61 : "Polygon inconsistent", + 62 : "Delta pressure for inverter compressor", + 63 : "Primary power supply", + 64 : "Energy managment", + 65 : "Low current humidif", + 66 : "No water humidif", + 67 : "High current humidif", + 68 : "Humidifier Board Offline", + 69 : "Life timer expired Reset/Clean cylinder", + 70 : "Humidifier Drain", + 71 : "Generic Humidifier", + 72 : "Electric heater", +} + + +def inventory_climaveneta_alarm(info): + return [(None,None)] + + +def check_climaveneta_alarm(item, params, info): + hit = False + for oid_id, status in info: + alarm_id = int(oid_id.split('.')[0]) + if alarm_id in climaveneta_alarms.keys(): + if status != '0': + hit = True + yield 2, "Alarm: %s" % climaveneta_alarms[alarm_id] + if not hit: + yield 0, "No alarm state" + + +check_info["climaveneta_alarm"] = { + "check_function" : check_climaveneta_alarm, + "inventory_function" : inventory_climaveneta_alarm, + "service_description" : "Alarm Status", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0") == "pCO Gateway", + "snmp_info" : (".1.3.6.1.4.1.9839.2.1", [ OID_END, 1 ] ), +} +

9 years, 7 months

Check_MK Git: check_mk: #1168 FIX HTML mails can now be configured to display graphs among each other

by Lars Michelsen

Module: check_mk Branch: master Commit: 03f5560f2006443edb59e975144efbd0e45073ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03f5560f200644… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 31 14:48:51 2014 +0100 #1168 FIX HTML mails can now be configured to display graphs among each other By default all graphs are displayed besides eachother, trying to fill horizontally as much space as possible. Now you can configure the mail notifications to display the graphs among each other by setting the notification parmeter. --- .werks/1168 | 12 ++++++++++++ ChangeLog | 3 +++ notifications/mail | 10 +++++++++- web/plugins/wato/notifications.py | 16 ++++++++++++---- 4 files changed, 36 insertions(+), 5 deletions(-) diff --git a/.werks/1168 b/.werks/1168 new file mode 100644 index 0000000..94d65a9 --- /dev/null +++ b/.werks/1168 @@ -0,0 +1,12 @@ +Title: HTML mails can now be configured to display graphs among each other +Level: 1 +Component: notifications +Compatible: compat +Version: 1.2.5i7 +Date: 1414763224 +Class: fix + +By default all graphs are displayed besides eachother, trying to fill +horizontally as much space as possible. Now you can configure the mail +notifications to display the graphs among each other by setting the +notification parmeter. diff --git a/ChangeLog b/ChangeLog index fcbfb17..c7f7171 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,9 @@ WATO: * 1165 FIX: Fixed exception in service discovery of logwatch event console forwarding checks... + Notifications: + * 1168 FIX: HTML mails can now be configured to display graphs among each other... + 1.2.5i6: Core & Setup: diff --git a/notifications/mail b/notifications/mail index 57f4b28..e77c21b 100755 --- a/notifications/mail +++ b/notifications/mail @@ -171,6 +171,11 @@ img { margin-right: 10px; } +img.nofloat { + display: block; + margin-bottom: 10px; +} + table.context { border-collapse: collapse; } @@ -555,7 +560,10 @@ def construct_content(context): name = '%s-%s-%d.png' % (context['HOSTNAME'], svc_desc, source) attachments.append(('img', name, content, 'inline')) - graph_code += '<img src="cid:%s" />' % name + cls = '' + if context.get('PARAMETER_NO_FLOATING_GRAPHS'): + cls = ' class="nofloat"' + graph_code += '<img src="cid:%s"%s />' % (name, cls) if graph_code: content_html += ( diff --git a/web/plugins/wato/notifications.py b/web/plugins/wato/notifications.py index 12d4733..0814e4b 100644 --- a/web/plugins/wato/notifications.py +++ b/web/plugins/wato/notifications.py @@ -78,11 +78,11 @@ register_notification_parameters("mail", ), ( "url_prefix", TextAscii( - title = _("URL prefix for links to Multisite"), + title = _("URL prefix for links to Check_MK"), help = _("If you specify an URL prefix here, then several parts of the " - "email body are armed with hyperlinks to your Multisite GUI, so " + "email body are armed with hyperlinks to your Check_MK GUI, so " "that the recipient of the email can directly visit the host or " - "service in question in Multisite. Specify an absolute URL including " + "service in question in Check_MK. Specify an absolute URL including " "the <tt>.../check_mk/</tt>"), regex = "^(http|https)://.*/check_mk/$", regex_error = _("The URL must begin with <tt>http</tt> or " @@ -91,7 +91,15 @@ register_notification_parameters("mail", default_value = "http://" + socket.gethostname() + "/" + ( defaults.omd_site and defaults.omd_site + "/" or "") + "check_mk/", ) - ) + ), + ( "no_floating_graphs", FixedValue( + True, + title = _("Display graphs among each other"), + totext = _("Graphs are shown among each other"), + help = _("By default all multiple graphs in emails are displayed floating " + "nearby. You can enable this option to show the graphs among each " + "other."), + )), ] ) )

9 years, 7 months

Check_MK Git: check_mk: Small fixes for climaventa checks

by Mathias Kettner

Module: check_mk Branch: master Commit: 4513d494030ef11185bf0f845b33b0d46baea8c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4513d494030ef1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 31 14:40:42 2014 +0100 Small fixes for climaventa checks --- checkman/climaveneta_fan | 12 ++++++------ checkman/climaveneta_temp | 6 +++--- checks/climaveneta_fan | 17 ++++++++++------- modules/catalog.py | 1 + 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/checkman/climaveneta_fan b/checkman/climaveneta_fan index 2c2011f..31978da 100644 --- a/checkman/climaveneta_fan +++ b/checkman/climaveneta_fan @@ -1,19 +1,19 @@ -title: Climaveneta Fan +title: Climaveneta: Fans agents: snmp catalog: hw/environment/climaveneta license: GPL -distribution: +distribution: check_mk description: - This check monitors the Fan speeds on Climaveneta mc01_o4cv devices. + This check monitors the fan speeds on Climaveneta mc01_o4cv devices. item: - The id of the Fan (1 or 2) + The id of the fan (1 or 2) perfdata: - the current Fan speed in rpm + the current fan speed in RPM inventory: - one service for each Fan + For each fan one service is created [parameters] lower_warning (int): Warning if speed is beneath diff --git a/checkman/climaveneta_temp b/checkman/climaveneta_temp index 2f71548..36bcef7 100644 --- a/checkman/climaveneta_temp +++ b/checkman/climaveneta_temp @@ -1,11 +1,11 @@ -title: Climaveneta Temperature +title: Climaveneta: Temperature sensors agents: snmp catalog: hw/environment/climaveneta license: GPL -distribution: +distribution: check_mk description: This check monitors the temperature of sensors attached - to climaveneta mc01_o4cv device. + to Climaveneta mc01_o4cv device. item: The item is the sensor description of the sensor as string. diff --git a/checks/climaveneta_fan b/checks/climaveneta_fan index d3fac3e..63d6672 100644 --- a/checks/climaveneta_fan +++ b/checks/climaveneta_fan @@ -24,28 +24,31 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + factory_settings["climaveneta_fan_default_levels"] = { "lower" : ( 200, 100 ), "upper" : ( 700, 800 ), } + def inventory_climaveneta_fan(info): if len(info[0]) == 2: return [ (1, {}), (2, {}) ] + def check_climaveneta_fan(item, params, info): - item = item-1 - rpm = int(info[0][item]) + rpm = int(info[0][item - 1]) l_warn, l_crit = params['lower'] u_warn, u_crit = params['upper'] perfdata = [("rpm", rpm )] - message = "Speed at %d rpm" % rpm + message = "Speed at %d RPM" % rpm if rpm <= l_crit or rpm >= u_crit: return 2, message, perfdata - if rpm <= l_warn or rpm >= u_warn: - return 1, messagae, perfdata - return 0, message, perfdata - + elif rpm <= l_warn or rpm >= u_warn: + return 1, message, perfdata + else: + return 0, message, perfdata + check_info["climaveneta_fan"] = { "check_function" : check_climaveneta_fan, diff --git a/modules/catalog.py b/modules/catalog.py index 4efae9f..c62e5d7 100644 --- a/modules/catalog.py +++ b/modules/catalog.py @@ -40,6 +40,7 @@ manpage_catalog_titles = { "stulz" : "STULZ", "wut" : "Wiesemann & Theis", "wagner" : "WAGNER Group", + "climaventa" : "Climaventa", "other" : "Other devices", "network" : "Networking (Switches, Routers, etc.)", "alcatel" : "Alcatel",

9 years, 7 months

Check_MK Git: check_mk: added missing files

by Bastian Kuhn

Module: check_mk Branch: master Commit: cce6fab9056d3487a08ded705a23daaefa1f3a55 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cce6fab9056d34… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Oct 31 14:25:53 2014 +0100 added missing files --- checkman/climaveneta_fan | 22 +++++++++++++++++ checks/climaveneta_fan | 60 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) diff --git a/checkman/climaveneta_fan b/checkman/climaveneta_fan new file mode 100644 index 0000000..2c2011f --- /dev/null +++ b/checkman/climaveneta_fan @@ -0,0 +1,22 @@ +title: Climaveneta Fan +agents: snmp +catalog: hw/environment/climaveneta +license: GPL +distribution: +description: + This check monitors the Fan speeds on Climaveneta mc01_o4cv devices. + +item: + The id of the Fan (1 or 2) + +perfdata: + the current Fan speed in rpm + +inventory: + one service for each Fan + +[parameters] +lower_warning (int): Warning if speed is beneath +lower_critical (int): Minimum level for the speed +upper_warning (int): Warning if the speed is above +upper_critical (int): Maximum level for the speed diff --git a/checks/climaveneta_fan b/checks/climaveneta_fan new file mode 100644 index 0000000..d3fac3e --- /dev/null +++ b/checks/climaveneta_fan @@ -0,0 +1,60 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 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["climaveneta_fan_default_levels"] = { + "lower" : ( 200, 100 ), + "upper" : ( 700, 800 ), +} + +def inventory_climaveneta_fan(info): + if len(info[0]) == 2: + return [ (1, {}), (2, {}) ] + +def check_climaveneta_fan(item, params, info): + item = item-1 + rpm = int(info[0][item]) + l_warn, l_crit = params['lower'] + u_warn, u_crit = params['upper'] + perfdata = [("rpm", rpm )] + message = "Speed at %d rpm" % rpm + if rpm <= l_crit or rpm >= u_crit: + return 2, message, perfdata + if rpm <= l_warn or rpm >= u_warn: + return 1, messagae, perfdata + return 0, message, perfdata + + +check_info["climaveneta_fan"] = { + "check_function" : check_climaveneta_fan, + "inventory_function" : inventory_climaveneta_fan, + "service_description" : "Fan %s", + "has_perfdata" : True, + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0") == "pCO Gateway", + "snmp_info" : (".1.3.6.1.4.1.9839.2.1.2", [ 42, 43 ] ), + "group" : "hw_fans", + "default_levels_variable" : "climaveneta_fan_default_levels", +} +

9 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2014