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",
+}
+
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...
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…
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"),
+ )
]
)
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
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"}).