Checkmk git commits October 2014

checkmk-commits@lists.checkmk.com

6 participants
310 discussions

Check_MK Git: check_mk: Updated werk description

by Mathias Kettner

Module: check_mk Branch: master Commit: 5c57c3ed315694d74aaf96a43f802fa771427f68 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c57c3ed315694… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 31 14:19:25 2014 +0100 Updated werk description --- .werks/1198 | 2 +- ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/1198 b/.werks/1198 index f156066..b8d2bf8 100644 --- a/.werks/1198 +++ b/.werks/1198 @@ -1,4 +1,4 @@ -Title: climaveneta_fan: New check for FAN speed on climaveneta devices +Title: climaveneta_fan: New check for fan speed on Climaveneta devices Level: 1 Component: checks Compatible: compat diff --git a/ChangeLog b/ChangeLog index 4bbe7c3..26cc9d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,7 +2,7 @@ Checks & Agents: * 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 + * 1198 climaveneta_fan: New check for fan speed on Climaveneta 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...

9 years, 7 months

Check_MK Git: check_mk: #1480 FIX brocade_vdx_status: disable check on some devices that do not support it

by Mathias Kettner

Module: check_mk Branch: master Commit: 9d18671cd307987c2c707a7baabbeb9bd7d73026 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d18671cd30798… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 31 14:11:34 2014 +0100 #1480 FIX brocade_vdx_status: disable check on some devices that do not support it Thanks to Oleg Roitburd. --- .werks/1480 | 10 ++++++++++ ChangeLog | 1 + checks/brocade_vdx_status | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/1480 b/.werks/1480 new file mode 100644 index 0000000..c3cd4bd --- /dev/null +++ b/.werks/1480 @@ -0,0 +1,10 @@ +Title: brocade_vdx_status: disable check on some devices that do not support it +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.5i7 +Date: 1414761045 + +Thanks to Oleg Roitburd. diff --git a/ChangeLog b/ChangeLog index 4ffb065..4bbe7c3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ * 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 * 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... Multisite: * 1164 FIX: Fixed links from servicegroup overviews to single servicegroups diff --git a/checks/brocade_vdx_status b/checks/brocade_vdx_status index 22af8d4..b6eecda 100644 --- a/checks/brocade_vdx_status +++ b/checks/brocade_vdx_status @@ -53,7 +53,8 @@ check_info["brocade_vdx_status"] = { "check_function" : check_brocade_vdx_status, "inventory_function" : inventory_brocade_vdx_status, "service_description" : "Status", - "snmp_scan_function" : lambda oid: oid('.1.3.6.1.2.1.1.2.0').startswith( ".1.3.6.1.4.1.1588"), + "snmp_scan_function" : lambda oid: oid('.1.3.6.1.2.1.1.2.0').startswith( ".1.3.6.1.4.1.1588") and + not oid('.1.3.6.1.2.1.1.2.0').startswith( ".1.3.6.1.4.1.1588.2.1.1.1"), "snmp_info" : ( ".1.3.6.1.4.1.1588.2.1.1.1.1", [ 6, # Firmware 7 # Status

9 years, 7 months

Check_MK Git: check_mk: #1198 climaveneta_fan: New check for FAN speed on climaveneta devices

by Bastian Kuhn

Module: check_mk Branch: master Commit: befd89a61f77b933808c3bd9c300ca6f0135c703 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=befd89a61f77b9… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Oct 31 14:03:57 2014 +0100 #1198 climaveneta_fan: New check for FAN speed on climaveneta devices --- .werks/1198 | 9 +++++++++ ChangeLog | 1 + 2 files changed, 10 insertions(+) diff --git a/.werks/1198 b/.werks/1198 new file mode 100644 index 0000000..f156066 --- /dev/null +++ b/.werks/1198 @@ -0,0 +1,9 @@ +Title: climaveneta_fan: New check for FAN speed on climaveneta devices +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1414760607 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index eb74241..4ffb065 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Checks & Agents: * 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 * 1478 FIX: kernel.util, statgrab_cpu: fix computation of utilization... Multisite:

9 years, 7 months

Check_MK Git: check_mk: Inventory sync now skips up-to-date files

by Mathias Kettner

Module: check_mk Branch: master Commit: d48a59853b31a3f5475447624f9b1fe7d8952875 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d48a59853b31a3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 31 14:01:58 2014 +0100 Inventory sync now skips up-to-date files --- doc/treasures/liveproxy/liveproxyd | 42 ++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/doc/treasures/liveproxy/liveproxyd b/doc/treasures/liveproxy/liveproxyd index 1581758..4f6d6f4 100755 --- a/doc/treasures/liveproxy/liveproxyd +++ b/doc/treasures/liveproxy/liveproxyd @@ -701,7 +701,7 @@ def dump_state(): #. -# .--Inventory-----------------------------------------------------------. +# .--HW/SW-Inventory-----------------------------------------------------. # | ___ _ | # | |_ _|_ ____ _____ _ __ | |_ ___ _ __ _ _ | # | | || '_ \ \ / / _ \ '_ \| __/ _ \| '__| | | | | @@ -723,8 +723,8 @@ def check_inventory_update(mk_inventory_last, sitename): if mk_inventory_last <= sitestatus["last_inventory_update"]: return # we are up-to-date - log("Site %s: new HW/SW-Inventory data since last update %d secs ago" % ( - sitename, mk_inventory_last - sitestatus["last_inventory_update"])) + # log("Site %s: new HW/SW-Inventory data since last update %d secs ago" % ( + # sitename, mk_inventory_last - sitestatus["last_inventory_update"])) # Inventory update goes in two steps: # 1. Getting the list of all hosts that have new inventory @@ -751,11 +751,10 @@ def check_inventory_update(mk_inventory_last, sitename): if pid: sitestatus["inventory_pid"] = pid sitestatus["inventory_new_last"] = mk_inventory_last - log("Created inventory sync helper with PID %d" % pid) else: try: - do_inventory_update(channel, sitestatus["last_inventory_update"]) + do_inventory_update(sitename, channel, sitestatus["last_inventory_update"]) sys.exit(0) except Exception, e: log("Inventory update of %s failed: %s" % (sitename, e)) @@ -767,7 +766,6 @@ def collect_inventory_updates(): if sitestatus["inventory_pid"]: pid, status = os.waitpid(sitestatus["inventory_pid"], os.WNOHANG) if pid: - log("Inventory update of %s finished %s" % (sitename, status)) sitestatus["inventory_pid"] = None for channel in sitestatus["channels"]: if channel["state"] == "inventory": @@ -777,7 +775,7 @@ def collect_inventory_updates(): del sitestatus["inventory_new_last"] -def do_inventory_update(channel, since): +def do_inventory_update(sitename, channel, since): # Close all filedescriptors that we do not need. needed_fds = [ channel["socket"].fileno(), @@ -793,7 +791,7 @@ def do_inventory_update(channel, since): # Get list of all hosts that have more recent inventory data query = "GET hosts\n" \ - "Columns: name\n" \ + "Columns: name mk_inventory_last\n" \ "Filter: mk_inventory_last > %d\n" \ "KeepAlive: on\n" \ "ResponseHeader: fixed16\n\n" % \ @@ -802,10 +800,10 @@ def do_inventory_update(channel, since): channel["socket"].send(query) response = get_livestatus_response(channel["socket"]) - host_names = response.split() + entries = [ l.split(";") for l in response.split() ] - for host_name in host_names: - do_inventory_update_of(channel["socket"], host_name) + for host_name, timestamp in entries: + do_inventory_update_of(channel["socket"], sitename, host_name, int(timestamp)) def get_livestatus_response(socket): @@ -819,13 +817,23 @@ def get_livestatus_response(socket): while(len(response) != length): response += socket.recv(4096) - if status != "200": - raise Exception("Livestatus query failed: %s" % response) + if status != "200": raise Exception("Livestatus query failed: %s" % response) return response -def do_inventory_update_of(socket, host_name): +# Update the inventory data of a host *if* its timestamp differs from +# the file that we already have +def do_inventory_update_of(socket, sitename, host_name, timestamp): + path = opt_inventory_dir + "/" + host_name + try: + last_mtime = int(os.stat(path).st_mtime) + if last_mtime == timestamp: + log("Inventory of %s is uptodate" % host_name) + return + except: + pass + query = "GET hosts\n" \ "Columns: mk_inventory_gz\n" \ "Filter: name = %s\n" \ @@ -835,14 +843,16 @@ def do_inventory_update_of(socket, host_name): socket.send(query) response = get_livestatus_response(socket) gzipped_invdata = response[:-1] # drop final linefeed - path = opt_inventory_dir + "/" + host_name file(path + ".gz", "w").write(gzipped_invdata) + os.utime(path + ".gz", (timestamp, timestamp)) unzipped_invdata = gzip.GzipFile(fileobj=StringIO.StringIO(gzipped_invdata)).read() file(path, "w").write(unzipped_invdata) + os.utime(path, (timestamp, timestamp)) + log("Site %s: new HW/SW-Inventory data for %s (%d bytes)" % ( + sitename, host_name, len(gzipped_invdata))) #. - # .--Daemon/main---------------------------------------------------------. # | ____ __ _ | # || _ \ __ _ ___ _ __ ___ ___ _ __ / / __ ___ __ _(_)_ __ |

9 years, 7 months

Check_MK Git: check_mk: #1479 liveproxyd: new function for collecting remote inventory data

by Mathias Kettner

Module: check_mk Branch: master Commit: 9d2f3c9f3e4fa4041e1a1a61852b6aa61a710767 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d2f3c9f3e4fa4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 31 13:39:22 2014 +0100 #1479 liveproxyd: new function for collecting remote inventory data The Livestatus Proxy Daemon has now a new function for collecting HW/SW-Data from remote sites. This needs up-to-date versions of Nagios or CMC on these sites, otherwise the proxy daemon will fail to consider these sites as up! So if you update the liveproxd you also need to update your remote sites! Note: The new feature only works in OMD based installations. After updating all sites to the new version, HW/SW-Inventory data collected on remote sites that are connected via liveproxyd will automatically be transferred to the central site. --- .werks/1479 | 17 +++ ChangeLog | 4 + doc/treasures/liveproxy/liveproxyd | 218 +++++++++++++++++++++++++++----- livestatus/src/HostFileColumn.cc | 18 ++- livestatus/src/HostSpecialIntColumn.cc | 2 +- livestatus/src/mk_inventory.cc | 8 +- 6 files changed, 233 insertions(+), 34 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9d2f3c9f3e…

9 years, 7 months

Check_MK Git: check_mk: climaventa: Fixed a few issues

by Mathias Kettner

Module: check_mk Branch: master Commit: d5be373bfb6a0a00742f589b3feab16fdad57148 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d5be373bfb6a0a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 31 13:29:53 2014 +0100 climaventa: Fixed a few issues --- checks/climaveneta_temp | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/checks/climaveneta_temp b/checks/climaveneta_temp index 30ee044..b8a52b2 100644 --- a/checks/climaveneta_temp +++ b/checks/climaveneta_temp @@ -24,27 +24,24 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# Example output from agent: -# Put here the example output from your TCP-Based agent. If the -# check is SNMP-Based, then remove this section climaveneta_sensors = { - 1 : "Room", - 3 : "Outlet air 1", - 4 : "Outlet air 2", - 5 : "Outlet air 3", - 6 : "Outlet air 4", - 7 : "Intlet air 1", - 8 : "Intlet air 2", - 9 : "Intlet air 3", - 10 : "Intlet air 4", - 11 : "Coil 1 Inlet Water", - 12 : "Coil 2 Inlet Water", - 13 : "Coil 1 Outlet Water", - 14 : "Coil 2 Outlet Water", - 23 : "Regulation valve/compressor", - 24 : "Regulation fan 1", - 25 : "Regulation fan 2", - 28 : "Suction", + 1 : "Room", + 3 : "Outlet Air 1", + 4 : "Outlet Air 2", + 5 : "Outlet Air 3", + 6 : "Outlet Air 4", + 7 : "Intlet Air 1", + 8 : "Intlet Air 2", + 9 : "Intlet Air 3", + 10 : "Intlet Air 4", + 11 : "Coil 1 Inlet Water", + 12 : "Coil 2 Inlet Water", + 13 : "Coil 1 Outlet Water", + 14 : "Coil 2 Outlet Water", + 23 : "Regulation Valve/Compressor", + 24 : "Regulation Fan 1", + 25 : "Regulation Fan 2", + 28 : "Suction", } climaveneta_temp_default_levels = (28, 30) @@ -55,21 +52,23 @@ def inventory_climaveneta_temp(info): if sensor_id in climaveneta_sensors.keys() and int(value) > 0: yield climaveneta_sensors[sensor_id], 'climaveneta_temp_default_levels' + def check_climaveneta_temp(item, params, info): for sensor_id, sensor_value in info: sensor_id = int(sensor_id.split('.')[0]) if climaveneta_sensors.get(sensor_id) == item: - sensor_value = int(sensor_value) / 10 + sensor_value = int(sensor_value) / 10.0 return check_temperature(sensor_value, params) + check_info["climaveneta_temp"] = { "check_function" : check_climaveneta_temp, "inventory_function" : inventory_climaveneta_temp, - "service_description" : "Temperature", + "service_description" : "Temperature %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", [ OID_END, 2 ] ), - "group" : "hw_temperature", + "group" : "room_temperature", "includes" : [ "temperature.include" ], }

9 years, 7 months

Check_MK Git: check_mk: #1167 citrix_license/esx_license: Can now be configured to always show OK as state

by Lars Michelsen

Module: check_mk Branch: master Commit: 92506652a8a241a38dc8b9d017b5ae329eb76897 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92506652a8a241… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 31 13:23:16 2014 +0100 #1167 citrix_license/esx_license: Can now be configured to always show OK as state --- .bugs/2203 | 9 +++++++++ .werks/1167 | 9 +++++++++ ChangeLog | 1 + checks/license.include | 7 +++++-- web/plugins/wato/check_parameters.py | 12 +++++++++--- 5 files changed, 33 insertions(+), 5 deletions(-) diff --git a/.bugs/2203 b/.bugs/2203 new file mode 100644 index 0000000..6204949 --- /dev/null +++ b/.bugs/2203 @@ -0,0 +1,9 @@ +Title: Windows-Dateien: Sicherstellen, dass alle CRLF-Umbrüche nutzen +Component: checks +State: open +Date: 2014-10-31 11:36:39 +Targetversion: 1.2.5i1 +Class: bug + +Some files contained in the windows agent (example config) and agent plugins do not use windows +line endings. This should be changed to make easier editing on windows systems easier diff --git a/.werks/1167 b/.werks/1167 new file mode 100644 index 0000000..c7378b9 --- /dev/null +++ b/.werks/1167 @@ -0,0 +1,9 @@ +Title: citrix_license/esx_license: Can now be configured to always show OK as state +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1414758172 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 2da460d..2c57c0b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 1.2.5i7: Checks & Agents: + * 1167 citrix_license/esx_license: Can now be configured to always show OK as state * 1478 FIX: kernel.util, statgrab_cpu: fix computation of utilization... Multisite: diff --git a/checks/license.include b/checks/license.include index fd8936b..8bf8f34 100644 --- a/checks/license.include +++ b/checks/license.include @@ -29,6 +29,9 @@ def license_check_levels(have, used, params): if params == None: warn = have crit = have + elif params == False: + warn = None + crit = None elif type(params[0]) == int: warn = max(0, have - params[0]) crit = max(0, have - params[1]) @@ -42,9 +45,9 @@ def license_check_levels(have, used, params): else: infotext = "used %d licenses, but you have only %d" % (used, have) - if used >= crit: + if crit != None and used >= crit: status = 2 - elif used >= warn: + elif warn != None and used >= warn: status = 1 else: status = 0 diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 381b24e..fe9254c 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -6189,18 +6189,19 @@ register_check_parameters( vs_license = Alternative( + title = _("Levels for Number of Licenses"), style = "dropdown", default_value = None, elements = [ Tuple( - title = _("Absolute Levels for unused licenses"), + title = _("Absolute levels for unused licenses"), elements = [ Integer(title = _("Warning at"), default_value = 5, unit = _("unused licenses")), Integer(title = _("Critical at"), default_value = 0, unit = _("unused licenses")), ] ), Tuple( - title = _("Percentual Levels for unused licenses"), + title = _("Percentual levels for unused licenses"), elements = [ Percentage(title = _("Warning at"), default_value = 10.0), Percentage(title = _("Critical at"), default_value = 0), @@ -6208,9 +6209,14 @@ vs_license = Alternative( ), FixedValue( None, - totext = _("critical if all are used"), + totext = _("Critical when all licenses are used"), title = _("Go critical if all licenses are used"), ), + FixedValue( + False, + title = _("Always report OK"), + totext = _("Alerting depending on the number of used licenses is disabled"), + ) ] )

9 years, 7 months

Check_MK Git: check_mk: #1197 climaveneta_temp: New check for temperature sensors on Climaveneta clima devices

by Bastian Kuhn

Module: check_mk Branch: master Commit: d5ae933997663cc541661425b1de0c6d67d949db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d5ae933997663c… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Oct 31 11:58:13 2014 +0100 #1197 climaveneta_temp: New check for temperature sensors on Climaveneta clima devices --- .werks/1197 | 9 ++++ ChangeLog | 1 + checkman/climaveneta_temp | 21 ++++++++ checks/climaveneta_temp | 75 +++++++++++++++++++++++++++ pnp-templates/check_mk-climaveneta_temp.php | 1 + web/plugins/perfometer/check_mk.py | 1 + 6 files changed, 108 insertions(+) diff --git a/.werks/1197 b/.werks/1197 new file mode 100644 index 0000000..b6c776b --- /dev/null +++ b/.werks/1197 @@ -0,0 +1,9 @@ +Title: climaveneta_temp: New check for temperature sensors on Climaveneta clima devices +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1414753041 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 2da460d..e9225ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 1.2.5i7: Checks & Agents: + * 1197 climaveneta_temp: New check for temperature sensors on Climaveneta clima devices * 1478 FIX: kernel.util, statgrab_cpu: fix computation of utilization... Multisite: diff --git a/checkman/climaveneta_temp b/checkman/climaveneta_temp new file mode 100644 index 0000000..2f71548 --- /dev/null +++ b/checkman/climaveneta_temp @@ -0,0 +1,21 @@ +title: Climaveneta Temperature +agents: snmp +catalog: hw/environment/climaveneta +license: GPL +distribution: +description: + This check monitors the temperature of sensors attached + to climaveneta mc01_o4cv device. + +item: + The item is the sensor description of the sensor as string. + +perfdata: + the current temperature in degree celsius + +inventory: + All available temperature sensors are automatically inventorized. + +[parameters] +warning (int): temperature in degrees at which the check goes warning +critical (int): level for critical temperature diff --git a/checks/climaveneta_temp b/checks/climaveneta_temp new file mode 100644 index 0000000..30ee044 --- /dev/null +++ b/checks/climaveneta_temp @@ -0,0 +1,75 @@ +#!/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. + +# Example output from agent: +# Put here the example output from your TCP-Based agent. If the +# check is SNMP-Based, then remove this section +climaveneta_sensors = { + 1 : "Room", + 3 : "Outlet air 1", + 4 : "Outlet air 2", + 5 : "Outlet air 3", + 6 : "Outlet air 4", + 7 : "Intlet air 1", + 8 : "Intlet air 2", + 9 : "Intlet air 3", + 10 : "Intlet air 4", + 11 : "Coil 1 Inlet Water", + 12 : "Coil 2 Inlet Water", + 13 : "Coil 1 Outlet Water", + 14 : "Coil 2 Outlet Water", + 23 : "Regulation valve/compressor", + 24 : "Regulation fan 1", + 25 : "Regulation fan 2", + 28 : "Suction", +} + +climaveneta_temp_default_levels = (28, 30) + +def inventory_climaveneta_temp(info): + for sensor_id, value in info: + sensor_id = int(sensor_id.split('.')[0]) + if sensor_id in climaveneta_sensors.keys() and int(value) > 0: + yield climaveneta_sensors[sensor_id], 'climaveneta_temp_default_levels' + +def check_climaveneta_temp(item, params, info): + for sensor_id, sensor_value in info: + sensor_id = int(sensor_id.split('.')[0]) + if climaveneta_sensors.get(sensor_id) == item: + sensor_value = int(sensor_value) / 10 + return check_temperature(sensor_value, params) + +check_info["climaveneta_temp"] = { + "check_function" : check_climaveneta_temp, + "inventory_function" : inventory_climaveneta_temp, + "service_description" : "Temperature", + "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", [ OID_END, 2 ] ), + "group" : "hw_temperature", + "includes" : [ "temperature.include" ], +} + diff --git a/pnp-templates/check_mk-climaveneta_temp.php b/pnp-templates/check_mk-climaveneta_temp.php new file mode 120000 index 0000000..8f2a365 --- /dev/null +++ b/pnp-templates/check_mk-climaveneta_temp.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 c7576ea..2f8bd97 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -345,6 +345,7 @@ perfometers["check_mk-casa_cpu_temp"] = perfometer_temperature 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 def perfometer_temperature_multi(row, check_command, perf_data): display_value = -1

9 years, 8 months

Check_MK Git: check_mk: ups_socomec_outphase: Fixed manpage

by Konstantin Büttner

Module: check_mk Branch: master Commit: 2a0e27abe5562b64b184551421a6e35f6e8a426d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a0e27abe5562b… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Fri Oct 31 11:24:55 2014 +0100 ups_socomec_outphase: Fixed manpage --- checkman/ups_socomec_outphase | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/checkman/ups_socomec_outphase b/checkman/ups_socomec_outphase index cba5759..562431d 100644 --- a/checkman/ups_socomec_outphase +++ b/checkman/ups_socomec_outphase @@ -4,9 +4,8 @@ catalog: hw/power/socomec license: GPL distribution: check_mk description: - Checks by which source the output phase is powered. Warns if the device - reports internal maintenance bypass, goes critical during battery operation - or when offline. SNMP state "other" is treated as unknown. + Monitors voltage, current and load output phases of Socomec UPSs. Current is purely informative + as of now and does not support setting parameters. item: The identifier of the phase (usually {"1"}, {"2"}, {"3"}).

9 years, 8 months

Check_MK Git: check_mk: #1166 FIX Also prevting stylesheet update issues during version updates ( just like for JS files)

by Lars Michelsen

Module: check_mk Branch: master Commit: f66943f9fab5b74e77c906e76c94d84c2aa1c223 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f66943f9fab5b7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 31 10:58:57 2014 +0100 #1166 FIX Also prevting stylesheet update issues during version updates (just like for JS files) --- .werks/1166 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/htmllib.py | 16 +++++++++++----- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/.werks/1166 b/.werks/1166 new file mode 100644 index 0000000..16fbc83 --- /dev/null +++ b/.werks/1166 @@ -0,0 +1,10 @@ +Title: Also prevting stylesheet update issues during version updates (just like for JS files) +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.5i7 +Date: 1414749505 + + diff --git a/ChangeLog b/ChangeLog index 5ba04bae..2da460d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,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) WATO: * 1165 FIX: Fixed exception in service discovery of logwatch event console forwarding checks... diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index fe528c9..c6e7574 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -705,11 +705,17 @@ class html: self.write('<base target="%s">\n' % self.attrencode(self.link_target)) # Load all specified style sheets and all user style sheets in htdocs/css - for css in [ "check_mk" ] + stylesheets: - self.write('<link rel="stylesheet" type="text/css" href="%s.css" />\n' % css) - self.write('\n') + for css in [ "check_mk" ] + stylesheets + [ 'ie' ]: + if defaults.omd_root: + fname = '%s-%s.css' % (css, defaults.check_mk_version) + else: + fname = '%s.css' % css + + if css == 'ie': + self.write('\n') self.add_custom_style_sheet()

9 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2014