Checkmk git commits November 2014

checkmk-commits@lists.checkmk.com

6 participants
232 discussions

Check_MK Git: check_mk: Fix too small input field in SNMP timing settings

by Mathias Kettner

Module: check_mk Branch: master Commit: 2b809eff1f3a00bd0aa7ed078e9cc98d6d4f746e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b809eff1f3a00… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 20 12:39:40 2014 +0100 Fix too small input field in SNMP timing settings --- web/plugins/wato/check_mk_configuration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 35446b2..782cb0d 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -2343,12 +2343,12 @@ register_rule(group, maxvalue = 60, allow_int = True, unit = _("sec"), + size = 6, ), ), ( "retries", Integer( title = _("Number of retries"), - help = _("The default is 5."), default_value = 5, minvalue = 0, maxvalue = 50,

9 years, 7 months

Check_MK Git: check_mk: Updated bug entries #1008, #2193

by Lars Michelsen

Module: check_mk Branch: master Commit: 909d614f01ac527f166f65a04ad2336438c8fbfa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=909d614f01ac52… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 20 11:31:38 2014 +0100 Updated bug entries #1008, #2193 --- .bugs/1008 | 7 +++++-- .bugs/2193 | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.bugs/1008 b/.bugs/1008 index 0496e6e..02305a9 100644 --- a/.bugs/1008 +++ b/.bugs/1008 @@ -1,9 +1,9 @@ Title: dashboards: dashboard of a single hostgroup cannot be edited Component: multisite -State: open +Class: bug +State: works4me Date: 2014-11-05 21:35:53 Targetversion: future -Class: bug after creating a dashboard for a single hostgroup, saving it and editing it again, the following traceback occurs at the and and the dashboard cannot @@ -34,3 +34,6 @@ Traceback (most recent call last): File "/omd/sites/heute/share/check_mk/web/htdocs/visuals.py", line 854, in set_value html.set_var(varname, value.get(varname)) AttributeError: 'unicode' object has no attribute 'get' + +2014-11-20 11:31:33: changed state open -> works4me +Already fixed. diff --git a/.bugs/2193 b/.bugs/2193 index 70f27d8..a1cf48a 100644 --- a/.bugs/2193 +++ b/.bugs/2193 @@ -1,10 +1,13 @@ Title: Dashboard: after going to a dashlet detail, edit mode is lost Component: multisite -State: open +Class: nastiness +State: works4me Date: 2014-10-06 19:00:53 Targetversion: future -Class: nastiness When you are in dashboard edit mode and go to the details of a dashlet and then got back - either by saving or by the back button - then the edit mode of the dashboard is lost. But it should keep in edit mode. + +2014-11-20 11:26:10: changed state open -> works4me +Unable to reproduce this. Already fixed.

9 years, 7 months

Check_MK Git: check_mk: Fixed dashlet deletion after latest confirm dialog change

by Lars Michelsen

Module: check_mk Branch: master Commit: 16da594edf2cb8d3d426ec14ef0a3427d55d4d64 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=16da594edf2cb8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 20 11:37:02 2014 +0100 Fixed dashlet deletion after latest confirm dialog change --- web/htdocs/dashboard.py | 2 +- web/htdocs/htmllib.py | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 77cd07c..b8834b4 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -977,7 +977,7 @@ def page_delete_dashlet(): html.context_button(_('Back'), back_url, 'back') html.end_context_buttons() - result = html.confirm(_('Do you really want to delete this dashlet?'), method = 'GET') + result = html.confirm(_('Do you really want to delete this dashlet?'), method='GET', add_transid=True) if result == False: html.footer() return # confirm dialog shown diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index d2f20ad..c43be21 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1128,7 +1128,12 @@ class html: else: return False - def confirm(self, msg, method="POST", action=None): + # The confirm dialog is normally not a dialog which need to be protected + # by a transid itselfs. It is only a intermediate step to the real action + # But there are use cases where the confirm dialog is used during rendering + # a normal page, for example when deleting a dashlet from a dashboard. In + # such cases, the transid must be added by the confirm dialog. + def confirm(self, msg, method="POST", action=None, add_transid=False): if self.var("_do_actions") == _("No"): # User has pressed "No", now invalidate the unused transid self.check_transaction() @@ -1137,9 +1142,7 @@ class html: if self.mobile: self.write('<center>') self.write("<div class=really>%s" % msg) - # The confirm dialog is never a dialog which need to be protected - # by a transid itselfs. It is only a intermediate step to the real action - self.begin_form("confirm", method=method, action=action, add_transid=False) + self.begin_form("confirm", method=method, action=action, add_transid=add_transid) self.hidden_fields(add_action_vars = True) self.button("_do_confirm", _("Yes!"), "really") self.button("_do_actions", _("No"), "")

9 years, 7 months

Check_MK Git: check_mk: Updated bug entries #2227

by Mathias Kettner

Module: check_mk Branch: master Commit: 6628989df281314123789cd733827440c1092c1d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6628989df28131… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 20 11:22:10 2014 +0100 Updated bug entries #2227 --- .bugs/2227 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/2227 b/.bugs/2227 new file mode 100644 index 0000000..6ad1e59 --- /dev/null +++ b/.bugs/2227 @@ -0,0 +1,8 @@ +Title: Multisite connections: move persistent connection option to TCP +Component: multisite +State: open +Date: 2014-11-20 11:21:24 +Targetversion: 1.2.5i1 +Class: nastiness + +This checkbox does not make sense for Livestatus-Proxy and local connections.

9 years, 7 months

Check_MK Git: check_mk: #1529 FIX Mobile-GUI: Fixed "all host problems" view not showing all problems

by Lars Michelsen

Module: check_mk Branch: master Commit: 6176dc990935bb0ce2d2fc9616bf219151d6c840 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6176dc990935bb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 20 11:14:14 2014 +0100 #1529 FIX Mobile-GUI: Fixed "all host problems" view not showing all problems The view was not showing all problems. Instead it was filtering acknowledged hosts. --- .werks/1529 | 10 ++++++++++ ChangeLog | 1 + web/plugins/views/mobile.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1529 b/.werks/1529 new file mode 100644 index 0000000..40eda92 --- /dev/null +++ b/.werks/1529 @@ -0,0 +1,10 @@ +Title: Mobile-GUI: Fixed "all host problems" view not showing all problems +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.5i7 +Date: 1416478405 + +The view was not showing all problems. Instead it was filtering acknowledged hosts. diff --git a/ChangeLog b/ChangeLog index 5dfe667..37877bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,6 +59,7 @@ * 1501 FIX: Legacy view formats created with 2014-09 snapshots are now converted... * 1506 FIX: Fixed randomly hidden dashboard title... * 1527 FIX: Fixed views missing values of some filters (serviceregex, hostgroup filters, ...)... + * 1529 FIX: Mobile-GUI: Fixed "all host problems" view not showing all problems... WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog diff --git a/web/plugins/views/mobile.py b/web/plugins/views/mobile.py index 936a698..2e97c47 100644 --- a/web/plugins/views/mobile.py +++ b/web/plugins/views/mobile.py @@ -392,7 +392,7 @@ multisite_builtin_views.update({ ('hst1', 'on'), ('hst2', 'on'), ('hstp', ''), - ('is_host_acknowledged', '0'), + ('is_host_acknowledged', '-1'), ('host', ''), ('is_summary_host', '0'), ('opthostgroup', '')

9 years, 7 months

Check_MK Git: check_mk: #1528 FIX Fixed actions in mobile GUI

by Lars Michelsen

Module: check_mk Branch: master Commit: 18079c8614fac92574fdc3dbd472789d9c321323 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18079c8614fac9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 20 11:12:31 2014 +0100 #1528 FIX Fixed actions in mobile GUI It was not possible to perform any actions using the mobile GUI. This has been fixed now. --- .werks/1528 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/htmllib.py | 13 +++++++++---- web/htdocs/mobile.py | 26 +++++++++++++++----------- 4 files changed, 35 insertions(+), 15 deletions(-) diff --git a/.werks/1528 b/.werks/1528 new file mode 100644 index 0000000..1cd1129 --- /dev/null +++ b/.werks/1528 @@ -0,0 +1,10 @@ +Title: Fixed actions in mobile GUI +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.5i7 +Date: 1416478312 + +It was not possible to perform any actions using the mobile GUI. This has been fixed now. diff --git a/ChangeLog b/ChangeLog index 37877bf..1552b86 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,6 +59,7 @@ * 1501 FIX: Legacy view formats created with 2014-09 snapshots are now converted... * 1506 FIX: Fixed randomly hidden dashboard title... * 1527 FIX: Fixed views missing values of some filters (serviceregex, hostgroup filters, ...)... + * 1528 FIX: Fixed actions in mobile GUI... * 1529 FIX: Mobile-GUI: Fixed "all host problems" view not showing all problems... WATO: diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 75ec7f6..d2f20ad 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1130,12 +1130,16 @@ class html: def confirm(self, msg, method="POST", action=None): if self.var("_do_actions") == _("No"): - return # user has pressed "No" # None --> "No" + # User has pressed "No", now invalidate the unused transid + self.check_transaction() + return # None --> "No" if not self.has_var("_do_confirm"): if self.mobile: self.write('<center>') self.write("<div class=really>%s" % msg) - self.begin_form("confirm", method=method, action=action) + # The confirm dialog is never a dialog which need to be protected + # by a transid itselfs. It is only a intermediate step to the real action + self.begin_form("confirm", method=method, action=action, add_transid=False) self.hidden_fields(add_action_vars = True) self.button("_do_confirm", _("Yes!"), "really") self.button("_do_actions", _("No"), "") @@ -1143,9 +1147,10 @@ class html: self.write("</div>") if self.mobile: self.write('</center>') - return False # False --> "Dialog shown, no answer yet" + return False # False --> "Dialog shown, no answer yet" else: - return self.check_transaction() and True or None # True: "Yes", None --> Browser reload + # Now check the transaction + return self.check_transaction() and True or None # True: "Yes", None --> Browser reload of "yes" page def register_event(self, name): self.events.add(name) diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py index f9e6812..751d798 100644 --- a/web/htdocs/mobile.py +++ b/web/htdocs/mobile.py @@ -71,6 +71,7 @@ def mobile_html_head(title, ready_code=""): def mobile_html_foot(): html.write("</body></html>\n") + html.store_new_transids() def jqm_header_button(pos, url, title, icon=""): html.write('<a href="%s" class="ui-btn-%s" data-direction="reverse" data-icon="%s" data-iconpos="notext" title="%s" ></a>' % (url, pos, icon, title )) @@ -221,11 +222,10 @@ def page_view(): try: views.show_view(view, show_heading = False, show_buttons = False, show_footer = False, render_function = render_view) - pass except Exception, e: if config.debug: raise - html.write("ERROR showing view: %s" % e) + html.write("ERROR showing view: %s" % html.attrencode(e)) mobile_html_foot() @@ -355,24 +355,28 @@ def show_command_form(view, datasource, rows): if not one_shown: html.write(_('No commands are possible in this view')) +# FIXME: Reduce ducplicate code with views.py def do_commands(view, what, rows): command = None - title, executor = views.core_command(what, rows[0])[1:3] # just get the title + title, executor = views.core_command(what, rows[0], 0, len(rows))[1:3] # just get the title r = html.confirm(_("Do you really want to %(title)s the %(count)d %(what)ss?") % { "title" : title, "count" : len(rows), "what" : _(what + "s"), }) if r != True: return r == None # Show commands on negative answer count = 0 - for row in rows: - nagios_commands, title, executor = views.core_command(what, row) + already_executed = set([]) + for nr, row in enumerate(rows): + nagios_commands, title, executor = views.core_command(what, row, nr, len(rows)) for command in nagios_commands: - if type(command) == unicode: - command = command.encode("utf-8") - executor(command, row["site"]) - count += 1 - - if command: + if command not in already_executed: + if type(command) == unicode: + command = command.encode("utf-8") + executor(command, row["site"]) + already_executed.add(command) + count += 1 + + if count > 0: html.message(_("Successfully sent %d commands.") % count) return True # Show commands again

9 years, 7 months

Check_MK Git: check_mk: #1527 FIX Fixed views missing values of some filters (serviceregex, hostgroup filters, ...)

by Lars Michelsen

Module: check_mk Branch: master Commit: 5f1dd7ed6bb7e58103bf9feaaf808b577b221a17 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f1dd7ed6bb7e5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 20 09:51:57 2014 +0100 #1527 FIX Fixed views missing values of some filters (serviceregex, hostgroup filters, ...) With the rewrite of the views/dashboards/visuals we introduced a mechanism of transforming views of the old format to the new format. This transform mechanism missed to transform hard coded values of some filters where the variable names had been renamed. The affected filters are: 'serviceregex' 'hostregex' 'hostgroupnameregex' 'servicegroupnameregex' 'opthostgroup' 'optservicegroup' 'hostgroup' 'servicegroup' 'host_contactgroup' 'service_contactgroup' If you already have migrated to a previous release, which transformed your views and made you miss these filters or hard coded values, you can install a version containing this fix, remove the file <tt>var/check_mk/web/USER/user_views.mk</tt> from your site and then access the Web-GUI again. This should fix the problem. Be aware: By removing the user_views.mk all your changes to your views you made since the initial creation of the user_views.mk will be reverted. --- .werks/1527 | 31 +++++++++++++++++++++++++++++++ web/htdocs/views.py | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) diff --git a/.werks/1527 b/.werks/1527 new file mode 100644 index 0000000..502c88e --- /dev/null +++ b/.werks/1527 @@ -0,0 +1,31 @@ +Title: Fixed views missing values of some filters (serviceregex, hostgroup filters, ...) +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i6p3 +Date: 1416473103 +Class: fix + +With the rewrite of the views/dashboards/visuals we introduced a mechanism of transforming +views of the old format to the new format. This transform mechanism missed to transform +hard coded values of some filters where the variable names had been renamed. + +The affected filters are: + +'serviceregex' +'hostregex' +'hostgroupnameregex' +'servicegroupnameregex' +'opthostgroup' +'optservicegroup' +'hostgroup' +'servicegroup' +'host_contactgroup' +'service_contactgroup' + +If you already have migrated to a previous release, which transformed your views and made +you miss these filters or hard coded values, you can install a version containing this +fix, remove the file <tt>var/check_mk/web/USER/user_views.mk</tt> from your site and then +access the Web-GUI again. This should fix the problem. Be aware: By removing the user_views.mk +all your changes to your views you made since the initial creation of the user_views.mk +will be reverted. diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 8601980..b6f0d13 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -171,6 +171,7 @@ def transform_old_views(): # The exact match filters have been removed. They where used only as # link filters anyway - at least by the builtin views. continue + for var in f.htmlvars: # Check whether or not the filter is supported by the datasource, # then either skip or use the filter vars @@ -179,6 +180,56 @@ def transform_old_views(): all_vars[var] = value context[filter_name][var] = value + # We changed different filters since the visuals-rewrite. This must be treated here, since + # we need to transform views which have been created with the old filter var names. + # Changes which have been made so far: + changed_filter_vars = { + 'serviceregex': { # Name of the filter + # old var name: new var name + 'service': 'service_regex', + }, + 'hostregex': { + 'host': 'host_regex', + }, + 'hostgroupnameregex': { + 'hostgroup_name': 'hostgroup_regex', + }, + 'servicegroupnameregex': { + 'servicegroup_name': 'servicegroup_regex', + }, + 'opthostgroup': { + 'opthostgroup': 'opthost_group', + 'neg_opthostgroup': 'neg_opthost_group', + }, + 'optservicegroup': { + 'optservicegroup': 'optservice_group', + 'neg_optservicegroup': 'neg_optservice_group', + }, + 'hostgroup': { + 'hostgroup': 'host_group', + 'neg_hostgroup': 'neg_host_group', + }, + 'servicegroup': { + 'servicegroup': 'service_group', + 'neg_servicegroup': 'neg_service_group', + }, + 'host_contactgroup': { + 'host_contactgroup': 'host_contact_group', + 'neg_host_contactgroup': 'neg_host_contact_group', + }, + 'service_contactgroup': { + 'service_contactgroup': 'service_contact_group', + 'neg_service_contactgroup': 'neg_service_contact_group', + }, + } + + if filter_name in changed_filter_vars and f.info in datasource['infos']: + for old_var, new_var in changed_filter_vars[filter_name].items(): + if old_var in filtervars: + value = filtervars[old_var] + all_vars[new_var] = value + context[filter_name][new_var] = value + # Now, when there are single object infos specified, add these keys to the # context for single_key in single_keys:

9 years, 7 months

Check_MK Git: check_mk: Fixed werk version

by Lars Michelsen

Module: check_mk Branch: master Commit: c0ff879205c6f6f328a3b44dd6260e88dedf78ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0ff879205c6f6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 20 10:01:23 2014 +0100 Fixed werk version --- .werks/1527 | 2 +- ChangeLog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.werks/1527 b/.werks/1527 index 502c88e..e9e60e5 100644 --- a/.werks/1527 +++ b/.werks/1527 @@ -2,7 +2,7 @@ Title: Fixed views missing values of some filters (serviceregex, hostgroup filte Level: 1 Component: multisite Compatible: compat -Version: 1.2.5i6p3 +Version: 1.2.5i7 Date: 1416473103 Class: fix diff --git a/ChangeLog b/ChangeLog index 19be91d..5dfe667 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,6 +58,7 @@ * 1438 FIX: quicksearch: fixed various non-working quicksearch filters... * 1501 FIX: Legacy view formats created with 2014-09 snapshots are now converted... * 1506 FIX: Fixed randomly hidden dashboard title... + * 1527 FIX: Fixed views missing values of some filters (serviceregex, hostgroup filters, ...)... WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog

9 years, 7 months

Check_MK Git: check_mk: Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: f31cc90a83e87cc89d1867a469ccde9d02fec50b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f31cc90a83e87c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 20 09:44:45 2014 +0100 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index c16dfe7..d8e2d5c 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1527 +1547

9 years, 7 months

Check_MK Git: check_mk: #1517 carel_sensors: New check for monitoring temperature sensors of Carel AC devices

by Konstantin Büttner

Module: check_mk Branch: master Commit: a4fc73ce2f4f478ebcbe8e7b349f3b7ab763c1b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4fc73ce2f4f47… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Nov 19 18:28:14 2014 +0100 #1517 carel_sensors: New check for monitoring temperature sensors of Carel AC devices --- .werks/1517 | 9 +++ ChangeLog | 1 + checkman/carel_sensors | 22 +++++++ checks/carel_sensors | 103 ++++++++++++++++++++++++++++++ pnp-templates/check_mk-carel_sensors.php | 1 + web/plugins/perfometer/check_mk.py | 1 + 6 files changed, 137 insertions(+) diff --git a/.werks/1517 b/.werks/1517 new file mode 100644 index 0000000..09875a0 --- /dev/null +++ b/.werks/1517 @@ -0,0 +1,9 @@ +Title: carel_sensors: New check for monitoring temperature sensors of Carel AC devices +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1416418058 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 25aa3db..19be91d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ * 1448 domino_info: check is extended to also show and monitor the lnNotesServerState * 1509 if, if64: New option for make inventory based on port alias... * 1440 livedump: now able to add hosts icon_image on config generation... + * 1517 carel_sensors: New check for monitoring temperature sensors of Carel AC devices * 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... * 1485 FIX: dell_om_disks, dell_om_esmlog, dell_om_mem, dell_om_processors, dell_om_sensors: detect more devices... diff --git a/checkman/carel_sensors b/checkman/carel_sensors new file mode 100644 index 0000000..26572a5 --- /dev/null +++ b/checkman/carel_sensors @@ -0,0 +1,22 @@ +title: Temperature sensors for Carel air conditioning +agents: snmp +catalog: hw/environment/carel +license: GPL +distribution: check_mk +description: + This check monitors the temperature for Carel + air conditioning devices. + +perfdata: + The current temperature in degrees celsius + +item: + The description of the sensor. + +inventory: + One check for each sensor is created by the inventory if the + sensor does not read 0 or -9999. + +[parameters] +warn(int): Warning level for the temperature. +crit(int): Critical level for the temperature. diff --git a/checks/carel_sensors b/checks/carel_sensors new file mode 100644 index 0000000..043958d --- /dev/null +++ b/checks/carel_sensors @@ -0,0 +1,103 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 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. + +# This is not intended for overriding in main.mk, as any changes will require +# re-inventory. +carel_temp_defaultlevels = { # This still needs sensible values + "Room" : (30, 35), + "Outdoor" : (60, 70), + "Delivery" : (60, 70), + "Cold Water" : (60, 70), + "Hot Water" : (60, 70), + "Cold Water Outlet" : (60, 70), + "Circuit 1 Suction" : (60, 70), + "Circuit 2 Suction" : (60, 70), + "Circuit 1 Evap" : (60, 70), + "Circuit 2 Evap" : (60, 70), + "Circuit 1 Superheat" : (60, 70), + "Circuit 2 Superheat" : (60, 70), + "Cooling Set Point" : (60, 70), + "Cooling Prop. Band" : (60, 70), + "Cooling 2nd Set Point" : (60, 70), + "Heating Set Point" : (60, 70), + "Heating 2nd Set Point" : (60, 70), + "Heating Prop. Band" : (60, 70), +} + +def carel_sensors_parse(info): + + oidtothing = { + "1.0" : ("temp", "Room"), + "2.0" : ("temp", "Outdoor"), + "3.0" : ("temp", "Delivery"), + "4.0" : ("temp", "Cold Water"), + "5.0" : ("temp", "Hot Water"), + "7.0" : ("temp", "Cold Water Outlet"), + "10.0" : ("temp", "Circuit 1 Suction"), + "11.0" : ("temp", "Circuit 2 Suction"), + "12.0" : ("temp", "Circuit 1 Evap"), + "13.0" : ("temp", "Circuit 2 Evap"), + "14.0" : ("temp", "Circuit 1 Superheat"), + "15.0" : ("temp", "Circuit 2 Superheat"), + "20.0" : ("temp", "Cooling Set Point"), + "21.0" : ("temp", "Cooling Prop. Band"), + "22.0" : ("temp", "Cooling 2nd Set Point"), + "23.0" : ("temp", "Heating Set Point"), + "24.0" : ("temp", "Heating 2nd Set Point"), + "25.0" : ("temp", "Heating Prop. Band"), + } + + parsed = {} + parsed["temp"] = {} + for oidend, value in info: + quantity, sensor = oidtothing.get(oidend, (None, None)) + if quantity == "temp": + if value and value != "0" and value != "-9999": + parsed[quantity][sensor] = float(value) / 10 + + return parsed + + +def inventory_carel_sensors_temp(parsed): + for thing in parsed["temp"].keys(): + yield thing, carel_temp_defaultlevels[thing] + + +def check_carel_sensors_temp(item, params, parsed): + return check_temperature(parsed["temp"][item], params) + + +check_info["carel_sensors"] = { + "parse_function" : carel_sensors_parse, + "inventory_function" : inventory_carel_sensors_temp, + "check_function" : check_carel_sensors_temp, + "service_description" : "Temperature %s", + "group" : "room_temperature", + "has_perfdata" : True, + "snmp_info" : ( ".1.3.6.1.4.1.9839.2.1", [ OID_END, "2" ] ), + "snmp_scan_function" : lambda oid: "pCO" in oid(".1.3.6.1.2.1.1.1.0"), + "includes" : [ "temperature.include" ], +} diff --git a/pnp-templates/check_mk-carel_sensors.php b/pnp-templates/check_mk-carel_sensors.php new file mode 120000 index 0000000..8f2a365 --- /dev/null +++ b/pnp-templates/check_mk-carel_sensors.php @@ -0,0 +1 @@ +template-temperature.php \ No newline at end of file diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 0a09b48..87f6fa9 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -348,6 +348,7 @@ perfometers["check_mk-rms200_temp"] = perfometer_temperature perfometers["check_mk-juniper_screenos_temp"] = perfometer_temperature perfometers["check_mk-lnx_thermal"] = perfometer_temperature perfometers["check_mk-climaveneta_temp"] = perfometer_temperature +perfometers["check_mk-carel_sensors"] = perfometer_temperature def perfometer_temperature_multi(row, check_command, perf_data): display_value = -1

9 years, 7 months

← Newer
1
...
4
5
6
7
8
9
10
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2014