Module: check_mk
Branch: master
Commit: a888c1608e3bf8ca0bd3bb5fcf4bbd76cb8779f5
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a888c1608e3bf8…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Fri Mar 28 11:18:11 2014 +0100
enterasys_fans: New Check to monitor fans of enterasys swichtes
---
.werks/147 | 8 +++++++
ChangeLog | 1 +
checkman/enterasys_fans | 16 ++++++++++++++
checks/enterasys_fans | 54 +++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 79 insertions(+)
diff --git a/.werks/147 b/.werks/147
new file mode 100644
index 0000000..e270cab
--- /dev/null
+++ b/.werks/147
@@ -0,0 +1,8 @@
+Title: enterasys_fans: New Check to monitor fans of enterasys swichtes
+Level: 1
+Component: checks
+Version: 1.2.5i1
+Date: 1396001864
+Class: feature
+
+
diff --git a/ChangeLog b/ChangeLog
index 4d39944..26a2291 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -135,6 +135,7 @@
* 0770 innovaphone_licenses: New check to monitor licenses on innovaphone devices"
* 0771 juniper_trpz_aps: Show the number of connected access points on juniper wlan controllers
* 0772 added special agent for IBM SVC / V7000 storage systems...
+ * 0147 enterasys_fans: New Check to monitor fans of enterasys swichtes
* 0103 FIX: services: Fixed bug with service inventory defined in main.mk...
* 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now
* 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs...
diff --git a/checkman/enterasys_fans b/checkman/enterasys_fans
new file mode 100644
index 0000000..70f44c5
--- /dev/null
+++ b/checkman/enterasys_fans
@@ -0,0 +1,16 @@
+title: Enterasys: Fans
+agents: snmp
+catalog: hw/network/enterasys
+license: GPL
+distribution: check_mk
+description:
+ This check monitors the health of the Fans. It will return an {UKN} state if the status changes
+ to "infoNotAvailable" or "notInstalled", and to {CRIT} if the state changes to "installedAndNotOperating".
+ No configuration is necessary.
+
+item:
+ The id of the FAN like reported in the output of the SNMP agent.
+
+inventory:
+ One check is created for each Fan.
+
diff --git a/checks/enterasys_fans b/checks/enterasys_fans
new file mode 100644
index 0000000..aaf5f2c
--- /dev/null
+++ b/checks/enterasys_fans
@@ -0,0 +1,54 @@
+#!/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.
+
+def inventory_enterasys_fans(info):
+ return [ (x[0], None) for x in info if x[1] != '2' ]
+
+def check_enterasys_fans(item, _no_params, info):
+ fan_states = {
+ "1" : "info not available",
+ "2" : "not installed",
+ "3" : "installed and operating",
+ "4" : "installed and not operating",
+ }
+ for num, state in info:
+ if num == item:
+ message = "FAN State: %s" % ( fan_states[state] )
+ if state in [ "1", "2" ]:
+ return 3, message
+ if state == "4":
+ return 2, message
+ return 0, message
+
+
+check_info["enterasys_fans"] = {
+ "check_function" : check_enterasys_fans,
+ "inventory_function" : inventory_enterasys_fans,
+ "service_description" : "FAN %s",
+ "snmp_info" : ( ".1.3.6.1.4.1.52.4.3.1.3.1.1", [ OID_END, 2 ]),
+ "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.5624.2.1"),
+}
+
Module: check_mk
Branch: master
Commit: c5d0d1d6588725f7549595451258f7ef0fc55aa8
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5d0d1d6588725…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Fri Mar 28 10:36:10 2014 +0100
FIX Availablity: Prevent crash if the notification period is missing
There are some setup where the notification period of a nagios object was set to NULL.
---
.werks/739 | 8 ++++++++
ChangeLog | 1 +
livestatus/src/TableStateHistory.cc | 5 +++++
3 files changed, 14 insertions(+)
diff --git a/.werks/739 b/.werks/739
new file mode 100644
index 0000000..599abd9
--- /dev/null
+++ b/.werks/739
@@ -0,0 +1,8 @@
+Title: Availablity: Prevent crash if the notification period is missing
+Level: 1
+Component: core
+Version: 1.2.5i1
+Date: 1395999230
+Class: fix
+
+There are some setup where the notification period of a nagios object was set to NULL.
diff --git a/ChangeLog b/ChangeLog
index 7064a84..7aada6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,7 @@
* 0282 FIX: TIMEPERIOD TRANSITION messages no longer cut at 64 bytes...
* 0730 FIX: cmc: fixed bug displaying logentries after a logfile rotation...
* 0140 FIX: Fixed unwanted handling of hostname as regex...
+ * 0739 FIX: Availablity: Prevent crash if the notification period is missing...
Checks & Agents:
* 0306 esx_vsphere_counters: added missing ramdisk levels sfcbtickets
diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc
index a399e9e..ee1f8c6 100644
--- a/livestatus/src/TableStateHistory.cc
+++ b/livestatus/src/TableStateHistory.cc
@@ -527,6 +527,11 @@ void TableStateHistory::answerQuery(Query *query)
else
state->_notification_period = (char *)"";
+ // If for some reason the notification period is missing set a default
+ if (state->_notification_period == NULL) {
+ state->_notification_period = (char *)"";
+ }
+
// Same for service period. For Nagios this is a bit different, since this
// is no native field but just a custom variable
if (state->_service != 0)
Module: check_mk
Branch: master
Commit: 1452e74fbf397812b8b884f6dbf97d3208f57bc3
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1452e74fbf3978…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Mar 28 10:23:59 2014 +0100
FIX hpux_if: Fixed exception during parsing of provided data on some systems
Some systems provide float values instead of ints. Parsing failed in this case
with a ValueError exception.
---
.werks/763 | 10 ++++++++++
ChangeLog | 1 +
checks/hpux_if | 2 +-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/.werks/763 b/.werks/763
new file mode 100644
index 0000000..8542aaf
--- /dev/null
+++ b/.werks/763
@@ -0,0 +1,10 @@
+Title: hpux_if: Fixed exception during parsing of provided data on some systems
+Level: 1
+Component: checks
+Class: fix
+State: unknown
+Version: 1.2.5i1
+Date: 1395998553
+
+Some systems provide float values instead of ints. Parsing failed in this case
+with a ValueError exception.
diff --git a/ChangeLog b/ChangeLog
index e900da7..503949c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -237,6 +237,7 @@
* 0758 FIX: check_sql: Fixed monitoring of stored procedures with oracle
* 0599 FIX: esx_vsphere_datastores: provisioning levels in WATO are no longer limited to 101%
* 0737 FIX: megaraid_ldisks: now able to handle "No Virtual Drive Configured" states...
+ * 0763 FIX: hpux_if: Fixed exception during parsing of provided data on some systems...
Multisite:
* 0371 Added log class filter to hostsvcevents view
diff --git a/checks/hpux_if b/checks/hpux_if
index 9dba74a..4cad7d3 100644
--- a/checks/hpux_if
+++ b/checks/hpux_if
@@ -116,7 +116,7 @@ def hpux_parse_speed(speed):
mult = 1000 * 1000 * 1000
else:
mult = 1000 * 1000
- return int(parts[0]) * mult
+ return float(parts[0]) * mult
def hpux_parse_operstatus(txt):
if txt.lower() == "up":
Module: check_mk
Branch: master
Commit: e84865946a8b359ffce1969036402dbdfa79a91f
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e84865946a8b35…
Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de>
Date: Fri Mar 28 10:16:44 2014 +0100
added special agent for IBM SVC / V7000 storage systems
Added a special agent for IBM SVC / V7000 storage systems and a WATO
rule for configuring it. This way you do not need any longer give the
very long SSH command manually as a datasource program.
---
.werks/772 | 8 +-
ChangeLog | 2 +-
agents/special/agent_ibmsvc | 184 +++++++++++++++++++++++++++++++
checks/agent_ibmsvc | 37 +++++++
web/plugins/wato/datasource_programs.py | 62 +++++++++++
5 files changed, 289 insertions(+), 4 deletions(-)
Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e84865946a…